Changeset 7871 for branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4

Timestamp:

05/22/12 17:37:33 (12 years ago)

Author:

svonolfe

Message:

Added support for included TSPLib CVRP instances (#1177)

Location:

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4

Files:

• HeuristicLab.Problems.VehicleRouting-3.4.csproj (modified) (2 diffs)
• Interpreters (added)
• Interpreters/CVRPInterpreter.cs (added)
• Interpreters/IVRPDataInterpreter.cs (added)
• Plugin.cs.frame (modified) (1 diff)
• VehicleRoutingProblem.cs (modified) (3 diffs)

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/HeuristicLab.Problems.VehicleRouting-3.4.csproj

@@ -150 +150 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Problems.Instances-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL" />
     <Reference Include="System" />
     <Reference Include="System.Core">
@@ -191 +192 @@
     <Compile Include="Encodings\Potvin\Moves\TwoOptStar\PotvinTwoOptStarSingleMoveGenerator.cs" />
     <Compile Include="Interfaces\IVRPLocalSearchManipulator.cs" />
+    <Compile Include="Interpreters\CVRPInterpreter.cs" />
+    <Compile Include="Interpreters\IVRPDataInterpreter.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Encodings\Alba\AlbaEncoding.cs" />

branches/VRP/HeuristicLab.Problems.VehicleRouting/3.4/Plugin.cs.frame

@@ -40 +40 @@
   [PluginDependency("HeuristicLab.Parameters", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
+  [PluginDependency("HeuristicLab.Problems.Instances", "3.3")]
   public class HeuristicLabProblemsVehicleRoutingPlugin : PluginBase {
   }

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

@@ -36 +36 @@
 using HeuristicLab.Problems.VehicleRouting.ProblemInstances;
 using HeuristicLab.Problems.VehicleRouting.Variants;
+using HeuristicLab.Problems.Instances;
+using System.Reflection;
+using HeuristicLab.Problems.VehicleRouting.Interpreters;
 
 namespace HeuristicLab.Problems.VehicleRouting {
@@ -41 +44 @@
   [Creatable("Problems")]
   [StorableClass]
-  public sealed class VehicleRoutingProblem : ParameterizedNamedItem, ISingleObjectiveHeuristicOptimizationProblem, IStorableContent {
+  public sealed class VehicleRoutingProblem : ParameterizedNamedItem, ISingleObjectiveHeuristicOptimizationProblem, IStorableContent, IProblemInstanceConsumer<IVRPData> {
     public string Filename { get; set; }
 
@@ -466 +469 @@
       }
     }
+
+    public void Load(IVRPData data) {
+      Type interpreterType = typeof(IVRPDataInterpreter<>).MakeGenericType(data.GetType());
+      var interpreters = ApplicationManager.Manager.GetInstances(interpreterType);
+      if (interpreters.Count() > 0) {
+        IVRPDataInterpreter interpreter = interpreters.First() as IVRPDataInterpreter;
+        VRPInstanceDescription instance = interpreter.Interpret(data);
+
+        Name = instance.Name;
+        Description = instance.Description;
+        ProblemInstance = instance.ProblemInstance;
+
+        OnReset();
+
+        if (instance.BestKnownQuality != null) {
+          BestKnownQuality = new DoubleValue((double)instance.BestKnownQuality);
+        }
+
+        if (instance.BestKnownSolution != null) {
+          VRPSolution solution = new VRPSolution(ProblemInstance, instance.BestKnownSolution, new DoubleValue(0));
+          BestKnownSolutionParameter.Value = solution;
+        }
+      } else {
+        throw new Exception("Cannot find an interpreter for " + data.GetType());
+      }   
+    }
   }
 }