Changeset 7954 for branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TestFunctions

Timestamp:

06/04/12 16:48:59 (13 years ago)

Author:

jkarder

Message:

#1331:

• added EvaluatedSolutions parameter
• SingleObjectiveTestFunctionImprovementOperator now retrieves the bounds from the scope tree
• SingleObjectiveTestFunctionProblem now assigns the bounds to the similarity calculator

Location:

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TestFunctions/3.3

Files:

• Improvers/SingleObjectiveTestFunctionImprovementOperator.cs (modified) (5 diffs)
• SimilarityCalculators/SingleObjectiveTestFunctionSimilarityCalculator.cs (modified) (3 diffs)
• SingleObjectiveTestFunctionProblem.cs (modified) (1 diff)

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TestFunctions/3.3/Improvers/SingleObjectiveTestFunctionImprovementOperator.cs

@@ -45 +45 @@
       get { return (IValueParameter<DoubleValue>)Parameters["Beta"]; }
     }
+    public IValueLookupParameter<DoubleMatrix> BoundsParameter {
+      get { return (IValueLookupParameter<DoubleMatrix>)Parameters["Bounds"]; }
+    }
     public ScopeParameter CurrentScopeParameter {
       get { return (ScopeParameter)Parameters["CurrentScope"]; }
@@ -74 +77 @@
     private DoubleValue Beta {
       get { return BetaParameter.Value; }
+    }
+    private DoubleMatrix Bounds {
+      get { return BoundsParameter.ActualValue; }
     }
     public IScope CurrentScope {
@@ -109 +115 @@
       Parameters.Add(new ValueParameter<DoubleValue>("Alpha", new DoubleValue(1.0)));
       Parameters.Add(new ValueParameter<DoubleValue>("Beta", new DoubleValue(2.0)));
+      Parameters.Add(new ValueLookupParameter<DoubleMatrix>("Bounds"));
       Parameters.Add(new ScopeParameter("CurrentScope"));
       Parameters.Add(new ValueParameter<DoubleValue>("Delta", new DoubleValue(0.5)));
@@ -136 +143 @@
       for (int i = 0; i < simplex.Length; i++) {
         simplex[i] = bestSol.Clone() as RealVector;
-        simplex[i][i] += 0.1 * (Evaluator.Bounds[0, 1] - Evaluator.Bounds[0, 0]);
-        if (simplex[i][i] > Evaluator.Bounds[0, 1]) simplex[i][i] = Evaluator.Bounds[0, 1];
-        if (simplex[i][i] < Evaluator.Bounds[0, 0]) simplex[i][i] = Evaluator.Bounds[0, 0];
+        simplex[i][i] += 0.1 * (Bounds[0, 1] - Bounds[0, 0]);
+        if (simplex[i][i] > Bounds[0, 1]) simplex[i][i] = Bounds[0, 1];
+        if (simplex[i][i] < Bounds[0, 0]) simplex[i][i] = Bounds[0, 0];
       }
 
@@ -195 +202 @@
 
       for (int i = 0; i < simplex[0].Length; i++) {
-        if (simplex[0][i] > Evaluator.Bounds[0, 1]) simplex[0][i] = Evaluator.Bounds[0, 1];
-        if (simplex[0][i] < Evaluator.Bounds[0, 0]) simplex[0][i] = Evaluator.Bounds[0, 0];
+        if (simplex[0][i] > Bounds[0, 1]) simplex[0][i] = Bounds[0, 1];
+        if (simplex[0][i] < Bounds[0, 0]) simplex[0][i] = Bounds[0, 0];
       }
 

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TestFunctions/3.3/SimilarityCalculators/SingleObjectiveTestFunctionSimilarityCalculator.cs

@@ -26 +26 @@
 using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Optimization.Operators;
-using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
@@ -36 +35 @@
   [StorableClass]
   public sealed class SingleObjectiveTestFunctionSimilarityCalculator : SimilarityCalculator {
-    #region Parameter properties
-    public ILookupParameter<DoubleMatrix> BoundsParameter {
-      get { return (ILookupParameter<DoubleMatrix>)Parameters["Bounds"]; }
-    }
-    #endregion
-
     #region Properties
-    private DoubleMatrix Bounds {
-      get { return BoundsParameter.ActualValue; }
-      set { BoundsParameter.ActualValue = value; }
-    }
+    public DoubleMatrix Bounds { get; set; }
     #endregion
 
@@ -52 +42 @@
     private SingleObjectiveTestFunctionSimilarityCalculator(bool deserializing) : base(deserializing) { }
     private SingleObjectiveTestFunctionSimilarityCalculator(SingleObjectiveTestFunctionSimilarityCalculator original, Cloner cloner) : base(original, cloner) { }
-    public SingleObjectiveTestFunctionSimilarityCalculator()
-      : base() {
-      #region Create parameters
-      Parameters.Add(new LookupParameter<DoubleMatrix>("Bounds"));
-      #endregion
-    }
+    public SingleObjectiveTestFunctionSimilarityCalculator() : base() { }
 
     public override IDeepCloneable Clone(Cloner cloner) {

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs

@@ -376 +376 @@
         op.ParentsParameter.Hidden = true;
       }
-      foreach (ISimilarityCalculator op in Operators.OfType<ISimilarityCalculator>()) {
+      foreach (SingleObjectiveTestFunctionSimilarityCalculator op in Operators.OfType<ISimilarityCalculator>()) {
         op.TargetParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
         op.TargetParameter.Hidden = true;
+        op.Bounds = Bounds;
       }
     }