Changeset 7438 for branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Analyzers/GQAPSolutionArchiveAnalyzer.cs

Timestamp:

02/01/12 13:28:54 (12 years ago)

Author:

abeham

Message:

#1614

• Add BestKnownSolutions parameter
• Assignment view
  • Clicking on an equipment highlights all related equipments
  • Clicking on a location highlights other locations that contain equipment to which relations exist
  • Showing installation costs when nothing is selected
• Analyzers were present double times
• Fixed GRASP to check EnabledByDefault

File:

• branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Analyzers/GQAPSolutionArchiveAnalyzer.cs (modified) (2 diffs)

branches/GeneralizedQAP/HeuristicLab.Problems.GeneralizedQuadraticAssignment/3.3/Analyzers/GQAPSolutionArchiveAnalyzer.cs

@@ -20 +20 @@
 #endregion
 
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -163 +164 @@
       }
 
-      ItemList<GQAPSolution> front = new ItemList<GQAPSolution>(archive.Solutions);
-      for (int i = 0; i < assignments.Length; i++) {
-        if (overbookedCapacities[i].Value <= 0.0)
-          front.Add(new GQAPSolution(assignments[i], qualities[i], flowDistanceQualities[i], installationQualities[i], overbookedCapacities[i]));
-      }
-
-      for (int i = 0; i < front.Count - 1; i++) {
-        for (int j = i + 1; j < front.Count; j++) {
-          if (front[i].FlowDistanceQuality.Value < front[j].FlowDistanceQuality.Value
-            && front[i].InstallationQuality.Value < front[j].InstallationQuality.Value) {
-            front.RemoveAt(j);
-            j--;
-          } else if (front[i].FlowDistanceQuality.Value > front[j].FlowDistanceQuality.Value
-            && front[i].InstallationQuality.Value > front[j].InstallationQuality.Value) {
-            front.RemoveAt(i);
-            j = i;
-          }
-        }
-      }
-
-      archive.Solutions = front;
+      var solutions = Enumerable.Range(0, assignments.Length)
+        .Select(i => new GQAPSolution(assignments[i], qualities[i], flowDistanceQualities[i], installationQualities[i], overbookedCapacities[i]))
+        .Concat(archive.Solutions);
+      archive.Solutions = GQAPSolutionArchiveUpdater.GetFeasibleParetoFront(solutions);
 
       return base.Apply();