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

Timestamp:

07/24/12 15:04:37 (12 years ago)

Author:

jkarder

Message:

#1331:

• applied some of the changes suggested by ascheibe in comment:32:ticket:1331
• restructured path relinking and improvement operators and similarity calculators
• fixed bug in TSPMultipleGuidesPathRelinker

Location:

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

Files:

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

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

@@ -35 +35 @@
   /// An operator that improves test functions solutions.
   /// </summary>
+  /// <remarks>
+  /// It is implemented as described in Gao, F. and Han, L. (2010). Implementing the Nelder-Mead simplex algorithm with adaptive parameters. Computational Optimization and Applications, Vol. 51. Springer.<br />
+  /// The operator is an implementation of the Nelder-Mead method and conducts relection, expansion, contraction and reduction on the test functions solution.
+  /// </remarks>
   [Item("SingleObjectiveTestFunctionImprovementOperator", "An operator that improves test functions solutions.")]
   [StorableClass]
-  public sealed class SingleObjectiveTestFunctionImprovementOperator : SingleSuccessorOperator, IImprovementOperator {
+  public sealed class SingleObjectiveTestFunctionImprovementOperator : SingleSuccessorOperator, ISingleObjectiveImprovementOperator {
     #region Parameter properties
     public IValueParameter<DoubleValue> AlphaParameter {
@@ -63 +67 @@
       get { return (IValueLookupParameter<IntValue>)Parameters["ImprovementAttempts"]; }
     }
-    public IValueLookupParameter<IItem> TargetParameter {
-      get { return (IValueLookupParameter<IItem>)Parameters["Target"]; }
+    public IValueLookupParameter<IItem> SolutionParameter {
+      get { return (IValueLookupParameter<IItem>)Parameters["Solution"]; }
     }
     #endregion
@@ -109 +113 @@
       Parameters.Add(new ValueParameter<DoubleValue>("Gamma", new DoubleValue(0.5)));
       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."));
+      Parameters.Add(new ValueLookupParameter<IItem>("Solution", "The solution to be improved. This parameter is used for name translation only."));
       #endregion
     }
@@ -118 +122 @@
 
     public override IOperation Apply() {
-      RealVector bestSol = CurrentScope.Variables[TargetParameter.ActualName].Value as RealVector;
+      RealVector bestSol = CurrentScope.Variables[SolutionParameter.ActualName].Value as RealVector;
       if (bestSol == null)
         throw new ArgumentException("Cannot improve solution because it has the wrong type.");
@@ -196 +200 @@
       }
 
-      CurrentScope.Variables[TargetParameter.ActualName].Value = simplex[0];
+      CurrentScope.Variables[SolutionParameter.ActualName].Value = simplex[0];
       CurrentScope.Variables.Add(new Variable("LocalEvaluatedSolutions", ImprovementAttempts));
 

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

@@ -35 +35 @@
   /// An operator that relinks paths between test functions solutions.
   /// </summary>
+  /// <remarks>
+  /// TODO: add reference and remarks
+  /// </remarks>
   [Item("SingleObjectiveTestFunctionPathRelinker", "An operator that relinks paths between test functions solutions.")]
   [StorableClass]
-  public sealed class SingleObjectiveTestFunctionPathRelinker : PathRelinker {
+  public sealed class SingleObjectiveTestFunctionPathRelinker : SingleObjectivePathRelinker {
     #region Parameter properties
     public IValueParameter<IntValue> RelinkingIntensityParameter {

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

@@ -32 +32 @@
   /// An operator that performs similarity calculation between two test functions solutions.
   /// </summary>
+  /// <remarks>
+  /// The operator calculates the similarity based on the euclidean distance of the two solutions in n-dimensional space.
+  /// </remarks>
   [Item("SingleObjectiveTestFunctionSimilarityCalculator", "An operator that performs similarity calculation between two test functions solutions.")]
   [StorableClass]
-  public sealed class SingleObjectiveTestFunctionSimilarityCalculator : SimilarityCalculator {
+  public sealed class SingleObjectiveTestFunctionSimilarityCalculator : SingleObjectiveSolutionSimilarityCalculator {
     #region Properties
     [Storable]
@@ -57 +60 @@
       if (bounds == null)
         throw new ArgumentException("Cannot calculate similarity because no bounds were provided.");
+      if (left.Length != right.Length)
+        throw new ArgumentException("Cannot calculate similarity because the provided solutions have different lengths.");
       if (left == right) return 1.0;
 
@@ -72 +77 @@
     }
 
-    public override double CalculateIndividualSimilarity(IScope left, IScope right) {
-      var sol1 = left.Variables[Target].Value as RealVector;
-      var sol2 = right.Variables[Target].Value as RealVector;
+    public override double CalculateSolutionSimilarity(IScope leftSolution, IScope rightSolution) {
+      var sol1 = leftSolution.Variables[SolutionVariableName].Value as RealVector;
+      var sol2 = rightSolution.Variables[SolutionVariableName].Value as RealVector;
 
       return CalculateSimilarity(sol1, sol2, Bounds);

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

@@ -363 +363 @@
         op.MaximizationParameter.Hidden = true;
       }
-      foreach (var op in Operators.OfType<IRealVectorMultiNeighborhoodShakingOperator>()) {
-        op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
-        op.RealVectorParameter.Hidden = true;
-      }
-      foreach (IImprovementOperator op in Operators.OfType<IImprovementOperator>()) {
-        op.TargetParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
-        op.TargetParameter.Hidden = true;
-      }
-      foreach (IPathRelinker op in Operators.OfType<IPathRelinker>()) {
+      foreach (IRealVectorMultiNeighborhoodShakingOperator op in Operators.OfType<IRealVectorMultiNeighborhoodShakingOperator>()) {
+        op.RealVectorParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
+        op.RealVectorParameter.Hidden = true;
+      }
+      foreach (ISingleObjectiveImprovementOperator op in Operators.OfType<ISingleObjectiveImprovementOperator>()) {
+        op.SolutionParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
+        op.SolutionParameter.Hidden = true;
+      }
+      foreach (ISingleObjectivePathRelinker op in Operators.OfType<ISingleObjectivePathRelinker>()) {
         op.ParentsParameter.ActualName = SolutionCreator.RealVectorParameter.ActualName;
         op.ParentsParameter.Hidden = true;
       }
-      foreach (SingleObjectiveTestFunctionSimilarityCalculator op in Operators.OfType<ISimilarityCalculator>()) {
-        op.Target = SolutionCreator.RealVectorParameter.ActualName;
+      foreach (SingleObjectiveTestFunctionSimilarityCalculator op in Operators.OfType<SingleObjectiveTestFunctionSimilarityCalculator>()) {
+        op.SolutionVariableName = SolutionCreator.RealVectorParameter.ActualName;
         op.Bounds = Bounds;
       }