Changeset 14055 for branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Instances/BPPInstanceProvider.cs

Timestamp:

07/13/16 09:30:01 (8 years ago)

Author:

gkronber

Message:

#1966: simplified parsers

File:

• branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Instances/BPPInstanceProvider.cs (modified) (4 diffs)

branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Instances/BPPInstanceProvider.cs

@@ -42 +42 @@
 
     public override Uri WebLink {
-      get { return new Uri("http://people.brunel.ac.uk/~mastjjb/jeb/orlib/binpacktwoinfo.html , http://www.diku.dk/~pisinger/new3dbpp/readme.3dbpp"); }
+      get { return new Uri("http://people.brunel.ac.uk/~mastjjb/jeb/orlib/binpacktwoinfo.html"); }
     }
 
@@ -74 +74 @@
 
         using (var stream = entry.Open()) {
-          var parser = new BPPORLIBParser();
-          parser.Parse(stream);
-          var instance = Load(parser);
+          var instance = BPPORLIBParser.Parse(stream);
           instance.Name = id.Name;
           instance.Description = id.Description;
@@ -89 +87 @@
     }
     public override BPPData ImportData(string path) {
-      var parser = new BPPORLIBParser();
-      parser.Parse(path);
-      var instance = Load(parser);
+      var instance = BPPORLIBParser.Parse(path);
       instance.Name = Path.GetFileName(path);
       instance.Description = "Loaded from file \"" + path + "\" on " + DateTime.Now;
-      return instance;
-    }
-
-    private BPPData Load(BPPORLIBParser parser) {
-      var instance = new BPPData {
-        Items = parser.Items,
-        BinMeasures = parser.BinMeasures,
-        ItemMeasures = parser.ItemMeasures
-      };
       return instance;
     }
@@ -111 +98 @@
 
     public override void ExportData(BPPData instance, string path) {
-      var parser = new BPPORLIBParser {
-        Name = instance.Name,
-        Description = instance.Description,
-        Items = instance.Items,
-        BinMeasures = instance.BinMeasures,
-        ItemMeasures = instance.ItemMeasures
-      };
-      parser.Export(path);
+      BPPORLIBParser.Export(instance, path);
     }