Changeset 4380

Timestamp:

09/10/10 13:58:35 (14 years ago)

Author:

svonolfe

Message:

Readded DistanceMatrix parameter to the VRP problem instance (#1177)

File:

• branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs (modified) (4 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/ProblemInstances/VRPProblemInstance.cs

@@ -56 +56 @@
       get { return (ValueParameter<DoubleMatrix>)Parameters["Coordinates"]; }
     }
+    protected OptionalValueParameter<DoubleMatrix> DistanceMatrixParameter {
+      get { return (OptionalValueParameter<DoubleMatrix>)Parameters["DistanceMatrix"]; }
+    }
     protected ValueParameter<BoolValue> UseDistanceMatrixParameter {
       get { return (ValueParameter<BoolValue>)Parameters["UseDistanceMatrix"]; }
@@ -77 +80 @@
       set { CoordinatesParameter.Value = value; }
     }
-    
-    [Storable]
-    public DoubleMatrix DistanceMatrix { get; set; }
-    
+
+    public DoubleMatrix DistanceMatrix {
+      get { return DistanceMatrixParameter.Value; }
+      set { DistanceMatrixParameter.Value = value; }
+    }
     public BoolValue UseDistanceMatrix {
       get { return UseDistanceMatrixParameter.Value; }
@@ -134 +138 @@
     public double GetDistance(int start, int end) {
       double distance = 0.0;
+      DoubleMatrix distanceMatrix = DistanceMatrix;
 
-      if (DistanceMatrix == null && UseDistanceMatrix.Value) 
-        DistanceMatrix = CreateDistanceMatrix();
-      
-      if(DistanceMatrix != null)
-        distance = DistanceMatrix[start, end];
+      if (distanceMatrix == null && UseDistanceMatrix.Value) {
+        distanceMatrix = DistanceMatrix = CreateDistanceMatrix();
+      }
+
+      if (distanceMatrix != null)
+        distance = distanceMatrix[start, end];
       else 
         distance = CalculateDistance(start, end);
@@ -175 +181 @@
       : base() {
       Parameters.Add(new ValueParameter<DoubleMatrix>("Coordinates", "The x- and y-Coordinates of the cities.", new DoubleMatrix()));
+      Parameters.Add(new OptionalValueParameter<DoubleMatrix>("DistanceMatrix", "The matrix which contains the distances between the cities."));
       Parameters.Add(new ValueParameter<BoolValue>("UseDistanceMatrix", "True if a distance matrix should be calculated and used for evaluation, otherwise false.", new BoolValue(true)));
       Parameters.Add(new ValueParameter<IntValue>("Vehicles", "The number of vehicles.", new IntValue(0)));