Changeset 7538 for branches/GeneralizedQAP/HeuristicLab.Problems.Instances.QAPLIB/3.3/QAPLIBParser.cs

Timestamp:

03/01/12 15:15:22 (12 years ago)

Author:

abeham

Message:

#1614

• Fixed plugin dependencies
• Updated GQAP view
• Changed instances infrastructure
  • Changed interface types into classes
  • Removed the library specific instance classes

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.Instances.QAPLIB/3.3/QAPLIBParser.cs (modified) (3 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.Instances.QAPLIB/3.3/QAPLIBParser.cs

@@ -28 +28 @@
     public double[,] Distances { get; private set; }
     public double[,] Weights { get; private set; }
-    public Exception Error { get; private set; }
 
     public QAPLIBParser() {
@@ -38 +37 @@
       Distances = null;
       Weights = null;
-      Error = null;
     }
 
-    public bool Parse(string file) {
+    public void Parse(string file) {
       using (Stream stream = new FileStream(file, FileMode.Open, FileAccess.Read)) {
-        return Parse(stream);
+        Parse(stream);
       }
     }
@@ -55 +53 @@
     /// <param name="stream">The stream to read data from.</param>
     /// <returns>True if the file was successfully read or false otherwise.</returns>
-    public bool Parse(Stream stream) {
-      Error = null;
-      try {
-        StreamReader reader = new StreamReader(stream);
-        Size = int.Parse(reader.ReadLine());
-        Distances = new double[Size, Size];
-        Weights = new double[Size, Size];
-        string valLine = null;
-        char[] delim = new char[] { ' ' };
-        int read = 0;
-        int k = 0;
-        while (k < Size) {
-          if (reader.EndOfStream) throw new InvalidDataException("Reached end of stream while reading first matrix.");
-          valLine = reader.ReadLine();
-          while (String.IsNullOrWhiteSpace(valLine)) valLine = reader.ReadLine();
-          string[] vals = valLine.Split(delim, StringSplitOptions.RemoveEmptyEntries);
-          foreach (string val in vals) {
-            Weights[k, read++] = double.Parse(val);
-            if (read == Size) {
-              read = 0;
-              k++;
-            }
+    public void Parse(Stream stream) {
+      var reader = new StreamReader(stream);
+      Size = int.Parse(reader.ReadLine());
+      Distances = new double[Size, Size];
+      Weights = new double[Size, Size];
+      char[] delim = new char[] { ' ' };
+
+      Distances = ParseMatrix(reader, delim);
+      Weights = ParseMatrix(reader, delim);
+    }
+
+    private double[,] ParseMatrix(StreamReader reader, char[] delim) {
+      int read = 0, k = 0;
+      double[,] result = new double[Size, Size];
+      while (k < Size) {
+        if (reader.EndOfStream) throw new InvalidDataException("Reached end of stream while reading second matrix.");
+        string valLine = reader.ReadLine();
+        while (String.IsNullOrWhiteSpace(valLine)) valLine = reader.ReadLine();
+        string[] vals = valLine.Split(delim, StringSplitOptions.RemoveEmptyEntries);
+        foreach (string val in vals) {
+          Distances[k, read++] = double.Parse(val);
+          if (read == Size) {
+            read = 0;
+            k++;
           }
         }
-
-        read = 0;
-        k = 0;
-
-        while (k < Size) {
-          if (reader.EndOfStream) throw new InvalidDataException("Reached end of stream while reading second matrix.");
-          valLine = reader.ReadLine();
-          while (String.IsNullOrWhiteSpace(valLine)) valLine = reader.ReadLine();
-          string[] vals = valLine.Split(delim, StringSplitOptions.RemoveEmptyEntries);
-          foreach (string val in vals) {
-            Distances[k, read++] = double.Parse(val);
-            if (read == Size) {
-              read = 0;
-              k++;
-            }
-          }
-        }
-        return true;
-      } catch (Exception e) {
-        Error = e;
-        return false;
       }
+      return result;
     }
   }