Changeset 5694 for branches/DataAnalysis Refactoring/HeuristicLab.Algorithms.DataAnalysis

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/HeuristicLab.Algorithms.DataAnalysis/3.4

Files:

• HeuristicLab.Algorithms.DataAnalysis-3.4.csproj (modified) (1 diff)
• Interfaces/ISupportVectorMachineModel.cs (added)
• Interfaces/ISupportVectorMachineSolution.cs (added)
• SupportVectorMachine/SupportVectorClassificationSolution.cs (modified) (1 diff)
• SupportVectorMachine/SupportVectorMachineModel.cs (modified) (4 diffs)
• SupportVectorMachine/SupportVectorRegressionSolution.cs (modified) (1 diff)

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; }
     }