Changeset 4015 for trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/VRPSolution.cs

Timestamp:

07/08/10 11:23:02 (14 years ago)

Author:

svonolfe

Message:

Improved VRP solution view (#1039)

File:

• trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/VRPSolution.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/VRPSolution.cs

@@ -142 +142 @@
       }
     }
+    [Storable]
+    private DoubleMatrix distanceMatrix;
+    public DoubleMatrix DistanceMatrix {
+      get { return distanceMatrix; }
+      set {
+        if (distanceMatrix != value) {
+          distanceMatrix = value;
+        }
+      }
+    }
+    [Storable]
+    private BoolValue useDistanceMatrix;
+    public BoolValue UseDistanceMatrix {
+      get { return useDistanceMatrix; }
+      set {
+        if (useDistanceMatrix != value) {
+          useDistanceMatrix = value;
+        }
+      }
+    }
+    [Storable]
+    private DoubleArray readyTime;
+    public DoubleArray ReadyTime {
+      get { return readyTime; }
+      set {
+        if (readyTime != value) {
+          readyTime = value;
+        }
+      }
+    }
+    [Storable]
+    private DoubleArray dueTime;
+    public DoubleArray DueTime {
+      get { return dueTime; }
+      set {
+        if (dueTime != value) {
+          dueTime = value;
+        }
+      }
+    }
+    [Storable]
+    private DoubleArray serviceTime;
+    public DoubleArray ServiceTime {
+      get { return serviceTime; }
+      set {
+        if (serviceTime != value) {
+          serviceTime = value;
+        }
+      }
+    }
 
     public VRPSolution() : base() { }
@@ -147 +197 @@
     public VRPSolution(DoubleMatrix coordinates, IVRPEncoding solution, DoubleValue quality, 
       DoubleValue distance, DoubleValue overload, DoubleValue tardiness, DoubleValue travelTime, 
-      DoubleValue vehicleUtilization)
+      DoubleValue vehicleUtilization, DoubleMatrix distanceMatrix, BoolValue useDistanceMatrix,
+      DoubleArray readyTime, DoubleArray dueTime, DoubleArray serviceTime)
       : base() {
       this.coordinates = coordinates;
@@ -157 +208 @@
       this.travelTime = travelTime;
       this.vehicleUtilization = vehicleUtilization;
+      this.distanceMatrix = distanceMatrix;
+      this.useDistanceMatrix = useDistanceMatrix;
+      this.readyTime = readyTime;
+      this.dueTime = dueTime;
+      this.serviceTime = serviceTime;
       Initialize();
     }
@@ -167 +223 @@
       if (solution != null) RegisterSolutionEvents();
       if (quality != null) RegisterQualityEvents();
+      if (distance != null) RegisterDistanceEvents();
+      if (overload != null) RegisterOverloadEvents();
+      if (tardiness != null) RegisterTardinessEvents();
+      if (travelTime != null) RegisterTravelTimeEvents();
+      if (vehicleUtilization != null) RegisterVehicleUtilizationEvents();
     }
 
@@ -180 +241 @@
       clone.travelTime = (DoubleValue)cloner.Clone(travelTime);
       clone.vehicleUtilization = (DoubleValue)cloner.Clone(vehicleUtilization);
+      clone.distanceMatrix = (DoubleMatrix)cloner.Clone(distanceMatrix);
+      clone.useDistanceMatrix = (BoolValue)cloner.Clone(useDistanceMatrix);
+      clone.readyTime = (DoubleArray)cloner.Clone(readyTime);
+      clone.dueTime = (DoubleArray)cloner.Clone(dueTime);
+      clone.serviceTime = (DoubleArray)cloner.Clone(serviceTime);
       clone.Initialize();
       return clone;