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

Timestamp:

01/21/11 10:54:30 (14 years ago)

Author:

abeham

Message:

#1344

• Added EvaluatedSolutions result to GeneticAlgorithm
• Updated the GA and SGP samples (GA samples with parallel engine, SGP with sequential engine)

File:

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

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

@@ -26 +26 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Operators;
 using HeuristicLab.Optimization;
 using HeuristicLab.Optimization.Operators;
@@ -134 +135 @@
     }
     private GeneticAlgorithmMainLoop GeneticAlgorithmMainLoop {
-      get { return (GeneticAlgorithmMainLoop)SolutionsCreator.Successor; }
+      get { return (GeneticAlgorithmMainLoop)((Assigner)SolutionsCreator.Successor).Successor; }
     }
     [Storable]
@@ -155 +156 @@
       RandomCreator randomCreator = new RandomCreator();
       SolutionsCreator solutionsCreator = new SolutionsCreator();
+      Assigner assigner = new Assigner();
       GeneticAlgorithmMainLoop geneticAlgorithmMainLoop = new GeneticAlgorithmMainLoop();
       OperatorGraph.InitialOperator = randomCreator;
@@ -166 +168 @@
 
       solutionsCreator.NumberOfSolutionsParameter.ActualName = PopulationSizeParameter.Name;
-      solutionsCreator.Successor = geneticAlgorithmMainLoop;
+      solutionsCreator.Successor = assigner;
+
+      assigner.Name = "Initialize EvaluatedSolutions";
+      assigner.LeftSideParameter.ActualName = "EvaluatedSolutions";
+      assigner.RightSideParameter.ActualName = PopulationSizeParameter.Name;
+      assigner.Successor = geneticAlgorithmMainLoop;
 
       geneticAlgorithmMainLoop.SelectorParameter.ActualName = SelectorParameter.Name;
@@ -176 +183 @@
       geneticAlgorithmMainLoop.RandomParameter.ActualName = RandomCreator.RandomParameter.ActualName;
       geneticAlgorithmMainLoop.AnalyzerParameter.ActualName = AnalyzerParameter.Name;
+      geneticAlgorithmMainLoop.EvaluatedSolutionsParameter.ActualName = "EvaluatedSolutions";
+      geneticAlgorithmMainLoop.PopulationSizeParameter.ActualName = PopulationSizeParameter.Name;
       geneticAlgorithmMainLoop.ResultsParameter.ActualName = "Results";