Changeset 5694

Timestamp:

03/15/11 17:02:57 (13 years ago)

Author:

gkronber

Message:

#1418 ported views for support vector machine solutions and models.

Location:

branches/DataAnalysis Refactoring

Files:

• HeuristicLab.Algorithms.DataAnalysis.Views/3.4 (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis.Views/3.4/HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj (modified) (3 diffs)
• HeuristicLab.Algorithms.DataAnalysis.Views/3.4/SupportVectorMachineModelView.Designer.cs (copied) (copied from branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views/3.3/SupportVectorMachineModelView.Designer.cs) (1 diff)
• HeuristicLab.Algorithms.DataAnalysis.Views/3.4/SupportVectorMachineModelView.cs (copied) (copied from branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views/3.3/SupportVectorMachineModelView.cs) (2 diffs)
• HeuristicLab.Algorithms.DataAnalysis.Views/3.4/SupportVectorRegressionSolutionView.Designer.cs (copied) (copied from branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views/3.3/SupportVectorRegressionSolutionView.Designer.cs)
• HeuristicLab.Algorithms.DataAnalysis.Views/3.4/SupportVectorRegressionSolutionView.cs (copied) (copied from branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views/3.3/SupportVectorRegressionSolutionView.cs) (2 diffs)
• HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj (modified) (1 diff)
• HeuristicLab.Algorithms.DataAnalysis/3.4/Interfaces/ISupportVectorMachineModel.cs (added)
• HeuristicLab.Algorithms.DataAnalysis/3.4/Interfaces/ISupportVectorMachineSolution.cs (added)
• HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorClassificationSolution.cs (modified) (1 diff)
• HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorMachineModel.cs (modified) (4 diffs)
• HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorRegressionSolution.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisSolutionView.Designer.cs (copied) (copied from branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views/3.3/DataAnalysisSolutionView.Designer.cs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisSolutionView.cs (copied) (copied from branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views/3.3/DataAnalysisSolutionView.cs) (2 diffs)
• HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj (modified) (1 diff)

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis.Views/3.4

@@ -3 +3 @@
 HeuristicLabAlgorithmsDataAnalysisViewsPlugin.cs
 *.vs10x
+*.user

@@ -3 +3 @@
 HeuristicLabAlgorithmsDataAnalysisViewsPlugin.cs
 *.vs10x
+*.user

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/HeuristicLab.Algorithms.DataAnalysis.Views-3.4.csproj

@@ -122 +122 @@
     <Compile Include="HeuristicLabAlgorithmsDataAnalysisViewsPlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="SupportVectorMachineModelView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="SupportVectorMachineModelView.Designer.cs">
+      <DependentUpon>SupportVectorMachineModelView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="SupportVectorRegressionSolutionView.cs" />
+    <Compile Include="SupportVectorRegressionSolutionView.Designer.cs">
+      <DependentUpon>SupportVectorRegressionSolutionView.cs</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
@@ -161 +171 @@
       <Name>HeuristicLab.Data-3.3</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.LibSVM\1.6.3\HeuristicLab.LibSVM-1.6.3\HeuristicLab.LibSVM-1.6.3.csproj">
+      <Project>{89B50302-9CEE-4D13-9779-633EADCAE624}</Project>
+      <Name>HeuristicLab.LibSVM-1.6.3 %28HeuristicLab.ExtLibs\HeuristicLab.LibSVM\HeuristicLab.LibSVM-1.6.3\HeuristicLab.LibSVM-1.6.3%29</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.ExtLibs\HeuristicLab.LibSVM\1.6.3\LibSVM-1.6.3\LibSVM-1.6.3.csproj">
+      <Project>{A16F23B5-FB62-499E-A831-26953AA56FE2}</Project>
+      <Name>LibSVM-1.6.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.MainForm.WindowsForms\3.3\HeuristicLab.MainForm.WindowsForms-3.3.csproj">
       <Project>{AB687BBE-1BFE-476B-906D-44237135431D}</Project>
@@ -180 +198 @@
       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
       <Name>HeuristicLab.PluginInfrastructure-3.3</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis.Views\3.4\HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj">
+      <Project>{3E9E8944-44FF-40BB-A622-3A4A7DD0F198}</Project>
+      <Name>HeuristicLab.Problems.DataAnalysis.Views-3.4</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Problems.DataAnalysis\3.4\HeuristicLab.Problems.DataAnalysis-3.4.csproj">

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/SupportVectorMachineModelView.Designer.cs

@@ -19 +19 @@
  */
 #endregion
-namespace HeuristicLab.Problems.DataAnalysis.Views {
+
+namespace HeuristicLab.Algorithms.DataAnalysis.Views {
   partial class SupportVectorMachineModelView {
     /// <summary> 

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/SupportVectorMachineModelView.cs

@@ -24 +24 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
-using HeuristicLab.Problems.DataAnalysis.SupportVectorMachine;
 
-namespace HeuristicLab.Problems.DataAnalysis.Views {
-  [View("Support Vector Machine Model View")]
+namespace HeuristicLab.Algorithms.DataAnalysis.Views {
+  [View("Support vector machine model view")]
   [Content(typeof(SupportVectorMachineModel), true)]
   public partial class SupportVectorMachineModelView : AsynchronousContentView {
@@ -63 +62 @@
     private void UpdateTextBox() {
       using (MemoryStream s = new MemoryStream()) {
-        SupportVectorMachineModel.Export(Content, s);
-        s.Seek(0, System.IO.SeekOrigin.Begin);
+        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();
+
         StreamReader reader = new StreamReader(s);
         textBox.Text = reader.ReadToEnd();

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis.Views/3.4/SupportVectorRegressionSolutionView.cs

@@ -22 +22 @@
 using HeuristicLab.MainForm;
 using HeuristicLab.MainForm.WindowsForms;
-using HeuristicLab.Problems.DataAnalysis.Regression.SupportVectorRegression;
+using HeuristicLab.Algorithms.DataAnalysis;
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
-  [View("Support Vector Regression Solution View")]
-  [Content(typeof(SupportVectorRegressionSolution))]
+  [View("Support vector machine solution view")]
+  [Content(typeof(ISupportVectorMachineSolution))]
   public partial class SupportVectorRegressionSolutionView : DataAnalysisSolutionView {
 
-    public new SupportVectorRegressionSolution Content {
-      get { return (SupportVectorRegressionSolution)base.Content; }
+    public new ISupportVectorMachineSolution Content {
+      get { return (ISupportVectorMachineSolution)base.Content; }
       set { base.Content = value; }
     }
@@ -42 +42 @@
       base.OnContentChanged();
       if (Content != null) {
-        supportVectorViewHost.Content = Content.SupportVectors;
+        supportVectorViewHost.Content = Content.Model.SupportVectors;
       } else {
         supportVectorViewHost.Content = null;

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj

@@ -112 +112 @@
     <Compile Include="HeuristicLabAlgorithmsDataAnalysisPlugin.cs" />
     <Compile Include="FixedDataAnalysisAlgorithm.cs" />
+    <Compile Include="Interfaces\ISupportVectorMachineModel.cs" />
+    <Compile Include="Interfaces\ISupportVectorMachineSolution.cs" />
     <Compile Include="Interfaces\IDataAnalysisAlgorithm.cs" />
     <Compile Include="kMeans\KMeansClustering.cs" />

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorClassificationSolution.cs

@@ -35 +35 @@
   [Item("SupportVectorClassificationSolution", "Represents a support vector solution for a classification problem which can be visualized in the GUI.")]
   [StorableClass]
-  public sealed class SupportVectorClassificationSolution : ClassificationSolution {
+  public sealed class SupportVectorClassificationSolution : ClassificationSolution, ISupportVectorMachineSolution {
 
-    public new SupportVectorMachineModel Model {
-      get { return (SupportVectorMachineModel)base.Model; }
+    public new ISupportVectorMachineModel Model {
+      get { return (ISupportVectorMachineModel)base.Model; }
     }
 

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorMachineModel.cs

@@ -38 +38 @@
   [StorableClass]
   [Item("SupportVectorMachineModel", "Represents a support vector machine model.")]
-  public sealed class SupportVectorMachineModel : NamedItem, IRegressionModel, IClassificationModel {
+  public sealed class SupportVectorMachineModel : NamedItem, ISupportVectorMachineModel, IRegressionModel, IClassificationModel {
 
     private SVM.Model model;
@@ -76 +76 @@
           var sv = Model.SupportVectors[i];
           for (int j = 0; j < sv.Length; j++) {
-            data[i, sv[j].Index] = sv[j].Value;
+            data[i, j] = sv[j].Value;
           }
         }
@@ -118 +118 @@
       return new SupportVectorMachineModel(this, cloner);
     }
-
 
     #region IRegressionModel Members
@@ -196 +195 @@
       }
     }
-    #endregion
+    #endregion    
   }
 }

branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis/3.4/SupportVectorMachine/SupportVectorRegressionSolution.cs

@@ -35 +35 @@
   [Item("SupportVectorRegressionSolution", "Represents a support vector solution for a regression problem which can be visualized in the GUI.")]
   [StorableClass]
-  public sealed class SupportVectorRegressionSolution : RegressionSolution {
+  public sealed class SupportVectorRegressionSolution : RegressionSolution, ISupportVectorMachineSolution {
 
-    public new SupportVectorMachineModel Model {
-      get { return (SupportVectorMachineModel)base.Model; }
+    public new ISupportVectorMachineModel Model {
+      get { return (ISupportVectorMachineModel)base.Model; }
     }
 

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views/3.4/DataAnalysisSolutionView.cs

@@ -25 +25 @@
 
 namespace HeuristicLab.Problems.DataAnalysis.Views {
-  [View("Data Analysis Solution View")]
-  [Content(typeof(DataAnalysisSolution))]
+  [View("Data analysis solution view")]
+  [Content(typeof(IDataAnalysisSolution))]
   public partial class DataAnalysisSolutionView : AsynchronousContentView {
     public DataAnalysisSolutionView() {
@@ -32 +32 @@
     }
 
-    public new DataAnalysisSolution Content {
-      get { return (DataAnalysisSolution)base.Content; }
+    public new IDataAnalysisSolution Content {
+      get { return (IDataAnalysisSolution)base.Content; }
       set { base.Content = value; }
     }

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Views/3.4/HeuristicLab.Problems.DataAnalysis.Views-3.4.csproj

@@ -140 +140 @@
       <DependentUpon>DiscriminantFunctionClassificationSolutionView.cs</DependentUpon>
     </Compile>
+    <Compile Include="DataAnalysisSolutionView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="DataAnalysisSolutionView.Designer.cs">
+      <DependentUpon>DataAnalysisSolutionView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Regression\RegressionSolutionEstimatedValuesView.cs">
       <SubType>UserControl</SubType>

@@ -3 +3 @@
 HeuristicLabAlgorithmsDataAnalysisViewsPlugin.cs
 *.vs10x
+*.user