Changeset 17533 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/ProbabilisticTSPData.cs

Timestamp:

05/08/20 16:55:51 (4 years ago)

Author:

abeham

Message:

#2521: Unified architecture

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/ProbabilisticTSPData.cs (modified) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/ProbabilisticTSPData.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using HEAL.Attic;
@@ -32 +33 @@
 namespace HeuristicLab.Problems.PTSP {
   [StorableType("dd2d0ecc-372e-46f1-846f-fb4ca2afa124")]
-  public interface IProbabilisticTSPData : INamedItem {
-    ITSPData TSPData { get; }
-
+  public interface IProbabilisticTSPData : ITSPData {
     double GetProbability(int city);
-    IProbabilisticTSPSolution GetSolution(Permutation tspTour, double tourLength);
-    PTSPData Export();
+    new IProbabilisticTSPSolution GetSolution(Permutation tspTour, double tourLength);
+    new PTSPData Export();
   }
 
@@ -89 +88 @@
       };
     }
+
+    #region ITSPData members
+    int ITSPData.Cities => TSPData.Cities;
+    double ITSPData.GetDistance(int fromCity, int toCity) => TSPData.GetDistance(fromCity, toCity);
+    double ITSPData.GetPathDistance(IEnumerable<int> path, bool closed) => TSPData.GetPathDistance(path, closed);
+    ITSPSolution ITSPData.GetSolution(Permutation tspTour, double tourLength) => TSPData.GetSolution(tspTour, tourLength);
+    TSPData ITSPData.Export() => TSPData.Export();
+    DoubleMatrix ITSPData.GetCoordinatesOrDefault() => TSPData.GetCoordinatesOrDefault();
+    #endregion
   }
 }