Changeset 8319 for branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TravelingSalesman/3.3/PathRelinkers

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.TravelingSalesman/3.3/PathRelinkers

Files:

• TSPMultipleGuidesPathRelinker.cs (modified) (2 diffs)
• TSPPathRelinker.cs (modified) (1 diff)
• TSPSimultaneousPathRelinker.cs (modified) (1 diff)

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TravelingSalesman/3.3/PathRelinkers/TSPMultipleGuidesPathRelinker.cs

@@ -35 +35 @@
   /// An operator that relinks paths between traveling salesman solutions using a multiple guiding strategy.
   /// </summary>
+  /// <remarks>
+  /// The operator incrementally changes the initiating solution towards the guiding solution by correcting edges as needed. For each city it choses the best edge from all guiding solutions.
+  /// </remarks>
   [Item("TSPMultipleGuidesPathRelinker", "An operator that relinks paths between traveling salesman solutions using a multiple guiding strategy.")]
   [StorableClass]
-  public sealed class TSPMultipleGuidesPathRelinker : PathRelinker {
+  public sealed class TSPMultipleGuidesPathRelinker : SingleObjectivePathRelinker {
     #region Parameter properties
     public ILookupParameter<DistanceMatrix> DistanceMatrixParameter {
@@ -93 +96 @@
           }
         });
-        Invert(v1, i, bestCityIndex);
+        Invert(v1, currCityIndex + 1, bestCityIndex);
         solutions.Add(v1.Clone() as Permutation);
       }

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TravelingSalesman/3.3/PathRelinkers/TSPPathRelinker.cs

@@ -34 +34 @@
   /// An operator that relinks paths between traveling salesman solutions.
   /// </summary>
+  /// <remarks>
+  /// The operator incrementally assimilates the initiating solution into the guiding solution by correcting edges as needed.
+  /// </remarks>
   [Item("TSPPathRelinker", "An operator that relinks paths between traveling salesman solutions.")]
   [StorableClass]
-  public sealed class TSPPathRelinker : PathRelinker {
+  public sealed class TSPPathRelinker : SingleObjectivePathRelinker {
     [StorableConstructor]
     private TSPPathRelinker(bool deserializing) : base(deserializing) { }

branches/ScatterSearch (trunk integration)/HeuristicLab.Problems.TravelingSalesman/3.3/PathRelinkers/TSPSimultaneousPathRelinker.cs

@@ -34 +34 @@
   /// An operator that relinks paths between traveling salesman solutions starting from both ends.
   /// </summary>
+  /// <remarks>
+  /// The operator incrementally assimilates the initiating solution into the guiding solution and vice versa by correcting edges as needed.
+  /// </remarks>
   [Item("TSPSimultaneousPathRelinker", "An operator that relinks paths between traveling salesman solutions starting from both ends.")]
   [StorableClass]
-  public sealed class TSPSimultaneousPathRelinker : PathRelinker {
+  public sealed class TSPSimultaneousPathRelinker : SingleObjectivePathRelinker {
     [StorableConstructor]
     private TSPSimultaneousPathRelinker(bool deserializing) : base(deserializing) { }