Changeset 15018 for branches/PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear

Timestamp:

06/01/17 11:29:49 (8 years ago)

Author:

gkronber

Message:

#2520 introduced StorableConstructorFlag type for StorableConstructors

Location:

branches/PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear

Files:

• LinearDiscriminantAnalysis.cs (modified) (1 diff)
• LinearRegression.cs (modified) (1 diff)
• MultinomialLogitClassification.cs (modified) (1 diff)
• MultinomialLogitClassificationSolution.cs (modified) (1 diff)
• MultinomialLogitModel.cs (modified) (2 diffs)
• Scaling.cs (modified) (1 diff)

branches/PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/LinearDiscriminantAnalysis.cs

@@ -44 +44 @@
 
     [StorableConstructor]
-    private LinearDiscriminantAnalysis(bool deserializing) : base(deserializing) { }
+    private LinearDiscriminantAnalysis(StorableConstructorFlag deserializing) : base(deserializing) { }
     private LinearDiscriminantAnalysis(LinearDiscriminantAnalysis original, Cloner cloner)
       : base(original, cloner) {

branches/PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/LinearRegression.cs

@@ -44 +44 @@
 
     [StorableConstructor]
-    private LinearRegression(bool deserializing) : base(deserializing) { }
+    private LinearRegression(StorableConstructorFlag deserializing) : base(deserializing) { }
     private LinearRegression(LinearRegression original, Cloner cloner)
       : base(original, cloner) {

branches/PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/MultinomialLogitClassification.cs

@@ -42 +42 @@
 
     [StorableConstructor]
-    private MultiNomialLogitClassification(bool deserializing) : base(deserializing) { }
+    private MultiNomialLogitClassification(StorableConstructorFlag deserializing) : base(deserializing) { }
     private MultiNomialLogitClassification(MultiNomialLogitClassification original, Cloner cloner)
       : base(original, cloner) {

branches/PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/MultinomialLogitClassificationSolution.cs

@@ -39 +39 @@
 
     [StorableConstructor]
-    private MultinomialLogitClassificationSolution(bool deserializing) : base(deserializing) { }
+    private MultinomialLogitClassificationSolution(StorableConstructorFlag deserializing) : base(deserializing) { }
     private MultinomialLogitClassificationSolution(MultinomialLogitClassificationSolution original, Cloner cloner)
       : base(original, cloner) {

branches/PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/MultinomialLogitModel.cs

@@ -36 +36 @@
   public sealed class MultinomialLogitModel : ClassificationModel {
 
-    private alglib.logitmodel logitModel;
+    private alglib.logitmodel logitModel = new alglib.logitmodel();
     public alglib.logitmodel Model {
       get { return logitModel; }
@@ -60 +60 @@
 
     [StorableConstructor]
-    private MultinomialLogitModel(bool deserializing)
+    private MultinomialLogitModel(StorableConstructorFlag deserializing)
       : base(deserializing) {
-      if (deserializing)
-        logitModel = new alglib.logitmodel();
     }
     private MultinomialLogitModel(MultinomialLogitModel original, Cloner cloner)

branches/PersistenceReintegration/HeuristicLab.Algorithms.DataAnalysis/3.4/Linear/Scaling.cs

@@ -36 +36 @@
     private Dictionary<string, Tuple<double, double>> scalingParameters = new Dictionary<string, Tuple<double, double>>();
     [StorableConstructor]
-    protected Scaling(bool deserializing) : base(deserializing) { }
+    protected Scaling(StorableConstructorFlag deserializing) : base(deserializing) { }
     protected Scaling(Scaling original, Cloner cloner)
       : base(original, cloner) {