Changeset 10026 for branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views/3.3/ConvexHullView.cs

Timestamp:

10/04/13 17:24:46 (11 years ago)

Author:

ascheibe

Message:

#1886

• removed old caching code
• adapted convex hull view and some other minor improvements

File:

• branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views/3.3/ConvexHullView.cs (modified) (3 diffs)

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views/3.3/ConvexHullView.cs

@@ -22 +22 @@
 using System;
 using System.Linq;
-using System.Windows.Forms;
+using HeuristicLab.Analysis.SolutionCaching.PermutationEncoding;
 using HeuristicLab.Core.Views;
 using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.MainForm;
-using HeuristicLab.MainForm.WindowsForms;
 
 namespace HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views {
   [View("ConvexHull View")]
-  [Content(typeof(PermutationSolutionDictionary), false)]
+  [Content(typeof(PermutationSolutionCache), false)]
   public partial class ConvexHullView : ItemView {
     public ConvexHullView() {
@@ -36 +35 @@
     }
 
-    public new PermutationSolutionDictionary Content {
-      get { return (PermutationSolutionDictionary)base.Content; }
+    public new PermutationSolutionCache Content {
+      get { return (PermutationSolutionCache)base.Content; }
       set { base.Content = value; }
     }
@@ -51 +50 @@
         var sols = Content.GetSolutionsFromGeneration(i);
 
-        var input = sols.Select(x => ConvertPermutationToVertex(x.GetPermutation())).ToArray();
+        var input = sols.Select(x => ConvertPermutationToVertex(x)).ToArray();
         var convexHull = HyperHull.CalculateUsingSMO(input);
         resultsTextBox.Text += "Nr. of Points in Generation " + i + ": " + convexHull.Count + Environment.NewLine;