Changeset 7392

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

Location:

branches/HiveHiveEngine

Files:

• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/IslandGeneticAlgorithm.cs (modified) (1 diff)
• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/ParallelIslandGeneticAlgorithm.cs (modified) (5 diffs)
• HeuristicLab.Algorithms.GeneticAlgorithm/3.3/ParallelIslandGeneticAlgorithmMainLoop.cs (modified) (4 diffs)
• HeuristicLab.Operators/3.3/DataReducer.cs (added)
• HeuristicLab.Operators/3.3/HeuristicLab.Operators-3.3.csproj (modified) (1 diff)
• HeuristicLab.Operators/3.3/IntDataReducer.cs (deleted)
• HeuristicLab.Operators/3.3/LocalRandomGenerator.cs (added)
• HeuristicLab.Operators/3.3/SubScopesRandomCreator.cs (deleted)

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

@@ -297 +297 @@
       if (proportionalSelector != null) SelectorParameter.Value = proportionalSelector;
 
-      foreach (ISelector selector in ApplicationManager.Manager.GetInstances<ISelector>().Where(x => !(x is IMultiObjectiveSelector)).OrderBy(x => x.Name)) {
-        var stochasticOperator = selector as IStochasticOperator;
-        if (stochasticOperator != null)
-          stochasticOperator.RandomParameter.ActualName = "Global Random";
+      foreach (ISelector selector in ApplicationManager.Manager.GetInstances<ISelector>().Where(x => !(x is IMultiObjectiveSelector)).OrderBy(x => x.Name))
         EmigrantsSelectorParameter.ValidValues.Add(selector);
-      }
 
       foreach (IReplacer replacer in ApplicationManager.Manager.GetInstances<IReplacer>().OrderBy(x => x.Name))

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

@@ -242 +242 @@
       OperatorGraph.InitialOperator = randomCreator;
 
-      randomCreator.RandomParameter.ActualName = "Random";
+      randomCreator.RandomParameter.ActualName = "GlobalRandom";
       randomCreator.SeedParameter.ActualName = SeedParameter.Name;
       randomCreator.SeedParameter.Value = null;
@@ -418 +418 @@
       }
     }
+    private void ParameterizeStochasticOperatorForIsland(IOperator op) {
+      IStochasticOperator stochasticOp = op as IStochasticOperator;
+      if (stochasticOp != null) {
+        stochasticOp.RandomParameter.ActualName = "LocalRandom";
+        stochasticOp.RandomParameter.Hidden = true;
+      }
+    }
     private void ParameterizeSelectors() {
       foreach (ISelector selector in SelectorParameter.ValidValues) {
@@ -423 +430 @@
         selector.NumberOfSelectedSubScopesParameter.Value = new IntValue(2 * (PopulationSize.Value - Elites.Value));
         selector.NumberOfSelectedSubScopesParameter.Hidden = true;
-        ParameterizeStochasticOperator(selector);
+        ParameterizeStochasticOperatorForIsland(selector);
       }
       foreach (ISelector selector in EmigrantsSelectorParameter.ValidValues) {
@@ -491 +498 @@
       ICrossover oldCrossover = CrossoverParameter.Value;
       CrossoverParameter.ValidValues.Clear();
-      foreach (ICrossover crossover in Problem.Operators.OfType<ICrossover>().OrderBy(x => x.Name))
+      foreach (ICrossover crossover in Problem.Operators.OfType<ICrossover>().OrderBy(x => x.Name)) {
+        ParameterizeStochasticOperatorForIsland(crossover);
         CrossoverParameter.ValidValues.Add(crossover);
+      }
       if (oldCrossover != null) {
         ICrossover crossover = CrossoverParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldCrossover.GetType());
@@ -501 +510 @@
       IManipulator oldMutator = MutatorParameter.Value;
       MutatorParameter.ValidValues.Clear();
-      foreach (IManipulator mutator in Problem.Operators.OfType<IManipulator>().OrderBy(x => x.Name))
+      foreach (IManipulator mutator in Problem.Operators.OfType<IManipulator>().OrderBy(x => x.Name)) {
+        ParameterizeStochasticOperatorForIsland(mutator);
         MutatorParameter.ValidValues.Add(mutator);
+      }
       if (oldMutator != null) {
         IManipulator mutator = MutatorParameter.ValidValues.FirstOrDefault(x => x.GetType() == oldMutator.GetType());

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;

branches/HiveHiveEngine/HeuristicLab.Operators/3.3/HeuristicLab.Operators-3.3.csproj

@@ -118 +118 @@
     <Compile Include="Assigner.cs" />
     <Compile Include="AlgorithmOperator.cs" />
-    <Compile Include="SubScopesRandomCreator.cs" />
-    <Compile Include="IntDataReducer.cs" />
+    <Compile Include="LocalRandomGenerator.cs" />
+    <Compile Include="DataReducer.cs" />
     <Compile Include="ReductionOperation.cs" />
     <Compile Include="ReductionOperations.cs" />