Changeset 7391 for branches/HiveHiveEngine/HeuristicLab.Algorithms.GeneticAlgorithm/3.3

Timestamp:

01/22/12 15:08:47 (13 years ago)

Author:

ascheibe

Message:

#1745 removed target operations, use reduction operations instead

Location:

branches/HiveHiveEngine/HeuristicLab.Algorithms.GeneticAlgorithm/3.3

Files:

• IslandGeneticAlgorithm.cs (modified) (1 diff)
• ParallelIslandGeneticAlgorithmMainLoop.cs (modified) (1 diff)

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))
+      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";
         EmigrantsSelectorParameter.ValidValues.Add(selector);
+      }
 
       foreach (IReplacer replacer in ApplicationManager.Manager.GetInstances<IReplacer>().OrderBy(x => x.Name))

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

@@ -270 +270 @@
       generationsReducer.Name = "Increment Generations";
       generationsReducer.ParameterToReduce.ActualName = islandGenerationsCounter.ValueParameter.ActualName;
-      generationsReducer.TargetParameterName.Value = new StringValue("Generations");
-      generationsReducer.ReductionOperation.Value = new ReductionType(ReductionTypes.Min);
-      generationsReducer.TargetOperation.Value = new TargetOperationType(TargetOperationTypes.Sum);
+      generationsReducer.TargetParameter.ActualName = "Generations";
+      generationsReducer.ReductionOperation.Value = new ReductionOperation(ReductionOperations.Min);
+      generationsReducer.TargetOperation.Value = new ReductionOperation(ReductionOperations.Sum);
 
       evaluatedSolutionsReducer.Name = "Increment Evaluated Solutions";
       evaluatedSolutionsReducer.ParameterToReduce.ActualName = IslandEvaluatedSolutions.Name;
-      evaluatedSolutionsReducer.TargetParameterName.Value = new StringValue(EvaluatedSolutionsParameter.Name);
-      evaluatedSolutionsReducer.ReductionOperation.Value = new ReductionType(ReductionTypes.Sum);
-      evaluatedSolutionsReducer.TargetOperation.Value = new TargetOperationType(TargetOperationTypes.Sum);
+      evaluatedSolutionsReducer.TargetParameter.ActualName = EvaluatedSolutionsParameter.Name;
+      evaluatedSolutionsReducer.ReductionOperation.Value = new ReductionOperation(ReductionOperations.Sum);
+      evaluatedSolutionsReducer.TargetOperation.Value = new ReductionOperation(ReductionOperations.Sum);
 
       emigrantsSelector.Name = "Emigrants Selector (placeholder)";