Changeset 7558 for trunk/sources/HeuristicLab.Problems.Instances.QAPLIB/3.3/QAPLIBInstanceProvider.cs

Timestamp:

03/06/12 01:43:06 (12 years ago)

Author:

abeham

Message:

#1782: trunk integration of problem instance development

• Adapted TSP and QAP to use the new feature
• Moved the TSPLIB importer dialog from the TSP plugin to the TSPLIB instances plugin (created a view for that provider)
• Created it as a default view for IHeuristicOptimizationProblem in order not to interfere with other problems do not yet work with this

Location:

trunk/sources/HeuristicLab.Problems.Instances.QAPLIB

Files:

• . (copied) (copied from branches/GeneralizedQAP/HeuristicLab.Problems.Instances.QAPLIB)
• 3.3 (modified) (1 prop)
• 3.3/QAPLIBInstanceProvider.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.Instances.QAPLIB/3.3

@@ -2 +2 @@
 obj
 Plugin.cs
+bin

@@ -2 +2 @@
 obj
 Plugin.cs
+bin

trunk/sources/HeuristicLab.Problems.Instances.QAPLIB/3.3/QAPLIBInstanceProvider.cs

@@ -29 +29 @@
 namespace HeuristicLab.Problems.Instances.QAPLIB {
   public class QAPLIBInstanceProvider : ProblemInstanceProvider<QAPData> {
+    #region Reversed instances
+    // These instances specified their best known solution in the wrong order
+    private static HashSet<string> reversedSolutions = new HashSet<string>(new string[] {
+      "bur26a",
+      "bur26b",
+      "bur26c",
+      "bur26d",
+      "bur26e",
+      "bur26f",
+      "bur26g",
+      "bur26h",
+      "chr12a",
+      "chr12b",
+      "chr12c",
+      "chr15a",
+      "chr15b",
+      "chr15c",
+      "chr18a",
+      "chr18b",
+      "chr20a",
+      "chr20b",
+      "chr20c",
+      "chr22a",
+      "chr22b",
+      "chr25a",
+      "esc16a",
+      "esc16b",
+      "esc16c",
+      "esc16d",
+      "esc16e",
+      "esc16g",
+      "esc16h",
+      "esc16i",
+      "esc16j",
+      "esc32a",
+      "esc32e",
+      "esc32f",
+      "esc32g",
+      "had12",
+      "had14",
+      "had16",
+      "had18",
+      "had20",
+      "kra32",
+      "lipa20a",
+      "lipa30a",
+      "lipa40a",
+      "lipa50a",
+      "lipa60a",
+      "lipa70a",
+      "lipa80a",
+      "lipa90a",
+      "nug12",
+      "nug14",
+      "nug15",
+      "nug16a",
+      "nug16b",
+      "nug17",
+      "nug18",
+      "nug20",
+      "nug21",
+      "nug22",
+      "nug24",
+      "nug25",
+      "nug27",
+      "nug28",
+      "rou12",
+      "rou15",
+      "rou20",
+      "scr12",
+      "scr15",
+      "scr20",
+      "sko100a",
+      "sko100b",
+      "sko100c",
+      "sko100d",
+      "sko100e",
+      "sko100f",
+      "sko49",
+      "sko81",
+      "sko90",
+      "ste36a",
+      "ste36b",
+      "tai100a",
+      "tai100b",
+      "tai12a",
+      "tai12b",
+      "tai150b",
+      "tai15a",
+      "tai15b",
+      "tai17a",
+      "tai20a",
+      "tai20b",
+      "tai256c",
+      "tai25a",
+      "tai25b",
+      "tai30b",
+      "tai35b",
+      "tai40b",
+      "tai50a",
+      "tai50b",
+      "tai60a",
+      "tai60b",
+      "tai64c",
+      "tai80a",
+      "tai80b",
+      "wil100"
+    });
+    #endregion
+
     public override string Name {
       get { return "QAPLIB"; }
@@ -79 +189 @@
             if (slnParser.Error != null) throw slnParser.Error;
 
-            instance.BestKnownAssignment = slnParser.Assignment;
+            int[] assignment = slnParser.Assignment;
+            if (reversedSolutions.Contains(instance.Name)) {
+              assignment = (int[])slnParser.Assignment.Clone();
+              for (int i = 0; i < assignment.Length; i++)
+                assignment[slnParser.Assignment[i]] = i;
+            }
+            instance.BestKnownAssignment = assignment;
             instance.BestKnownQuality = slnParser.Quality;
           }

@@ -2 +2 @@
 obj
 Plugin.cs
+bin