Changeset 8553

Timestamp:

09/01/12 22:32:07 (12 years ago)

Author:

abeham

Message:

#1890: Updated best known qualities of missing QAPLIB solutions

Location:

trunk/sources

Files:

• HeuristicLab.Problems.Instances.QAPLIB/3.3/Data/qap.sln.zip (modified) (previous)
• HeuristicLab.Problems.Instances.QAPLIB/3.3/QAPLIBInstanceProvider.cs (modified) (3 diffs)
• HeuristicLab.Problems.Instances.QAPLIB/3.3/QAPLIBSolutionParser.cs (modified) (2 diffs)
• HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.Instances.QAPLIB/3.3/QAPLIBInstanceProvider.cs

@@ -65 +65 @@
       "esc16j",
       "esc32a",
+      "esc32b",
+      "esc32c",
+      "esc32d",
       "esc32e",
       "esc32f",
       "esc32g",
+      "esc32h",
       "had12",
       "had14",
@@ -126 +130 @@
       "tai25a",
       "tai25b",
+      "tai30a",
       "tai30b",
+      "tai35a",
       "tai35b",
+      "tai40a",
       "tai40b",
       "tai50a",
@@ -204 +211 @@
 
                 int[] assignment = slnParser.Assignment;
-                if (reversedSolutions.Contains(instance.Name)) {
+                if (assignment != null && reversedSolutions.Contains(instance.Name)) {
                   assignment = (int[])slnParser.Assignment.Clone();
                   for (int i = 0; i < assignment.Length; i++)

trunk/sources/HeuristicLab.Problems.Instances.QAPLIB/3.3/QAPLIBSolutionParser.cs

@@ -90 +90 @@
           string valLine = reader.ReadLine();
           string[] vals = valLine.Split(delim, StringSplitOptions.RemoveEmptyEntries);
+          if (vals.Length == 0) continue;
           for (int j = 0; j < vals.Length; j++) {
             if (valueAsLocation)
@@ -96 +97 @@
           }
         }
+        if (read < Size) Assignment = null;
         return true;
       } catch (Exception e) {

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

@@ -412 +412 @@
       Description = data.Description;
       Load(weights, distances);
+      if (data.BestKnownQuality.HasValue) BestKnownQuality = new DoubleValue(data.BestKnownQuality.Value);
       EvaluateAndLoadAssignment(data.BestKnownAssignment);
       OnReset();
@@ -426 +427 @@
       Description = data.Description;
       Load(weights, distances);
+      if (data.BestKnownQuality.HasValue) BestKnownQuality = new DoubleValue(data.BestKnownQuality.Value);
       EvaluateAndLoadAssignment(data.BestKnownTour);
       OnReset();