Changeset 3023 for trunk/sources/HeuristicLab.Algorithms.SGA/3.3/SGA.cs

Timestamp:

03/14/10 23:32:27 (15 years ago)

Author:

swagner

Message:

Renamed PopulationCreator to SolutionsCreator (#911)

File:

• trunk/sources/HeuristicLab.Algorithms.SGA/3.3/SGA.cs (modified) (6 diffs)

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

@@ -120 +120 @@
       get { return (RandomCreator)OperatorGraph.InitialOperator; }
     }
-    private PopulationCreator PopulationCreator {
-      get { return (PopulationCreator)RandomCreator.Successor; }
+    private SolutionsCreator SolutionsCreator {
+      get { return (SolutionsCreator)RandomCreator.Successor; }
     }
     private SGAMainLoop SGAMainLoop {
-      get { return (SGAMainLoop)PopulationCreator.Successor; }
+      get { return (SGAMainLoop)SolutionsCreator.Successor; }
     }
     private List<ISelector> selectors;
@@ -145 +145 @@
 
       RandomCreator randomCreator = new RandomCreator();
-      PopulationCreator populationCreator = new PopulationCreator();
+      SolutionsCreator solutionsCreator = new SolutionsCreator();
       SGAMainLoop sgaMainLoop = new SGAMainLoop();
       OperatorGraph.InitialOperator = randomCreator;
@@ -154 +154 @@
       randomCreator.SetSeedRandomlyParameter.ActualName = SetSeedRandomlyParameter.Name;
       randomCreator.SetSeedRandomlyParameter.Value = null;
-      randomCreator.Successor = populationCreator;
-
-      populationCreator.PopulationSizeParameter.ActualName = PopulationSizeParameter.Name;
-      populationCreator.Successor = sgaMainLoop;
+      randomCreator.Successor = solutionsCreator;
+
+      solutionsCreator.NumberOfSolutionsParameter.ActualName = PopulationSizeParameter.Name;
+      solutionsCreator.Successor = sgaMainLoop;
 
       sgaMainLoop.SelectorParameter.ActualName = SelectorParameter.Name;
@@ -184 +184 @@
       ParameterizeStochasticOperator(Problem.Evaluator);
       foreach (IOperator op in Problem.Operators) ParameterizeStochasticOperator(op);
-      ParameterizePopulationCreator();
+      ParameterizeSolutionsCreator();
       ParameterizeSGAMainLoop();
       ParameterizeSelectors();
@@ -194 +194 @@
     protected override void Problem_SolutionCreatorChanged(object sender, EventArgs e) {
       ParameterizeStochasticOperator(Problem.SolutionCreator);
-      ParameterizePopulationCreator();
+      ParameterizeSolutionsCreator();
       base.Problem_SolutionCreatorChanged(sender, e);
     }
     protected override void Problem_EvaluatorChanged(object sender, EventArgs e) {
       ParameterizeStochasticOperator(Problem.Evaluator);
-      ParameterizePopulationCreator();
+      ParameterizeSolutionsCreator();
       ParameterizeSGAMainLoop();
       ParameterizeSelectors();
@@ -244 +244 @@
     }
 
-    private void ParameterizePopulationCreator() {
-      PopulationCreator.EvaluatorParameter.ActualName = Problem.EvaluatorParameter.Name;
-      PopulationCreator.SolutionCreatorParameter.ActualName = Problem.SolutionCreatorParameter.Name;
+    private void ParameterizeSolutionsCreator() {
+      SolutionsCreator.EvaluatorParameter.ActualName = Problem.EvaluatorParameter.Name;
+      SolutionsCreator.SolutionCreatorParameter.ActualName = Problem.SolutionCreatorParameter.Name;
     }
     private void ParameterizeSGAMainLoop() {