Changeset 9363 for branches/OaaS/HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs

Timestamp:

04/16/13 13:13:41 (12 years ago)

Author:

spimming

Message:

#1888:

• Merged revisions from trunk

Location:

branches/OaaS

Files:

• . (modified) (2 props)
• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs (modified) (5 diffs)

branches/OaaS

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

branches/OaaS/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 global random resetter with 3.4 and rewire the operator graph
+      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();

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages