Changeset 17525 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman

Timestamp:

05/07/20 17:41:18 (5 years ago)

Author:

abeham

Message:

#2521: working on porting orienteering problem
Open points include:

• Visualization of OrienteeringProblemData
• Fix visualization of solution
• Cleanup unused classes

Location:

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

Files:

• TSP.cs (modified) (1 diff)
• TSPData.cs (modified) (4 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/TSP.cs

@@ -47 +47 @@
     [Storable] public IValueParameter<ITSPData> TSPDataParameter { get; private set; }
     [Storable] public IValueParameter<ITSPSolution> BestKnownSolutionParameter { get; private set; }
-    [Storable] public IResultParameter<ITSPSolution> BestTSPSolutionParameter { get; private set; }
+    [Storable] protected IResultParameter<ITSPSolution> BestTSPSolutionParameter { get; private set; }
+    public IResultDefinition<ITSPSolution> BestTSPSolution => BestTSPSolutionParameter;
 
     public ITSPData TSPData {

branches/2521_ProblemRefactoring/HeuristicLab.Problems.TravelingSalesman/3.3/TSPData.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using HEAL.Attic;
 using HeuristicLab.Common;
@@ -34 +35 @@
 
     double GetDistance(int fromCity, int toCity);
+    double GetPathDistance(IEnumerable<int> path, bool closed = true);
     ITSPSolution GetSolution(Permutation tspTour, double tourLength);
     TSPData Export();
@@ -85 +87 @@
 
     public double GetDistance(int fromCity, int toCity) => Matrix[fromCity, toCity];
-
+    public double GetPathDistance(IEnumerable<int> path, bool closed = true) {
+      var iter = path.GetEnumerator();
+      if (!iter.MoveNext()) return 0;
+      var start = iter.Current;
+      var prev = start;
+      var distance = 0.0;
+      while (iter.MoveNext()) {
+        var cur = iter.Current;
+        distance += Matrix[prev, cur];
+        prev = cur;
+      }
+      if (closed) distance += Matrix[prev, start];
+      return distance;
+    }
     public TSPData Export() {
       return new TSPData() {
@@ -133 +148 @@
 
     public abstract double GetDistance(double fromX, double fromY, double toX, double toY);
+    public double GetPathDistance(IEnumerable<int> path, bool closed = true) {
+      var iter = path.GetEnumerator();
+      if (!iter.MoveNext()) return 0;
+      var start = iter.Current;
+      var prev = start;
+      var distance = 0.0;
+      while (iter.MoveNext()) {
+        var cur = iter.Current;
+        distance += GetDistance(prev, cur);
+        prev = cur;
+      }
+      if (closed) distance += GetDistance(prev, start);
+      return distance;
+    }
 
     public virtual ITSPSolution GetSolution(Permutation tour, double tourLength) {