Changeset 17867

Timestamp:

03/09/21 08:39:25 (4 years ago)

Author:

gkronber

Message:

#2898: simplified code in Spline1dModel

File:

• trunk/HeuristicLab.Algorithms.DataAnalysis/3.4/GAM/Spline1dModel.cs (modified) (3 diffs)

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

@@ -37 +37 @@
     [Storable]
     private readonly string[] variablesUsedForPrediction;
-    public override IEnumerable<string> VariablesUsedForPrediction {
-      get {
-        return variablesUsedForPrediction;
-      }
-    }
+    public override IEnumerable<string> VariablesUsedForPrediction => variablesUsedForPrediction;
 
     [StorableConstructor]
@@ -54 +50 @@
     public Spline1dModel(alglib.spline1d.spline1dinterpolant interpolant, string targetVar, string inputVar)
       : base(targetVar, "Spline model (1d)") {
-      this.interpolant = (alglib.spline1d.spline1dinterpolant)interpolant.make_copy();      
+      this.interpolant = (alglib.spline1d.spline1dinterpolant)interpolant.make_copy();
       this.variablesUsedForPrediction = new string[] { inputVar };
     }
 
 
-    public override IDeepCloneable Clone(Cloner cloner) {
-      return new Spline1dModel(this, cloner);
-    }
+    public override IDeepCloneable Clone(Cloner cloner) => new Spline1dModel(this, cloner);
 
     public override IRegressionSolution CreateRegressionSolution(IRegressionProblemData problemData) {
@@ -67 +61 @@
     }
 
-    public double GetEstimatedValue(double x) {
-      return alglib.spline1d.spline1dcalc(interpolant, x);
-    }
+    public double GetEstimatedValue(double x) => alglib.spline1d.spline1dcalc(interpolant, x);
 
     public override IEnumerable<double> GetEstimatedValues(IDataset dataset, IEnumerable<int> rows) {
-      var x = dataset.GetDoubleValues(VariablesUsedForPrediction.First(), rows).ToArray();
-      foreach (var xi in x) {
-        yield return GetEstimatedValue(xi);
-      }
+      return dataset.GetDoubleValues(VariablesUsedForPrediction.First(), rows).Select(GetEstimatedValue);
     }