Changeset 17265

Timestamp:

09/19/19 20:46:19 (5 years ago)

Author:

abeham

Message:

#2521: remove usage of solutions or best-known quality when converting TSPLIB instances to pTSP instances

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBPTSPInstanceProvider.cs (modified) (2 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBPTSPInstanceProvider.cs

@@ -22 +22 @@
 using System;
 using System.IO;
-using System.Linq;
 
 namespace HeuristicLab.Problems.Instances.TSPLIB {
@@ -76 +75 @@
     protected abstract double[] GetProbabilities(IDataDescriptor descriptor, PTSPData instance);
 
+    public override PTSPData LoadData(IDataDescriptor id) {
+      var tsplibId = (id as TSPLIBDataDescriptor);
+      if (tsplibId != null) tsplibId.SolutionIdentifier = null;
+      return base.LoadData(tsplibId ?? id);
+    }
+
     protected override void LoadSolution(TSPLIBParser parser, PTSPData instance) {
-      parser.Parse();
-      instance.BestKnownTour = parser.Tour.FirstOrDefault();
+      // solutions are not defined for pTSP
     }
 
     protected override void LoadQuality(double? bestQuality, PTSPData instance) {
-      instance.BestKnownQuality = bestQuality;
+      // best known qualities are not defined for pTSP
     }
-
-    public PTSPData LoadData(string tspFile, string tourFile, double? bestQuality) {
-      var data = LoadInstance(new TSPLIBParser(tspFile));
-      if (!String.IsNullOrEmpty(tourFile)) {
-        var tourParser = new TSPLIBParser(tourFile);
-        LoadSolution(tourParser, data);
-      }
-      if (bestQuality.HasValue)
-        data.BestKnownQuality = bestQuality.Value;
-      return data;
-    }
-
   }
 }