Changeset 5814 for branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs

Timestamp:

03/23/11 12:03:24 (13 years ago)

Author:

abeham

Message:

#1330

• Added a test if the reported quality of the solution instances is similar to the evaluated qualities of these solutions
• Adapted parsing of the solution file and added another parameter whether the permutation should be treated as facility->location (HeuristicLab default) or location->facility.
• Adapted QuadraticAssignmentProblem to use that method that corresponds with the reported quality since there is no consistent encoding over all files
• Improved API documentation of the parsing methods

File:

• branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs (modified) (1 diff)

branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs

@@ -325 +325 @@
           .GetManifestResourceStream(InstancePrefix + instance + ".sln")) {
           QAPLIBSolutionParser solParser = new QAPLIBSolutionParser();
-          solParser.Parse(solStream);
+          solParser.Parse(solStream, false); // most sln's seem to be of the type index = location => value = facility
           if (solParser.Error != null) throw solParser.Error;
-          BestKnownQuality = new DoubleValue(solParser.Qualiy);
-          BestKnownSolution = new Permutation(PermutationTypes.Absolute, solParser.Assignment);
+          if (!solParser.Quality.IsAlmost(QAPEvaluator.Apply(new Permutation(PermutationTypes.Absolute, solParser.Assignment), Weights, DistanceMatrix))) {
+            solStream.Seek(0, SeekOrigin.Begin);
+            solParser.Parse(solStream, true); // some 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, DistanceMatrix))) {
+              BestKnownQuality = new DoubleValue(solParser.Quality);
+              BestKnownSolution = new Permutation(PermutationTypes.Absolute, solParser.Assignment);
+            } else {
+              BestKnownQuality = null;
+              BestKnownSolution = null;
+            }
+          } else {
+            BestKnownQuality = new DoubleValue(solParser.Quality);
+            BestKnownSolution = new Permutation(PermutationTypes.Absolute, solParser.Assignment);
+          }
         }
       } else {