Changeset 13470 for branches/PTSP/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBHomogeneousPTSPInstanceProvider.cs

Timestamp:

12/15/15 16:38:08 (9 years ago)

Author:

abeham

Message:

#2221:

• implemented review comments
  • hid rng as private class, implemented djb2 hash function (hash function implementation may also change)
  • added missing probabilities
  • base class for instance providers
  • prebuild event events
  • build platforms
  • unit test will be removed on trunk integration
  • corrected assembly file version
  • distance calculator parameter was not hidden, can be changed by user, updates distance matrix
  • fixed performance problems (ouch!) also for estimated ptsp (inlined GetDistance method)
• added moves (full evaluation) for analytical tsp
• added local improvement operators for analytical ptsp
• added recalculation of distance matrix when parameters change
• still lots of other changes

File:

• branches/PTSP/HeuristicLab.Problems.Instances.TSPLIB/3.3/TSPLIBHomogeneousPTSPInstanceProvider.cs (modified) (3 diffs)

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

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
 using System.Linq;
 
 namespace HeuristicLab.Problems.Instances.TSPLIB {
-  public class TSPLIBHomogeneousPTSPInstanceProvider : TSPLIBInstanceProvider<PTSPData> {
-    private static readonly double[] probabilities = new[] { 0.1, 0.2, 0.4, 0.5, 0.6, 0.8, 0.9, 1.0 };
+  public class TSPLIBHomogeneousPTSPInstanceProvider : TSPLIBPTSPInstanceProvider {
+    private static readonly double[] Probabilities = new[] { 0.1, 0.2, 0.3, 0.4, 0.5, 0.6, 0.7, 0.8, 0.9, 1.0 };
 
     public override string Name {
@@ -34 +32 @@
     }
 
-    public override string Description {
-      get { return "Traveling Salesman Problem Library"; }
-    }
-
-    protected override string FileExtension { get { return "tsp"; } }
-
     public override IEnumerable<IDataDescriptor> GetDataDescriptors() {
       var tspDescriptors = base.GetDataDescriptors().OfType<TSPLIBDataDescriptor>();
       foreach (var desc in tspDescriptors) {
-        foreach (var p in probabilities) {
+        foreach (var p in Probabilities) {
           yield return new TSPLIBHomogeneousPTSPDataDescriptor(
             desc.Name + "-" + p.ToString(CultureInfo.InvariantCulture.NumberFormat),
@@ -54 +46 @@
     }
 
-    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 PTSPData();
-      instance.Dimension = parser.Dimension;
-      instance.Coordinates = parser.Vertices != null ? parser.Vertices : parser.DisplayVertices;
-      instance.Distances = parser.Distances;
-      switch (parser.EdgeWeightType) {
-        case TSPLIBEdgeWeightTypes.ATT:
-          instance.DistanceMeasure = DistanceMeasure.Att; break;
-        case TSPLIBEdgeWeightTypes.CEIL_2D:
-          instance.DistanceMeasure = DistanceMeasure.UpperEuclidean; break;
-        case TSPLIBEdgeWeightTypes.EUC_2D:
-          instance.DistanceMeasure = DistanceMeasure.RoundedEuclidean; break;
-        case TSPLIBEdgeWeightTypes.EUC_3D:
-          throw new InvalidDataException("3D coordinates are not supported.");
-        case TSPLIBEdgeWeightTypes.EXPLICIT:
-          instance.DistanceMeasure = DistanceMeasure.Direct; break;
-        case TSPLIBEdgeWeightTypes.GEO:
-          instance.DistanceMeasure = DistanceMeasure.Geo; break;
-        case TSPLIBEdgeWeightTypes.MAN_2D:
-          instance.DistanceMeasure = DistanceMeasure.Manhattan; break;
-        case TSPLIBEdgeWeightTypes.MAN_3D:
-          throw new InvalidDataException("3D coordinates are not supported.");
-        case TSPLIBEdgeWeightTypes.MAX_2D:
-          instance.DistanceMeasure = DistanceMeasure.Maximum; break;
-        case TSPLIBEdgeWeightTypes.MAX_3D:
-          throw new InvalidDataException("3D coordinates are not supported.");
-        default:
-          throw new InvalidDataException("The given edge weight is not supported by HeuristicLab.");
-      }
-
-      instance.Name = parser.Name;
-      instance.Description = parser.Comment
-        + Environment.NewLine + Environment.NewLine
-        + GetInstanceDescription();
+    protected override double[] GetProbabilities(IDataDescriptor descriptor, PTSPData instance) {
       var ptspDesc = descriptor as TSPLIBHomogeneousPTSPDataDescriptor;
-      instance.Probabilities = ptspDesc != null ? Enumerable.Range(0, instance.Dimension).Select(_ => ptspDesc.Probability).ToArray()
-                                                : Enumerable.Range(0, instance.Dimension).Select(_ => 0.5).ToArray();
-
-      return instance;
+      return ptspDesc != null ? Enumerable.Range(0, instance.Dimension).Select(_ => ptspDesc.Probability).ToArray()
+                              : Enumerable.Range(0, instance.Dimension).Select(_ => 0.5).ToArray();
     }
-
-    protected override void LoadSolution(TSPLIBParser parser, PTSPData instance) {
-      parser.Parse();
-      instance.BestKnownTour = parser.Tour.FirstOrDefault();
-    }
-
-    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;
-    }
-
   }
 }