Changeset 6087 for branches/histogram

Timestamp:

05/01/11 14:57:08 (14 years ago)

Author:

abeham

Message:

#1469

• Adapted analyzer to add best-known solution in case it was unknown, but its quality was known
• Added best-known solutions for esc32a, sko49 in QAPLIB Solution format
• Changed some solutions to be EmbeddedResources so that they'd be picked up

Location:

branches/histogram/HeuristicLab.Problems.QuadraticAssignment/3.3

Files:

• Analyzers/BestQAPSolutionAnalyzer.cs (modified) (3 diffs)
• Data/esc32a.sln (added)
• Data/sko49.sln (added)
• HeuristicLab.Problems.QuadraticAssignment-3.3.csproj (modified) (1 diff)

branches/histogram/HeuristicLab.Problems.QuadraticAssignment/3.3/Analyzers/BestQAPSolutionAnalyzer.cs

@@ -84 +84 @@
       Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The result collection where the best QAP solution should be stored."));
       Parameters.Add(new LookupParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this QAP instance."));
-      Parameters.Add(new LookupParameter<ItemList<Permutation>>("BestKnownSolutions", "The best known solutions of this QAP instance."));
+      Parameters.Add(new LookupParameter<ItemList<Permutation>>("BestKnownSolutions", "The best known solutions (there may be multiple) of this QAP instance."));
       Parameters.Add(new LookupParameter<Permutation>("BestKnownSolution", "The best known solution of this QAP instance."));
     }
@@ -92 +92 @@
       // BackwardsCompatibility3.3
       #region Backwards compatible code, remove with 3.4
-      /*if (Parameters.ContainsKey("BestKnownSolution")) {
-        Parameters.Remove("BestKnownSolution");
-        Parameters.Add(new LookupParameter<ItemList<Permutation>>("BestKnownSolutions", "The best known solutions of this QAP instance."));
-      }*/
       if (!Parameters.ContainsKey("BestKnownSolutions")) {
         Parameters.Add(new LookupParameter<ItemList<Permutation>>("BestKnownSolutions", "The best known solutions of this QAP instance."));
@@ -117 +113 @@
       if (bestKnownQuality == null
           || max && qualities[i].Value > bestKnownQuality.Value
-          || !max && qualities[i].Value < bestKnownQuality.Value
-          || bestKnownQuality.Value == qualities[i].Value
-            && (BestKnownSolutionsParameter.ActualValue == null || BestKnownSolutionsParameter.ActualValue.Count == 0)) {
+          || !max && qualities[i].Value < bestKnownQuality.Value) {
+        // if there isn't a best-known quality or we improved the best-known quality we'll add the current solution as best-known
         BestKnownQualityParameter.ActualValue = new DoubleValue(qualities[i].Value);
         BestKnownSolutionParameter.ActualValue = (Permutation)permutations[i].Clone();
         BestKnownSolutionsParameter.ActualValue = new ItemList<Permutation>();
         BestKnownSolutionsParameter.ActualValue.Add((Permutation)permutations[i].Clone());
-      } else if (bestKnownQuality != null && qualities[i].Value == bestKnownQuality.Value) {
+      } else if (bestKnownQuality.Value == qualities[i].Value) {
+        // if we matched the best-known quality we'll try to set the best-known solution if it isn't null
+        // and try to add it to the pool of best solutions if it is different
+        if (BestKnownSolutionParameter.ActualValue == null)
+          BestKnownSolutionParameter.ActualValue = (Permutation)permutations[i].Clone();
+        if (BestKnownSolutionsParameter.ActualValue == null)
+          BestKnownSolutionsParameter.ActualValue = new ItemList<Permutation>();
         PermutationEqualityComparer comparer = new PermutationEqualityComparer();
-        foreach (var k in sorted) {
+        foreach (var k in sorted) { // for each solution that we found check if it is in the pool of best-knowns
           if (!max && k.Value > qualities[i].Value
-            || max && k.Value < qualities[i].Value) break;
+            || max && k.Value < qualities[i].Value) break; // stop when we reached a solution worse than the best-known quality
           Permutation p = permutations[k.index];
           bool alreadyPresent = false;

branches/histogram/HeuristicLab.Problems.QuadraticAssignment/3.3/HeuristicLab.Problems.QuadraticAssignment-3.3.csproj

@@ -439 +439 @@
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Data\tai100a.sln" />
-    <Content Include="Data\tai25a.sln" />
-    <Content Include="Data\tai50a.sln" />
+    <EmbeddedResource Include="Data\tai100a.sln" />
+    <EmbeddedResource Include="Data\tai25a.sln" />
+    <EmbeddedResource Include="Data\tai50a.sln" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\esc32a.sln" />
+  </ItemGroup>
+  <ItemGroup>
+    <EmbeddedResource Include="Data\sko49.sln" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />