Changeset 9730 for branches/HeuristicLab.Analysis.AlgorithmBehavior
- Timestamp:
- 07/22/13 12:05:19 (11 years ago)
- Location:
- branches/HeuristicLab.Analysis.AlgorithmBehavior
- Files:
-
- 22 added
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views/3.3/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views-3.3.csproj
r9728 r9730 83 83 <Private>False</Private> 84 84 </Reference> 85 <Reference Include="HeuristicLab.Encodings.PermutationEncoding-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 86 <SpecificVersion>False</SpecificVersion> 87 <HintPath>..\..\..\..\trunk\sources\bin\HeuristicLab.Encodings.PermutationEncoding-3.3.dll</HintPath> 88 </Reference> 85 89 <Reference Include="HeuristicLab.MainForm-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=MSIL"> 86 90 <Private>False</Private> … … 129 133 </ItemGroup> 130 134 <ItemGroup> 135 <Compile Include="ConvexHullView.cs"> 136 <SubType>UserControl</SubType> 137 </Compile> 138 <Compile Include="ConvexHullView.Designer.cs"> 139 <DependentUpon>ConvexHullView.cs</DependentUpon> 140 </Compile> 131 141 <Compile Include="CreateExperimentDialog.cs"> 132 142 <SubType>Form</SubType> … … 151 161 <Compile Include="Plugin.cs" /> 152 162 <Compile Include="Properties\AssemblyInfo.cs" /> 163 <Compile Include="Properties\Resources.Designer.cs"> 164 <AutoGen>True</AutoGen> 165 <DesignTime>True</DesignTime> 166 <DependentUpon>Resources.resx</DependentUpon> 167 </Compile> 153 168 <Compile Include="SuccessorConfigurator.cs"> 154 169 <SubType>Form</SubType> … … 170 185 <Private>False</Private> 171 186 </ProjectReference> 187 <ProjectReference Include="..\..\MIConvexHull\MIConvexHull.csproj"> 188 <Project>{2337776d-7d0c-40aa-a439-c26c3ce24fab}</Project> 189 <Name>MIConvexHull</Name> 190 </ProjectReference> 172 191 </ItemGroup> 173 192 <ItemGroup> 174 193 <EmbeddedResource Include="CreateExperimentDialog.resx"> 175 194 <DependentUpon>CreateExperimentDialog.cs</DependentUpon> 195 </EmbeddedResource> 196 <EmbeddedResource Include="Properties\Resources.resx"> 197 <Generator>ResXFileCodeGenerator</Generator> 198 <LastGenOutput>Resources.Designer.cs</LastGenOutput> 176 199 </EmbeddedResource> 177 200 </ItemGroup> -
branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views/3.3/PermutationSolutionDictionaryView.Designer.cs
r9728 r9730 30 30 this.partialSizeTextBox = new System.Windows.Forms.TextBox(); 31 31 this.completeSizeTextBox = new System.Windows.Forms.TextBox(); 32 this.toolStrip = new System.Windows.Forms.ToolStrip(); 33 this.analyzeToolStripButton = new System.Windows.Forms.ToolStripDropDownButton(); 34 this.toolStrip.SuspendLayout(); 32 35 this.SuspendLayout(); 33 36 // … … 35 38 // 36 39 this.label1.AutoSize = true; 37 this.label1.Location = new System.Drawing.Point(3, 10);40 this.label1.Location = new System.Drawing.Point(3, 60); 38 41 this.label1.Name = "label1"; 39 42 this.label1.Size = new System.Drawing.Size(64, 13); … … 44 47 // 45 48 this.label2.AutoSize = true; 46 this.label2.Location = new System.Drawing.Point(3, 42);49 this.label2.Location = new System.Drawing.Point(3, 92); 47 50 this.label2.Name = "label2"; 48 51 this.label2.Size = new System.Drawing.Size(108, 13); … … 53 56 // 54 57 this.label3.AutoSize = true; 55 this.label3.Location = new System.Drawing.Point(3, 74);58 this.label3.Location = new System.Drawing.Point(3, 124); 56 59 this.label3.Name = "label3"; 57 60 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) 64 67 | System.Windows.Forms.AnchorStyles.Right))); 65 this.cacheSizeTextBox.Location = new System.Drawing.Point(132, 7);68 this.cacheSizeTextBox.Location = new System.Drawing.Point(132, 57); 66 69 this.cacheSizeTextBox.Name = "cacheSizeTextBox"; 67 70 this.cacheSizeTextBox.ReadOnly = true; … … 73 76 this.partialSizeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 74 77 | System.Windows.Forms.AnchorStyles.Right))); 75 this.partialSizeTextBox.Location = new System.Drawing.Point(132, 39);78 this.partialSizeTextBox.Location = new System.Drawing.Point(132, 89); 76 79 this.partialSizeTextBox.Name = "partialSizeTextBox"; 77 80 this.partialSizeTextBox.ReadOnly = true; … … 83 86 this.completeSizeTextBox.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 84 87 | System.Windows.Forms.AnchorStyles.Right))); 85 this.completeSizeTextBox.Location = new System.Drawing.Point(132, 71);88 this.completeSizeTextBox.Location = new System.Drawing.Point(132, 121); 86 89 this.completeSizeTextBox.Name = "completeSizeTextBox"; 87 90 this.completeSizeTextBox.ReadOnly = true; … … 89 92 this.completeSizeTextBox.TabIndex = 5; 90 93 // 94 // toolStrip 95 // 96 this.toolStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { 97 this.analyzeToolStripButton}); 98 this.toolStrip.Location = new System.Drawing.Point(0, 0); 99 this.toolStrip.Name = "toolStrip"; 100 this.toolStrip.Size = new System.Drawing.Size(486, 25); 101 this.toolStrip.TabIndex = 6; 102 // 103 // analyzeToolStripButton 104 // 105 this.analyzeToolStripButton.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text; 106 this.analyzeToolStripButton.ImageTransparentColor = System.Drawing.Color.Magenta; 107 this.analyzeToolStripButton.Name = "analyzeToolStripButton"; 108 this.analyzeToolStripButton.Size = new System.Drawing.Size(61, 22); 109 this.analyzeToolStripButton.Text = "Analyze"; 110 // 91 111 // PermutationSolutionDictionaryView 92 112 // 93 113 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 94 114 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 115 this.Controls.Add(this.toolStrip); 95 116 this.Controls.Add(this.completeSizeTextBox); 96 117 this.Controls.Add(this.partialSizeTextBox); … … 100 121 this.Controls.Add(this.label1); 101 122 this.Name = "PermutationSolutionDictionaryView"; 102 this.Size = new System.Drawing.Size(486, 98); 123 this.Size = new System.Drawing.Size(486, 175); 124 this.toolStrip.ResumeLayout(false); 125 this.toolStrip.PerformLayout(); 103 126 this.ResumeLayout(false); 104 127 this.PerformLayout(); … … 114 137 private System.Windows.Forms.TextBox partialSizeTextBox; 115 138 private System.Windows.Forms.TextBox completeSizeTextBox; 139 private System.Windows.Forms.ToolStrip toolStrip; 140 private System.Windows.Forms.ToolStripDropDownButton analyzeToolStripButton; 116 141 } 117 142 } -
branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views/3.3/PermutationSolutionDictionaryView.cs
r9728 r9730 20 20 #endregion 21 21 22 using System; 23 using System.Linq; 22 24 using System.Windows.Forms; 23 25 using HeuristicLab.Core.Views; 24 26 using HeuristicLab.MainForm; 27 using HeuristicLab.MainForm.WindowsForms; 25 28 26 29 namespace HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views { … … 48 51 completeSizeTextBox.Text = Content.NumberOfCompleteSolutions().ToString(); 49 52 } 50 } 53 } 54 55 protected override void OnInitialized(EventArgs e) { 56 base.OnInitialized(e); 57 var viewTypes = MainFormManager.GetViewTypes(typeof(PermutationSolutionDictionary<PermutationWrapper, PermutationInformation>), true); 58 foreach (Type viewType in viewTypes.OrderBy(x => ViewAttribute.GetViewName(x))) { 59 if ((viewType != typeof(PermutationSolutionDictionaryView)) && (viewType != typeof(ViewHost))) { 60 ToolStripMenuItem menuItem = new ToolStripMenuItem(); 61 menuItem.Text = ViewAttribute.GetViewName(viewType); 62 menuItem.Tag = viewType; 63 menuItem.Click += new EventHandler(menuItem_Click); 64 analyzeToolStripButton.DropDownItems.Add(menuItem); 65 } 66 } 67 } 68 69 private void menuItem_Click(object sender, EventArgs e) { 70 ToolStripMenuItem menuItem = (ToolStripMenuItem)sender; 71 Type viewType = (Type)menuItem.Tag; 72 IContentView view = MainFormManager.MainForm.ShowContent(Content, viewType); 73 if (view != null) { 74 view.Locked = Locked; 75 view.ReadOnly = ReadOnly; 76 } 77 } 51 78 } 52 79 } -
branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/SolutionsCaching/PermutationSolutionDictionary.cs
r9728 r9730 92 92 return solutionDictionary.Where(x => x.Key.ElementType == ElementType.Complete).Count(); 93 93 } 94 95 public List<PermutationWrapper> GetSolutionsFromGeneration(int generation) { 96 return solutionDictionary.Where(x => x.Value.Where(y => y.Generation == generation).Count() != 0).Select(x => x.Key).ToList<PermutationWrapper>(); 97 } 94 98 } 95 99 } -
branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.sln
r9728 r9730 15 15 EndProject 16 16 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AlgorithmBehaviorUnitTests", "AlgorithmBehaviorUnitTests\AlgorithmBehaviorUnitTests.csproj", "{8EFDEA16-A348-401F-82FC-C7E08FDA1C5A}" 17 EndProject 18 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MIConvexHull", "MIConvexHull\MIConvexHull.csproj", "{2337776D-7D0C-40AA-A439-C26C3CE24FAB}" 17 19 EndProject 18 20 Global … … 62 64 {8EFDEA16-A348-401F-82FC-C7E08FDA1C5A}.Release|x64.ActiveCfg = Release|Any CPU 63 65 {8EFDEA16-A348-401F-82FC-C7E08FDA1C5A}.Release|x86.ActiveCfg = Release|Any CPU 66 {2337776D-7D0C-40AA-A439-C26C3CE24FAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU 67 {2337776D-7D0C-40AA-A439-C26C3CE24FAB}.Debug|Any CPU.Build.0 = Debug|Any CPU 68 {2337776D-7D0C-40AA-A439-C26C3CE24FAB}.Debug|x64.ActiveCfg = Debug|Any CPU 69 {2337776D-7D0C-40AA-A439-C26C3CE24FAB}.Debug|x86.ActiveCfg = Debug|Any CPU 70 {2337776D-7D0C-40AA-A439-C26C3CE24FAB}.Release|Any CPU.ActiveCfg = Release|Any CPU 71 {2337776D-7D0C-40AA-A439-C26C3CE24FAB}.Release|Any CPU.Build.0 = Release|Any CPU 72 {2337776D-7D0C-40AA-A439-C26C3CE24FAB}.Release|x64.ActiveCfg = Release|Any CPU 73 {2337776D-7D0C-40AA-A439-C26C3CE24FAB}.Release|x86.ActiveCfg = Release|Any CPU 64 74 EndGlobalSection 65 75 GlobalSection(SolutionProperties) = preSolution
Note: See TracChangeset
for help on using the changeset viewer.