Changeset 11851 for branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GeneticProgramming

Timestamp:

02/01/15 20:30:44 (10 years ago)

Author:

gkronber

Message:

#2283: solution reorganization

Location:

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GeneticProgramming

Files:

• HeuristicLab.Algorithms.GeneticProgramming.csproj (modified) (1 diff)
• OffspringSelectionGP.cs (modified) (2 diffs)
• StandardGP.cs (modified) (2 diffs)

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GeneticProgramming/HeuristicLab.Algorithms.GeneticProgramming.csproj

@@ -67 +67 @@
       <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.Selection-3.3.dll</HintPath>
     </Reference>
-    <Reference Include="HeuristicLab.SequentialEngine-3.3">
-      <HintPath>..\..\..\trunk\sources\bin\HeuristicLab.SequentialEngine-3.3.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GeneticProgramming/OffspringSelectionGP.cs

@@ -8 +8 @@
 using HeuristicLab.Problems.GrammaticalOptimization;
 using HeuristicLab.Selection;
-using HeuristicLab.SequentialEngine;
 using HeuristicLab.Algorithms.GeneticAlgorithm;
 
@@ -33 +32 @@
     public override void Run(int maxEvaluations) {
       var hlProblem = new GenericSymbExprProblem(problem);
-      hlProblem.Evaluator.SolutionEvaluated += OnSolutionEvaluated; // raise solution evaluated event for each GP solution, don't scale quality to 0..1 
+      var onEvalLocker = new object();
+      hlProblem.Evaluator.SolutionEvaluated += (sentence, quality) => {
+        // raise solution evaluated event for each GP solution, don't scale quality to 0..1 
+        // need to synchronize in case we are using a parallel engine
+        lock (onEvalLocker) {
+          OnSolutionEvaluated(sentence, quality);
+        }
+      };
       hlProblem.MaximumSymbolicExpressionTreeLength.Value = MaxSolutionSize;
       hlProblem.MaximumSymbolicExpressionTreeDepth.Value = MaxSolutionDepth;

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GeneticProgramming/StandardGP.cs

@@ -8 +8 @@
 using HeuristicLab.Problems.GrammaticalOptimization;
 using HeuristicLab.Selection;
-using HeuristicLab.SequentialEngine;
 using HeuristicLab.Algorithms.GeneticAlgorithm;
 
@@ -35 +34 @@
     public override void Run(int maxEvaluations) {
       var hlProblem = new GenericSymbExprProblem(problem);
-      hlProblem.Evaluator.SolutionEvaluated += OnSolutionEvaluated; // raise solution evaluated event for each GP solution, don't scale quality to 0..1 
+      var onEvalLocker = new object();
+      hlProblem.Evaluator.SolutionEvaluated += (sentence, quality) => {
+        // raise solution evaluated event for each GP solution, don't scale quality to 0..1 
+        // need to synchronize in case we are using a parallel engine
+        lock (onEvalLocker) {
+          OnSolutionEvaluated(sentence, quality);
+        }
+      };
       hlProblem.MaximumSymbolicExpressionTreeLength.Value = MaxSolutionSize;
       hlProblem.MaximumSymbolicExpressionTreeDepth.Value = MaxSolutionDepth;