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

Timestamp:

06/22/12 11:11:38 (12 years ago)

Author:

jkarder

Message:

#1331:

• synced branch with trunk
• added custom interface (ISimilarityBasedOperator) to mark operators that conduct similarity calculation
• similarity calculators are now parameterized by the algorithm
• deleted SolutionPool2TierUpdateMethod
• deleted KnapsackMultipleGuidesPathRelinker
• moved IImprovementOperator, IPathRelinker and ISimilarityCalculator to HeuristicLab.Optimization
• added parameter descriptions
• fixed plugin references
• fixed count of EvaluatedSolutions
• fixed check for duplicate solutions
• minor code improvements

Location:

branches/ScatterSearch (trunk integration)

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.TestFunctions/3.3/Improvers/SingleObjectiveTestFunctionImprovementOperator.cs (modified) (7 diffs)
• HeuristicLab.Problems.TestFunctions/3.3/PathRelinkers/SingleObjectiveTestFunctionPathRelinker.cs (modified) (2 diffs)
• HeuristicLab.Problems.TestFunctions/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/SimilarityCalculators/SingleObjectiveTestFunctionSimilarityCalculator.cs (modified) (3 diffs)
• HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs (modified) (2 diffs)

branches/ScatterSearch (trunk integration)

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests

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

@@ -27 +27 @@
 using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Operators;
-using HeuristicLab.Optimization.Operators;
+using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -63 +63 @@
       get { return (IValueLookupParameter<IntValue>)Parameters["ImprovementAttempts"]; }
     }
-    public IValueLookupParameter<IRandom> RandomParameter {
-      get { return (IValueLookupParameter<IRandom>)Parameters["Random"]; }
-    }
     public IValueLookupParameter<IItem> TargetParameter {
       get { return (IValueLookupParameter<IItem>)Parameters["Target"]; }
@@ -89 +86 @@
     public ISingleObjectiveTestFunctionProblemEvaluator Evaluator {
       get { return EvaluatorParameter.ActualValue; }
-      set { EvaluatorParameter.ActualValue = value; }
     }
     private DoubleValue Gamma {
@@ -96 +92 @@
     public IntValue ImprovementAttempts {
       get { return ImprovementAttemptsParameter.ActualValue; }
-      set { ImprovementAttemptsParameter.ActualValue = value; }
-    }
-    public IRandom Random {
-      get { return RandomParameter.ActualValue; }
-      set { RandomParameter.ActualValue = value; }
-    }
-    private IItem Target {
-      get { return TargetParameter.ActualValue; }
     }
     #endregion
@@ -115 +103 @@
       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 ValueLookupParameter<DoubleMatrix>("Bounds", "The lower and upper bounds in each dimension."));
+      Parameters.Add(new ScopeParameter("CurrentScope", "The current scope that contains the solution to be improved."));
       Parameters.Add(new ValueParameter<DoubleValue>("Delta", new DoubleValue(0.5)));
-      Parameters.Add(new ValueLookupParameter<ISingleObjectiveTestFunctionProblemEvaluator>("Evaluator"));
+      Parameters.Add(new ValueLookupParameter<ISingleObjectiveTestFunctionProblemEvaluator>("Evaluator", "The operator used to evaluate solutions."));
       Parameters.Add(new ValueParameter<DoubleValue>("Gamma", new DoubleValue(0.5)));
-      Parameters.Add(new ValueLookupParameter<IntValue>("ImprovementAttempts", new IntValue(100)));
-      Parameters.Add(new ValueLookupParameter<IItem>("Target"));
-      Parameters.Add(new ValueLookupParameter<IRandom>("Random"));
+      Parameters.Add(new ValueLookupParameter<IntValue>("ImprovementAttempts", "The number of improvement attempts the operator should perform.", new IntValue(100)));
+      Parameters.Add(new ValueLookupParameter<IItem>("Target", "This parameter is used for name translation only."));
       #endregion
     }
@@ -132 +119 @@
     public override IOperation Apply() {
       RealVector bestSol = CurrentScope.Variables[TargetParameter.ActualName].Value as RealVector;
+      if (bestSol == null)
+        throw new ArgumentException("Cannot improve solution because it has the wrong type.");
+
       MethodInfo evaluationMethod = Evaluator.GetType().GetMethod("Apply",
                                                                   BindingFlags.Public | BindingFlags.Static,
@@ -207 +197 @@
 
       CurrentScope.Variables[TargetParameter.ActualName].Value = simplex[0];
+      CurrentScope.Variables.Add(new Variable("LocalEvaluatedSolutions", ImprovementAttempts));
 
       return base.Apply();

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

@@ -47 +47 @@
     private IntValue RelinkingIntensity {
       get { return RelinkingIntensityParameter.Value; }
-      set { RelinkingIntensityParameter.Value = value; }
     }
     #endregion
@@ -57 +56 @@
       : base() {
       #region Create parameters
-      Parameters.Add(new ValueParameter<IntValue>("RelinkingIntensity", new IntValue(10)));
+      Parameters.Add(new ValueParameter<IntValue>("RelinkingIntensity", "Determines how strong path relinking should be applied.", new IntValue(10)));
       #endregion
     }

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

@@ -36 +36 @@
   [PluginDependency("HeuristicLab.Operators", "3.3")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization.Operators", "3.3")]
   [PluginDependency("HeuristicLab.Parameters", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]

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

@@ -26 +26 @@
 using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Optimization.Operators;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Problems.TestFunctions {
@@ -33 +32 @@
   /// </summary>
   [Item("SingleObjectiveTestFunctionSimilarityCalculator", "An operator that performs similarity calculation between two test functions solutions.")]
-  [StorableClass]
   public sealed class SingleObjectiveTestFunctionSimilarityCalculator : SimilarityCalculator {
     #region Properties
@@ -39 +37 @@
     #endregion
 
-    [StorableConstructor]
     private SingleObjectiveTestFunctionSimilarityCalculator(bool deserializing) : base(deserializing) { }
     private SingleObjectiveTestFunctionSimilarityCalculator(SingleObjectiveTestFunctionSimilarityCalculator original, Cloner cloner) : base(original, cloner) { }
     public SingleObjectiveTestFunctionSimilarityCalculator() : base() { }
 
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new SingleObjectiveTestFunctionSimilarityCalculator(this, cloner);
+    public static double CalculateSimilarity(RealVector left, RealVector right, DoubleMatrix bounds) {
+      if (left == null || right == null)
+        throw new ArgumentException("Cannot calculate similarity because one of the provided solutions or both are null.");
+      if (bounds == null)
+        throw new ArgumentException("Cannot calculate similarity because no bounds were provided.");
+
+      double maxSum = 0.0;
+      for (int i = 0; i < left.Length; i++)
+        maxSum += Math.Pow(bounds[0, 0] - bounds[0, 1], 2);
+      double maxDistance = Math.Sqrt(maxSum) / left.Length;
+
+      double sum = 0.0;
+      for (int i = 0; i < left.Length; i++)
+        sum += Math.Pow(left[i] - right[i], 2);
+      double distance = Math.Sqrt(sum) / left.Length;
+
+      return 1.0 - distance / maxDistance;
     }
 
     protected override double CalculateSimilarity(IScope left, IScope right) {
-      RealVector sol1 = left.Variables["Point"].Value as RealVector;
-      RealVector sol2 = right.Variables["Point"].Value as RealVector;
+      RealVector sol1 = left.Variables[Target].Value as RealVector;
+      RealVector sol2 = right.Variables[Target].Value as RealVector;
 
-      double maxSum = 0.0;
-      for (int i = 0; i < sol1.Length; i++)
-        maxSum += Math.Pow(Bounds[0, 0] - Bounds[0, 1], 2);
-      double maxDistance = Math.Sqrt(maxSum) / sol1.Length;
-
-      double sum = 0.0;
-      for (int i = 0; i < sol1.Length; i++)
-        sum += Math.Pow(sol1[i] - sol2[i], 2);
-      double distance = Math.Sqrt(sum) / sol1.Length;
-
-      return 1.0 - distance / maxDistance;
+      return CalculateSimilarity(sol1, sol2, Bounds);
     }
   }

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

@@ -28 +28 @@
 using HeuristicLab.Encodings.RealVectorEncoding;
 using HeuristicLab.Optimization;
-using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -377 +376 @@
       }
       foreach (SingleObjectiveTestFunctionSimilarityCalculator op in Operators.OfType<ISimilarityCalculator>()) {
-        op.TargetParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
-        op.TargetParameter.Hidden = true;
+        op.Target = SolutionCreator.RealVectorParameter.ActualName;
         op.Bounds = Bounds;
       }

@@ -20 +20 @@
 bin
 protoc.exe
+_ReSharper.HeuristicLab 3.3 Tests