Changeset 12092

Timestamp:

02/27/15 10:54:37 (9 years ago)

Author:

pfleck

Message:

#2269

• Use the new toint function of the ExpressionCalculator in the EldersEmigrator and remove the now obsolete MergingReducerCalculator.
• Removed some parameters from the EldersMigrator because the AlpsGeneticAlgorithmMainLoop already defines those parameters.

Location:

branches/ALPS/HeuristicLab.Algorithms.ALPS/3.3

Files:

• AlpsGeneticAlgorithm.cs (modified) (2 diffs)
• EldersEmigrator.cs (modified) (5 diffs)
• HeuristicLab.Algorithms.ALPS-3.3.csproj (modified) (1 diff)
• MergingReducerCalculator.cs (deleted)

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

@@ -274 +274 @@
 
       layerVariableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Layer", new IntValue(0)));
-      //layerVariableCreator.CollectedValues.Add(new ValueParameter<ResultCollection>("Results", new ResultCollection()));
       layerVariableCreator.Successor = layerSolutionsCreator;
 
@@ -457 +456 @@
       MainLoop.MainOperator.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
       MainLoop.MainOperator.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
-      MainLoop.EldersEmigrator.MaximizationParameter.ActualName = Problem.MaximizationParameter.Name;
-      MainLoop.EldersEmigrator.QualityParameter.ActualName = Problem.Evaluator.QualityParameter.ActualName;
       MainLoop.LayerUpdator.SolutionsCreator.NumberOfSolutionsParameter.ActualName = PopulationSizeParameter.Name;
     }

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

@@ -24 +24 @@
 using HeuristicLab.Data;
 using HeuristicLab.Operators;
+using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -32 +33 @@
   [StorableClass]
   public sealed class EldersEmigrator : AlgorithmOperator {
-
-    public IValueLookupParameter<BoolValue> MaximizationParameter {
-      get { return (IValueLookupParameter<BoolValue>)Parameters["Maximization"]; }
-    }
-    public IScopeTreeLookupParameter<DoubleValue> QualityParameter {
-      get { return (IScopeTreeLookupParameter<DoubleValue>)Parameters["Quality"]; }
-    }
-
     [StorableConstructor]
     private EldersEmigrator(bool deserializing)
@@ -50 +43 @@
     public EldersEmigrator()
       : base() {
-      Parameters.Add(new ValueLookupParameter<BoolValue>("Maximization", "True if the problem is a maximization problem, otherwise false."));
-      Parameters.Add(new ScopeTreeLookupParameter<DoubleValue>("Quality", "The value which represents the quality of a solution."));
-
       var selectorProsessor = new UniformSubScopesProcessor();
       var eldersSelector = new EldersSelector();
@@ -59 +49 @@
       var mergingReducer = new MergingReducer();
       var subScopesCounter = new SubScopesCounter();
-      // TODO: if expression calculator supports int, use expression calculator
-      var countCalculator = new MergingReducerCalculator() { Name = "LayerPopulationSize = Min(LayerPopulationSize, PopulationSize)" };
-      //var countCalculator = new ExpressionCalculator() { Name = "NumSubScopes = Min(NumSubScopes, PopulationSize)" };
+      var countCalculator = new ExpressionCalculator() { Name = "LayerPopulationSize = Min(LayerPopulationSize, PopulationSize)" };
       var bestSelector = new BestSelector();
       var rightReducer = new RightReducer();
@@ -85 +73 @@
       subScopesCounter.Successor = countCalculator;
 
-      //countCalculator.CollectedValues.Add(new LookupParameter<IntValue>("PopulationSize"));
-      //countCalculator.CollectedValues.Add(new LookupParameter<IntValue>("NumSubScopes"));
-      //countCalculator.ExpressionParameter.Value = new StringValue("NumSubScopes PopulationSize NumSubScopes PopulationSize < if");
-      //countCalculator.ExpressionResultParameter.ActualName = "NumSubScopes";
+      countCalculator.CollectedValues.Add(new LookupParameter<IntValue>("PopulationSize"));
+      countCalculator.CollectedValues.Add(new LookupParameter<IntValue>("LayerPopulationSize"));
+      countCalculator.ExpressionParameter.Value = new StringValue("LayerPopulationSize PopulationSize LayerPopulationSize PopulationSize < if toint");
+      countCalculator.ExpressionResultParameter.ActualName = "LayerPopulationSize";
       countCalculator.Successor = bestSelector;
 
       bestSelector.NumberOfSelectedSubScopesParameter.ActualName = "LayerPopulationSize";
-      bestSelector.QualityParameter.ActualName = QualityParameter.Name;
-      bestSelector.MaximizationParameter.ActualName = MaximizationParameter.Name;
       bestSelector.CopySelected = new BoolValue(false);
       bestSelector.Successor = rightReducer;

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

@@ -147 +147 @@
     <Compile Include="NumberOfSelectedSubScopesCalculator.cs" />
     <Compile Include="OpenNewLayerCalculator.cs" />
-    <Compile Include="MergingReducerCalculator.cs" />
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />