Changeset 9039 for trunk

Timestamp:

12/12/12 13:46:18 (12 years ago)

Author:

mkommend

Message:

#1996: Adapted IslandGA to created local RNG outside of the main loop.

Location:

trunk/sources/HeuristicLab.Algorithms.GeneticAlgorithm/3.3

Files:

• IslandGeneticAlgorithm.cs (modified) (5 diffs)
• IslandGeneticAlgorithmMainLoop.cs (modified) (1 diff)

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

@@ -181 +181 @@
     }
     private UniformSubScopesProcessor IslandProcessor {
-      get { return ((RandomCreator.Successor as SubScopesCreator).Successor as UniformSubScopesProcessor); }
+      get { return OperatorGraph.Iterate().OfType<UniformSubScopesProcessor>().First(x => x.Operator is SolutionsCreator); }
     }
     private SolutionsCreator SolutionsCreator {
@@ -232 +232 @@
 
       RandomCreator randomCreator = new RandomCreator();
+      UniformSubScopesProcessor ussp0 = new UniformSubScopesProcessor();
+      LocalRandomCreator localRandomCreator = new LocalRandomCreator();
+      RandomCreator globalRandomResetter = new RandomCreator();
       SubScopesCreator populationCreator = new SubScopesCreator();
       UniformSubScopesProcessor ussp1 = new UniformSubScopesProcessor();
@@ -250 +253 @@
 
       populationCreator.NumberOfSubScopesParameter.ActualName = NumberOfIslandsParameter.Name;
-      populationCreator.Successor = ussp1;
+      populationCreator.Successor = ussp0;
+
+      ussp0.Operator = localRandomCreator;
+      ussp0.Successor = globalRandomResetter;
+
+      // BackwardsCompatibility3.3
+      // the global random is resetted to ensure the same algorithm results
+      #region Backwards compatible code, remove with 3.4
+      globalRandomResetter.RandomParameter.ActualName = "GlobalRandom";
+      globalRandomResetter.SeedParameter.ActualName = SeedParameter.Name;
+      globalRandomResetter.SeedParameter.Value = null;
+      globalRandomResetter.SetSeedRandomlyParameter.Value = new BoolValue(false);
+      globalRandomResetter.Successor = ussp1;
+      #endregion
 
       ussp1.Operator = solutionsCreator;
@@ -325 +341 @@
     protected override void OnProblemChanged() {
       ParameterizeStochasticOperator(Problem.SolutionCreator);
-      ParameterizeStochasticOperator(Problem.Evaluator);
+      ParameterizeStochasticOperatorForIsland(Problem.Evaluator);
       foreach (IOperator op in Problem.Operators.OfType<IOperator>()) ParameterizeStochasticOperator(op);
       ParameterizeSolutionsCreator();
@@ -345 +361 @@
     }
     protected override void Problem_EvaluatorChanged(object sender, EventArgs e) {
-      ParameterizeStochasticOperator(Problem.Evaluator);
+      ParameterizeStochasticOperatorForIsland(Problem.Evaluator);
       ParameterizeSolutionsCreator();
       ParameterizeMainLoop();

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

@@ -313 +313 @@
       uniformSubScopesProcessor0.Successor = analyzer1;
       islandVariableCreator.Successor = islandAnalyzer1;
+      // BackwardsCompatibility3.3
+      //the local randoms are created by the island GA itself and are only here to ensure same algorithm results
+      #region Backwards compatible code, remove with 3.4
       islandAnalyzer1.Successor = localRandomCreator;
       localRandomCreator.Successor = null;
+      #endregion
       analyzer1.Successor = resultsCollector1;
       resultsCollector1.Successor = uniformSubScopesProcessor1;