Changeset 13031

Timestamp:

10/19/15 14:26:35 (3 years ago)

Author:

pfleck

Message:

#2269 Removed obsolete MatingPoolPreprocessor.

Location:

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3

Files:

• AlpsGeneticAlgorithmMainLoop.cs (modified) (3 diffs)
• MatingPoolCreator.cs (modified) (1 diff)

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/AlpsGeneticAlgorithmMainLoop.cs

@@ -87 +87 @@
       var initAnalyzerPlaceholder = new Placeholder() { Name = "Analyzer (Placeholder)" };
       var resultsCollector = new ResultsCollector();
-      var matingPoolPreProcessor = new UniformSubScopesProcessor() { Name = "MatingPoolPreProcessor" };
-      var matingPoolPreSorter = new SubScopesSorter() { Name = "MatingPoolPreSorter" };
       var matingPoolCreator = new MatingPoolCreator() { Name = "Create Mating Pools" };
       var matingPoolProcessor = new UniformSubScopesProcessor();
@@ -126 +124 @@
       resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("OpenLayers"));
       resultsCollector.CopyValue = new BoolValue(false);
-      resultsCollector.Successor = matingPoolPreProcessor;
-
-      matingPoolPreProcessor.Operator = matingPoolPreSorter;
-      matingPoolPreProcessor.Successor = matingPoolCreator;
-
-      matingPoolPreSorter.ValueParameter.ActualName = QualityParameter.Name;
-      matingPoolPreSorter.DescendingParameter.ActualName = MaximizationParameter.Name;
+      resultsCollector.Successor = matingPoolCreator;
 
       matingPoolCreator.Successor = matingPoolProcessor;
@@ -166 +158 @@
       analyzerPlaceholder.Successor = termination;
 
-      termination.ContinueBranch = matingPoolPreProcessor;
+      termination.ContinueBranch = matingPoolCreator;
     }
 

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/MatingPoolCreator.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;