Context Navigation

Changeset 10744 for stable/HeuristicLab.Problems.Instances.VehicleRouting

Timestamp:

04/14/14 10:04:43 (11 years ago)

Author:

pfleck

Message:

Location:

stable

Files:

stable
- Property svn:mergeinfo changed
  /trunk/sources merged: 10435,10460,10475,10651-10652

-                      r9456
+                      r10744
 namespace HeuristicLab.Problems.Instances.VehicleRouting {
   public abstract class CordeauFormatInstanceProvider : VRPInstanceProvider<MDCVRPTWData> {
     protected override MDCVRPTWData LoadData(Stream stream) {
+  public abstract class CordeauFormatInstanceProvider : VRPInstanceProvider {
+    protected override VRPData LoadData(Stream stream) {
       return LoadInstance(new CordeauParser(stream));
+    }
 …
       get { return true; }
+    }
     public override MDCVRPTWData ImportData(string path) {
+    public override VRPData ImportData(string path) {
       return LoadInstance(new CordeauParser(path));
+    }

-                      r9456
+                      r10744
 namespace HeuristicLab.Problems.Instances.VehicleRouting {
   public abstract class GoldenFormatInstanceProvider : VRPInstanceProvider<CVRPTWData> {
     protected override CVRPTWData LoadData(Stream stream) {
+  public abstract class GoldenFormatInstanceProvider : VRPInstanceProvider {
+    protected override VRPData LoadData(Stream stream) {
       return LoadInstance(new GoldenParser(stream));
+    }
 …
       get { return true; }
+    }
     public override CVRPTWData ImportData(string path) {
+    public override VRPData ImportData(string path) {
       return LoadInstance(new GoldenParser(path));
+    }

-                      r9456
+                      r10744
 namespace HeuristicLab.Problems.Instances.VehicleRouting {
   public abstract class LiLimFormatInstanceProvider : VRPInstanceProvider<PDPTWData> {
     protected override PDPTWData LoadData(Stream stream) {
+  public abstract class LiLimFormatInstanceProvider : VRPInstanceProvider {
+    protected override VRPData LoadData(Stream stream) {
       return LoadInstance(new LiLimParser(stream));
+    }
 …
       get { return true; }
+    }
     public override PDPTWData ImportData(string path) {
+    public override VRPData ImportData(string path) {
       return LoadInstance(new LiLimParser(path));
+    }

-                      r9456
+                      r10744
 namespace HeuristicLab.Problems.Instances.VehicleRouting {
   public abstract class SolomonFormatInstanceProvider : VRPInstanceProvider<CVRPTWData> {
     protected override CVRPTWData LoadData(Stream stream) {
+  public abstract class SolomonFormatInstanceProvider : VRPInstanceProvider {
+    protected override VRPData LoadData(Stream stream) {
       return LoadInstance(new SolomonParser(stream));
+    }
 …
       get { return true; }
+    }
     public override CVRPTWData ImportData(string path) {
+    public override VRPData ImportData(string path) {
       return LoadInstance(new SolomonParser(path));
+    }

-                      r9456
+                      r10744
 namespace HeuristicLab.Problems.Instances.VehicleRouting {
   public abstract class TSPLibFormatInstanceProvider : VRPInstanceProvider<CVRPData> {
     protected override CVRPData LoadData(Stream stream) {
+  public abstract class TSPLibFormatInstanceProvider : VRPInstanceProvider {
+    protected override VRPData LoadData(Stream stream) {
       return LoadInstance(new TSPLIBParser(stream));
+    }
 …
       get { return true; }
+    }
     public override CVRPData ImportData(string path) {
+    public override VRPData ImportData(string path) {
       return LoadInstance(new TSPLIBParser(path));
+    }

-                      r9456
+                      r10744
 namespace HeuristicLab.Problems.Instances.VehicleRouting {
   public abstract class TaillardFormatInstanceProvider : VRPInstanceProvider<CVRPData> {
     protected override CVRPData LoadData(Stream stream) {
+  public abstract class TaillardFormatInstanceProvider : VRPInstanceProvider {
+    protected override VRPData LoadData(Stream stream) {
       return LoadInstance(new TaillardParser(stream));
+    }
 …
       get { return true; }
+    }
     public override CVRPData ImportData(string path) {
+    public override VRPData ImportData(string path) {
       return LoadInstance(new TaillardParser(path));
+    }

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

Note: See TracChangeset for help on using the changeset viewer.