Changeset 13202 for branches/PTSP/HeuristicLab.Problems.PTSP/3.3/PTSP.cs

Timestamp:

11/17/15 09:28:57 (8 years ago)

Author:

abeham

Message:

#2221: reverse engineered PTSPData and added simple instance provider based on TSPLIB

File:

• branches/PTSP/HeuristicLab.Problems.PTSP/3.3/PTSP.cs (modified) (5 diffs)

branches/PTSP/HeuristicLab.Problems.PTSP/3.3/PTSP.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using HeuristicLab.Common;
+using HeuristicLab.Core;
+using HeuristicLab.Data;
+using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.Optimization;
-using HeuristicLab.PluginInfrastructure;
-using HeuristicLab.Core;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.Instances;
-using HeuristicLab.Encodings.PermutationEncoding;
-using HeuristicLab.Common;
-using HeuristicLab.Parameters;
-using HeuristicLab.Data;
-using HeuristicLab.Random;
 
 namespace HeuristicLab.Problems.PTSP {
@@ -59 +52 @@
       get { return (ValueParameter<DoubleArray>)Parameters["ProbabilityMatrix"]; }
     }
-    
+
 
     #endregion
@@ -84 +77 @@
       set { ProbabilityMatrixParameter.Value = value; }
     }
-    
+
     #endregion
-    
+
 
     public override bool Maximization {
@@ -112 +105 @@
       });
 
-      ProbabilityMatrix = new DoubleArray(new double[] {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1});
-      
+      ProbabilityMatrix = new DoubleArray(new double[] { 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 });
+
     }
 
@@ -134 +127 @@
         BestKnownSolution = new Permutation(PermutationTypes.RelativeUndirected, data.BestKnownTour);
       }
-      
-      bool clearCoordinates = false, clearDistanceMatrix = false;
-      if (data.Coordinates != null && data.Coordinates.GetLength(0) > 0)
-        Coordinates = new DoubleMatrix(data.Coordinates);
-      else clearCoordinates = true;
 
-      // reset them after assigning the evaluator
-      if (clearCoordinates) Coordinates = null;
-      if (clearDistanceMatrix) DistanceMatrix = null;
+      Coordinates = data.Coordinates != null && data.Coordinates.GetLength(0) > 0 ? new DoubleMatrix(data.Coordinates) : null;
+      DistanceMatrix = new DistanceMatrix(data.GetDistanceMatrix());
 
-      DistanceMatrix = new DistanceMatrix(data.GetDistanceMatrix());
-      
       Encoding.Length = data.Dimension;