Changeset 17335 for branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/ProbabilisticTSP.cs

Timestamp:

10/17/19 21:40:30 (5 years ago)

Author:

abeham

Message:

#2521: Refactored pTSP to use compositional pattern

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.PTSP/3.3/ProbabilisticTSP.cs (modified) (4 diffs)

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

@@ -25 +25 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Optimization;
@@ -70 +69 @@
       Parameters.Add(BestKnownSolutionParameter = new OptionalValueParameter<IProbabilisticTSPSolution>("BestKnownSolution", "The best known solution of this pTSP instance."));
 
-      ProbabilisticTSPData = new MatrixPTSPData();
-      Encoding.Length = ProbabilisticTSPData.Cities;
+      ProbabilisticTSPData = new ProbabilisticTSPData();
+      Encoding.Length = ProbabilisticTSPData.TSPData.Cities;
     }
 
     protected override void OnEncodingChanged() {
       base.OnEncodingChanged();
-      Encoding.Length = ProbabilisticTSPData.Cities;
+      Encoding.Length = ProbabilisticTSPData.TSPData.Cities;
     }
 
@@ -117 +116 @@
       Description = data.Description;
 
-      if (data.Dimension <= DistanceMatrixSizeLimit) {
-        ProbabilisticTSPData = new MatrixPTSPData(data.Name, data.GetDistanceMatrix(), data.Probabilities, data.Coordinates) { Description = data.Description };
-      } else if (data.DistanceMeasure == DistanceMeasure.Direct && data.Distances != null) {
-        ProbabilisticTSPData = new MatrixPTSPData(data.Name, data.Distances, data.Probabilities, data.Coordinates) { Description = data.Description };
-      } else {
-        switch (data.DistanceMeasure) {
-          case DistanceMeasure.Att:
-            ProbabilisticTSPData = new AttPTSPData(data.Name, data.Coordinates, data.Probabilities) { Description = data.Description };
-            break;
-          case DistanceMeasure.Euclidean:
-            ProbabilisticTSPData = new EuclideanPTSPData(data.Name, data.Coordinates, data.Probabilities, EuclideanTSPData.DistanceRounding.None) { Description = data.Description };
-            break;
-          case DistanceMeasure.RoundedEuclidean:
-            ProbabilisticTSPData = new EuclideanPTSPData(data.Name, data.Coordinates, data.Probabilities, EuclideanTSPData.DistanceRounding.Midpoint) { Description = data.Description };
-            break;
-          case DistanceMeasure.UpperEuclidean:
-            ProbabilisticTSPData = new EuclideanPTSPData(data.Name, data.Coordinates, data.Probabilities, EuclideanTSPData.DistanceRounding.Ceiling) { Description = data.Description };
-            break;
-          case DistanceMeasure.Geo:
-            ProbabilisticTSPData = new GeoPTSPData(data.Name, data.Coordinates, data.Probabilities) { Description = data.Description };
-            break;
-          case DistanceMeasure.Manhattan:
-            ProbabilisticTSPData = new ManhattanPTSPData(data.Name, data.Coordinates, data.Probabilities) { Description = data.Description };
-            break;
-          case DistanceMeasure.Maximum:
-            ProbabilisticTSPData = new MaximumPTSPData(data.Name, data.Coordinates, data.Probabilities) { Description = data.Description };
-            break;
-          default:
-            throw new System.IO.InvalidDataException("An unknown distance measure is given in the instance!");
-        }
-      }
+      var tspData = TSP.GetDataFromInstance(data);
+      ProbabilisticTSPData = new ProbabilisticTSPData(tspData, data.Probabilities);
       BestKnownSolution = null;
       BestKnownQuality = double.NaN;
@@ -154 +124 @@
         try {
           var tour = new Permutation(PermutationTypes.RelativeUndirected, data.BestKnownTour);
-          var tourLength = Evaluate(tour, new MersenneTwister(1));
-          BestKnownSolution = new ProbabilisticTSPSolution(data.Coordinates != null ? new DoubleMatrix(data.Coordinates) : null, new PercentArray(data.Probabilities), tour, new DoubleValue(tourLength));
+          var tourLength = Evaluate(tour, new MersenneTwister(1));          
+          BestKnownSolution = ProbabilisticTSPData.GetSolution(tour, tourLength);
           BestKnownQuality = tourLength;
         } catch (InvalidOperationException) {