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

Timestamp:

04/04/11 21:22:06 (13 years ago)

Author:

abeham

Message:

#1330

• simplified parser
• correctly reading first matrix as weights (accessed by index of permutation) and second matrix as distances (accessed by value of permutation)

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, false); // most sln's seem to be of the type index = location => value = facility
+          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))) {