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

Timestamp:

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

Author:

pfleck

Message:

#2152: merged r10435, r10460, r10475, r10651,r10652 into stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.Instances.VehicleRouting/3.4/TSPLibFormat/TSPLibFormatInstanceProvider.cs (modified) (2 diffs)

stable/HeuristicLab.Problems.Instances.VehicleRouting/3.4/TSPLibFormat/TSPLibFormatInstanceProvider.cs

@@ -25 +25 @@
 
 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));
     }
@@ -33 +33 @@
       get { return true; }
     }
-    public override CVRPData ImportData(string path) {
+    public override VRPData ImportData(string path) {
       return LoadInstance(new TSPLIBParser(path));
     }