Changeset 7958 for branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4

Timestamp:

06/05/12 08:34:36 (12 years ago)

Author:

svonolfe

Message:

Merged changes from trunk into branch (#1177)

Location:

branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.Instances.VehicleRouting-3.4.csproj (modified) (1 diff)
• IVRPInstanceProvider.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting/3.4/IVRPInstanceProvider.cs)
• VRPInstanceProvider.cs (modified) (2 diffs)

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

@@ -134 +134 @@
     <Compile Include="GoldenFormat\GoldenParser.cs" />
     <Compile Include="GoldenFormat\GoldenFormatInstanceProvider.cs" />
+    <Compile Include="IVRPInstanceProvider.cs" />
     <Compile Include="TaillardFormat\TaillardInstanceProvider.cs" />
     <Compile Include="TaillardFormat\TaillardParser.cs" />

branches/VRP/HeuristicLab.Problems.Instances.VehicleRouting/3.4/VRPInstanceProvider.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Problems.Instances.VehicleRouting {
-  public abstract class VRPInstanceProvider<T> : ProblemInstanceProvider<T> where T : IVRPData {
+  public abstract class VRPInstanceProvider<T> : ProblemInstanceProvider<T>, IVRPInstanceProvider where T : IVRPData {
     protected abstract string FileName { get; }
 
@@ -110 +110 @@
     }
 
-    public T LoadData(string vrpFile, string tourFile) {
+    public IVRPData LoadData(string vrpFile, string tourFile) {
       var data = LoadData(vrpFile);
       if (!String.IsNullOrEmpty(tourFile)) {