Changeset 9730

Timestamp:

07/22/13 12:05:19 (11 years ago)

Author:

ascheibe

Message:

#1886 added a library that calculates convex hulls

Location:

branches/HeuristicLab.Analysis.AlgorithmBehavior

Files:

• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views/3.3/ConvexHullView.Designer.cs (added)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views/3.3/ConvexHullView.cs (added)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views/3.3/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views-3.3.csproj (modified) (4 diffs)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views/3.3/PermutationSolutionDictionaryView.Designer.cs (modified) (10 diffs)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views/3.3/PermutationSolutionDictionaryView.cs (modified) (2 diffs)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/SolutionsCaching/PermutationSolutionDictionary.cs (modified) (1 diff)
• HeuristicLab.Analysis.AlgorithmBehavior.sln (modified) (2 diffs)
• MIConvexHull (added)
• MIConvexHull/ConvexHull (added)
• MIConvexHull/ConvexHull/Collections.cs (added)
• MIConvexHull/ConvexHull/ConvexFace.cs (added)
• MIConvexHull/ConvexHull/ConvexFaceInternal.cs (added)
• MIConvexHull/ConvexHull/ConvexHull.cs (added)
• MIConvexHull/ConvexHull/ConvexHullInternal.cs (added)
• MIConvexHull/ConvexHull/IVertex.cs (added)
• MIConvexHull/HeuristicLab.snk (added)
• MIConvexHull/MIConvexHull.csproj (added)
• MIConvexHull/Properties (added)
• MIConvexHull/Properties/AssemblyInfo.cs (added)
• MIConvexHull/StarMath (added)
• MIConvexHull/StarMath/StarMathLibrary.cs (added)
• MIConvexHull/Triangulation (added)
• MIConvexHull/Triangulation/DelaunayTriangulation.cs (added)
• MIConvexHull/Triangulation/Triangulation.cs (added)
• MIConvexHull/Triangulation/TriangulationCell.cs (added)
• MIConvexHull/Triangulation/VoronoiEdge.cs (added)
• MIConvexHull/Triangulation/VoronoiMesh.cs (added)

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

@@ -83 +83 @@
       <Private>False</Private>
     </Reference>
+    <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL">
       <Private>False</Private>
@@ -129 +133 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="ConvexHullView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ConvexHullView.Designer.cs">
+      <DependentUpon>ConvexHullView.cs</DependentUpon>
+    </Compile>
     <Compile Include="CreateExperimentDialog.cs">
       <SubType>Form</SubType>
@@ -151 +161 @@
     <Compile Include="Plugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Include="SuccessorConfigurator.cs">
       <SubType>Form</SubType>
@@ -170 +185 @@
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\..\MIConvexHull\MIConvexHull.csproj">
+      <Project>{2337776d-7d0c-40aa-a439-c26c3ce24fab}</Project>
+      <Name>MIConvexHull</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="CreateExperimentDialog.resx">
       <DependentUpon>CreateExperimentDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>

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

@@ -30 +30 @@
       this.partialSizeTextBox = new System.Windows.Forms.TextBox();
       this.completeSizeTextBox = new System.Windows.Forms.TextBox();
+      this.toolStrip = new System.Windows.Forms.ToolStrip();
+      this.analyzeToolStripButton = new System.Windows.Forms.ToolStripDropDownButton();
+      this.toolStrip.SuspendLayout();
       this.SuspendLayout();
       // 
@@ -35 +38 @@
       // 
       this.label1.AutoSize = true;
-      this.label1.Location = new System.Drawing.Point(3, 10);
+      this.label1.Location = new System.Drawing.Point(3, 60);
       this.label1.Name = "label1";
       this.label1.Size = new System.Drawing.Size(64, 13);
@@ -44 +47 @@
       // 
       this.label2.AutoSize = true;
-      this.label2.Location = new System.Drawing.Point(3, 42);
+      this.label2.Location = new System.Drawing.Point(3, 92);
       this.label2.Name = "label2";
       this.label2.Size = new System.Drawing.Size(108, 13);
@@ -53 +56 @@
       // 
       this.label3.AutoSize = true;
-      this.label3.Location = new System.Drawing.Point(3, 74);
+      this.label3.Location = new System.Drawing.Point(3, 124);
       this.label3.Name = "label3";
       this.label3.Size = new System.Drawing.Size(123, 13);
@@ -63 +66 @@
       this.cacheSizeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.cacheSizeTextBox.Location = new System.Drawing.Point(132, 7);
+      this.cacheSizeTextBox.Location = new System.Drawing.Point(132, 57);
       this.cacheSizeTextBox.Name = "cacheSizeTextBox";
       this.cacheSizeTextBox.ReadOnly = true;
@@ -73 +76 @@
       this.partialSizeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.partialSizeTextBox.Location = new System.Drawing.Point(132, 39);
+      this.partialSizeTextBox.Location = new System.Drawing.Point(132, 89);
       this.partialSizeTextBox.Name = "partialSizeTextBox";
       this.partialSizeTextBox.ReadOnly = true;
@@ -83 +86 @@
       this.completeSizeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
             | System.Windows.Forms.AnchorStyles.Right)));
-      this.completeSizeTextBox.Location = new System.Drawing.Point(132, 71);
+      this.completeSizeTextBox.Location = new System.Drawing.Point(132, 121);
       this.completeSizeTextBox.Name = "completeSizeTextBox";
       this.completeSizeTextBox.ReadOnly = true;
@@ -89 +92 @@
       this.completeSizeTextBox.TabIndex = 5;
       // 
+      // toolStrip
+      // 
+      this.toolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.analyzeToolStripButton});
+      this.toolStrip.Location = new System.Drawing.Point(0, 0);
+      this.toolStrip.Name = "toolStrip";
+      this.toolStrip.Size = new System.Drawing.Size(486, 25);
+      this.toolStrip.TabIndex = 6;
+      // 
+      // analyzeToolStripButton
+      // 
+      this.analyzeToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+      this.analyzeToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta;
+      this.analyzeToolStripButton.Name = "analyzeToolStripButton";
+      this.analyzeToolStripButton.Size = new System.Drawing.Size(61, 22);
+      this.analyzeToolStripButton.Text = "Analyze";
+      // 
       // PermutationSolutionDictionaryView
       // 
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
       this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+      this.Controls.Add(this.toolStrip);
       this.Controls.Add(this.completeSizeTextBox);
       this.Controls.Add(this.partialSizeTextBox);
@@ -100 +121 @@
       this.Controls.Add(this.label1);
       this.Name = "PermutationSolutionDictionaryView";
-      this.Size = new System.Drawing.Size(486, 98);
+      this.Size = new System.Drawing.Size(486, 175);
+      this.toolStrip.ResumeLayout(false);
+      this.toolStrip.PerformLayout();
       this.ResumeLayout(false);
       this.PerformLayout();
@@ -114 +137 @@
     private System.Windows.Forms.TextBox partialSizeTextBox;
     private System.Windows.Forms.TextBox completeSizeTextBox;
+    private System.Windows.Forms.ToolStrip toolStrip;
+    private System.Windows.Forms.ToolStripDropDownButton analyzeToolStripButton;
   }
 }

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

@@ -20 +20 @@
 #endregion
 
+using System;
+using System.Linq;
 using System.Windows.Forms;
 using HeuristicLab.Core.Views;
 using HeuristicLab.MainForm;
+using HeuristicLab.MainForm.WindowsForms;
 
 namespace HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views {
@@ -48 +51 @@
         completeSizeTextBox.Text = Content.NumberOfCompleteSolutions().ToString();
       }
-    }                                                                             
+    }
+
+    protected override void OnInitialized(EventArgs e) {
+      base.OnInitialized(e);
+      var viewTypes = MainFormManager.GetViewTypes(typeof(PermutationSolutionDictionary<PermutationWrapper, PermutationInformation>), true);
+      foreach (Type viewType in viewTypes.OrderBy(x => ViewAttribute.GetViewName(x))) {
+        if ((viewType != typeof(PermutationSolutionDictionaryView)) && (viewType != typeof(ViewHost))) {
+          ToolStripMenuItem menuItem = new ToolStripMenuItem();
+          menuItem.Text = ViewAttribute.GetViewName(viewType);
+          menuItem.Tag = viewType;
+          menuItem.Click += new EventHandler(menuItem_Click);
+          analyzeToolStripButton.DropDownItems.Add(menuItem);
+        }
+      }
+    }
+
+    private void menuItem_Click(object sender, EventArgs e) {
+      ToolStripMenuItem menuItem = (ToolStripMenuItem)sender;
+      Type viewType = (Type)menuItem.Tag;
+      IContentView view = MainFormManager.MainForm.ShowContent(Content, viewType);
+      if (view != null) {
+        view.Locked = Locked;
+        view.ReadOnly = ReadOnly;
+      }
+    }
   }
 }

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/SolutionsCaching/PermutationSolutionDictionary.cs

@@ -92 +92 @@
       return solutionDictionary.Where(x => x.Key.ElementType == ElementType.Complete).Count();
     }
+
+    public List<PermutationWrapper> GetSolutionsFromGeneration(int generation) {
+      return solutionDictionary.Where(x => x.Value.Where(y => y.Generation == generation).Count() != 0).Select(x => x.Key).ToList<PermutationWrapper>();
+    }
   }
 }

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.sln

@@ -15 +15 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AlgorithmBehaviorUnitTests", "AlgorithmBehaviorUnitTests\AlgorithmBehaviorUnitTests.csproj", "{8EFDEA16-A348-401F-82FC-C7E08FDA1C5A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MIConvexHull", "MIConvexHull\MIConvexHull.csproj", "{2337776D-7D0C-40AA-A439-C26C3CE24FAB}"
 EndProject
 Global
@@ -62 +64 @@
     {8EFDEA16-A348-401F-82FC-C7E08FDA1C5A}.Release|x64.ActiveCfg = Release|Any CPU
     {8EFDEA16-A348-401F-82FC-C7E08FDA1C5A}.Release|x86.ActiveCfg = Release|Any CPU
+    {2337776D-7D0C-40AA-A439-C26C3CE24FAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+    {2337776D-7D0C-40AA-A439-C26C3CE24FAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+    {2337776D-7D0C-40AA-A439-C26C3CE24FAB}.Debug|x64.ActiveCfg = Debug|Any CPU
+    {2337776D-7D0C-40AA-A439-C26C3CE24FAB}.Debug|x86.ActiveCfg = Debug|Any CPU
+    {2337776D-7D0C-40AA-A439-C26C3CE24FAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+    {2337776D-7D0C-40AA-A439-C26C3CE24FAB}.Release|Any CPU.Build.0 = Release|Any CPU
+    {2337776D-7D0C-40AA-A439-C26C3CE24FAB}.Release|x64.ActiveCfg = Release|Any CPU
+    {2337776D-7D0C-40AA-A439-C26C3CE24FAB}.Release|x86.ActiveCfg = Release|Any CPU
   EndGlobalSection
   GlobalSection(SolutionProperties) = preSolution