Changeset 10027

Timestamp:

10/04/13 22:00:01 (11 years ago)

Author:

ascheibe

Message:

#1886 adapted convex hull view to work with real vectors and permutations

Location:

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

Files:

• ConvexHullView.Designer.cs (modified) (2 diffs)
• ConvexHullView.cs (modified) (2 diffs)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views-3.3.csproj (modified) (3 diffs)
• PermutationConvexHullView.cs (added)
• RealVectorConvexHullView.cs (added)

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

@@ -1 +1 @@
 namespace HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views {
-  partial class ConvexHullView {
+  partial class ConvexHullView<TKey, TValue> {
     /// <summary> 
     /// Required designer variable.
@@ -40 +40 @@
       // resultsTextBox
       // 
-      this.resultsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-            | System.Windows.Forms.AnchorStyles.Left) 
+      this.resultsTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
+            | System.Windows.Forms.AnchorStyles.Left)
             | System.Windows.Forms.AnchorStyles.Right)));
       this.resultsTextBox.Location = new System.Drawing.Point(3, 33);

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

@@ -22 +22 @@
 using System;
 using System.Linq;
-using HeuristicLab.Analysis.SolutionCaching.PermutationEncoding;
+using HeuristicLab.Analysis.SolutionCaching;
+using HeuristicLab.Core;
 using HeuristicLab.Core.Views;
-using HeuristicLab.Encodings.PermutationEncoding;
 using HeuristicLab.MainForm;
 
 namespace HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views {
   [View("ConvexHull View")]
-  [Content(typeof(PermutationSolutionCache), false)]
-  public partial class ConvexHullView : ItemView {
+  [Content(typeof(SolutionCache<,>), false)]
+  public abstract partial class ConvexHullView<TKey, TValue> : ItemView
+    where TKey : Item
+    where TValue : SolutionInformation<TKey> {
     public ConvexHullView() {
       InitializeComponent();
     }
 
-    public new PermutationSolutionCache Content {
-      get { return (PermutationSolutionCache)base.Content; }
+    public new SolutionCache<TKey, TValue> Content {
+      get { return (SolutionCache<TKey, TValue>)base.Content; }
       set { base.Content = value; }
     }
 
-    protected override void OnContentChanged() {
-      base.OnContentChanged();
-
-      if (Content != null) { }
-    }
-
-    private void testConvexHullButton_Click(object sender, System.EventArgs e) {
+    protected void testConvexHullButton_Click(object sender, System.EventArgs e) {
       for (int i = 0; i < 20; i++) {
         var sols = Content.GetSolutionsFromGeneration(i);
@@ -58 +54 @@
     }
 
-    private double[] ConvertPermutationToVertex(Permutation p) {
-      double[] vertex = p.Select(x => (double)x).ToArray();
-      return vertex;
-    }
+    protected abstract double[] ConvertPermutationToVertex(TKey key);
   }
 }

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views/3.3/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views-3.3.csproj

@@ -74 +74 @@
       <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.Encodings.RealVectorEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.RealVectorEncoding-3.3.dll</HintPath>
+      <Private>False</Private>
+    </Reference>
     <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <Private>False</Private>
@@ -131 +136 @@
       <DependentUpon>ConvexHullView.cs</DependentUpon>
     </Compile>
+    <Compile Include="RealVectorConvexHullView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
     <Compile Include="CreateExperimentDialog.cs">
       <SubType>Form</SubType>
@@ -144 +152 @@
     <Compile Include="ParameterInfluenceView.designer.cs">
       <DependentUpon>ParameterInfluenceView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="PermutationConvexHullView.cs">
+      <SubType>UserControl</SubType>
     </Compile>
     <Compile Include="Plugin.cs" />