Changeset 12992 for branches

Timestamp:

10/09/15 13:47:46 (9 years ago)

Author:

pfleck

Message:

#2269

• Changed PopulationSize from array to int.
• Removed obsolete LayerUniformSubScopesProcessor.

Location:

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3

Files:

• AlpsGeneticAlgorithm.cs (modified) (4 diffs)
• AlpsGeneticAlgorithmMainLoop.cs (modified) (2 diffs)
• EldersEmigrator.cs (modified) (1 diff)
• HeuristicLab.Algorithms.ALPS-3.3.csproj (modified) (1 diff)
• LayerUniformSubScopesProcessor.cs (deleted)
• LayerUpdator.cs (modified) (2 diffs)

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

@@ -41 +41 @@
   public sealed class AlpsGeneticAlgorithm : Alps {
     #region Parameter Properties
-    private IValueParameter<IntArray> PopulationSizeParameter {
-      get { return (IValueParameter<IntArray>)Parameters["PopulationSize"]; }
+    private IValueParameter<IntValue> PopulationSizeParameter {
+      get { return (IValueParameter<IntValue>)Parameters["PopulationSize"]; }
     }
     public IConstrainedValueParameter<ISelector> SelectorParameter {
@@ -68 +68 @@
 
     #region Properties
-    public IntArray PopulationSize {
+    public IntValue PopulationSize {
       get { return PopulationSizeParameter.Value; }
       set { PopulationSizeParameter.Value = value; }
@@ -130 +130 @@
     public AlpsGeneticAlgorithm()
       : base() {
-      Parameters.Add(new ValueParameter<IntArray>("PopulationSize", "The size of the population of solutions each layer.", new IntArray(new[] { 100 })));
+      Parameters.Add(new ValueParameter<IntValue>("PopulationSize", "The size of the population of solutions each layer.", new IntValue(100)));
       Parameters.Add(new ConstrainedValueParameter<ISelector>("Selector", "The operator used to select solutions for reproduction."));
       Parameters.Add(new ConstrainedValueParameter<ICrossover>("Crossover", "The operator used to cross solutions."));
@@ -141 +141 @@
       var globalRandomCreator = new RandomCreator();
       var layer0Creator = new SubScopesCreator() { Name = "Create Layer Zero" };
-      var layer0Processor = new LayerUniformSubScopesProcessor();
+      var layer0Processor = new UniformSubScopesProcessor();
       var localRandomCreator = new LocalRandomCreator();
       var layerVariableCreator = new VariableCreator();

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

@@ -90 +90 @@
       var matingPoolPreSorter = new SubScopesSorter() { Name = "MatingPoolPreSorter" };
       var matingPoolCreator = new MatingPoolCreator() { Name = "Create Mating Pools" };
-      var matingPoolProcessor = new LayerUniformSubScopesProcessor();
+      var matingPoolProcessor = new UniformSubScopesProcessor();
       var initializeLayer = new Assigner() { Name = "Reset LayerEvaluatedSolutions" };
       var mainOperator = CreatePreparedGeneticAlgorithmMainLoop();
@@ -97 +97 @@
       var eldersEmigrator = new EldersEmigrator() { Name = "Emigrate Elders" };
       var layerUpdator = new LayerUpdator(mainOperator) { Name = "Update Layers" };
-      var layerAnalyzerProcessor = new LayerUniformSubScopesProcessor();
+      var layerAnalyzerProcessor = new UniformSubScopesProcessor();
       var layerAnalyzerPlaceholder = new Placeholder() { Name = "LayerAnalyzer (Placeholder)" };
       var analyzerPlaceholder = new Placeholder() { Name = "Analyzer (Placeholder)" };

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

@@ -46 +46 @@
       var eldersSelector = new EldersSelector();
       var shiftToRightMigrator = new ShiftToRightMigrator();
-      var mergingProsessor = new LayerUniformSubScopesProcessor();
+      var mergingProsessor = new UniformSubScopesProcessor();
       var mergingReducer = new MergingReducer();
       var subScopesCounter = new SubScopesCounter();

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3/HeuristicLab.Algorithms.ALPS-3.3.csproj

@@ -145 +145 @@
     <Compile Include="LayerCreator.cs" />
     <Compile Include="LayerSorter.cs" />
-    <Compile Include="LayerUniformSubScopesProcessor.cs" />
     <Compile Include="LayerUpdator.cs" />
     <Compile Include="MatingPoolCreator.cs" />

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

@@ -62 +62 @@
       var newLayerSelector = new RightSelector();
       var newLayerProsessor = new SubScopesProcessor() { Name = "NewLayerProcessor" };
-      var newLayerLayerProcessor = new LayerUniformSubScopesProcessor();
+      var newLayerLayerProcessor = new UniformSubScopesProcessor();
       var newLayerReducer = new MergingReducer();
       var layerInitializer = new Assigner() { Name = "Init Layer" };
@@ -71 +71 @@
       var regenerateLayerZeroSelector = new LeftSelector();
       var regenerateLayerZeroProsessor = new SubScopesProcessor() { Name = "LayerZeroProcessor" };
-      var regenerateLayerZeroLayerProsessor = new LayerUniformSubScopesProcessor();
+      var regenerateLayerZeroLayerProsessor = new UniformSubScopesProcessor();
       var regenerateLayerZeroReducer = new MergingReducer();
       var layerSorter = new LayerSorter();