Changeset 11287 for trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting

Timestamp:

08/19/14 15:52:56 (10 years ago)

Author:

pfleck

Message:

#2225
Fixed unit test for VRP instances.

Location:

trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting/3.4

Files:

• IVRPInstanceProvider.cs (modified) (1 diff)
• VRPInstanceProvider.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting/3.4/IVRPInstanceProvider.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.Problems.Instances.VehicleRouting {
-  public interface IVRPInstanceProvider<T> where T : IVRPData {
+  public interface IVRPInstanceProvider {
     bool CanImportData { get; }
-    T Import(string vrpFile, string tourFile);
+    IVRPData Import(string vrpFile, string tourFile);
 
     bool CanExportData { get; }
-    void Export(T instance, string path);
+    void Export(IVRPData instance, string path);
   }
 }

trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting/3.4/VRPInstanceProvider.cs

@@ -29 +29 @@
 
 namespace HeuristicLab.Problems.Instances.VehicleRouting {
-  public abstract class VRPInstanceProvider<T> : ProblemInstanceProvider<T>, IVRPInstanceProvider<T> where T : IVRPData {
+  public abstract class VRPInstanceProvider<T> : ProblemInstanceProvider<T>, IVRPInstanceProvider where T : IVRPData {
     protected abstract string FileName { get; }
 
@@ -107 +107 @@
     protected abstract T LoadData(Stream stream);
 
-    public T Import(string vrpFile, string tourFile) {
+    public IVRPData Import(string vrpFile, string tourFile) {
       var data = ImportData(vrpFile);
       if (!String.IsNullOrEmpty(tourFile)) {
@@ -115 +115 @@
     }
 
-    public void Export(T instance, string path) {
-      ExportData(instance, path);
+    public void Export(IVRPData instance, string path) {
+      ExportData((T)instance, path);
     }