Changeset 7881 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

Timestamp:

05/23/12 17:32:07 (12 years ago)

Author:

svonolfe

Message:

Added VRP test instances (#1177)

File:

• branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs (modified) (5 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/VehicleRoutingProblem.cs

@@ -33 +33 @@
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Problems.VehicleRouting.Interfaces;
-using HeuristicLab.Problems.VehicleRouting.Parsers;
 using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
 using HeuristicLab.Problems.VehicleRouting.Variants;
@@ -194 +193 @@
       if (ProblemInstance != null) {
         EvaluatorParameter.Value = ProblemInstance.SolutionEvaluator;
+        IVRPCreator defaultCreator = null;
         foreach (IVRPCreator creator in operators.Where(o => o is IVRPCreator)) {
           solutionCreatorParameter.ValidValues.Add(creator);
-        }
+          if (creator is Encodings.Alba.RandomCreator)
+            defaultCreator = creator;
+        }
+        if (defaultCreator != null)
+          solutionCreatorParameter.Value = defaultCreator;
+
         ProblemInstance.EvaluationChanged += new EventHandler(ProblemInstance_EvaluationChanged);
       }      
@@ -275 +280 @@
     }
     #endregion
-
-    public void ImportFromCordeau(string cordeauFileName) {
-      CordeauParser parser = new CordeauParser(cordeauFileName);
-      parser.Parse();
-
-      this.Name = parser.ProblemName;
-      MDCVRPTWProblemInstance problem = new MDCVRPTWProblemInstance();
-
-      problem.Coordinates = new DoubleMatrix(parser.Coordinates);
-      problem.Vehicles.Value = parser.Vehicles;
-      problem.Capacity = new DoubleArray(parser.Capacity);
-      problem.Demand = new DoubleArray(parser.Demands);
-      problem.Depots.Value = parser.Depots;
-      problem.VehicleDepotAssignment = new IntArray(parser.Vehicles);
-      problem.ReadyTime = new DoubleArray(parser.Readytimes);
-      problem.ServiceTime = new DoubleArray(parser.Servicetimes);
-      problem.DueTime = new DoubleArray(parser.Duetimes);
-
-      int depot = 0;
-      int i = 0;
-      while(i < parser.Vehicles) {
-        problem.VehicleDepotAssignment[i] = depot;
-
-        i++;
-        if (i % (parser.Vehicles / parser.Depots) == 0)
-          depot++;
-      }
-
-      this.ProblemInstance = problem;
-
-      OnReset();
-    }
-
-    public void ImportFromLiLim(string liLimFileName) {
-      LiLimParser parser = new LiLimParser(liLimFileName);
-      parser.Parse();
-
-      this.Name = parser.ProblemName;
-      CVRPPDTWProblemInstance problem = new CVRPPDTWProblemInstance();
-
-      problem.Coordinates = new DoubleMatrix(parser.Coordinates);
-      problem.Vehicles.Value = parser.Vehicles;
-      problem.Capacity.Value = parser.Capacity;
-      problem.Demand = new DoubleArray(parser.Demands);
-      problem.ReadyTime = new DoubleArray(parser.Readytimes);
-      problem.DueTime = new DoubleArray(parser.Duetimes);
-      problem.ServiceTime = new DoubleArray(parser.Servicetimes);
-      problem.PickupDeliveryLocation = new IntArray(parser.PickupDeliveryLocations);
-
-      this.ProblemInstance = problem;
-
-      OnReset();
-    }
-
-    public void ImportFromSolomon(string solomonFileName) {
-      SolomonParser parser = new SolomonParser(solomonFileName);
-      parser.Parse();
-
-      this.Name = parser.ProblemName;
-      CVRPTWProblemInstance problem = new CVRPTWProblemInstance();
-      
-      problem.Coordinates = new DoubleMatrix(parser.Coordinates);
-      problem.Vehicles.Value = parser.Vehicles;
-      problem.Capacity.Value = parser.Capacity;
-      problem.Demand = new DoubleArray(parser.Demands);
-      problem.ReadyTime = new DoubleArray(parser.Readytimes);
-      problem.DueTime = new DoubleArray(parser.Duetimes);
-      problem.ServiceTime = new DoubleArray(parser.Servicetimes);
-
-      this.ProblemInstance = problem;
-
-      OnReset();
-    }
-
-    public void ImportFromTSPLib(string tspFileName) {
-      TSPLIBParser parser = new TSPLIBParser(tspFileName);
-      parser.Parse();
-
-      this.Name = parser.Name;
-      int problemSize = parser.Demands.Length;
-
-      if (parser.Depot != 1) {
-        ErrorHandling.ShowErrorDialog(new Exception("Invalid depot specification"));
-        return;
-      }
-
-      if (parser.WeightType != TSPLIBParser.TSPLIBEdgeWeightType.EUC_2D)  {
-        ErrorHandling.ShowErrorDialog(new Exception("Invalid weight type"));
-        return;
-      }
-
-      CVRPTWProblemInstance problem = new CVRPTWProblemInstance();
-      problem.Coordinates = new DoubleMatrix(parser.Vertices);
-      if (parser.Vehicles != -1)
-        problem.Vehicles.Value = parser.Vehicles;
-      else
-        problem.Vehicles.Value = problemSize - 1;
-      problem.Capacity.Value = parser.Capacity;
-      problem.Demand = new DoubleArray(parser.Demands);
-      problem.ReadyTime = new DoubleArray(problemSize);
-      problem.DueTime = new DoubleArray(problemSize);
-      problem.ServiceTime = new DoubleArray(problemSize);
-
-      for (int i = 0; i < problemSize; i++) {
-        problem.ReadyTime[i] = 0;
-        problem.DueTime[i] = int.MaxValue;
-        problem.ServiceTime[i] = 0;
-      }
-
-      if (parser.Distance != -1) {
-        problem.DueTime[0] = parser.Distance;
-      }
-
-      this.ProblemInstance = problem;
-
-      OnReset();
-    }
-
-    public void ImportFromORLib(string orFileName) {
-      ORLIBParser parser = new ORLIBParser(orFileName);
-      parser.Parse();
-
-      this.Name = parser.Name;
-      int problemSize = parser.Demands.Length;
-
-      CVRPProblemInstance problem = new CVRPProblemInstance();
-
-      problem.Coordinates = new DoubleMatrix(parser.Vertices);
-      problem.Vehicles.Value = problemSize - 1;
-      problem.Capacity.Value = parser.Capacity;
-      problem.Demand = new DoubleArray(parser.Demands);
-
-      this.ProblemInstance = problem;
-
-      OnReset();
-    }
 
     private void InitializeRandomVRPInstance() {
@@ -482 +351 @@
 
         OnReset();
+        BestKnownQuality = null;
+        BestKnownSolution = null;
 
         if (instance.BestKnownQuality != null) {
@@ -489 +360 @@
         if (instance.BestKnownSolution != null) {
           VRPSolution solution = new VRPSolution(ProblemInstance, instance.BestKnownSolution, new DoubleValue(0));
-          BestKnownSolutionParameter.Value = solution;
+          BestKnownSolution = solution;
         }
       } else {