Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
07/03/12 13:41:36 (12 years ago)
Author:
sforsten
Message:

#1782:

  • renamed CanSave to CanExportData and SaveData to ExportData
  • added the same functionality for importing problem instance as we implemented for exporting
  • some special changes had to be made in Problems.Instances.VehicleRouting
Location:
trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting/3.4
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting/3.4/CordeauFormat/CordeauFormatInstanceProvider.cs

    r7882 r8192  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    2422using System.IO;
    25 using System.Linq;
    26 using System.Reflection;
    27 using System.Text.RegularExpressions;
    28 using ICSharpCode.SharpZipLib.Zip;
    29 using HeuristicLab.Problems.Instances.TSPLIB;
    3023
    3124namespace HeuristicLab.Problems.Instances.VehicleRouting {
    … …  
    3528    }
    3629
    37     public override MDCVRPTWData LoadData(string path) {
     30    public override bool CanImportData {
     31      get { return true; }
     32    }
     33    public override MDCVRPTWData ImportData(string path) {
    3834      return LoadInstance(new CordeauParser(path));
    3935    }

  • trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting/3.4/GoldenFormat/GoldenFormatInstanceProvider.cs

    r7887 r8192  
    2121
    2222using System;
    23 using System.Collections.Generic;
    2423using System.IO;
    25 using System.Linq;
    26 using System.Reflection;
    27 using System.Text.RegularExpressions;
    28 using ICSharpCode.SharpZipLib.Zip;
    29 using HeuristicLab.Problems.Instances.TSPLIB;
    3024
    3125namespace HeuristicLab.Problems.Instances.VehicleRouting {
    … …  
    3529    }
    3630
    37     public override CVRPTWData LoadData(string path) {
     31    public override bool CanImportData {
     32      get { return true; }
     33    }
     34    public override CVRPTWData ImportData(string path) {
    3835      return LoadInstance(new GoldenParser(path));
    3936    }
    … …  
    6663      }
    6764
    68       if(parser.Distance > 0)
     65      if (parser.Distance > 0)
    6966        instance.DueTimes[0] = parser.Distance;
    7067

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

    r7956 r8192  
    2222namespace HeuristicLab.Problems.Instances.VehicleRouting {
    2323  public interface IVRPInstanceProvider {
    24     IVRPData LoadData(string vrpFile, string tourFile);
     24    bool CanImportData { get; }
     25    IVRPData Import(string vrpFile, string tourFile);
     26
     27    bool CanExportData { get; }
     28    void Export(IVRPData instance, string path);
    2529  }
    2630}

  • trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting/3.4/LiLimFormat/LiLimFormatInstanceProvider.cs

    r7882 r8192  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    2422using System.IO;
    25 using System.Linq;
    26 using System.Reflection;
    27 using System.Text.RegularExpressions;
    28 using ICSharpCode.SharpZipLib.Zip;
    29 using HeuristicLab.Problems.Instances.TSPLIB;
    3023
    3124namespace HeuristicLab.Problems.Instances.VehicleRouting {
    … …  
    3528    }
    3629
    37     public override PDPTWData LoadData(string path) {
     30    public override bool CanImportData {
     31      get { return true; }
     32    }
     33    public override PDPTWData ImportData(string path) {
    3834      return LoadInstance(new LiLimParser(path));
    3935    }

  • trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting/3.4/SolomonFormat/SolomonFormatInstanceProvider.cs

    r7882 r8192  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    2422using System.IO;
    25 using System.Linq;
    26 using System.Reflection;
    27 using System.Text.RegularExpressions;
    28 using ICSharpCode.SharpZipLib.Zip;
    29 using HeuristicLab.Problems.Instances.TSPLIB;
    3023
    3124namespace HeuristicLab.Problems.Instances.VehicleRouting {
    … …  
    3528    }
    3629
    37     public override CVRPTWData LoadData(string path) {
     30    public override bool CanImportData {
     31      get { return true; }
     32    }
     33    public override CVRPTWData ImportData(string path) {
    3834      return LoadInstance(new SolomonParser(path));
    3935    }

  • trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting/3.4/TSPLibFormat/TSPLibFormatInstanceProvider.cs

    r7882 r8192  
    2121
    2222using System;
    23 using System.Collections.Generic;
    2423using System.IO;
    25 using System.Linq;
    26 using System.Reflection;
    27 using System.Text.RegularExpressions;
    28 using ICSharpCode.SharpZipLib.Zip;
    2924using HeuristicLab.Problems.Instances.TSPLIB;
    3025
    … …  
    3530    }
    3631
    37     public override CVRPData LoadData(string path) {
     32    public override bool CanImportData {
     33      get { return true; }
     34    }
     35    public override CVRPData ImportData(string path) {
    3836      return LoadInstance(new TSPLIBParser(path));
    3937    }

  • trunk/sources/HeuristicLab.Problems.Instances.VehicleRouting/3.4/TaillardFormat/TaillardFormatInstanceProvider.cs

    r7888 r8192  
    2020#endregion
    2121
    22 using System;
    23 using System.Collections.Generic;
    2422using System.IO;
    25 using System.Linq;
    26 using System.Reflection;
    27 using System.Text.RegularExpressions;
    28 using ICSharpCode.SharpZipLib.Zip;
    29 using HeuristicLab.Problems.Instances.TSPLIB;
    3023
    3124namespace HeuristicLab.Problems.Instances.VehicleRouting {
    … …  
    3528    }
    3629
    37     public override CVRPData LoadData(string path) {
     30    public override bool CanImportData {
     31      get { return true; }
     32    }
     33    public override CVRPData ImportData(string path) {
    3834      return LoadInstance(new TaillardParser(path));
    3935    }

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

    r8180 r8192  
    107107    protected abstract T LoadData(Stream stream);
    108108
    109     public IVRPData LoadData(string vrpFile, string tourFile) {
    110       var data = LoadData(vrpFile);
     109    public IVRPData Import(string vrpFile, string tourFile) {
     110      var data = ImportData(vrpFile);
    111111      if (!String.IsNullOrEmpty(tourFile)) {
    112112        LoadSolution(tourFile, data);
    113113      }
    114114      return data;
     115    }
     116
     117    public void Export(IVRPData instance, string path) {
     118      ExportData((T)instance, path);
    115119    }
    116120
Note: See TracChangeset for help on using the changeset viewer.