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

Timestamp:

04/13/15 17:43:28 (9 years ago)

Author:

apolidur

Message:

#2221: Prepared PTSP for instance input

File:

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

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

@@ -40 +40 @@
   [StorableClass]
   public abstract class ProbabilisticTravelingSalesmanProblem : SingleObjectiveBasicProblem<PermutationEncoding>, IStorableContent,
-  IProblemInstanceConsumer<TSPData> {
+  IProblemInstanceConsumer<PTSPData> {
     private static readonly int DistanceMatrixSizeLimit = 1000;
 
@@ -59 +59 @@
       get { return (ValueParameter<DoubleArray>)Parameters["ProbabilityMatrix"]; }
     }
-    public ValueParameter<IntValue> SampleSizeParameter {
-      get { return (ValueParameter<IntValue>)Parameters["SampleSize"]; }
+    public ValueParameter<IntValue> RealizationsSizeParameter {
+      get { return (ValueParameter<IntValue>)Parameters["RealizationsSize"]; }
     }
 
@@ -86 +86 @@
       set { ProbabilityMatrixParameter.Value = value; }
     }
-    public IntValue SampleSize {
-      get { return SampleSizeParameter.Value; }
-      set { SampleSizeParameter.Value = value; }
+    public IntValue RealizationsSize {
+      get { return RealizationsSizeParameter.Value; }
+      set { RealizationsSizeParameter.Value = value; }
     }
     #endregion
@@ -121 +121 @@
     }
 
-    public virtual void Load(TSPData data) {
+    public virtual void Load(PTSPData data) {
       if (data.Coordinates == null && data.Distances == null)
         throw new System.IO.InvalidDataException("The given instance specifies neither coordinates nor distances!");
@@ -134 +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);
+      ProbabilityMatrix = new DoubleArray(data.Probabilities);
 
       if (data.BestKnownTour != null) {