Changeset 10280 for branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/ArtificialAnt

Timestamp:

01/05/14 12:53:58 (11 years ago)

Author:

sawinkle

Message:

#2109: Fetched random number generator in Evaluator implementations from scope, so that the same results are produced using the same seed.

File:

• branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/ArtificialAnt/GEArtificialAntEvaluator.cs (modified) (3 diffs)

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/ArtificialAnt/GEArtificialAntEvaluator.cs

@@ -63 +63 @@
       get { return (ILookupParameter<IGenotypeToPhenotypeMapper>)Parameters["GenotypeToPhenotypeMapper"]; }
     }
+    public ILookupParameter<IRandom> RandomParameter {
+      get { return (ILookupParameter<IRandom>)Parameters["Random"]; }
+    }
     #endregion
 
@@ -78 +81 @@
       Parameters.Add(new ValueLookupParameter<ISymbolicExpressionGrammar>("SymbolicExpressionTreeGrammar", "The tree grammar that defines the correct syntax of symbolic expression trees that should be created."));
       Parameters.Add(new LookupParameter<IGenotypeToPhenotypeMapper>("GenotypeToPhenotypeMapper", "Maps the genotype (an integer vector) to the phenotype (a symbolic expression tree)."));
+      Parameters.Add(new LookupParameter<IRandom>("Random", "Random number generator for the genotype creation and the genotype-to-phenotype mapping."));
     }
 
     public sealed override IOperation Apply() {
-      SymbolicExpressionTree expression = GenotypeToPhenotypeMapperParameter.ActualValue.Map(
+      SymbolicExpressionTree tree = GenotypeToPhenotypeMapperParameter.ActualValue.Map(
+        RandomParameter.ActualValue,
         SymbolicExpressionTreeGrammarParameter.ActualValue,
         IntegerVectorParameter.ActualValue
       );
-      SymbolicExpressionTreeParameter.ActualValue = expression;
+      SymbolicExpressionTreeParameter.ActualValue = tree;
       BoolMatrix world = WorldParameter.ActualValue;
       IntValue maxTimeSteps = MaxTimeStepsParameter.ActualValue;
@@ -92 +97 @@
       interpreter.MaxTimeSteps = maxTimeSteps.Value;
       interpreter.World = world;
-      interpreter.Expression = expression;
+      interpreter.Expression = tree;
       interpreter.Run();