Changeset 16607

Timestamp:

02/15/19 00:51:31 (6 years ago)

Author:

swagner

Message:

#2989: Worked on Moving Peaks Benchmark

Location:

branches/2989_MovingPeaksBenchmark/HeuristicLab.Problems.MovingPeaksBenchmark/3.3

Files:

• HeuristicLab.Problems.MovingPeaksBenchmark-3.3.csproj (modified) (1 diff)
• Interfaces/IMovingPeaksBenchmarkProblemEvaluator.cs (modified) (1 diff)
• MovingPeaksBenchmarkProblem.cs (modified) (4 diffs)
• MovingPeaksBenchmarkProblemEvaluator.cs (added)
• Plugin.cs.frame (modified) (1 diff)

branches/2989_MovingPeaksBenchmark/HeuristicLab.Problems.MovingPeaksBenchmark/3.3/HeuristicLab.Problems.MovingPeaksBenchmark-3.3.csproj

@@ -52 +52 @@
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="MovingPeaksBenchmarkProblemEvaluator.cs" />
   </ItemGroup>
   <ItemGroup>

branches/2989_MovingPeaksBenchmark/HeuristicLab.Problems.MovingPeaksBenchmark/3.3/Interfaces/IMovingPeaksBenchmarkProblemEvaluator.cs

@@ -30 +30 @@
   /// </summary>
   public interface IMovingPeaksBenchmarkProblemEvaluator : ISingleObjectiveEvaluator {
-    bool Maximization { get; }
-    DoubleMatrix Bounds { get; }
-    double BestKnownQuality { get; }
-    int MinimumProblemSize { get; }
-    int MaximumProblemSize { get; }
-    string FunctionName { get; }
-
+    ILookupParameter<DoubleMatrix> PeakLocationsParameter { get; }
+    ILookupParameter<DoubleArray> PeakWidthsParameter { get; }
+    ILookupParameter<DoubleArray> PeakHeightsParameter { get; }
     ILookupParameter<RealVector> PointParameter { get; }
-
-    double Evaluate2D(double x, double y);
-    double Evaluate(RealVector point);
-    RealVector GetBestKnownSolution(int dimension);
   }
 }

branches/2989_MovingPeaksBenchmark/HeuristicLab.Problems.MovingPeaksBenchmark/3.3/MovingPeaksBenchmarkProblem.cs

@@ -42 +42 @@
     public string Filename { get; set; }
 
-    [Storable]
-    private StdDevStrategyVectorCreator strategyVectorCreator;
-    [Storable]
-    private StdDevStrategyVectorCrossover strategyVectorCrossover;
-    [Storable]
-    private StdDevStrategyVectorManipulator strategyVectorManipulator;
+    //[Storable]
+    //private StdDevStrategyVectorCreator strategyVectorCreator;
+    //[Storable]
+    //private StdDevStrategyVectorCrossover strategyVectorCrossover;
+    //[Storable]
+    //private StdDevStrategyVectorManipulator strategyVectorManipulator;
 
     #region Parameter Properties
@@ -55 +55 @@
     public ValueParameter<IntValue> ProblemSizeParameter {
       get { return (ValueParameter<IntValue>)Parameters["ProblemSize"]; }
+    }
+    public ValueParameter<IntValue> PeaksParameter {
+      get { return (ValueParameter<IntValue>)Parameters["Peaks"]; }
+    }
+    public ValueParameter<DoubleMatrix> PeakLocationsParameter {
+      get { return (ValueParameter<DoubleMatrix>)Parameters["PeakLocations"]; }
+    }
+    public ValueParameter<DoubleArray> PeakWidthsParameter {
+      get { return (ValueParameter<DoubleArray>)Parameters["PeakWidths"]; }
+    }
+    public ValueParameter<DoubleArray> PeakHeightsParameter {
+      get { return (ValueParameter<DoubleArray>)Parameters["PeakHeights"]; }
     }
     public OptionalValueParameter<RealVector> BestKnownSolutionParameter {
@@ -70 +82 @@
       set { ProblemSizeParameter.Value = value; }
     }
-//    private BestSingleObjectiveTestFunctionSolutionAnalyzer BestSingleObjectiveTestFunctionSolutionAnalyzer {
-//      get { return Operators.OfType<BestSingleObjectiveTestFunctionSolutionAnalyzer>().FirstOrDefault(); }
-//    }
+    public IntValue Peaks {
+      get { return PeaksParameter.Value; }
+      set { PeaksParameter.Value = value; }
+    }
+    public DoubleMatrix PeakLocations {
+      get { return PeakLocationsParameter.Value; }
+      set { PeakLocationsParameter.Value = value; }
+    }
+    public DoubleArray PeakWidths {
+      get { return PeakWidthsParameter.Value; }
+      set { PeakWidthsParameter.Value = value; }
+    }
+    public DoubleArray PeakHeights {
+      get { return PeakHeightsParameter.Value; }
+      set { PeakHeightsParameter.Value = value; }
+    }
+    //    private BestSingleObjectiveTestFunctionSolutionAnalyzer BestSingleObjectiveTestFunctionSolutionAnalyzer {
+    //      get { return Operators.OfType<BestSingleObjectiveTestFunctionSolutionAnalyzer>().FirstOrDefault(); }
+    //    }
     #endregion
 
@@ -79 +107 @@
     private MovingPeaksBenchmarkProblem(MovingPeaksBenchmarkProblem original, Cloner cloner)
       : base(original, cloner) {
-      strategyVectorCreator = cloner.Clone(original.strategyVectorCreator);
-      strategyVectorCrossover = cloner.Clone(original.strategyVectorCrossover);
-      strategyVectorManipulator = cloner.Clone(original.strategyVectorManipulator);
+      //strategyVectorCreator = cloner.Clone(original.strategyVectorCreator);
+      //strategyVectorCrossover = cloner.Clone(original.strategyVectorCrossover);
+      //strategyVectorManipulator = cloner.Clone(original.strategyVectorManipulator);
       RegisterEventHandlers();
     }
     public MovingPeaksBenchmarkProblem()
-//      : base(new AckleyEvaluator(), new UniformRandomRealVectorCreator()) {
-      : base(null, new UniformRandomRealVectorCreator()) {
-      Parameters.Add(new ValueParameter<DoubleMatrix>("Bounds", "The lower and upper bounds in each dimension.", Evaluator.Bounds));
-      Parameters.Add(new ValueParameter<IntValue>("ProblemSize", "The dimension of the problem.", new IntValue(2)));
+      : base(new MovingPeaksBenchmarkProblemEvaluator(), new UniformRandomRealVectorCreator()) {
+      Parameters.Add(new ValueParameter<DoubleMatrix>("Bounds", "The lower and upper bounds in each dimension.", null));
+      Parameters.Add(new ValueParameter<IntValue>("ProblemSize", "The dimension of the problem.", new IntValue(5)));
+      Parameters.Add(new ValueParameter<IntValue>("Peaks", "The number of peaks.", new IntValue(5)));
+      Parameters.Add(new ValueParameter<DoubleMatrix>("PeakLocations", "", null ));
+      Parameters.Add(new ValueParameter<DoubleArray>("PeakWidths", "", new DoubleArray(new double[] { 0, 0, 0, 0, 0 })));
+      Parameters.Add(new ValueParameter<DoubleArray>("PeakHeights", "", new DoubleArray(new double[] { 0, 0, 0, 0, 0 })));
+
       Parameters.Add(new OptionalValueParameter<RealVector>("BestKnownSolution", "The best known solution for this test function instance."));
 
-      Maximization.Value = Evaluator.Maximization;
-      BestKnownQuality = new DoubleValue(Evaluator.BestKnownQuality);
-
-      strategyVectorCreator = new StdDevStrategyVectorCreator();
-      strategyVectorCreator.LengthParameter.ActualName = ProblemSizeParameter.Name;
-      strategyVectorCrossover = new StdDevStrategyVectorCrossover();
-      strategyVectorManipulator = new StdDevStrategyVectorManipulator();
-      strategyVectorManipulator.LearningRateParameter.Value = new DoubleValue(0.5);
-      strategyVectorManipulator.GeneralLearningRateParameter.Value = new DoubleValue(0.5);
+      Maximization.Value = true;
+      //BestKnownQuality = new DoubleValue(Evaluator.BestKnownQuality);
+
+      //strategyVectorCreator = new StdDevStrategyVectorCreator();
+      //strategyVectorCreator.LengthParameter.ActualName = ProblemSizeParameter.Name;
+      //strategyVectorCrossover = new StdDevStrategyVectorCrossover();
+      //strategyVectorManipulator = new StdDevStrategyVectorManipulator();
+      //strategyVectorManipulator.LearningRateParameter.Value = new DoubleValue(0.5);
+      //strategyVectorManipulator.GeneralLearningRateParameter.Value = new DoubleValue(0.5);
 
       SolutionCreator.RealVectorParameter.ActualName = "Point";

branches/2989_MovingPeaksBenchmark/HeuristicLab.Problems.MovingPeaksBenchmark/3.3/Plugin.cs.frame

@@ -29 +29 @@
   [Plugin("HeuristicLab.Problems.MovingPeaksBenchmark", "3.3.15.$WCREV$")]
 //  [PluginDependency("HeuristicLab.Analysis", "3.3")]
-//  [PluginDependency("HeuristicLab.Collections", "3.3")]
-//  [PluginDependency("HeuristicLab.Common", "3.3")]
+  [PluginDependency("HeuristicLab.Collections", "3.3")]
+  [PluginDependency("HeuristicLab.Common", "3.3")]
 //  [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
   [PluginDependency("HeuristicLab.Core", "3.3")]
-//  [PluginDependency("HeuristicLab.Data", "3.3")]
-//  [PluginDependency("HeuristicLab.Encodings.RealVectorEncoding", "3.3")]
-//  [PluginDependency("HeuristicLab.Operators", "3.3")]
-//  [PluginDependency("HeuristicLab.Optimization", "3.3")]
+  [PluginDependency("HeuristicLab.Data", "3.3")]
+  [PluginDependency("HeuristicLab.Encodings.RealVectorEncoding", "3.3")]
+  [PluginDependency("HeuristicLab.Operators", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization", "3.3")]
 //  [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
 //  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
-//  [PluginDependency("HeuristicLab.Parameters", "3.3")]
+  [PluginDependency("HeuristicLab.Parameters", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
   public class HeuristicLabProblemsMovingPeaksBenchmarkPlugin : PluginBase {