Changeset 5949 for trunk/sources

Timestamp:

04/04/11 22:30:39 (14 years ago)

Author:

abeham

Message:

#1330

• some remaining problems with benchmark data, two instances had quality values and solutions that did not go together

Location:

trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3

Files:

• Data/kra32.sln (modified) (1 diff)
• Data/ste36a.sln (modified) (1 diff)
• QuadraticAssignmentProblem.cs (modified) (2 diffs)
• Tests/QAPLIBInstancesTest.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/Data/kra32.sln

@@ -1 @@
-32 88900 
-31 23 18 21 22 19 10 11 15 9 30 29 14 12 17 26 27 
-28 1 7 6 25 5 3 8 24 32 13 2 20 4 16
+32 88700 
+31,23,18,21,22,19,10,11,15,9,30,29,14,12,17,26,
+27,28,1,7,6,25,5,3,8,24,32,13,2,20,4,16
 
 
 
-

trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/Data/ste36a.sln

@@ -1 +1 @@
   36   9526
-  12  19  30  11 2 3 22 20 10  21  5  4 13 15 31 32 28 29 24 14 17 18 16 9
-  8 7 6 23 33 34 25 35 27 26 1 36
+  35,5,6,12,11,27,26,25,24,9,4,1,13,20,14,23,21,22,2,8,10,7,28,19,
+32,34,33,17,18,3,15,16,29,30,31,36
 

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

@@ -337 +337 @@
           if (!solParser.Quality.IsAlmost(QAPEvaluator.Apply(new Permutation(PermutationTypes.Absolute, solParser.Assignment), Weights, Distances))) {
             solStream.Seek(0, SeekOrigin.Begin);
+            solParser.Reset();
             solParser.Parse(solStream, false); // some sln's seem to be of the type index = "location" => value = "facility"
             if (solParser.Error != null) throw solParser.Error;
@@ -343 +344 @@
               BestKnownSolution = new Permutation(PermutationTypes.Absolute, solParser.Assignment);
             } else {
-              BestKnownQuality = null;
+              BestKnownQuality = new DoubleValue(solParser.Quality);
               BestKnownSolution = null;
             }

trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/Tests/QAPLIBInstancesTest.cs

@@ -21 +21 @@
 
 using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
 using System.Text;
 using HeuristicLab.Common;
@@ -38 +42 @@
         } catch (Exception ex) {
           failedInstances.AppendLine(instance + ": " + ex.Message);
+        }
+      }
+      Assert.IsTrue(failedInstances.Length == 0, "Following instances failed to load: " + Environment.NewLine + failedInstances.ToString());
+    }
+
+    [TestMethod]
+    public void LoadAllEmbeddedSolutions() {
+      IEnumerable<string> solutionFiles = Assembly.GetAssembly(typeof(QuadraticAssignmentProblem))
+          .GetManifestResourceNames()
+          .Where(x => x.EndsWith(".sln"));
+      QAPLIBSolutionParser parser = new QAPLIBSolutionParser();
+      StringBuilder failedInstances = new StringBuilder();
+      foreach (string solution in solutionFiles) {
+        using (Stream stream = Assembly.GetAssembly(typeof(QuadraticAssignmentProblem)).GetManifestResourceStream(solution)) {
+          parser.Reset();
+          parser.Parse(stream, true);
+          if (parser.Error != null)
+            failedInstances.AppendLine(solution + ": " + parser.Error.Message);
         }
       }
@@ -63 +85 @@
             failedInstances.AppendLine(instance + ": Reported quality: " + qap.BestKnownQuality.Value.ToString() + ", evaluated fitness: " + quality.ToString() + ".");
           }
+        } else if (qap.BestKnownQuality != null) {
+          failedInstances.AppendLine(instance + ": The solution failed to load, only the quality value is available!");
         }