Changeset 15217 for stable/HeuristicLab.Problems.Instances.DIMACS/3.3/GcolInstanceProvider.cs

Timestamp:

07/12/17 21:02:01 (7 years ago)

Author:

abeham

Message:

#2666, #2706, #2730, #2736: merged revisions 14412, 14475, 14476, 14659, 14660, 14663, 14779, 14780, 14912, 15050, 15067, 15069, 15079, 15162, 15166, 15172, 15173 to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.Instances.DIMACS (copied) (copied from trunk/sources/HeuristicLab.Problems.Instances.DIMACS)
• HeuristicLab.Problems.Instances.DIMACS/3.3/GcolInstanceProvider.cs (modified) (2 diffs)

stable/HeuristicLab.Problems.Instances.DIMACS/3.3/GcolInstanceProvider.cs

@@ -69 +69 @@
 
         using (var stream = entry.Open()) {
-          var parser = new Parser();
+          var parser = new GcolParser();
           parser.Parse(stream);
           var instance = Load(parser);
           instance.Name = id.Name;
-          instance.Description = id.Description;
+          instance.Description += Environment.NewLine + id.Description;
           int bestknown;
           if (bkq.TryGetValue(instance.Name, out bestknown))
@@ -86 +86 @@
     }
     public override GCPData ImportData(string path) {
-      var parser = new Parser();
+      var parser = new GcolParser();
       parser.Parse(path);
       var instance = Load(parser);
       instance.Name = Path.GetFileName(path);
-      instance.Description = "Loaded from file \"" + path + "\" on " + DateTime.Now.ToString();
+      instance.Description += Environment.NewLine + "Loaded from file \"" + path + "\" on " + DateTime.Now.ToString();
       return instance;
     }
 
-    private GCPData Load(Parser parser) {
+    private GCPData Load(GcolParser parser) {
       var instance = new GCPData();
+      instance.Description = parser.Comments;
       instance.Nodes = parser.Nodes;
       var adjacencies = new int[parser.Edges, 2];
       var i = 0;
       foreach (var a in parser.AdjacencyList) {
-        adjacencies[i, 0] = a.Item1 - 1;
-        adjacencies[i, 1] = a.Item2 - 1;
+        adjacencies[i, 0] = a.Item1;
+        adjacencies[i, 1] = a.Item2;
         i++;
       }
       instance.Adjacencies = adjacencies;
       return instance;
+    }
+
+    public override bool CanExportData { get { return true; } }
+    public override void ExportData(GCPData instance, string path) {
+      using (var stream = new StreamWriter(File.Create(path)) { AutoFlush = true }) {
+        stream.WriteLine("c " + instance.Name);
+        foreach (var comment in instance.Description.Split(new[] { Environment.NewLine }, StringSplitOptions.None)) {
+          var c = comment;
+          if (!c.StartsWith("c ")) c = "c " + comment;
+          stream.WriteLine(c);
+        }
+        var edges = instance.Adjacencies.GetLength(0);
+        stream.WriteLine("p edge " + instance.Nodes + " " + edges);
+        for (var i = 0; i < edges; i++) {
+          stream.WriteLine("e " + (instance.Adjacencies[i, 0] + 1) + " " + (instance.Adjacencies[i, 1] + 1));
+        }
+      }
     }