Changeset 7289

Timestamp:

01/08/12 19:01:18 (13 years ago)

Author:

ascheibe

Message:

#1745 readded migrations counter

File:

• branches/HiveHiveEngine/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/ParallelIslandGeneticAlgorithmMainLoop.cs (modified) (4 diffs)

branches/HiveHiveEngine/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/ParallelIslandGeneticAlgorithmMainLoop.cs

@@ -187 +187 @@
       UniformSubScopesProcessor uniformSubScopesProcessor5 = new UniformSubScopesProcessor();
       Placeholder emigrantsSelector = new Placeholder();
+      IntCounter migrationsCounter = new IntCounter();
       Placeholder migrator = new Placeholder();
       UniformSubScopesProcessor uniformSubScopesProcessor6 = new UniformSubScopesProcessor();
@@ -271 +272 @@
       generationsReducer.Name = "Increment Generations";
       generationsReducer.ParameterToReduce.Value = new StringValue(islandGenerationsCounter.ValueParameter.ActualName);
-      generationsReducer.TargetParameterName.Value = new StringValue("Generations"); //TODO: fixme
+      generationsReducer.TargetParameterName.Value = new StringValue("Generations");
 
       evaluatedSolutionsReducer.Name = "Increment Evaluated Solutions";
@@ -279 +280 @@
       emigrantsSelector.Name = "Emigrants Selector (placeholder)";
       emigrantsSelector.OperatorParameter.ActualName = EmigrantsSelectorParameter.Name;
+
+      migrationsCounter.Name = "Increment number of Migrations";
+      migrationsCounter.ValueParameter.ActualName = "Migrations";
+      migrationsCounter.Increment = new IntValue(1);
 
       migrator.Name = "Migrator (placeholder)";
@@ -344 +349 @@
       islandAnalyzer2.Successor = null;
       uniformSubScopesProcessor5.Operator = emigrantsSelector;
+      emigrantsSelector.Successor = migrationsCounter;
       uniformSubScopesProcessor5.Successor = migrator;
       migrator.Successor = uniformSubScopesProcessor6;