Changeset 11286 for trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting/3.4/VRPInstanceProvider.cs

Timestamp:

08/19/14 14:20:34 (10 years ago)

Author:

pfleck

Message:

#2225
Reverted parts of r10435 since the generic VRPInstanceProvider work accordingly after recent changes.

File:

• trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting/3.4/VRPInstanceProvider.cs (modified) (6 diffs)

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

@@ -29 +29 @@
 
 namespace HeuristicLab.Problems.Instances.VehicleRouting {
-  public abstract class VRPInstanceProvider : ProblemInstanceProvider<VRPData>, IVRPInstanceProvider {
+  public abstract class VRPInstanceProvider<T> : ProblemInstanceProvider<T>, IVRPInstanceProvider<T> where T : IVRPData {
     protected abstract string FileName { get; }
 
@@ -52 +52 @@
     }
 
-    public override VRPData LoadData(IDataDescriptor id) {
+    public override T LoadData(IDataDescriptor id) {
       var descriptor = (VRPDataDescriptor)id;
       var instanceArchiveName = GetResourceName(FileName + @"\.zip");
@@ -76 +76 @@
     }
 
-    private static void LoadSolution(Stream stream, VRPData instance) {
+    private static void LoadSolution(Stream stream, T instance) {
       List<List<int>> routes = new List<List<int>>();
 
@@ -99 +99 @@
     }
 
-    public static void LoadSolution(string path, VRPData instance) {
+    public static void LoadSolution(string path, T instance) {
       using (FileStream stream = new FileStream(path, FileMode.Open)) {
         LoadSolution(stream, instance);
@@ -105 +105 @@
     }
 
-    protected abstract VRPData LoadData(Stream stream);
+    protected abstract T LoadData(Stream stream);
 
-    public IVRPData Import(string vrpFile, string tourFile) {
+    public T Import(string vrpFile, string tourFile) {
       var data = ImportData(vrpFile);
       if (!String.IsNullOrEmpty(tourFile)) {
@@ -115 +115 @@
     }
 
-    public void Export(IVRPData instance, string path) {
-      ExportData((VRPData)instance, path);
+    public void Export(T instance, string path) {
+      ExportData(instance, path);
     }