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)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.BinPacking/HeuristicLab.Problems.BinPacking.2D/3.3/Instances/BPPInstanceProvider.cs
r14053 r14055 42 42 43 43 public override Uri WebLink { 44 get { return new Uri("http://people.brunel.ac.uk/~mastjjb/jeb/orlib/binpacktwoinfo.html , http://www.diku.dk/~pisinger/new3dbpp/readme.3dbpp"); }44 get { return new Uri("http://people.brunel.ac.uk/~mastjjb/jeb/orlib/binpacktwoinfo.html"); } 45 45 } 46 46 … … 74 74 75 75 using (var stream = entry.Open()) { 76 var parser = new BPPORLIBParser(); 77 parser.Parse(stream); 78 var instance = Load(parser); 76 var instance = BPPORLIBParser.Parse(stream); 79 77 instance.Name = id.Name; 80 78 instance.Description = id.Description; … … 89 87 } 90 88 public override BPPData ImportData(string path) { 91 var parser = new BPPORLIBParser(); 92 parser.Parse(path); 93 var instance = Load(parser); 89 var instance = BPPORLIBParser.Parse(path); 94 90 instance.Name = Path.GetFileName(path); 95 91 instance.Description = "Loaded from file \"" + path + "\" on " + DateTime.Now; 96 return instance;97 }98 99 private BPPData Load(BPPORLIBParser parser) {100 var instance = new BPPData {101 Items = parser.Items,102 BinMeasures = parser.BinMeasures,103 ItemMeasures = parser.ItemMeasures104 };105 92 return instance; 106 93 } … … 111 98 112 99 public override void ExportData(BPPData instance, string path) { 113 var parser = new BPPORLIBParser { 114 Name = instance.Name, 115 Description = instance.Description, 116 Items = instance.Items, 117 BinMeasures = instance.BinMeasures, 118 ItemMeasures = instance.ItemMeasures 119 }; 120 parser.Export(path); 100 BPPORLIBParser.Export(instance, path); 121 101 } 122 102
Note: See TracChangeset
for help on using the changeset viewer.