Changeset 5948

Timestamp:

04/04/11 21:36:53 (14 years ago)

Author:

abeham

Message:

#1330

• fixed an oversight in the last commit

File:

• trunk/sources/HeuristicLab.Problems.QuadraticAssignment/3.3/QuadraticAssignmentProblem.cs (modified) (1 diff)

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

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