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

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

Location:

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

Files:

• ConvexHullView.cs (modified) (3 diffs)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views-3.3.csproj (modified) (2 diffs)
• PermutationSolutionDictionaryView.Designer.cs (deleted)
• PermutationSolutionDictionaryView.cs (deleted)

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;

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

@@ -145 +145 @@
       <DependentUpon>ParameterInfluenceView.cs</DependentUpon>
     </Compile>
-    <Compile Include="PermutationSolutionDictionaryView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="PermutationSolutionDictionaryView.Designer.cs">
-      <DependentUpon>PermutationSolutionDictionaryView.cs</DependentUpon>
-    </Compile>
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -171 +165 @@
       <Name>HeuristicLab.Analysis.AlgorithmBehavior.Analyzers-3.3</Name>
       <Private>False</Private>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Analysis.SolutionCaching.Views\3.3\HeuristicLab.Analysis.SolutionCaching.Views-3.3.csproj">
+      <Project>{3977f98a-3d59-4d02-a6d3-51021bceb488}</Project>
+      <Name>HeuristicLab.Analysis.SolutionCaching.Views-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Analysis.SolutionCaching\3.3\HeuristicLab.Analysis.SolutionCaching-3.3.csproj">
+      <Project>{a05aa272-14ec-4422-ac70-c9ca42164441}</Project>
+      <Name>HeuristicLab.Analysis.SolutionCaching-3.3</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\MIConvexHull\MIConvexHull.csproj">