- Timestamp:
- 03/24/11 23:56:39 (13 years ago)
- Location:
- trunk/sources
- Files:
-
- 13 added
- 24 edited
- 8 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj
r5809 r5829 114 114 </ItemGroup> 115 115 <ItemGroup> 116 <Compile Include="SupportVectorMachineModelSupportVectorsView.cs"> 117 <SubType>UserControl</SubType> 118 </Compile> 119 <Compile Include="SupportVectorMachineModelSupportVectorsView.Designer.cs"> 120 <DependentUpon>SupportVectorMachineModelSupportVectorsView.cs</DependentUpon> 121 </Compile> 116 122 <Compile Include="CrossValidationView.cs"> 117 123 <SubType>UserControl</SubType> … … 127 133 <Compile Include="SupportVectorMachineModelView.Designer.cs"> 128 134 <DependentUpon>SupportVectorMachineModelView.cs</DependentUpon> 129 </Compile>130 <Compile Include="SupportVectorRegressionSolutionView.cs">131 <SubType>UserControl</SubType>132 </Compile>133 <Compile Include="SupportVectorRegressionSolutionView.Designer.cs">134 <DependentUpon>SupportVectorRegressionSolutionView.cs</DependentUpon>135 135 </Compile> 136 136 </ItemGroup> -
trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/SupportVectorMachineModelSupportVectorsView.Designer.cs
r5827 r5829 21 21 22 22 namespace HeuristicLab.Algorithms.DataAnalysis.Views { 23 partial class SupportVectorMachineModel View {23 partial class SupportVectorMachineModelSupportVectorsView { 24 24 /// <summary> 25 25 /// Required designer variable. … … 45 45 /// </summary> 46 46 private void InitializeComponent() { 47 this. textBox = new System.Windows.Forms.TextBox();47 this.stringConvertibleMatrixView = new HeuristicLab.Data.Views.StringConvertibleMatrixView(); 48 48 this.SuspendLayout(); 49 49 // 50 // textBox50 // stringConvertibleMatrixView 51 51 // 52 this.textBox.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 53 | System.Windows.Forms.AnchorStyles.Left) 54 | System.Windows.Forms.AnchorStyles.Right))); 55 this.textBox.Location = new System.Drawing.Point(3, 3); 56 this.textBox.Multiline = true; 57 this.textBox.Name = "textBox"; 58 this.textBox.ReadOnly = true; 59 this.textBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical; 60 this.textBox.Size = new System.Drawing.Size(247, 245); 61 this.textBox.TabIndex = 0; 52 this.stringConvertibleMatrixView.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 53 | System.Windows.Forms.AnchorStyles.Left) 54 | System.Windows.Forms.AnchorStyles.Right))); 55 this.stringConvertibleMatrixView.Caption = "StringConvertibleMatrix View"; 56 this.stringConvertibleMatrixView.Content = null; 57 this.stringConvertibleMatrixView.Location = new System.Drawing.Point(3, 3); 58 this.stringConvertibleMatrixView.Name = "stringConvertibleMatrixView"; 59 this.stringConvertibleMatrixView.ReadOnly = false; 60 this.stringConvertibleMatrixView.ShowRowsAndColumnsTextBox = true; 61 this.stringConvertibleMatrixView.ShowStatisticalInformation = false; 62 this.stringConvertibleMatrixView.Size = new System.Drawing.Size(381, 230); 63 this.stringConvertibleMatrixView.TabIndex = 0; 62 64 // 63 // SupportVectorMachineModel View65 // SupportVectorMachineModelSupportVectorsView 64 66 // 65 this.AllowDrop = true;66 67 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 67 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 68 this.Controls.Add(this.textBox); 69 this.Name = "SupportVectorMachineModelView"; 70 this.Size = new System.Drawing.Size(253, 251); 68 this.Controls.Add(this.stringConvertibleMatrixView); 69 this.Name = "SupportVectorMachineModelSupportVectorsView"; 70 this.Size = new System.Drawing.Size(387, 236); 71 71 this.ResumeLayout(false); 72 this.PerformLayout();73 72 74 73 } … … 76 75 #endregion 77 76 78 private System.Windows.Forms.TextBox textBox; 79 80 77 private Data.Views.StringConvertibleMatrixView stringConvertibleMatrixView; 81 78 } 82 79 } -
trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/SupportVectorMachineModelSupportVectorsView.cs
r5827 r5829 20 20 #endregion 21 21 using System; 22 using System.IO;23 22 using System.Windows.Forms; 24 23 using HeuristicLab.MainForm; … … 26 25 27 26 namespace HeuristicLab.Algorithms.DataAnalysis.Views { 28 [View("Support vector machine modelview")]29 [Content(typeof(SupportVectorMachineModel), true)]30 public partial class SupportVectorMachineModel View : AsynchronousContentView {27 [View("Support vectors view")] 28 [Content(typeof(SupportVectorMachineModel), false)] 29 public partial class SupportVectorMachineModelSupportVectorsView : AsynchronousContentView { 31 30 32 31 public new SupportVectorMachineModel Content { … … 35 34 } 36 35 37 public SupportVectorMachineModel View()36 public SupportVectorMachineModelSupportVectorsView() 38 37 : base() { 39 38 InitializeComponent(); … … 42 41 protected override void OnContentChanged() { 43 42 base.OnContentChanged(); 44 if (Content == null)45 textBox.Text = string.Empty;43 if (Content != null) 44 stringConvertibleMatrixView.Content = Content.SupportVectors; 46 45 else 47 UpdateTextBox();46 stringConvertibleMatrixView.Content = null; 48 47 } 49 48 … … 57 56 } 58 57 private void Content_Changed(object sender, EventArgs e) { 59 UpdateTextBox(); 60 } 61 62 private void UpdateTextBox() { 63 using (MemoryStream s = new MemoryStream()) { 64 StreamWriter writer = new StreamWriter(s); 65 writer.WriteLine("RangeTransform:"); 66 writer.Flush(); 67 using (MemoryStream memStream = new MemoryStream()) { 68 SVM.RangeTransform.Write(memStream, Content.RangeTransform); 69 memStream.Seek(0, SeekOrigin.Begin); 70 memStream.WriteTo(s); 71 } 72 writer.WriteLine("Model:"); 73 writer.Flush(); 74 using (MemoryStream memStream = new MemoryStream()) { 75 SVM.Model.Write(memStream, Content.Model); 76 memStream.Seek(0, SeekOrigin.Begin); 77 memStream.WriteTo(s); 78 } 79 s.Flush(); 80 s.Seek(0, SeekOrigin.Begin); 81 82 StreamReader reader = new StreamReader(s); 83 textBox.Text = reader.ReadToEnd(); 84 } 58 OnContentChanged(); 85 59 } 86 60 } -
trunk/sources/HeuristicLab.Core.Views/3.3/NamedItemCollectionView.cs
r5744 r5829 51 51 protected override void OnContentChanged() { 52 52 string selectedName = null; 53 if ((itemsListView.SelectedItems.Count == 1) && (itemsListView.SelectedItems[0].Tag != null)) 53 if ((itemsListView.SelectedItems.Count == 1) && (itemsListView.SelectedItems[0].Tag != null && 54 itemsListView.SelectedItems[0].Tag is T)) 54 55 selectedName = ((T)itemsListView.SelectedItems[0].Tag).Name; 55 56 base.OnContentChanged(); -
trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionView.cs
r5809 r5829 20 20 #endregion 21 21 22 using System; 22 23 using System.Collections.Generic; 23 24 using System.Windows.Forms; … … 25 26 using HeuristicLab.MainForm.WindowsForms; 26 27 using HeuristicLab.PluginInfrastructure; 27 using System;28 28 29 29 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views { … … 34 34 List<ISymbolicExpressionTreeStringFormatter> treeFormattersList = new List<ISymbolicExpressionTreeStringFormatter>(); 35 35 36 public new SymbolicExpressionTree Content {37 get { return ( SymbolicExpressionTree)base.Content; }36 public new ISymbolicExpressionTree Content { 37 get { return (ISymbolicExpressionTree)base.Content; } 38 38 set { base.Content = value; } 39 39 } -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views-3.4.csproj
r5809 r5829 235 235 </BootstrapperPackage> 236 236 </ItemGroup> 237 <ItemGroup />238 237 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 239 238 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/SymbolicDiscriminantFunctionClassificationSolutionView.Designer.cs
r5809 r5829 45 45 /// </summary> 46 46 private void InitializeComponent() { 47 this.btn_SimplifyModel = new System.Windows.Forms.Button(); 48 this.tabControl.SuspendLayout(); 49 this.dataTabPage.SuspendLayout(); 50 this.modelTabPage.SuspendLayout(); 47 System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SymbolicDiscriminantFunctionClassificationSolutionView)); 48 this.btnSimplify = new System.Windows.Forms.Button(); 49 ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); 50 this.splitContainer.Panel1.SuspendLayout(); 51 this.splitContainer.Panel2.SuspendLayout(); 52 this.splitContainer.SuspendLayout(); 53 this.itemsGroupBox.SuspendLayout(); 54 this.detailsGroupBox.SuspendLayout(); 51 55 this.SuspendLayout(); 52 56 // 53 // tabControl57 // splitContainer 54 58 // 55 this.tabControl.Size = new System.Drawing.Size(380, 233);56 59 // 57 // dataTabPage60 // splitContainer.Panel1 58 61 // 59 this. dataTabPage.Size = new System.Drawing.Size(372, 207);62 this.splitContainer.Panel1.Controls.Add(this.btnSimplify); 60 63 // 61 // modelTabPage64 // btnSimplify 62 65 // 63 this.modelTabPage.Size = new System.Drawing.Size(372, 207); 66 this.btnSimplify.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); 67 this.btnSimplify.Location = new System.Drawing.Point(172, 4); 68 this.btnSimplify.Name = "btnSimplify"; 69 this.btnSimplify.Size = new System.Drawing.Size(75, 23); 70 this.btnSimplify.TabIndex = 6; 71 this.btnSimplify.Text = "Simplify"; 72 this.btnSimplify.UseVisualStyleBackColor = true; 73 this.btnSimplify.Click += new System.EventHandler(this.btn_SimplifyModel_Click); 64 74 // 65 // dataViewHost 66 // 67 this.dataViewHost.Size = new System.Drawing.Size(360, 195); 68 // 69 // modelViewHost 70 // 71 this.modelViewHost.Size = new System.Drawing.Size(360, 195); 72 // 73 // btn_SimplifyModel 74 // 75 this.btn_SimplifyModel.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 76 | System.Windows.Forms.AnchorStyles.Right))); 77 this.btn_SimplifyModel.Location = new System.Drawing.Point(3, 238); 78 this.btn_SimplifyModel.Name = "btn_SimplifyModel"; 79 this.btn_SimplifyModel.Size = new System.Drawing.Size(376, 23); 80 this.btn_SimplifyModel.TabIndex = 2; 81 this.btn_SimplifyModel.Text = "Simplify Model"; 82 this.btn_SimplifyModel.UseVisualStyleBackColor = true; 83 this.btn_SimplifyModel.Click += new System.EventHandler(this.btn_SimplifyModel_Click); 84 // 85 // SymbolicRegressionSolutionView 75 // SymbolicDiscriminantFunctionClassificationSolutionView 86 76 // 87 77 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 88 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 89 this.Controls.Add(this.btn_SimplifyModel); 90 this.Name = "SymbolicRegressionSolutionView"; 91 this.Controls.SetChildIndex(this.btn_SimplifyModel, 0); 92 this.Controls.SetChildIndex(this.tabControl, 0); 93 this.tabControl.ResumeLayout(false); 94 this.dataTabPage.ResumeLayout(false); 95 this.modelTabPage.ResumeLayout(false); 78 this.Name = "SymbolicDiscriminantFunctionClassificationSolutionView"; 79 this.splitContainer.Panel1.ResumeLayout(false); 80 this.splitContainer.Panel2.ResumeLayout(false); 81 ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit(); 82 this.splitContainer.ResumeLayout(false); 83 this.itemsGroupBox.ResumeLayout(false); 84 this.detailsGroupBox.ResumeLayout(false); 96 85 this.ResumeLayout(false); 97 86 98 87 } 99 100 88 #endregion 101 89 102 pr ivate System.Windows.Forms.Button btn_SimplifyModel;90 protected System.Windows.Forms.Button btnSimplify; 103 91 } 104 92 } -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views/3.4/SymbolicDiscriminantFunctionClassificationSolutionView.cs
r5809 r5829 26 26 27 27 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views { 28 [Content(typeof(SymbolicDiscriminantFunctionClassificationSolution) )]28 [Content(typeof(SymbolicDiscriminantFunctionClassificationSolution), true)] 29 29 [View("Symbolic Discriminant Function Classification Solution View")] 30 public partial class SymbolicDiscriminantFunctionClassificationSolutionView : D ataAnalysisSolutionView {30 public partial class SymbolicDiscriminantFunctionClassificationSolutionView : DiscriminantFunctionClassificationSolutionView { 31 31 public SymbolicDiscriminantFunctionClassificationSolutionView() { 32 32 InitializeComponent(); -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views-3.4.csproj
r5809 r5829 239 239 </BootstrapperPackage> 240 240 </ItemGroup> 241 <ItemGroup />242 241 <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> 243 242 <!-- To modify your build process, add your task inside one of the targets below and uncomment it. -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionSolutionView.cs
r5809 r5829 26 26 27 27 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views { 28 [Content(typeof(SymbolicRegressionSolution) )]28 [Content(typeof(SymbolicRegressionSolution), true)] 29 29 [View("Symbolic Regression Solution View")] 30 public partial class SymbolicRegressionSolutionView : DataAnalysisSolutionView {30 public partial class SymbolicRegressionSolutionView : RegressionSolutionView { 31 31 public SymbolicRegressionSolutionView() { 32 32 InitializeComponent(); -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/GraphicalSymbolicDataAnalysisModelView.cs
r5818 r5829 25 25 26 26 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views { 27 [View(" Symbolic data analysis model view")]27 [View("Graphical symbolic data analysis model view")] 28 28 [Content(typeof(ISymbolicDataAnalysisModel), true)] 29 public partial class SymbolicExpressionModelView : AsynchronousContentView {30 public SymbolicExpressionModelView()29 public partial class GraphicalSymbolicDataAnalysisModelView : AsynchronousContentView { 30 public GraphicalSymbolicDataAnalysisModelView() 31 31 : base() { 32 32 InitializeComponent(); … … 41 41 base.OnContentChanged(); 42 42 if (Content != null) 43 UpdateTreeChart();43 symbolicExpressionTreeView.Content = Content.SymbolicExpressionTree; 44 44 else 45 viewHost.Content = null; 46 } 47 48 private void UpdateTreeChart() { 49 viewHost.Content = Content.SymbolicExpressionTree; 45 symbolicExpressionTreeView.Content = null; 50 46 } 51 47 } -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/GraphicalSymbolicDataAnalysisModelView.designer.cs
r5818 r5829 21 21 22 22 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views { 23 partial class SymbolicExpressionModelView {23 partial class GraphicalSymbolicDataAnalysisModelView { 24 24 /// <summary> 25 25 /// Required designer variable. … … 45 45 /// </summary> 46 46 private void InitializeComponent() { 47 this.modelGroupBox = new System.Windows.Forms.GroupBox(); 48 this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost(); 49 this.modelGroupBox.SuspendLayout(); 47 this.symbolicExpressionTreeView = new HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.GraphicalSymbolicExpressionTreeView(); 50 48 this.SuspendLayout(); 51 49 // 52 // modelGroupBox50 // expressionTreeView 53 51 // 54 this.modelGroupBox.Controls.Add(this.viewHost); 55 this.modelGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; 56 this.modelGroupBox.Location = new System.Drawing.Point(0, 0); 57 this.modelGroupBox.Name = "modelGroupBox"; 58 this.modelGroupBox.Size = new System.Drawing.Size(352, 413); 59 this.modelGroupBox.TabIndex = 0; 60 this.modelGroupBox.TabStop = false; 61 this.modelGroupBox.Text = "Symbolic Expression Model"; 62 // 63 // viewHost 64 // 65 this.viewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 66 | System.Windows.Forms.AnchorStyles.Left) 67 | System.Windows.Forms.AnchorStyles.Right))); 68 this.viewHost.Content = null; 69 this.viewHost.Location = new System.Drawing.Point(6, 19); 70 this.viewHost.Name = "viewHost"; 71 this.viewHost.ReadOnly = false; 72 this.viewHost.Size = new System.Drawing.Size(340, 388); 73 this.viewHost.TabIndex = 0; 74 this.viewHost.ViewType = null; 52 this.symbolicExpressionTreeView.AllowDrop = true; 53 this.symbolicExpressionTreeView.Caption = "Graphical SymbolicExpressionTree View"; 54 this.symbolicExpressionTreeView.Content = null; 55 this.symbolicExpressionTreeView.Dock = System.Windows.Forms.DockStyle.Fill; 56 this.symbolicExpressionTreeView.Location = new System.Drawing.Point(0, 0); 57 this.symbolicExpressionTreeView.Name = "expressionTreeView"; 58 this.symbolicExpressionTreeView.ReadOnly = false; 59 this.symbolicExpressionTreeView.Size = new System.Drawing.Size(352, 413); 60 this.symbolicExpressionTreeView.TabIndex = 0; 75 61 // 76 62 // SymbolicExpressionModelView … … 79 65 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 80 66 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 81 this.Controls.Add(this. modelGroupBox);67 this.Controls.Add(this.symbolicExpressionTreeView); 82 68 this.Name = "SymbolicExpressionModelView"; 83 69 this.Size = new System.Drawing.Size(352, 413); 84 this.modelGroupBox.ResumeLayout(false);85 70 this.ResumeLayout(false); 86 71 … … 88 73 89 74 #endregion 90 91 private System.Windows.Forms.GroupBox modelGroupBox; 92 private HeuristicLab.MainForm.WindowsForms.ViewHost viewHost; 75 private HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.GraphicalSymbolicExpressionTreeView symbolicExpressionTreeView; 93 76 94 77 } -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic.Views-3.4.csproj
r5809 r5829 93 93 </PropertyGroup> 94 94 <ItemGroup> 95 <Reference Include="HeuristicLab.Common.Resources-3.3, Version=3.3.0.0, Culture=neutral, PublicKeyToken=ba48961d6f65dcec, processorArchitecture=x86" /> 95 96 <Reference Include="System" /> 96 97 <Reference Include="System.Core"> … … 110 111 </ItemGroup> 111 112 <ItemGroup> 113 <Compile Include="TextualSymbolicDataAnalysisModelView.cs"> 114 <SubType>UserControl</SubType> 115 </Compile> 116 <Compile Include="TextualSymbolicDataAnalysisModelView.designer.cs"> 117 <DependentUpon>TextualSymbolicDataAnalysisModelView.cs</DependentUpon> 118 </Compile> 112 119 <Compile Include="InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs"> 113 120 <SubType>UserControl</SubType> … … 116 123 <DependentUpon>InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs</DependentUpon> 117 124 </Compile> 118 <Compile Include=" SymbolicDataAnalysisModelView.cs">119 <SubType>UserControl</SubType> 120 </Compile> 121 <Compile Include=" SymbolicDataAnalysisModelView.designer.cs">122 <DependentUpon> SymbolicDataAnalysisModelView.cs</DependentUpon>125 <Compile Include="GraphicalSymbolicDataAnalysisModelView.cs"> 126 <SubType>UserControl</SubType> 127 </Compile> 128 <Compile Include="GraphicalSymbolicDataAnalysisModelView.designer.cs"> 129 <DependentUpon>GraphicalSymbolicDataAnalysisModelView.cs</DependentUpon> 123 130 </Compile> 124 131 <Compile Include="Symbols\ConstantView.cs"> … … 216 223 <Project>{23DA7FF4-D5B8-41B6-AA96-F0561D24F3EE}</Project> 217 224 <Name>HeuristicLab.Operators-3.3</Name> 225 </ProjectReference> 226 <ProjectReference Include="..\..\HeuristicLab.Optimization.Views\3.3\HeuristicLab.Optimization.Views-3.3.csproj"> 227 <Project>{662B4B15-8F4D-4AE5-B3EB-D91C215F5AF2}</Project> 228 <Name>HeuristicLab.Optimization.Views-3.3</Name> 218 229 </ProjectReference> 219 230 <ProjectReference Include="..\..\HeuristicLab.Optimization\3.3\HeuristicLab.Optimization-3.3.csproj"> -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TextualSymbolicDataAnalysisModelView.cs
r5818 r5829 25 25 26 26 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views { 27 [View(" Symbolic data analysis model view")]28 [Content(typeof(ISymbolicDataAnalysisModel), true)]29 public partial class SymbolicExpressionModelView : AsynchronousContentView {30 public SymbolicExpressionModelView()27 [View("Textual symbolic data analysis model view")] 28 [Content(typeof(ISymbolicDataAnalysisModel), false)] 29 public partial class TextualSymbolicDataAnalysisModelView : AsynchronousContentView { 30 public TextualSymbolicDataAnalysisModelView() 31 31 : base() { 32 32 InitializeComponent(); … … 41 41 base.OnContentChanged(); 42 42 if (Content != null) 43 UpdateTreeChart();43 symbolicExpressionTreeView.Content = Content.SymbolicExpressionTree; 44 44 else 45 viewHost.Content = null; 46 } 47 48 private void UpdateTreeChart() { 49 viewHost.Content = Content.SymbolicExpressionTree; 45 symbolicExpressionTreeView.Content = null; 50 46 } 51 47 } -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TextualSymbolicDataAnalysisModelView.designer.cs
r5818 r5829 21 21 22 22 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views { 23 partial class SymbolicExpressionModelView {23 partial class TextualSymbolicDataAnalysisModelView { 24 24 /// <summary> 25 25 /// Required designer variable. … … 45 45 /// </summary> 46 46 private void InitializeComponent() { 47 this.modelGroupBox = new System.Windows.Forms.GroupBox(); 48 this.viewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost(); 49 this.modelGroupBox.SuspendLayout(); 47 this.symbolicExpressionTreeView = new HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.SymbolicExpressionView(); 50 48 this.SuspendLayout(); 51 49 // 52 // modelGroupBox50 // expressionTreeView 53 51 // 54 this.modelGroupBox.Controls.Add(this.viewHost); 55 this.modelGroupBox.Dock = System.Windows.Forms.DockStyle.Fill; 56 this.modelGroupBox.Location = new System.Drawing.Point(0, 0); 57 this.modelGroupBox.Name = "modelGroupBox"; 58 this.modelGroupBox.Size = new System.Drawing.Size(352, 413); 59 this.modelGroupBox.TabIndex = 0; 60 this.modelGroupBox.TabStop = false; 61 this.modelGroupBox.Text = "Symbolic Expression Model"; 62 // 63 // viewHost 64 // 65 this.viewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 66 | System.Windows.Forms.AnchorStyles.Left) 67 | System.Windows.Forms.AnchorStyles.Right))); 68 this.viewHost.Content = null; 69 this.viewHost.Location = new System.Drawing.Point(6, 19); 70 this.viewHost.Name = "viewHost"; 71 this.viewHost.ReadOnly = false; 72 this.viewHost.Size = new System.Drawing.Size(340, 388); 73 this.viewHost.TabIndex = 0; 74 this.viewHost.ViewType = null; 52 this.symbolicExpressionTreeView.AllowDrop = true; 53 this.symbolicExpressionTreeView.Caption = "Graphical SymbolicExpressionTree View"; 54 this.symbolicExpressionTreeView.Content = null; 55 this.symbolicExpressionTreeView.Dock = System.Windows.Forms.DockStyle.Fill; 56 this.symbolicExpressionTreeView.Location = new System.Drawing.Point(0, 0); 57 this.symbolicExpressionTreeView.Name = "expressionTreeView"; 58 this.symbolicExpressionTreeView.ReadOnly = false; 59 this.symbolicExpressionTreeView.Size = new System.Drawing.Size(352, 413); 60 this.symbolicExpressionTreeView.TabIndex = 0; 75 61 // 76 62 // SymbolicExpressionModelView … … 79 65 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 80 66 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 81 this.Controls.Add(this. modelGroupBox);67 this.Controls.Add(this.symbolicExpressionTreeView); 82 68 this.Name = "SymbolicExpressionModelView"; 83 69 this.Size = new System.Drawing.Size(352, 413); 84 this.modelGroupBox.ResumeLayout(false);85 70 this.ResumeLayout(false); 86 71 … … 88 73 89 74 #endregion 90 91 private System.Windows.Forms.GroupBox modelGroupBox; 92 private HeuristicLab.MainForm.WindowsForms.ViewHost viewHost; 75 private HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views.SymbolicExpressionView symbolicExpressionTreeView; 93 76 94 77 } -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionConfusionMatrixView.Designer.cs
r5809 r5829 1 namespace HeuristicLab.Problems.DataAnalysis. Classification.Views {1 namespace HeuristicLab.Problems.DataAnalysis.Views { 2 2 partial class ClassificationSolutionConfusionMatrixView { 3 3 /// <summary> -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionConfusionMatrixView.cs
r5809 r5829 24 24 using System.Linq; 25 25 using System.Windows.Forms; 26 using HeuristicLab.Core.Views; 26 27 using HeuristicLab.MainForm; 27 28 using HeuristicLab.MainForm.WindowsForms; 28 29 29 namespace HeuristicLab.Problems.DataAnalysis. Classification.Views {30 namespace HeuristicLab.Problems.DataAnalysis.Views { 30 31 [View("Classification solution confusion matrix view")] 31 32 [Content(typeof(IClassificationSolution))] 32 public partial class ClassificationSolutionConfusionMatrixView : AsynchronousContentView {33 public partial class ClassificationSolutionConfusionMatrixView : ItemView, IClassificationSolutionEvaluationView { 33 34 private const string TrainingSamples = "Training"; 34 35 private const string TestSamples = "Test"; -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/ClassificationSolutionEstimatedClassValuesView.cs
r5809 r5829 22 22 using System.Linq; 23 23 using System.Windows.Forms; 24 using HeuristicLab.Core.Views; 24 25 using HeuristicLab.Data; 25 26 using HeuristicLab.Data.Views; … … 30 31 [View("Classification solution estimated class values view")] 31 32 [Content(typeof(IClassificationSolution))] 32 public partial class ClassificationSolutionEstimatedClassValuesView : AsynchronousContentView {33 public partial class ClassificationSolutionEstimatedClassValuesView : ItemView, IClassificationSolutionEvaluationView { 33 34 private const string TARGETVARIABLE_SERIES_NAME = "TargetVariable"; 34 35 private const string ESTIMATEDVALUES_SERIES_NAME = "EstimatedClassValues"; -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationRocCurvesView.Designer.cs
r5809 r5829 1 namespace HeuristicLab.Problems.DataAnalysis. Classification.Views {1 namespace HeuristicLab.Problems.DataAnalysis.Views { 2 2 partial class DiscriminantFunctionClassificationRocCurvesView { 3 3 /// <summary> -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationRocCurvesView.cs
r5809 r5829 28 28 using System.Windows.Forms.DataVisualization.Charting; 29 29 using HeuristicLab.Common; 30 using HeuristicLab.Core.Views; 30 31 using HeuristicLab.MainForm; 31 32 using HeuristicLab.MainForm.WindowsForms; 32 namespace HeuristicLab.Problems.DataAnalysis. Classification.Views {33 namespace HeuristicLab.Problems.DataAnalysis.Views { 33 34 [View("Discriminant function classification solution ROC curves view")] 34 35 [Content(typeof(IDiscriminantFunctionClassificationSolution))] 35 public partial class DiscriminantFunctionClassificationRocCurvesView : AsynchronousContentView {36 public partial class DiscriminantFunctionClassificationRocCurvesView : ItemView, IDiscriminantFunctionClassificationSolutionEvaluationView { 36 37 private const string xAxisTitle = "False Positive Rate"; 37 38 private const string yAxisTitle = "True Positive Rate"; -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationSolutionEstimatedClassValuesView.cs
r5809 r5829 22 22 using System.Linq; 23 23 using System.Windows.Forms; 24 using HeuristicLab.Core.Views; 24 25 using HeuristicLab.Data; 25 26 using HeuristicLab.Data.Views; … … 30 31 [View("Discriminant function classification solution estimated class values view")] 31 32 [Content(typeof(IDiscriminantFunctionClassificationSolution))] 32 public partial class DiscriminantFunctionClassificationSolutionEstimatedClassValuesView : AsynchronousContentView {33 public partial class DiscriminantFunctionClassificationSolutionEstimatedClassValuesView : ItemView, IDiscriminantFunctionClassificationSolutionEvaluationView { 33 34 private const string TargetClassValuesSeriesname = "TargetVariable"; 34 35 private const string EstimatedClassValuesSeriesName = "EstimatedClassValues"; -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationSolutionThresholdView.Designer.cs
r5827 r5829 1 namespace HeuristicLab.Problems.DataAnalysis. Classification.Views {2 partial class DiscriminantFunctionClassificationSolution View {1 namespace HeuristicLab.Problems.DataAnalysis.Views { 2 partial class DiscriminantFunctionClassificationSolutionThresholdView { 3 3 /// <summary> 4 4 /// Required designer variable. -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Classification/DiscriminantFunctionClassificationSolutionThresholdView.cs
r5827 r5829 27 27 using System.Windows.Forms.DataVisualization.Charting; 28 28 using HeuristicLab.Common; 29 using HeuristicLab.Core.Views; 29 30 using HeuristicLab.MainForm; 30 31 using HeuristicLab.MainForm.WindowsForms; 31 32 32 namespace HeuristicLab.Problems.DataAnalysis. Classification.Views {33 [View("D iscriminant function classification solution view")]33 namespace HeuristicLab.Problems.DataAnalysis.Views { 34 [View("DsicriminantFunctionClassificationSolutino ThresholdView")] 34 35 [Content(typeof(IDiscriminantFunctionClassificationSolution), true)] 35 public sealed partial class DiscriminantFunctionClassificationSolution View : AsynchronousContentView {36 public sealed partial class DiscriminantFunctionClassificationSolutionThresholdView : ItemView, IDiscriminantFunctionClassificationSolutionEvaluationView { 36 37 private const double TrainingAxisValue = 0.0; 37 38 private const double TestAxisValue = 10.0; … … 49 50 private bool updateInProgress; 50 51 51 public DiscriminantFunctionClassificationSolution View()52 public DiscriminantFunctionClassificationSolutionThresholdView() 52 53 : base() { 53 54 InitializeComponent(); -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisSolutionView.Designer.cs
r5809 r5829 44 44 /// </summary> 45 45 private void InitializeComponent() { 46 this.dataTabPage = new System.Windows.Forms.TabPage(); 47 this.dataViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost(); 48 this.modelTabPage = new System.Windows.Forms.TabPage(); 49 this.modelViewHost = new HeuristicLab.MainForm.WindowsForms.ViewHost(); 50 this.tabControl = new HeuristicLab.MainForm.WindowsForms.DragOverTabControl(); 51 this.dataTabPage.SuspendLayout(); 52 this.modelTabPage.SuspendLayout(); 53 this.tabControl.SuspendLayout(); 46 ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).BeginInit(); 47 this.splitContainer.Panel1.SuspendLayout(); 48 this.splitContainer.Panel2.SuspendLayout(); 49 this.splitContainer.SuspendLayout(); 50 this.itemsGroupBox.SuspendLayout(); 51 this.detailsGroupBox.SuspendLayout(); 54 52 this.SuspendLayout(); 55 53 // 56 // dataTabPage54 // splitContainer 57 55 // 58 this.dataTabPage.Controls.Add(this.dataViewHost);59 this.dataTabPage.Location = new System.Drawing.Point(4, 22);60 this.dataTabPage.Name = "dataTabPage";61 this.dataTabPage.Padding = new System.Windows.Forms.Padding(3);62 this.dataTabPage.Size = new System.Drawing.Size(372, 236);63 this.dataTabPage.TabIndex = 1;64 this.dataTabPage.Text = "Data";65 this.dataTabPage.UseVisualStyleBackColor = true;66 56 // 67 // dataViewHost57 // itemsGroupBox 68 58 // 69 this.dataViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 70 | System.Windows.Forms.AnchorStyles.Left) 71 | System.Windows.Forms.AnchorStyles.Right))); 72 this.dataViewHost.Caption = "DataAnalysisSolution Data View"; 73 this.dataViewHost.Content = null; 74 this.dataViewHost.Enabled = false; 75 this.dataViewHost.Location = new System.Drawing.Point(6, 6); 76 this.dataViewHost.Name = "dataViewHost"; 77 this.dataViewHost.ReadOnly = false; 78 this.dataViewHost.Size = new System.Drawing.Size(360, 224); 79 this.dataViewHost.TabIndex = 2; 80 this.dataViewHost.ViewType = null; 59 this.itemsGroupBox.Text = "Data Analysis Solution"; 81 60 // 82 // modelTabPage61 // addButton 83 62 // 84 this.modelTabPage.Controls.Add(this.modelViewHost); 85 this.modelTabPage.Location = new System.Drawing.Point(4, 22); 86 this.modelTabPage.Name = "modelTabPage"; 87 this.modelTabPage.Padding = new System.Windows.Forms.Padding(3); 88 this.modelTabPage.Size = new System.Drawing.Size(372, 236); 89 this.modelTabPage.TabIndex = 0; 90 this.modelTabPage.Text = "Model"; 91 this.modelTabPage.UseVisualStyleBackColor = true; 63 this.toolTip.SetToolTip(this.addButton, "Add"); 92 64 // 93 // modelViewHost65 // removeButton 94 66 // 95 this.modelViewHost.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 96 | System.Windows.Forms.AnchorStyles.Left) 97 | System.Windows.Forms.AnchorStyles.Right))); 98 this.modelViewHost.Caption = "DataAnalysisSolution Model View"; 99 this.modelViewHost.Content = null; 100 this.modelViewHost.Enabled = false; 101 this.modelViewHost.Location = new System.Drawing.Point(6, 6); 102 this.modelViewHost.Name = "modelViewHost"; 103 this.modelViewHost.ReadOnly = false; 104 this.modelViewHost.Size = new System.Drawing.Size(360, 224); 105 this.modelViewHost.TabIndex = 1; 106 this.modelViewHost.ViewType = null; 107 // 108 // tabControl 109 // 110 this.tabControl.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 111 | System.Windows.Forms.AnchorStyles.Left) 112 | System.Windows.Forms.AnchorStyles.Right))); 113 this.tabControl.Controls.Add(this.modelTabPage); 114 this.tabControl.Controls.Add(this.dataTabPage); 115 this.tabControl.Location = new System.Drawing.Point(3, 3); 116 this.tabControl.Name = "tabControl"; 117 this.tabControl.SelectedIndex = 0; 118 this.tabControl.Size = new System.Drawing.Size(380, 262); 119 this.tabControl.TabIndex = 1; 67 this.toolTip.SetToolTip(this.removeButton, "Remove"); 120 68 // 121 69 // DataAnalysisSolutionView … … 123 71 this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); 124 72 this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; 125 this.Controls.Add(this.tabControl);126 73 this.Name = "DataAnalysisSolutionView"; 127 this.Size = new System.Drawing.Size(386, 268); 128 this.dataTabPage.ResumeLayout(false); 129 this.modelTabPage.ResumeLayout(false); 130 this.tabControl.ResumeLayout(false); 74 this.splitContainer.Panel1.ResumeLayout(false); 75 this.splitContainer.Panel2.ResumeLayout(false); 76 ((System.ComponentModel.ISupportInitialize)(this.splitContainer)).EndInit(); 77 this.splitContainer.ResumeLayout(false); 78 this.itemsGroupBox.ResumeLayout(false); 79 this.detailsGroupBox.ResumeLayout(false); 131 80 this.ResumeLayout(false); 132 81 … … 135 84 #endregion 136 85 137 protected HeuristicLab.MainForm.WindowsForms.DragOverTabControl tabControl;138 protected System.Windows.Forms.TabPage dataTabPage;139 protected System.Windows.Forms.TabPage modelTabPage;140 protected HeuristicLab.MainForm.WindowsForms.ViewHost dataViewHost;141 protected HeuristicLab.MainForm.WindowsForms.ViewHost modelViewHost;142 86 } 143 87 } -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisSolutionView.cs
r5809 r5829 19 19 */ 20 20 #endregion 21 21 22 using System; 23 using System.Collections.Generic; 22 24 using System.Windows.Forms; 25 using HeuristicLab.Common.Resources; 23 26 using HeuristicLab.MainForm; 24 using HeuristicLab. MainForm.WindowsForms;27 using HeuristicLab.Optimization.Views; 25 28 26 29 namespace HeuristicLab.Problems.DataAnalysis.Views { 27 30 [View("Data analysis solution view")] 28 [Content(typeof( IDataAnalysisSolution))]29 public partial class DataAnalysisSolutionView : AsynchronousContentView {31 [Content(typeof(DataAnalysisSolution), true)] 32 public partial class DataAnalysisSolutionView : ResultCollectionView { 30 33 public DataAnalysisSolutionView() { 31 34 InitializeComponent(); 32 35 } 33 36 34 public new IDataAnalysisSolution Content {35 get { return ( IDataAnalysisSolution)base.Content; }37 public new DataAnalysisSolution Content { 38 get { return (DataAnalysisSolution)base.Content; } 36 39 set { base.Content = value; } 37 40 } 38 41 39 42 protected override void OnContentChanged() { 43 string selectedName = null; 44 if ((itemsListView.SelectedItems.Count == 1) && (itemsListView.SelectedItems[0].Tag != null && itemsListView.SelectedItems[0].Tag is Type)) 45 selectedName = itemsListView.SelectedItems[0].Text; 46 47 //cache old viewTypes; 48 var viewTypes = new List<Type>(); 49 foreach (ListViewItem item in ItemsListView.Items) { 50 var viewType = item.Tag as Type; 51 if (viewType != null) viewTypes.Add(viewType); 52 } 53 40 54 base.OnContentChanged(); 41 if (Content != null) { 42 modelViewHost.Content = Content.Model; 43 dataViewHost.Content = Content.ProblemData; 44 } else { 45 modelViewHost.Content = null; 46 dataViewHost.Content = null; 55 56 //readd viewTypes 57 foreach (Type viewType in viewTypes) 58 AddViewListViewItem(viewType); 59 60 //recover selection 61 if (selectedName != null) { 62 foreach (ListViewItem item in itemsListView.Items) { 63 if (item.Tag != null && item.Tag is Type && item.Text == selectedName) 64 item.Selected = true; 65 } 47 66 } 48 67 } 49 68 50 protected override void RegisterContentEvents() { 51 base.RegisterContentEvents(); 52 Content.ModelChanged += new EventHandler(Content_ModelChanged); 53 Content.ProblemDataChanged += new EventHandler(Content_ProblemDataChanged); 69 protected override void itemsListView_DoubleClick(object sender, EventArgs e) { 70 if (itemsListView.SelectedItems.Count == 1 && itemsListView.SelectedItems[0].Tag is Type) { 71 Type viewType = (Type)itemsListView.SelectedItems[0].Tag; 72 MainFormManager.MainForm.ShowContent(Content, viewType); 73 } else 74 base.itemsListView_DoubleClick(sender, e); 54 75 } 55 76 56 protected override void DeregisterContentEvents() { 57 base.DeregisterContentEvents(); 58 Content.ModelChanged -= new EventHandler(Content_ModelChanged); 59 Content.ProblemDataChanged -= new EventHandler(Content_ProblemDataChanged); 77 protected override void itemsListView_SelectedIndexChanged(object sender, EventArgs e) { 78 if (itemsListView.SelectedItems.Count == 1 && itemsListView.SelectedItems[0].Tag is Type) { 79 detailsGroupBox.Enabled = true; 80 Type viewType = (Type)itemsListView.SelectedItems[0].Tag; 81 viewHost.ViewType = viewType; 82 viewHost.Content = Content; 83 } else 84 base.itemsListView_SelectedIndexChanged(sender, e); 60 85 } 61 86 62 private void Content_ModelChanged(object sender, EventArgs e) { 63 modelViewHost.Content = Content.Model; 87 protected void AddViewListViewItem(Type viewType) { 88 if (!typeof(IDataAnalysisSolutionEvaluationView).IsAssignableFrom(viewType)) 89 throw new ArgumentException("Given type " + viewType + " is not a IDataAnalysisSolutionEvaluationView."); 90 91 ListViewItem listViewItem = new ListViewItem(); 92 listViewItem.Text = ViewAttribute.GetViewName(viewType); 93 itemsListView.SmallImageList.Images.Add(VSImageLibrary.Graph); 94 listViewItem.ImageIndex = itemsListView.SmallImageList.Images.Count - 1; 95 listViewItem.Tag = viewType; 96 itemsListView.Items.Add(listViewItem); 97 98 AdjustListViewColumnSizes(); 64 99 } 65 private void Content_ProblemDataChanged(object sender, EventArgs e) { 66 dataViewHost.Content = Content.ProblemData; 100 101 protected void RemoveViewListViewItem(Type viewType) { 102 List<ListViewItem> itemsToRemove = new List<ListViewItem>(); ; 103 foreach (ListViewItem item in itemsListView.Items) 104 if (item.Tag as Type == typeof(ClassificationSolutionEstimatedClassValuesView)) 105 itemsToRemove.Add(item); 106 107 foreach (ListViewItem item in itemsToRemove) 108 itemsListView.Items.Remove(item); 67 109 } 68 110 } -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj
r5809 r5829 110 110 </ItemGroup> 111 111 <ItemGroup> 112 <Compile Include="ClassificationSolutionView.cs"> 113 <SubType>UserControl</SubType> 114 </Compile> 115 <Compile Include="ClassificationSolutionView.Designer.cs"> 116 <DependentUpon>ClassificationSolutionView.cs</DependentUpon> 117 </Compile> 112 118 <Compile Include="Classification\ClassificationSolutionConfusionMatrixView.cs"> 113 119 <SubType>UserControl</SubType> … … 134 140 <DependentUpon>DiscriminantFunctionClassificationRocCurvesView.cs</DependentUpon> 135 141 </Compile> 136 <Compile Include="Classification\DiscriminantFunctionClassificationSolutionView.cs"> 137 <SubType>UserControl</SubType> 138 </Compile> 139 <Compile Include="Classification\DiscriminantFunctionClassificationSolutionView.Designer.cs"> 142 <Compile Include="Classification\DiscriminantFunctionClassificationSolutionThresholdView.cs"> 143 <SubType>UserControl</SubType> 144 </Compile> 145 <Compile Include="Classification\DiscriminantFunctionClassificationSolutionThresholdView.Designer.cs"> 146 <DependentUpon>DiscriminantFunctionClassificationSolutionThresholdView.cs</DependentUpon> 147 </Compile> 148 <Compile Include="DiscriminantFunctionClassificationSolutionView.cs"> 149 <SubType>UserControl</SubType> 150 </Compile> 151 <Compile Include="DiscriminantFunctionClassificationSolutionView.Designer.cs"> 140 152 <DependentUpon>DiscriminantFunctionClassificationSolutionView.cs</DependentUpon> 141 153 </Compile> 154 <Compile Include="Interfaces\IDataAnalysisSolutionEvaluationView.cs" /> 155 <Compile Include="Interfaces\IDiscriminantFunctionClassificationSolutionEvaluationView.cs" /> 156 <Compile Include="Interfaces\IClusteringSolutionEvaluationView.cs" /> 157 <Compile Include="Interfaces\IClassificationSolutionEvaluationView.cs" /> 142 158 <Compile Include="DataAnalysisSolutionView.cs"> 143 159 <SubType>UserControl</SubType> … … 151 167 <Compile Include="DoubleLimitView.Designer.cs"> 152 168 <DependentUpon>DoubleLimitView.cs</DependentUpon> 169 </Compile> 170 <Compile Include="Interfaces\IRegressionSolutionEvaluationView.cs" /> 171 <Compile Include="RegressionSolutionView.cs"> 172 <SubType>UserControl</SubType> 173 </Compile> 174 <Compile Include="RegressionSolutionView.Designer.cs"> 175 <DependentUpon>RegressionSolutionView.cs</DependentUpon> 153 176 </Compile> 154 177 <Compile Include="Regression\RegressionSolutionEstimatedValuesView.cs"> … … 183 206 </ItemGroup> 184 207 <ItemGroup> 208 <ProjectReference Include="..\..\HeuristicLab.Collections\3.3\HeuristicLab.Collections-3.3.csproj"> 209 <Project>{958B43BC-CC5C-4FA2-8628-2B3B01D890B6}</Project> 210 <Name>HeuristicLab.Collections-3.3</Name> 211 </ProjectReference> 212 <ProjectReference Include="..\..\HeuristicLab.Common.Resources\3.3\HeuristicLab.Common.Resources-3.3.csproj"> 213 <Project>{0E27A536-1C4A-4624-A65E-DC4F4F23E3E1}</Project> 214 <Name>HeuristicLab.Common.Resources-3.3</Name> 215 </ProjectReference> 185 216 <ProjectReference Include="..\..\HeuristicLab.Common\3.3\HeuristicLab.Common-3.3.csproj"> 186 217 <Project>{A9AD58B9-3EF9-4CC1-97E5-8D909039FF5C}</Project> -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLabProblemsDataAnalysisViewsPlugin.cs.frame
r5809 r5829 29 29 [PluginFile("HeuristicLab.Problems.DataAnalysis.Views-3.4.dll", PluginFileType.Assembly)] 30 30 [PluginDependency("HeuristicLab.ALGLIB","3.1.0.0")] 31 [PluginDependency("HeuristicLab.Common", "3.3.3.0")] 32 [PluginDependency("HeuristicLab.Core", "3.3.3.0")] 33 [PluginDependency("HeuristicLab.Core.Views", "3.3.3.0")] 34 [PluginDependency("HeuristicLab.Data", "3.3.3.0")] 35 [PluginDependency("HeuristicLab.Data.Views", "3.3.3.0")] 36 [PluginDependency("HeuristicLab.MainForm", "3.3.3.0")] 37 [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3.3.0")] 38 [PluginDependency("HeuristicLab.Optimization","3.3.3.0")] 39 [PluginDependency("HeuristicLab.Optimization.Views","3.3.3.0")] 40 [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4.0.0")] 31 [PluginDependency("HeuristicLab.Collections", "3.3")] 32 [PluginDependency("HeuristicLab.Common", "3.3")] 33 [PluginDependency("HeuristicLab.Common.Resources", "3.3")] 34 [PluginDependency("HeuristicLab.Core", "3.3")] 35 [PluginDependency("HeuristicLab.Core.Views", "3.3")] 36 [PluginDependency("HeuristicLab.Data", "3.3")] 37 [PluginDependency("HeuristicLab.Data.Views", "3.3")] 38 [PluginDependency("HeuristicLab.MainForm", "3.3")] 39 [PluginDependency("HeuristicLab.MainForm.WindowsForms", "3.3")] 40 [PluginDependency("HeuristicLab.Optimization","3.3")] 41 [PluginDependency("HeuristicLab.Optimization.Views","3.3")] 42 [PluginDependency("HeuristicLab.Problems.DataAnalysis", "3.4")] 41 43 [PluginDependency("HeuristicLab.Visualization.ChartControlsExtensions", "3.3")] 42 44 public class HeuristicLabProblemsDataAnalysisViewsPlugin : PluginBase { -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionEstimatedValuesView.cs
r5809 r5829 22 22 using System.Linq; 23 23 using System.Windows.Forms; 24 using HeuristicLab.Core.Views; 24 25 using HeuristicLab.Data; 25 26 using HeuristicLab.Data.Views; … … 30 31 [View("Regression solution estimated values view")] 31 32 [Content(typeof(IRegressionSolution))] 32 public partial class RegressionSolutionEstimatedValuesView : AsynchronousContentView {33 public partial class RegressionSolutionEstimatedValuesView : ItemView, IRegressionSolutionEvaluationView { 33 34 private const string TARGETVARIABLE_SERIES_NAME = "TargetVariable"; 34 35 private const string ESTIMATEDVALUES_SERIES_NAME = "EstimatedValues"; -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionLineChartView.cs
r5809 r5829 24 24 using System.Windows.Forms; 25 25 using System.Windows.Forms.DataVisualization.Charting; 26 using HeuristicLab.Core.Views; 26 27 using HeuristicLab.MainForm; 27 28 using HeuristicLab.MainForm.WindowsForms; … … 30 31 [View("Regression solution line chart")] 31 32 [Content(typeof(IRegressionSolution))] 32 public partial class RegressionSolutionLineChartView : AsynchronousContentView {33 public partial class RegressionSolutionLineChartView : ItemView, IRegressionSolutionEvaluationView { 33 34 private const string TARGETVARIABLE_SERIES_NAME = "TargetVariable"; 34 35 private const string ESTIMATEDVALUES_SERIES_NAME = "EstimatedValues"; -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.4/Regression/RegressionSolutionScatterPlotView.cs
r5809 r5829 25 25 using System.Windows.Forms; 26 26 using System.Windows.Forms.DataVisualization.Charting; 27 using HeuristicLab.Core.Views; 27 28 using HeuristicLab.MainForm; 28 29 using HeuristicLab.MainForm.WindowsForms; … … 31 32 [View("Regression solution scatter plot")] 32 33 [Content(typeof(IRegressionSolution))] 33 public partial class RegressionSolutionScatterPlotView : AsynchronousContentView {34 public partial class RegressionSolutionScatterPlotView : ItemView, IRegressionSolutionEvaluationView { 34 35 private const string ALL_SERIES = "All samples"; 35 36 private const string TRAINING_SERIES = "Training samples"; -
trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/IDataAnalysisSolution.cs
r5809 r5829 25 25 26 26 namespace HeuristicLab.Problems.DataAnalysis { 27 public interface IDataAnalysisSolution : INamedItem {27 public interface IDataAnalysisSolution : INamedItem, IKeyedItemCollection<string, IResult> { 28 28 IDataAnalysisModel Model { get; } 29 29 IDataAnalysisProblemData ProblemData { get; } -
trunk/sources/HeuristicLab.Problems.DataAnalysis/3.4/Interfaces/Regression/IRegressionSolution.cs
r5809 r5829 35 35 double TrainingRSquared { get; } 36 36 double TestRSquared { get; } 37 double TrainingRelativeError { get; } 38 double TestRelativeError { get; } 37 39 } 38 40 }
Note: See TracChangeset
for help on using the changeset viewer.