Changeset 5352 for trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.cs

Timestamp:

01/21/11 22:51:59 (14 years ago)

Author:

abeham

Message:

#1333

• Removed changes to IntCounter that would make it thread-safe, if a thread-safe operator is needed a separate one should be implemented
• Moved counting of evaluated solutions out of the parallel region

File:

• trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/GeneticAlgorithm.cs

@@ -135 +135 @@
     }
     private GeneticAlgorithmMainLoop GeneticAlgorithmMainLoop {
-      get { return (GeneticAlgorithmMainLoop)((Assigner)SolutionsCreator.Successor).Successor; }
+      get { return (GeneticAlgorithmMainLoop)((SubScopesCounter)SolutionsCreator.Successor).Successor; }
     }
     [Storable]
@@ -156 +156 @@
       RandomCreator randomCreator = new RandomCreator();
       SolutionsCreator solutionsCreator = new SolutionsCreator();
-      Assigner assigner = new Assigner();
+      SubScopesCounter subScopesCounter = new SubScopesCounter();
       GeneticAlgorithmMainLoop geneticAlgorithmMainLoop = new GeneticAlgorithmMainLoop();
       OperatorGraph.InitialOperator = randomCreator;
@@ -168 +168 @@
 
       solutionsCreator.NumberOfSolutionsParameter.ActualName = PopulationSizeParameter.Name;
-      solutionsCreator.Successor = assigner;
-
-      assigner.Name = "Initialize EvaluatedSolutions";
-      assigner.LeftSideParameter.ActualName = "EvaluatedSolutions";
-      assigner.RightSideParameter.ActualName = PopulationSizeParameter.Name;
-      assigner.Successor = geneticAlgorithmMainLoop;
+      solutionsCreator.Successor = subScopesCounter;
+
+      subScopesCounter.Name = "Initialize EvaluatedSolutions";
+      subScopesCounter.ValueParameter.ActualName = "EvaluatedSolutions";
+      subScopesCounter.Successor = geneticAlgorithmMainLoop;
 
       geneticAlgorithmMainLoop.SelectorParameter.ActualName = SelectorParameter.Name;