Changeset 17241 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/PathRelinkers

Timestamp:

09/10/19 21:55:35 (5 years ago)

Author:

abeham

Message:

#2521: worked on refactoring TSP

Location:

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/PathRelinkers

Files:

• TSPMultipleGuidesPathRelinker.cs (modified) (7 diffs)
• TSPPathRelinker.cs (modified) (3 diffs)
• TSPSimultaneousPathRelinker.cs (modified) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/PathRelinkers/TSPMultipleGuidesPathRelinker.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -29 +30 @@
 using HeuristicLab.Optimization.Operators;
 using HeuristicLab.Parameters;
-using HEAL.Attic;
 
 namespace HeuristicLab.Problems.TravelingSalesman {
@@ -39 +39 @@
   /// </remarks>
   [Item("TSPMultipleGuidesPathRelinker", "An operator that relinks paths between traveling salesman solutions using a multiple guiding strategy. 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.")]
-  [StorableType("6B5B2622-AB1D-47E6-8BBC-C6088D393149")]
+  [StorableType("13e879fd-7621-402e-9345-7dbfdd78e3b6")]
   public sealed class TSPMultipleGuidesPathRelinker : SingleObjectivePathRelinker {
-    #region Parameter properties
-    public ILookupParameter<DistanceMatrix> DistanceMatrixParameter {
-      get { return (ILookupParameter<DistanceMatrix>)Parameters["DistanceMatrix"]; }
-    }
-    #endregion
-
-    #region Properties
-    public DistanceMatrix DistanceMatrix {
-      get { return DistanceMatrixParameter.ActualValue; }
-    }
-    #endregion
+    [Storable] public ILookupParameter<ITSPData> TSPDataParameter { get; private set; }
 
     [StorableConstructor]
     private TSPMultipleGuidesPathRelinker(StorableConstructorFlag _) : base(_) { }
-    private TSPMultipleGuidesPathRelinker(TSPMultipleGuidesPathRelinker original, Cloner cloner) : base(original, cloner) { }
+    private TSPMultipleGuidesPathRelinker(TSPMultipleGuidesPathRelinker original, Cloner cloner)
+      : base(original, cloner) {
+      TSPDataParameter = cloner.Clone(original.TSPDataParameter);
+    }
     public TSPMultipleGuidesPathRelinker()
       : base() {
-      #region Create parameters
-      Parameters.Add(new LookupParameter<DistanceMatrix>("DistanceMatrix", "The matrix which contains the distances between the cities."));
-      #endregion
+      Parameters.Add(TSPDataParameter = new LookupParameter<ITSPData>("TSPData", "The main parameters of the TSP."));
     }
 
@@ -67 +58 @@
     }
 
-    public static ItemArray<IItem> Apply(IItem initiator, IItem[] guides, DistanceMatrix distances, PercentValue n) {
+    public static ItemArray<IItem> Apply(IItem initiator, IItem[] guides, ITSPData tspData, PercentValue n) {
       if (!(initiator is Permutation) || guides.Any(x => !(x is Permutation)))
         throw new ArgumentException("Cannot relink path because some of the provided solutions have the wrong type.");
@@ -84 +75 @@
         int currCityIndex = i;
         int bestCityIndex = (i + 1) % v1.Length;
-        double currDistance = distances[v1[currCityIndex], v1[bestCityIndex]];
+        double currDistance = tspData.GetDistance(v1[currCityIndex], v1[bestCityIndex]);
         // check each guiding solution
         targets.ToList().ForEach(solution => {
@@ -92 +83 @@
           int succ = solution[(node.Index + 1) % solution.Length];
           // get distances to neighbors
-          var results = new[] { pred, succ }.Select(x => new { Id = x, Distance = distances[x, node.Id] });
+          var results = new[] { pred, succ }.Select(x => new { Id = x, Distance = tspData.GetDistance(x, node.Id) });
           var bestCity = results.Where(x => x.Distance < currDistance).OrderBy(x => x.Distance).FirstOrDefault();
           if (bestCity != null) {
@@ -129 +120 @@
       if (parents.Length < 2)
         throw new ArgumentException("The number of parents is smaller than 2.");
-      return Apply(parents[0], parents.Skip(1).ToArray(), DistanceMatrix, n);
+      return Apply(parents[0], parents.Skip(1).ToArray(), TSPDataParameter.ActualValue, n);
     }
   }

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/PathRelinkers/TSPPathRelinker.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -28 +29 @@
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Optimization.Operators;
-using HEAL.Attic;
 
 namespace HeuristicLab.Problems.TravelingSalesman {
+
   /// <summary>
   /// An operator that relinks paths between traveling salesman solutions.
@@ -38 +39 @@
   /// </remarks>
   [Item("TSPPathRelinker", "An operator that relinks paths between traveling salesman solutions. The operator incrementally assimilates the initiating solution into the guiding solution by correcting edges as needed.")]
-  [StorableType("0997A24C-0592-4CE4-A681-70C97890D3F7")]
+  [StorableType("a2c5de50-a050-4269-b80e-1c995eb51626")]
   public sealed class TSPPathRelinker : SingleObjectivePathRelinker {
     [StorableConstructor]

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/PathRelinkers/TSPSimultaneousPathRelinker.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
+using HEAL.Attic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -28 +29 @@
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Optimization.Operators;
-using HEAL.Attic;
 
 namespace HeuristicLab.Problems.TravelingSalesman {
@@ -38 +38 @@
   /// </remarks>
   [Item("TSPSimultaneousPathRelinker", "An operator that relinks paths between traveling salesman solutions starting from both ends. The operator incrementally assimilates the initiating solution into the guiding solution and vice versa by correcting edges as needed.")]
-  [StorableType("D44D112E-5139-4848-8A2B-66CFC5784EE4")]
+  [StorableType("73457ec0-1d71-4d9f-b646-2ba3639317e2")]
   public sealed class TSPSimultaneousPathRelinker : SingleObjectivePathRelinker {
     [StorableConstructor]