Changeset 5814 for branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3/Parsers

Timestamp:

03/23/11 12:03:24 (14 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/Parsers/QAPLIBSolutionParser.cs (modified) (6 diffs)

branches/QAP/HeuristicLab.Problems.QuadraticAssignment/3.3/Parsers/QAPLIBSolutionParser.cs

@@ -1 +1 @@
 using System;
+using System.Globalization;
 using System.IO;
 
@@ -6 +7 @@
     public int Size { get; private set; }
     public int[] Assignment { get; private set; }
-    public double Qualiy { get; private set; }
+    public double Quality { get; private set; }
     public Exception Error { get; private set; }
 
@@ -16 +17 @@
       Size = 0;
       Assignment = null;
-      Qualiy = double.NaN;
+      Quality = double.NaN;
       Error = null;
     }
 
-    public bool Parse(string file) {
+    /// <summary>
+    /// Reads from the given stream data which is expected to be in the QAPLIB solution format.
+    /// 
+    /// The QAPLIB solution file format (.sln) is as follows:
+    /// First line: Size of the permutation followed by a blank followed by the quality formatted using no thousands separator and if a fractional number with the "." as decimal symbol
+    /// Remaining lines: The values of the permutation separated by blanks. Values must lie in the range [1;size of the permutation].
+    /// </summary>
+    /// <param name="file">The file to read data from.</param>
+    /// <param name="valueAsLocation">The numbers can be interpreted either as facilities or locations.
+    /// HeuristicLab always encodes the permutation such that the index denotes the facility and the value the location.
+    /// If this parameter is true, then the permutation is expected to follow this encoding.
+    /// If this parameter is false, the meaning of value and index will be swapped when reading the permutation.</param>
+    /// <returns></returns>
+    public bool Parse(string file, bool valueAsLocation) {
       using (Stream stream = new FileStream(file, FileMode.Open, FileAccess.Read)) {
-        return Parse(stream);
+        return Parse(stream, valueAsLocation);
       }
     }
 
     /// <summary>
-    /// Reads from the given stream data which is expected to be in the QAPLIB format.
+    /// Reads from the given stream data which is expected to be in the QAPLIB solution format.
+    /// 
+    /// The QAPLIB solution file format (.sln) is as follows:
+    /// First line: Size of the permutation followed by a blank followed by the quality formatted using no thousands separator and if a fractional number with the "." as decimal symbol
+    /// Remaining lines: The values of the permutation separated by blanks. Values must lie in the range [1;size of the permutation].
     /// </summary>
     /// <remarks>
@@ -33 +51 @@
     /// </remarks>
     /// <param name="stream">The stream to read data from.</param>
+    /// <param name="valueAsLocation">The numbers can be interpreted either as facilities or locations.
+    /// HeuristicLab always encodes the permutation such that the index denotes the facility and the value the location.
+    /// If this parameter is true, then the permutation is expected to follow this encoding.
+    /// If this parameter is false, the meaning of value and index will be swapped when reading the permutation.</param>
     /// <returns>True if the file was successfully read or false otherwise.</returns>
-    public bool Parse(Stream stream) {
+    public bool Parse(Stream stream, bool valueAsLocation) {
       Error = null;
       try {
@@ -41 +63 @@
         string[] firstline = reader.ReadLine().Split(delim, StringSplitOptions.RemoveEmptyEntries);
         Size = int.Parse(firstline[0]);
-        Qualiy = double.Parse(firstline[1]);
+        Quality = double.Parse(firstline[1], CultureInfo.InvariantCulture.NumberFormat);
         Assignment = new int[Size];
         int read = 0;
@@ -48 +70 @@
           string[] vals = valLine.Split(delim, StringSplitOptions.RemoveEmptyEntries);
           for (int j = 0; j < vals.Length; j++) {
-            Assignment[read++] = int.Parse(vals[j]);
+            if (valueAsLocation)
+              Assignment[int.Parse(vals[j]) - 1] = read++;
+            else Assignment[read++] = int.Parse(vals[j]) - 1;
           }
         }