Changeset 16069 for branches

Timestamp:

08/08/18 09:59:35 (6 years ago)

Author:

bwerth

Message:

#2847 fixed serialization bug

Location:

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/M5Regression/MetaModels

Files:

• RegressionNodeModel.cs (modified) (4 diffs)
• RegressionNodeTreeModel.cs (modified) (1 diff)

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/M5Regression/MetaModels/RegressionNodeModel.cs

@@ -23 +23 @@
 using System.Collections.Generic;
 using System.Linq;
-using System.Threading;
 using HeuristicLab.Common;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
@@ -33 +32 @@
     #region Properties
     public double PruningStrength = double.NaN;
-
-    [Storable]
     private IReadOnlyList<string> Variables {
       get {
@@ -52 +49 @@
     internal bool IsLeaf { get; private set; }
     [Storable]
-    internal IRegressionModel Model { get; private set; }
+    private IRegressionModel Model { get; set; }
 
     [Storable]
@@ -168 +165 @@
 
       private double GetEstimatedVariance(IDataset dataset, int row) {
-        if (!IsLeaf)
-          return ((IConfidenceRegressionModel)(dataset.GetDoubleValue(SplitAttribute, row) <= SplitValue ? Left : Right)).GetEstimatedVariances(dataset, row.ToEnumerable()).Single();
-        return ((IConfidenceRegressionModel)Model).GetEstimatedVariances(dataset, new[] {row}).First();
+        return !IsLeaf ? ((IConfidenceRegressionModel)(dataset.GetDoubleValue(SplitAttribute, row) <= SplitValue ? Left : Right)).GetEstimatedVariances(dataset, row.ToEnumerable()).Single() : ((IConfidenceRegressionModel)Model).GetEstimatedVariances(dataset, new[] {row}).First();
       }
 

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/M5Regression/MetaModels/RegressionNodeTreeModel.cs

@@ -26 +26 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
-using HeuristicLab.Data;
 using HeuristicLab.Optimization;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;