Changeset 14029 for branches/crossvalidation-2434/HeuristicLab.Problems.GrammaticalEvolution/3.4/ArtificialAnt

Timestamp:

07/08/16 14:40:02 (8 years ago)

Author:

gkronber

Message:

#2434: merged trunk changes r12934:14026 from trunk to branch

Location:

branches/crossvalidation-2434

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.GrammaticalEvolution (modified) (1 prop)
• HeuristicLab.Problems.GrammaticalEvolution/3.4/ArtificialAnt/GEArtificialAntProblem.cs (modified) (4 diffs)

branches/crossvalidation-2434/HeuristicLab.Problems.GrammaticalEvolution/3.4/ArtificialAnt/GEArtificialAntProblem.cs

@@ -22 +22 @@
 #endregion
 
-using System.Diagnostics.Contracts;
 using System.Linq;
 using HeuristicLab.Common;
@@ -33 +32 @@
 using HeuristicLab.Problems.GeneticProgramming.ArtificialAnt;
 using HeuristicLab.Problems.GrammaticalEvolution.Mappers;
+using HeuristicLab.Random;
 
 namespace HeuristicLab.Problems.GrammaticalEvolution {
-  [Item("Grammatical Evolution Artificial Ant Problem", "Represents the Artificial Ant problem, implemented in Grammatical Evolution.")]
+  [Item("Grammatical Evolution Artificial Ant Problem (GE)", "Represents the Artificial Ant problem, implemented in Grammatical Evolution.")]
   [Creatable(CreatableAttribute.Categories.GeneticProgrammingProblems, Priority = 170)]
   [StorableClass]
   public sealed class GEArtificialAntProblem : SingleObjectiveBasicProblem<IntegerVectorEncoding>, IStorableContent {
-    public string Filename { get; set; }
 
     #region Parameter Properties
@@ -98 +97 @@
     }
 
+    private readonly object syncRoot = new object();
     public override double Evaluate(Individual individual, IRandom random) {
       var vector = individual.IntegerVector();
@@ -106 +106 @@
       var mapper = GenotypeToPhenotypeMapperParameter.Value;
 
-      var tree = mapper.Map(random, bounds, len, grammar, vector);
+      // Evaluate might be called concurrently therefore access to random has to be synchronized.
+      // However, results depend on the order of execution. Therefore, results might be different for the same seed when using the parallel engine.
+      IRandom fastRand;
+      lock (syncRoot) {
+        fastRand = new FastRandom(random.Next());
+      }
+      var tree = mapper.Map(fastRand, bounds, len, grammar, vector);
 
       Interpreter interpreter = new Interpreter(tree, World, MaxTimeSteps);