Changeset 8319 for branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearchMainLoop.cs

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

File:

• branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearchMainLoop.cs (modified) (5 diffs)

branches/ScatterSearch (trunk integration)/HeuristicLab.Algorithms.ScatterSearch/3.3/ScatterSearchMainLoop.cs

@@ -89 +89 @@
       get { return (IValueLookupParameter<VariableCollection>)Parameters["Results"]; }
     }
-    public IValueLookupParameter<ISimilarityCalculator> SimilarityCalculatorParameter {
-      get { return (IValueLookupParameter<ISimilarityCalculator>)Parameters["SimilarityCalculator"]; }
-    }
-    public IValueLookupParameter<IItem> TargetParameter {
-      get { return (IValueLookupParameter<IItem>)Parameters["Target"]; }
+    public IValueLookupParameter<ISolutionSimilarityCalculator> SimilarityCalculatorParameter {
+      get { return (IValueLookupParameter<ISolutionSimilarityCalculator>)Parameters["SimilarityCalculator"]; }
     }
     #endregion
@@ -166 +163 @@
       set { ResultsParameter.ActualValue = value; }
     }
-    private ISimilarityCalculator SimilarityCalculator {
+    private ISolutionSimilarityCalculator SimilarityCalculator {
       get { return SimilarityCalculatorParameter.ActualValue; }
       set { SimilarityCalculatorParameter.ActualValue = value; }
-    }
-    private IItem Target {
-      get { return TargetParameter.ActualValue; }
-      set { TargetParameter.ActualValue = value; }
     }
     #endregion
@@ -204 +197 @@
       Parameters.Add(new ValueLookupParameter<IRandom>("Random", "A pseudo random number generator."));
       Parameters.Add(new ValueLookupParameter<VariableCollection>("Results", "The variable collection where results should be stored."));
-      Parameters.Add(new ValueLookupParameter<ISimilarityCalculator>("SimilarityCalculator", "The operator used to calculate the similarity between two solutions."));
-      Parameters.Add(new ValueLookupParameter<IItem>("Target", "This parameter is used for name translation only."));
+      Parameters.Add(new ValueLookupParameter<ISolutionSimilarityCalculator>("SimilarityCalculator", "The operator used to calculate the similarity between two solutions."));
       #endregion
 
@@ -298 +290 @@
       pathRelinker.Name = "PathRelinker";
       pathRelinker.OperatorParameter.ActualName = PathRelinkerParameter.Name;
-      pathRelinker.Successor = offspringProcessor;
+      pathRelinker.Successor = rightSelector;
 
       crossover.Name = "Crossover";
@@ -304 +296 @@
       crossover.Successor = offspringProcessor;
 
-      offspringProcessor.TargetParameter.ActualName = TargetParameter.ActualName;
       offspringProcessor.Successor = rightSelector;