Changeset 16613 for branches/2989_MovingPeaksBenchmark/HeuristicLab.Problems.MovingPeaksBenchmark/3.3/MovingPeaksBenchmarkProblem.cs

Timestamp:

02/17/19 22:56:09 (5 years ago)

Author:

swagner

Message:

#2989: Moving Peaks Benchmark

• fixed updates of best known quality
• added bounds for peak movement

File:

• branches/2989_MovingPeaksBenchmark/HeuristicLab.Problems.MovingPeaksBenchmark/3.3/MovingPeaksBenchmarkProblem.cs (modified) (3 diffs)

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

@@ -71 +71 @@
       get { return (FixedValueParameter<IntValue>)Parameters["MovingPeaksRandomSeed"]; }
     }
+    public FixedValueParameter<DoubleValue> MinPeakWidthParameter {
+      get { return (FixedValueParameter<DoubleValue>)Parameters["MinPeakWidth"]; }
+    }
+    public FixedValueParameter<DoubleValue> MaxPeakWidthParameter {
+      get { return (FixedValueParameter<DoubleValue>)Parameters["MaxPeakWidth"]; }
+    }
+    public FixedValueParameter<DoubleValue> MinPeakHeightParameter {
+      get { return (FixedValueParameter<DoubleValue>)Parameters["MinPeakHeight"]; }
+    }
+    public FixedValueParameter<DoubleValue> MaxPeakHeightParameter {
+      get { return (FixedValueParameter<DoubleValue>)Parameters["MaxPeakHeight"]; }
+    }
     public FixedValueParameter<IntValue> PeakMovementIntervalParameter {
       get { return (FixedValueParameter<IntValue>)Parameters["PeakMovementInterval"]; }
@@ -109 +121 @@
     public IntValue MovingPeaksRandomSeed {
       get { return MovingPeaksRandomSeedParameter.Value; }
+    }
+    public DoubleValue MinPeakWidth {
+      get { return MinPeakWidthParameter.Value; }
+    }
+    public DoubleValue MaxPeakWidth {
+      get { return MaxPeakWidthParameter.Value; }
+    }
+    public DoubleValue MinPeakHeight {
+      get { return MinPeakHeightParameter.Value; }
+    }
+    public DoubleValue MaxPeakHeight {
+      get { return MaxPeakHeightParameter.Value; }
     }
     public IntValue PeakMovementInterval {
@@ -140 +164 @@
         { 09.0, 19.0, 27.0, 67.0, 24.0 },
         { 66.0, 87.0, 65.0, 19.0, 43.0 },
-        { 76.0, 32.0, 43.0, 54.0, 65.0 }
+        { 76.0, 32.0, 43.0, 54.0, 65.0 },
+        { 25.0, 51.0, 17.0, 25.0, 16.0 },
+        { 19.0, 93.0, 06.0, 35.0, 15.0 },
+        { 88.0, 44.0, 37.0, 77.0, 74.0 },
+        { 37.0, 74.0, 55.0, 09.0, 53.0 },
+        { 42.0, 22.0, 93.0, 84.0, 35.0 }
       };
-      var defaultWidths = new double[] { 0.1, 0.1, 0.1, 0.1, 0.1 };
-      var defaultHeights = new double[] { 50.0, 50.0, 50.0, 50.0, 50.0 };
+      var defaultWidths = new double[] { -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0, -1.0 };
+      var defaultHeights = new double[] { 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0, 50.0 };
       var defaultBestKnown = new double[] { 08.0, 64.0, 67.0, 55.0, 04.0 };
 
       Parameters.Add(new ValueParameter<DoubleMatrix>("Bounds", "The lower and upper bounds in each dimension.", new DoubleMatrix(defaultBounds)));
       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<IntValue>("Peaks", "The number of peaks.", new IntValue(10)));
       Parameters.Add(new ValueParameter<DoubleMatrix>("InitialPeakLocations", "Initial coordinates of each peaks.", new DoubleMatrix(defaultPeaks)));
       Parameters.Add(new ValueParameter<DoubleArray>("InitialPeakWidths", "Initial width of each peak.", new DoubleArray(defaultWidths)));
       Parameters.Add(new ValueParameter<DoubleArray>("InitialPeakHeights", "Initial height of each peak.", new DoubleArray(defaultHeights)));
       Parameters.Add(new FixedValueParameter<IntValue>("MovingPeaksRandomSeed", "The random seed for initializing the PRNG for changing the peaks.", new IntValue(666)));
-      Parameters.Add(new FixedValueParameter<IntValue>("PeakMovementInterval", "The interval in evaluated solutions in which peaks are moved.", new IntValue(1000)));
-      Parameters.Add(new FixedValueParameter<DoubleValue>("PeakMovementStrength", "The length of the random vector used for changing peak locations.", new DoubleValue(1.0)));
+      Parameters.Add(new FixedValueParameter<DoubleValue>("MinPeakWidth", "The minimum width of each peak.", new DoubleValue(1.0)));
+      Parameters.Add(new FixedValueParameter<DoubleValue>("MaxPeakWidth", "The maximum width of each peak.", new DoubleValue(12.0)));
+      Parameters.Add(new FixedValueParameter<DoubleValue>("MinPeakHeight", "The minimum height of each peak.", new DoubleValue(30.0)));
+      Parameters.Add(new FixedValueParameter<DoubleValue>("MaxPeakHeight", "The maximum height of each peak.", new DoubleValue(70.0)));
+      Parameters.Add(new FixedValueParameter<IntValue>("PeakMovementInterval", "The interval in evaluated solutions in which peaks are moved.", new IntValue(5000)));
+      Parameters.Add(new FixedValueParameter<DoubleValue>("PeakMovementStrength", "The length of the random vector used for changing peak locations.", new DoubleValue(1.5)));
       Parameters.Add(new OptionalValueParameter<RealVector>("BestKnownSolution", "The location of the highest peak.", new RealVector(defaultBestKnown)));