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

Timestamp:

11/19/10 15:43:21 (14 years ago)

Author:

svonolfe

Message:

Merged changes from trunk into branch (#1177)

File:

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

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

@@ -64 +64 @@
       get { return BestKnownQualityParameter; }
     }
+    public OptionalValueParameter<VRPSolution> BestKnownSolutionParameter {
+      get { return (OptionalValueParameter<VRPSolution>)Parameters["BestKnownSolution"]; }
+    }
     public IValueParameter<IVRPCreator> SolutionCreatorParameter {
       get { return (IValueParameter<IVRPCreator>)Parameters["SolutionCreator"]; }
@@ -82 +85 @@
       get { return ProblemInstanceParameter.Value; }
       set { ProblemInstanceParameter.Value = value; }
+    }
+
+    public VRPSolution BestKnownSolution {
+      get { return BestKnownSolutionParameter.Value; }
+      set { BestKnownSolutionParameter.Value = value; }
     }
 
@@ -111 +119 @@
       Parameters.Add(new ValueParameter<IVRPProblemInstance>("ProblemInstance", "The VRP problem instance"));
       Parameters.Add(new OptionalValueParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this VRP instance."));
+      Parameters.Add(new OptionalValueParameter<VRPSolution>("BestKnownSolution", "The best known solution of this VRP instance."));
 
       operators = new List<IOperator>();
@@ -172 +181 @@
         Parameters.Remove("SolutionCreator");
 
+      if (Parameters.ContainsKey("BestKnownSolution"))
+        Parameters.Remove("BestKnownSolution");
+
+      if (Parameters.ContainsKey("BestKnownQuality"))
+        Parameters.Remove("BestKnownQuality");
+
+
       if (ProblemInstance != null) {
         ProblemInstance.SolutionCreatorParameter.ValueChanged += new EventHandler(SolutionCreatorParameter_ValueChanged);
@@ -177 +193 @@
         Parameters.Add(ProblemInstance.EvaluatorParameter);
         Parameters.Add(ProblemInstance.SolutionCreatorParameter);
+
+        Parameters.Add(ProblemInstance.BestKnownQualityParameter);
+        Parameters.Add(ProblemInstance.BestKnownSolutionParameter);
       }
     }
@@ -251 +270 @@
       int problemSize = parser.Demands.Length;
 
-      if (parser.Depot != 1)
-        throw new Exception("Invalid depot specification");
-
-      if (parser.WeightType != TSPLIBParser.TSPLIBEdgeWeightType.EUC_2D)
-        throw new Exception("Invalid weight type");
+      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();
@@ -337 +360 @@
       this.ProblemInstance = problem;
     }
+
+    public void ImportSolution(string solutionFileName) {
+      SolutionParser parser = new SolutionParser(solutionFileName);
+      parser.Parse();
+
+      HeuristicLab.Problems.VehicleRouting.Encodings.Potvin.PotvinEncoding encoding = new Encodings.Potvin.PotvinEncoding(ProblemInstance);
+
+      int cities = 0;
+      foreach (List<int> route in parser.Routes) {
+        Tour tour = new Tour();
+        tour.Stops.AddRange(route);
+        cities += tour.Stops.Count;
+
+        encoding.Tours.Add(tour);
+      }
+
+      if (cities != ProblemInstance.Coordinates.Rows - 1)
+        ErrorHandling.ShowErrorDialog(new Exception("The optimal solution does not seem to correspond with the problem data"));
+      else {
+        VRPSolution solution = new VRPSolution(ProblemInstance, encoding, new DoubleValue(0));
+        ProblemInstance.BestKnownSolutionParameter.Value = solution;
+      }
+    }
   }
 }