Changeset 4847 for trunk/sources/HeuristicLab.Problems.VehicleRouting

Timestamp:

11/19/10 11:12:40 (13 years ago)

Author:

svonolfe

Message:

Implemented review comments (#1236)

Location:

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3

Files:

• Evaluators/VRPEvaluator.cs (modified) (3 diffs)
• VRPUtilities.cs (modified) (1 diff)
• VehicleRoutingProblem.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Problems.VehicleRouting/3.3/Evaluators/VRPEvaluator.cs

@@ -116 +116 @@
       DoubleArray serviceTimeArray, DoubleArray readyTimeArray, DoubleArray demandArray, DoubleValue capacity,
       DoubleValue fleetUsageFactor, DoubleValue timeFactor, DoubleValue distanceFactor, DoubleValue overloadPenalty, DoubleValue tardinessPenalty,
-      DoubleMatrix coordinates, ILookupParameter<DoubleMatrix> distanceMatrix, BoolValue useDistanceMatrix) {
+      DoubleMatrix coordinates, IParameter distanceMatrix, BoolValue useDistanceMatrix) {
       TourEvaluation eval = new TourEvaluation();
 
@@ -190 +190 @@
       DoubleArray serviceTimeArray, DoubleArray readyTimeArray, DoubleArray demandArray, DoubleValue capacity,
       DoubleValue fleetUsageFactor, DoubleValue timeFactor, DoubleValue distanceFactor, DoubleValue overloadPenalty, DoubleValue tardinessPenalty,
-      DoubleMatrix coordinates, ILookupParameter<DoubleMatrix> distanceMatrix, BoolValue useDistanceMatrix) {
+      DoubleMatrix coordinates, IParameter distanceMatrix, BoolValue useDistanceMatrix) {
       TourEvaluation sumEval = new TourEvaluation();
       sumEval.Distance = 0;
@@ -199 +199 @@
       sumEval.Tardiness = 0;
 
-      foreach (Tour tour in solution.GetTours(distanceMatrix)) {
+      foreach (Tour tour in solution.GetTours(distanceMatrix as ILookupParameter<DoubleMatrix>)) {
         TourEvaluation eval = EvaluateTour(tour, dueTimeArray, serviceTimeArray, readyTimeArray, demandArray, capacity,
           fleetUsageFactor, timeFactor, distanceFactor, overloadPenalty, tardinessPenalty,

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

@@ -57 +57 @@
 
       if (useDistanceMatrix.Value) {
-        if (distanceMatrix is IValueLookupParameter<DoubleMatrix>) {
-          if ((distanceMatrix as IValueLookupParameter<DoubleMatrix>).Value == null) {
-            (distanceMatrix as IValueLookupParameter<DoubleMatrix>).Value = CreateDistanceMatrix(coordinates);
+        if (distanceMatrix is IValueParameter<DoubleMatrix>) {
+          if ((distanceMatrix as IValueParameter<DoubleMatrix>).Value == null) {
+            (distanceMatrix as IValueParameter<DoubleMatrix>).Value = CreateDistanceMatrix(coordinates);
           }
           
-          distance = (distanceMatrix as IValueLookupParameter<DoubleMatrix>).Value[start, end];
+          distance = (distanceMatrix as IValueParameter<DoubleMatrix>).Value[start, end];
         } else {
           if (distanceMatrix.ActualValue == null) {

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

@@ -620 +620 @@
       this.Name = parser.ProblemName;
 
+      BestKnownSolution = null;
       Coordinates = new DoubleMatrix(parser.Coordinates);
       Vehicles.Value = parser.Vehicles;
@@ -636 +637 @@
 
       this.Name = parser.Name;
-
       int problemSize = parser.Demands.Length;
 
+      BestKnownSolution = null;
       Coordinates = new DoubleMatrix(parser.Vertices);
       if (parser.Vehicles != -1)
@@ -661 +662 @@
 
       if (parser.Depot != 1)
-        throw new Exception("Invalid depot specification");
+        ErrorHandling.ShowErrorDialog(new Exception("Invalid depot specification"));
 
       if (parser.WeightType != TSPLIBParser.TSPLIBEdgeWeightType.EUC_2D)
-        throw new Exception("Invalid weight type");
+        ErrorHandling.ShowErrorDialog(new Exception("Invalid weight type"));
 
       OnReset();
@@ -672 +673 @@
       if (BestKnownSolution != null) {
         //call evaluator
-        IValueLookupParameter<DoubleMatrix> distMatrix = new ValueLookupParameter<DoubleMatrix>("DistMatrix",
+        IValueParameter<DoubleMatrix> distMatrix = new ValueParameter<DoubleMatrix>("DistMatrix",
           DistanceMatrix);
 
@@ -716 +717 @@
 
       if (cities != Coordinates.Rows - 1)
-        throw new Exception("Invalid solution");
-
-      BestKnownSolutionParameter.Value = encoding;
+        ErrorHandling.ShowErrorDialog(new Exception("Invalid solution"));
+      else
+        BestKnownSolutionParameter.Value = encoding;
     }
 
@@ -728 +729 @@
       int problemSize = parser.Demands.Length;
 
+      BestKnownSolution = null;
       Coordinates = new DoubleMatrix(parser.Vertices);
       Vehicles.Value = problemSize - 1;