Changeset 13412 for branches/PTSP/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBHeterogeneousPTSPInstanceProvider.cs

Timestamp:

11/28/15 23:38:51 (9 years ago)

Author:

abeham

Message:

#2221:

• Completely refactored PTSP branch
  • Added two sets of problem instances based on TSPLIB: homogeneous and heterogeneous
  • Implemented missing EvaluateByCoordinates for 1-shift moves
  • Made it clear that move evaluators are for estimated PTSP only
  • Changed parameter realization from a rather strange list of list of ints to a list of bool arrays
  • Reusing code of the 2-opt and 1-shift move evaluators in 2.5 move evaluator
  • Introducing distance calculators to properly handle the case when no distance matrix is given (previous code only worked with distance matrix and without only with euclidean distance in some settings)
  • Fixed several smaller code issues: protected, static, method parameters, copy & paste, interfaces, naming, parameters, serialization hooks, license headers, doc comments, data types

Location:

branches/PTSP/HeuristicLab.Problems.Instances.TSPLIB

Files:

• . (copied) (copied from trunk/sources/HeuristicLab.Problems.Instances.TSPLIB)
• 3.3/TSPLIBHeterogeneousPTSPInstanceProvider.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBTSPInstanceProvider.cs) (3 diffs)

branches/PTSP/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBHeterogeneousPTSPInstanceProvider.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
 namespace HeuristicLab.Problems.Instances.TSPLIB {
-  public class TSPLIBTSPInstanceProvider : TSPLIBInstanceProvider<TSPData> {
+  public class TSPLIBHeterogeneousPTSPInstanceProvider : TSPLIBInstanceProvider<PTSPData> {
 
     public override string Name {
-      get { return "TSPLIB (symmetric TSP)"; }
+      get { return "TSPLIB (heterogeneous symmetric PTSP)"; }
     }
 
@@ -37 +38 @@
     protected override string FileExtension { get { return "tsp"; } }
 
-    protected override TSPData LoadInstance(TSPLIBParser parser) {
+    public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
+      foreach (var desc in base.GetDataDescriptors().OfType<TSPLIBDataDescriptor>()) {
+        desc.Name += " [0.1;0.9]";
+        desc.SolutionIdentifier = null;
+        yield return desc;
+      }
+    }
+
+    protected override PTSPData LoadInstance(TSPLIBParser parser, IDataDescriptor descriptor = null) {
       parser.Parse();
       if (parser.FixedEdges != null) throw new InvalidDataException("TSP instance " + parser.Name + " contains fixed edges which are not supported by HeuristicLab.");
-      var instance = new TSPData();
+      var instance = new PTSPData();
       instance.Dimension = parser.Dimension;
       instance.Coordinates = parser.Vertices != null ? parser.Vertices : parser.DisplayVertices;
@@ -73 +82 @@
         + Environment.NewLine + Environment.NewLine
         + GetInstanceDescription();
+
+      var random = new MarsagliaRandom((uint)(descriptor != null ? descriptor.Name : instance.Name).GetHashCode());
+      instance.Probabilities = Enumerable.Range(0, instance.Dimension).Select(_ => 0.1 + 0.9 * random.NextDouble()).ToArray();
+
       return instance;
     }
 
-    protected override void LoadSolution(TSPLIBParser parser, TSPData instance) {
+    protected override void LoadSolution(TSPLIBParser parser, PTSPData instance) {
       parser.Parse();
       instance.BestKnownTour = parser.Tour.FirstOrDefault();
     }
 
-    public TSPData LoadData(string tspFile, string tourFile, double? bestQuality) {
+    public PTSPData LoadData(string tspFile, string tourFile, double? bestQuality) {
       var data = LoadInstance(new TSPLIBParser(tspFile));
       if (!String.IsNullOrEmpty(tourFile)) {