Changeset 16847 for branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/M5Regression/LeafModels/DampenedModel.cs

Timestamp:

04/19/19 13:06:11 (5 years ago)

Author:

gkronber

Message:

#2847: made some minor changes while reviewing

File:

• branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/M5Regression/LeafModels/DampenedModel.cs (modified) (6 diffs)

branches/2847_M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/M5Regression/LeafModels/DampenedModel.cs

@@ -24 +24 @@
 using System.Linq;
 using HeuristicLab.Common;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis;
+using HEAL.Attic;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {
   //mulitdimensional extension of http://www2.stat.duke.edu/~tjl13/s101/slides/unit6lec3H.pdf
-  [StorableClass]
+  [StorableType("42E9766F-207F-47B1-890C-D5DFCF469838")]
   public class DampenedModel : RegressionModel {
     [Storable]
@@ -41 +41 @@
 
     [StorableConstructor]
-    protected DampenedModel(bool deserializing) : base(deserializing) { }
+    protected DampenedModel(StorableConstructorFlag _) : base(_) { }
     protected DampenedModel(DampenedModel original, Cloner cloner) : base(original, cloner) {
       Model = cloner.Clone(original.Model);
@@ -69 +69 @@
       get { return Model.VariablesUsedForPrediction; }
     }
+
     public override IEnumerable<double> GetEstimatedValues(IDataset dataset, IEnumerable<int> rows) {
       var slow = Sigmoid(-Dampening);
@@ -79 +80 @@
       }
     }
+
     public override IRegressionSolution CreateRegressionSolution(IRegressionProblemData problemData) {
       return new RegressionSolution(this, problemData);
@@ -93 +95 @@
       return ((x - oMin) / d) * nd + nMin;
     }
+
     private static double Sigmoid(double x) {
       return 1 / (1 + Math.Exp(-x));
@@ -98 +101 @@
 
 
-    [StorableClass]
+    [StorableType("CCC93BEC-8796-4D8E-AC58-DD175073A79B")]
     private sealed class ConfidenceDampenedModel : DampenedModel, IConfidenceRegressionModel {
       #region HLConstructors
       [StorableConstructor]
-      private ConfidenceDampenedModel(bool deserializing) : base(deserializing) { }
+      private ConfidenceDampenedModel(StorableConstructorFlag _) : base(_) { }
       private ConfidenceDampenedModel(ConfidenceDampenedModel original, Cloner cloner) : base(original, cloner) { }
       public ConfidenceDampenedModel(IConfidenceRegressionModel model, IRegressionProblemData pd, double dampening) : base(model, pd, dampening) { }