Changeset 17812 for trunk

Timestamp:

12/31/20 15:45:14 (4 years ago)

Author:

gkronber

Message:

#2898: copied implementation from branch to trunk.

Location:

trunk/HeuristicLab.Algorithms.DataAnalysis/3.4

Files:

• GAM (copied) (copied from branches/2898_GeneralizedAdditiveModels/HeuristicLab.Algorithms.DataAnalysis/3.4/GAM)
• GAM/GeneralizedAdditiveModelAlgorithm.cs (modified) (4 diffs)
• GAM/Spline1dModel.cs (modified) (4 diffs)
• HeuristicLab.Algorithms.DataAnalysis-3.4.csproj (modified) (1 diff)

trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GAM/GeneralizedAdditiveModelAlgorithm.cs

@@ -25 +25 @@
 using System.Linq;
 using System.Threading;
+using HEAL.Attic;
 using HeuristicLab.Analysis;
 using HeuristicLab.Common;
@@ -31 +32 @@
 using HeuristicLab.Optimization;
 using HeuristicLab.Parameters;
-using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Random;
 
 namespace HeuristicLab.Algorithms.DataAnalysis {
-  [Item("Generalized Additive Model (GAM)",
-    "Generalized Additive Model Algorithm")]
-  [StorableClass]
+  [Item("Generalized Additive Model (GAM)", "Generalized additive model using uni-variate penalized regression splines as base learner.")]
+  [StorableType("98A887E7-73DD-4602-BD6C-2F6B9E6FBBC5")]
   [Creatable(CreatableAttribute.Categories.DataAnalysisRegression, Priority = 600)]
   public sealed class GeneralizedAdditiveModelAlgorithm : FixedDataAnalysisAlgorithm<IRegressionProblem> {
@@ -104 +103 @@
 
     [StorableConstructor]
-    private GeneralizedAdditiveModelAlgorithm(bool deserializing)
+    private GeneralizedAdditiveModelAlgorithm(StorableConstructorFlag deserializing)
       : base(deserializing) {
     }
@@ -228 +227 @@
       alglib.spline1dinterpolant s;
       alglib.spline1dfitreport rep;
-      int numKnots = (int)Math.Min(50, 3 * Math.Sqrt(x.Length)); // heuristic for number of knots  (forgot the source, but it is probably the R documentation or Elements of Statistical Learning)
+      int numKnots = (int)Math.Min(50, 3 * Math.Sqrt(x.Length)); // heuristic for number of knots  (Elements of Statistical Learning)
 
       alglib.spline1dfitpenalized(x, y, numKnots, lambda, out info, out s, out rep);

trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GAM/Spline1dModel.cs

@@ -22 +22 @@
 
 using System;
+using HEAL.Attic;
 using System.Collections.Generic;
 using System.Linq;
@@ -32 +33 @@
   [Item("Spline model (1d)",
     "Univariate spline model (wrapper for alglib.spline1dmodel)")]
-  [StorableClass]
+  [StorableType("23D71839-E011-4DC5-B451-2D4C1177D743")]
   public sealed class Spline1dModel : RegressionModel {
     // not storable! see persistence properties below
@@ -38 +39 @@
 
     [Storable]
-    private string[] variablesUsedForPrediction;
+    private readonly string[] variablesUsedForPrediction;
     public override IEnumerable<string> VariablesUsedForPrediction {
       get {
@@ -46 +47 @@
 
     [StorableConstructor]
-    private Spline1dModel(bool deserializing) : base(deserializing) {
+    private Spline1dModel(StorableConstructorFlag deserializing) : base(deserializing) {
       this.interpolant = new alglib.spline1d.spline1dinterpolant();
     }

trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/HeuristicLab.Algorithms.DataAnalysis-3.4.csproj

@@ -133 +133 @@
     <Compile Include="DoubleArrayExtensions.cs" />
     <Compile Include="FixedDataAnalysisAlgorithm.cs" />
+    <Compile Include="GAM\GeneralizedAdditiveModelAlgorithm.cs" />
+    <Compile Include="GAM\Spline1dModel.cs" />
     <Compile Include="GaussianProcess\CovarianceFunctions\CovarianceSpectralMixture.cs" />
     <Compile Include="GaussianProcess\CovarianceFunctions\CovariancePiecewisePolynomial.cs" />