Changeset 5947

Timestamp:

04/04/11 21:22:06 (14 years ago)

Author:

abeham

Message:

#1330

• simplified parser
• correctly reading first matrix as weights (accessed by index of permutation) and second matrix as distances (accessed by value of permutation)

Location:

trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3

Files:

• Parsers/QAPLIBParser.cs (modified) (1 diff)
• QuadraticAssignmentProblem.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/Parsers/QAPLIBParser.cs

@@ -62 +62 @@
         Distances = new double[Size, Size];
         Weights = new double[Size, Size];
-        string valLine = reader.ReadLine();
+        string valLine = null;
         char[] delim = new char[] { ' ' };
-        for (int i = 0; i < Size; i++) {
-          if (i > 0 || String.IsNullOrWhiteSpace(valLine))
-            valLine = reader.ReadLine();
-          string[] vals = new string[Size];
-          string[] partVals = valLine.Split(delim, StringSplitOptions.RemoveEmptyEntries);
-          partVals.CopyTo(vals, 0);
-          int index = partVals.Length;
-          while (index < Size) {
-            valLine = reader.ReadLine();
-            partVals = valLine.Split(delim, StringSplitOptions.RemoveEmptyEntries);
-            partVals.CopyTo(vals, index);
-            index += partVals.Length;
-          }
-          for (int j = 0; j < Size; j++) {
-            Distances[i, j] = double.Parse(vals[j]);
-          }
-        }
-        valLine = reader.ReadLine();
         int read = 0;
         int k = 0;
-        while (!reader.EndOfStream) {
-          if (read > 0 || String.IsNullOrWhiteSpace(valLine))
-            valLine = reader.ReadLine();
+        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);
-          for (int j = 0; j < vals.Length; j++) {
-            if (read + j == Size) {
+          foreach (string val in vals) {
+            Weights[k, read++] = double.Parse(val);
+            if (read == Size) {
               read = 0;
               k++;
             }
-            Weights[k, read + j] = double.Parse(vals[j]);
           }
-          read += vals.Length;
+        }
+
+        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;

trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs

@@ -333 +333 @@
           .GetManifestResourceStream(InstancePrefix + instance + ".sln")) {
           QAPLIBSolutionParser solParser = new QAPLIBSolutionParser();
-          solParser.Parse(solStream, false); // most sln's seem to be of the type index = location => value = facility
+          solParser.Parse(solStream, true); // most sln's seem to be of the type index = facility => value = location
           if (solParser.Error != null) throw solParser.Error;
           if (!solParser.Quality.IsAlmost(QAPEvaluator.Apply(new Permutation(PermutationTypes.Absolute, solParser.Assignment), Weights, Distances))) {