Changeset 5829 for trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views

Timestamp:

03/24/11 23:56:39 (13 years ago)

Author:

mkommend

Message:

#1313: Implemented new views for data analysis solutions.

Location:

trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4

Files:

• HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj (modified) (2 diffs)
• SupportVectorMachineModelSupportVectorsView.Designer.cs (copied) (copied from trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/SupportVectorMachineModelView.Designer.cs) (3 diffs)
• SupportVectorMachineModelSupportVectorsView.cs (copied) (copied from trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/SupportVectorMachineModelView.cs) (5 diffs)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj

@@ -114 +114 @@
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="SupportVectorMachineModelSupportVectorsView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="SupportVectorMachineModelSupportVectorsView.Designer.cs">
+      <DependentUpon>SupportVectorMachineModelSupportVectorsView.cs</DependentUpon>
+    </Compile>
     <Compile Include="CrossValidationView.cs">
       <SubType>UserControl</SubType>
@@ -127 +133 @@
     <Compile Include="SupportVectorMachineModelView.Designer.cs">
       <DependentUpon>SupportVectorMachineModelView.cs</DependentUpon>
-    </Compile>
-    <Compile Include="SupportVectorRegressionSolutionView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="SupportVectorRegressionSolutionView.Designer.cs">
-      <DependentUpon>SupportVectorRegressionSolutionView.cs</DependentUpon>
     </Compile>
   </ItemGroup>

trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/SupportVectorMachineModelSupportVectorsView.Designer.cs

@@ -21 +21 @@
 
 namespace HeuristicLab.Algorithms.DataAnalysis.Views {
-  partial class SupportVectorMachineModelView {
+  partial class SupportVectorMachineModelSupportVectorsView {
     /// <summary> 
     /// Required designer variable.
@@ -45 +45 @@
     /// </summary>
     private void InitializeComponent() {
-      this.textBox = new System.Windows.Forms.TextBox();
+      this.stringConvertibleMatrixView = new HeuristicLab.Data.Views.StringConvertibleMatrixView();
       this.SuspendLayout();
       // 
-      // textBox
+      // stringConvertibleMatrixView
       // 
-      this.textBox.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.textBox.Location = new System.Drawing.Point(3, 3);
-      this.textBox.Multiline = true;
-      this.textBox.Name = "textBox";
-      this.textBox.ReadOnly = true;
-      this.textBox.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-      this.textBox.Size = new System.Drawing.Size(247, 245);
-      this.textBox.TabIndex = 0;
+      this.stringConvertibleMatrixView.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.stringConvertibleMatrixView.Caption = "StringConvertibleMatrix View";
+      this.stringConvertibleMatrixView.Content = null;
+      this.stringConvertibleMatrixView.Location = new System.Drawing.Point(3, 3);
+      this.stringConvertibleMatrixView.Name = "stringConvertibleMatrixView";
+      this.stringConvertibleMatrixView.ReadOnly = false;
+      this.stringConvertibleMatrixView.ShowRowsAndColumnsTextBox = true;
+      this.stringConvertibleMatrixView.ShowStatisticalInformation = false;
+      this.stringConvertibleMatrixView.Size = new System.Drawing.Size(381, 230);
+      this.stringConvertibleMatrixView.TabIndex = 0;
       // 
-      // SupportVectorMachineModelView
+      // SupportVectorMachineModelSupportVectorsView
       // 
-      this.AllowDrop = true;
       this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
-      this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-      this.Controls.Add(this.textBox);
-      this.Name = "SupportVectorMachineModelView";
-      this.Size = new System.Drawing.Size(253, 251);
+      this.Controls.Add(this.stringConvertibleMatrixView);
+      this.Name = "SupportVectorMachineModelSupportVectorsView";
+      this.Size = new System.Drawing.Size(387, 236);
       this.ResumeLayout(false);
-      this.PerformLayout();
 
     }
@@ -76 +75 @@
     #endregion
 
-    private System.Windows.Forms.TextBox textBox;
-
-
+    private Data.Views.StringConvertibleMatrixView stringConvertibleMatrixView;
   }
 }

trunk/sources/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/SupportVectorMachineModelSupportVectorsView.cs

@@ -20 +20 @@
 #endregion
 using System;
-using System.IO;
 using System.Windows.Forms;
 using HeuristicLab.MainForm;
@@ -26 +25 @@
 
 namespace HeuristicLab.Algorithms.DataAnalysis.Views {
-  [View("Support vector machine model view")]
-  [Content(typeof(SupportVectorMachineModel), true)]
-  public partial class SupportVectorMachineModelView : AsynchronousContentView {
+  [View("Support vectors view")]
+  [Content(typeof(SupportVectorMachineModel), false)]
+  public partial class SupportVectorMachineModelSupportVectorsView : AsynchronousContentView {
 
     public new SupportVectorMachineModel Content {
@@ -35 +34 @@
     }
 
-    public SupportVectorMachineModelView()
+    public SupportVectorMachineModelSupportVectorsView()
       : base() {
       InitializeComponent();
@@ -42 +41 @@
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      if (Content == null)
-        textBox.Text = string.Empty;
+      if (Content != null)
+        stringConvertibleMatrixView.Content = Content.SupportVectors;
       else
-        UpdateTextBox();
+        stringConvertibleMatrixView.Content = null;
     }
 
@@ -57 +56 @@
     }
     private void Content_Changed(object sender, EventArgs e) {
-      UpdateTextBox();
-    }
-
-    private void UpdateTextBox() {
-      using (MemoryStream s = new MemoryStream()) {
-        StreamWriter writer = new StreamWriter(s);
-        writer.WriteLine("RangeTransform:");
-        writer.Flush();
-        using (MemoryStream memStream = new MemoryStream()) {
-          SVM.RangeTransform.Write(memStream, Content.RangeTransform);
-          memStream.Seek(0, SeekOrigin.Begin);
-          memStream.WriteTo(s);
-        }
-        writer.WriteLine("Model:");
-        writer.Flush();
-        using (MemoryStream memStream = new MemoryStream()) {
-          SVM.Model.Write(memStream, Content.Model);
-          memStream.Seek(0, SeekOrigin.Begin);
-          memStream.WriteTo(s);
-        }
-        s.Flush();
-        s.Seek(0, SeekOrigin.Begin);
-
-        StreamReader reader = new StreamReader(s);
-        textBox.Text = reader.ReadToEnd();
-      }
+      OnContentChanged();
     }
   }