Changeset 5692 for trunk/sources/HeuristicLab.Problems.DataAnalysis

Timestamp:

03/15/11 15:51:55 (14 years ago)

Author:

gkronber

Message:

#1426 merged r5690 from data analysis refactoring branch (see #1418) into trunk to fix persistence problems of SVMs.

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis

Files:

• . (modified) (1 prop)
• 3.3/SupportVectorMachine/SupportVectorMachineModel.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/SupportVectorMachine/SupportVectorMachineModel.cs

@@ -37 +37 @@
   [Item("SupportVectorMachineModel", "Represents a support vector machine model.")]
   public sealed class SupportVectorMachineModel : NamedItem, IDataAnalysisModel {
-    [StorableConstructor]
-    private SupportVectorMachineModel(bool deserializing) : base(deserializing) { }
-    private SupportVectorMachineModel(SupportVectorMachineModel original, Cloner cloner)
-      : base(original, cloner) {
-      // only using a shallow copy here! (gkronber)
-      this.model = original.model;
-      this.rangeTransform = original.rangeTransform;
-    }
-    public SupportVectorMachineModel() : base() { }
-
     private SVM.Model model;
     /// <summary>
@@ -77 +67 @@
     }
 
+    public IEnumerable<double[]> SupportVectors {
+      get {
+        return from sv in Model.SupportVectors
+               select (from svx in sv
+                       select svx.Value).ToArray();
+      }
+    }
+
+    [StorableConstructor]
+    private SupportVectorMachineModel(bool deserializing) : base(deserializing) { }
+    private SupportVectorMachineModel(SupportVectorMachineModel original, Cloner cloner)
+      : base(original, cloner) {
+      // only using a shallow copy here! (gkronber)
+      this.model = original.model;
+      this.rangeTransform = original.rangeTransform;
+    }
+    public SupportVectorMachineModel() : base() { }
+
     public IEnumerable<double> GetEstimatedValues(DataAnalysisProblemData problemData, int start, int end) {
       SVM.Problem problem = SupportVectorMachineUtil.CreateSvmProblem(problemData, Enumerable.Range(start, end - start));
@@ -96 +104 @@
 
     #region persistence
-    [Storable]
-    private int[] SupportVectorIndizes {
-      get { return this.Model.SupportVectorIndizes; }
-      set { this.Model.SupportVectorIndizes = value; }
-    }
-
     [Storable]
     private string ModelAsString {