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

Timestamp:

03/26/15 16:14:52 (9 years ago)

Author:

apolidur

Message:

#2221: Fixing MoveEvaluators after running unit tests

File:

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

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

@@ -34 +34 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Data;
+using HeuristicLab.Random;
 
 namespace HeuristicLab.Problems.PTSP {
@@ -133 +134 @@
       Description = data.Description;
 
+      // Get Probabilities of cities using random with seed from hash function on the Name of the instance
+      double[] tempMatrix = new double[data.Dimension];
+      MersenneTwister r = new MersenneTwister((uint)data.Name.GetHashCode());
+      for (int i = 0; i < data.Dimension; i++) {
+        tempMatrix[i] = r.NextDouble();
+      }
+      ProbabilityMatrix = new DoubleArray(tempMatrix);
+
+      if (data.BestKnownTour != null) {
+        BestKnownSolution = new Permutation(PermutationTypes.RelativeUndirected, data.BestKnownTour);
+      }
+      
       bool clearCoordinates = false, clearDistanceMatrix = false;
       if (data.Coordinates != null && data.Coordinates.GetLength(0) > 0)
@@ -143 +156 @@
 
       DistanceMatrix = new DistanceMatrix(data.GetDistanceMatrix());
-      // Get Probabilities of cities using random with seed from hash function on the Name of the instance
-      ProbabilityMatrix = new DoubleArray(data.Dimension);
-      Random r = new Random(data.Name.GetHashCode());
-      for (int i = 0; i < data.Dimension; i++) {
-        ProbabilityMatrix[i] = r.NextDouble();
-      }
+      
       Encoding.Length = data.Dimension;