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

Timestamp:

03/19/15 17:16:39 (9 years ago)

Author:

apolidur

Message:

#2221: Local improvement operator for VNS

File:

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

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

@@ -40 +40 @@
   public abstract class ProbabilisticTravelingSalesmanProblem : SingleObjectiveBasicProblem<PermutationEncoding>, IStorableContent,
   IProblemInstanceConsumer<TSPData> {
+    private static readonly int DistanceMatrixSizeLimit = 1000;
+
     #region Parameter Properties
     public OptionalValueParameter<DoubleMatrix> CoordinatesParameter {
@@ -53 +55 @@
       get { return (OptionalValueParameter<Permutation>)Parameters["BestKnownSolution"]; }
     }
-    public OptionalValueParameter<ItemList<DoubleValue>> ProbabilityMatrixParameter {
-      get { return (OptionalValueParameter<ItemList<DoubleValue>>)Parameters["ProbabilityMatrix"]; }
+    public ValueParameter<DoubleArray> ProbabilityMatrixParameter {
+      get { return (ValueParameter<DoubleArray>)Parameters["ProbabilityMatrix"]; }
     }
     public ValueParameter<IntValue> SampleSizeParameter {
@@ -79 +81 @@
       set { BestKnownSolutionParameter.Value = value; }
     }
-    public ItemList<DoubleValue> ProbabilityMatrix {
+    public DoubleArray ProbabilityMatrix {
       get { return ProbabilityMatrixParameter.Value; }
       set { ProbabilityMatrixParameter.Value = value; }
@@ -105 +107 @@
       Parameters.Add(new ValueParameter<BoolValue>("UseDistanceMatrix", "True if the coordinates based evaluators should calculate the distance matrix from the coordinates and use it for evaluation similar to the distance matrix evaluator, otherwise false.", new BoolValue(true)));
       Parameters.Add(new OptionalValueParameter<Permutation>("BestKnownSolution", "The best known solution of this TSP instance."));
-      Parameters.Add(new OptionalValueParameter<ItemList<DoubleValue>>("ProbabilityMatrix", "The matrix which contains the probabilities of each of the cities."));
+      Parameters.Add(new ValueParameter<DoubleArray>("ProbabilityMatrix", "The matrix which contains the probabilities of each of the cities."));
+
+      Coordinates = new DoubleMatrix(new double[,] {
+        { 100, 100 }, { 100, 200 }, { 100, 300 }, { 100, 400 },
+        { 200, 100 }, { 200, 200 }, { 200, 300 }, { 200, 400 },
+        { 300, 100 }, { 300, 200 }, { 300, 300 }, { 300, 400 },
+        { 400, 100 }, { 400, 200 }, { 400, 300 }, { 400, 400 }
+      });
+
+      ProbabilityMatrix = new DoubleArray(new double[] {1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1});
       
     }
 
     public virtual void Load(TSPData data) {
+      if (data.Coordinates == null && data.Distances == null)
+        throw new System.IO.InvalidDataException("The given instance specifies neither coordinates nor distances!");
+      if (data.Dimension > DistanceMatrixSizeLimit && (data.DistanceMeasure == DistanceMeasure.Att
+        || data.DistanceMeasure == DistanceMeasure.Manhattan
+        || data.DistanceMeasure == DistanceMeasure.Maximum))
+        throw new System.IO.InvalidDataException("The given instance uses an unsupported distance measure and is too large for using a distance matrix.");
+      if (data.Coordinates != null && data.Coordinates.GetLength(1) != 2)
+        throw new System.IO.InvalidDataException("The coordinates of the given instance are not in the right format, there need to be one row for each customer and two columns for the x and y coordinates.");
+
+      Name = data.Name;
+      Description = data.Description;
+
+      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;
+
       DistanceMatrix = new DistanceMatrix(data.GetDistanceMatrix());
       // Get Probabilities of cities using random with seed from hash function on the Name of the instance
-      ProbabilityMatrix = new ItemList<DoubleValue>(data.Dimension);
+      ProbabilityMatrix = new DoubleArray(data.Dimension);
       Random r = new Random(data.Name.GetHashCode());
       for (int i = 0; i < data.Dimension; i++) {
-        ProbabilityMatrix.Add(new DoubleValue(r.NextDouble()));
+        ProbabilityMatrix[i] = r.NextDouble();
       }
       Encoding.Length = data.Dimension;
+
+      OnReset();
     }
   }