Changeset 7392 for branches/HiveHiveEngine/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/ParallelIslandGeneticAlgorithmMainLoop.cs

Timestamp:

01/22/12 22:02:38 (13 years ago)

Author:

ascheibe

Message:

#1745 implemented reviewing comments for the data reducer and the local random generator

File:

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

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

@@ -158 +158 @@
       VariableCreator islandVariableCreator = new VariableCreator();
       Placeholder islandAnalyzer1 = new Placeholder();
-      SubScopesRandomCreator subScopesRandomCreator = new SubScopesRandomCreator();
+      LocalRandomGenerator localRandomGenerator = new LocalRandomGenerator();
       Placeholder analyzer1 = new Placeholder();
       ResultsCollector resultsCollector1 = new ResultsCollector();
@@ -182 +182 @@
       Comparator checkIslandGenerationsReachedMaximum = new Comparator();
       ConditionalBranch checkContinueEvolution = new ConditionalBranch();
-      IntDataReducer generationsReducer = new IntDataReducer();
-      IntDataReducer evaluatedSolutionsReducer = new IntDataReducer();
+      DataReducer generationsReducer = new DataReducer();
+      DataReducer evaluatedSolutionsReducer = new DataReducer();
       Placeholder islandAnalyzer2 = new Placeholder();
       UniformSubScopesProcessor uniformSubScopesProcessor5 = new UniformSubScopesProcessor();
@@ -234 +234 @@
 
       stochasticBranch.ProbabilityParameter.ActualName = MutationProbabilityParameter.Name;
-      stochasticBranch.RandomParameter.ActualName = RandomParameter.Name;
+      //set it to the random number generator of the island
+      stochasticBranch.RandomParameter.ActualName = "LocalRandom";
 
       mutator.Name = "Mutator (placeholder)";
@@ -312 +313 @@
       uniformSubScopesProcessor0.Successor = analyzer1;
       islandVariableCreator.Successor = islandAnalyzer1;
-      islandAnalyzer1.Successor = subScopesRandomCreator;
-      subScopesRandomCreator.Successor = null;
+      islandAnalyzer1.Successor = localRandomGenerator;
+      localRandomGenerator.Successor = null;
       analyzer1.Successor = resultsCollector1;
       resultsCollector1.Successor = uniformSubScopesProcessor1;