Changeset 5949 for trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs

Timestamp:

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

Author:

abeham

Message:

#1330

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

File:

• trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs (modified) (2 diffs)

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;
             }