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

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.Regression

Files:

• . (modified) (1 prop)
• 3.3/SupportVectorRegression/SupportVectorRegressionSolution.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/SupportVectorRegression/SupportVectorRegressionSolution.cs

@@ -46 +46 @@
     }
 
-    public Dataset SupportVectors {
-      get { return CalculateSupportVectors(); }
-    }
-
     private List<double> estimatedValues;
     public override IEnumerable<double> EstimatedValues {
@@ -70 +66 @@
     }
 
+    public Dataset SupportVectors {
+      get {
+        int nCol = inputVariables.Count;
+        double[,] data = new double[Model.Model.SupportVectorCount, nCol];
+        int row = 0;
+        foreach (var sv in Model.SupportVectors) {
+          for (int col = 0; col < nCol; col++) {
+            data[row, col] = sv[col];
+          }
+          row++;
+        }
+        return new Dataset(inputVariables, data);
+      }
+    }
+
+    [Storable]
+    private List<string> inputVariables;
+
     [StorableConstructor]
     private SupportVectorRegressionSolution(bool deserializing) : base(deserializing) { }
-    private SupportVectorRegressionSolution(SupportVectorRegressionSolution original, Cloner cloner) : base(original, cloner) { }
+    private SupportVectorRegressionSolution(SupportVectorRegressionSolution original, Cloner cloner)
+      : base(original, cloner) {
+      this.inputVariables = new List<string>(original.inputVariables);
+    }
     public SupportVectorRegressionSolution() : base() { }
     public SupportVectorRegressionSolution(DataAnalysisProblemData problemData, SupportVectorMachineModel model, IEnumerable<string> inputVariables, double lowerEstimationLimit, double upperEstimationLimit)
       : base(problemData, lowerEstimationLimit, upperEstimationLimit) {
       this.Model = model;
+      this.inputVariables = new List<string>(inputVariables);
+    }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      #region backwards compatibility
+      if (inputVariables == null) inputVariables = ProblemData.InputVariables.CheckedItems.Select(x => x.Value.Value).ToList();
+      #endregion
     }
 
     public override IDeepCloneable Clone(Cloner cloner) {
       return new SupportVectorRegressionSolution(this, cloner);
-    }
-
-    protected override void OnProblemDataChanged() {
-      Model.Model.SupportVectorIndizes = new int[0];
-      base.OnProblemDataChanged();
-    }
-
-    private Dataset CalculateSupportVectors() {
-      if (Model.Model.SupportVectorIndizes.Length == 0)
-        return new Dataset(new List<string>(), new double[0, 0]);
-
-      double[,] data = new double[Model.Model.SupportVectorIndizes.Length, ProblemData.Dataset.Columns];
-      for (int i = 0; i < Model.Model.SupportVectorIndizes.Length; i++) {
-        for (int column = 0; column < ProblemData.Dataset.Columns; column++)
-          data[i, column] = ProblemData.Dataset[Model.Model.SupportVectorIndizes[i], column];
-      }
-      return new Dataset(ProblemData.Dataset.VariableNames, data);
     }