Changeset 15967 for branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/M5Regression/LeafModels/ComponentReducedLinearModel.cs

Timestamp:

06/20/18 09:53:28 (6 years ago)

Author:

bwerth

Message:

#2847 added logistic dampening and some minor changes

File:

• branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/M5Regression/LeafModels/ComponentReducedLinearModel.cs (modified) (3 diffs)

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/M5Regression/LeafModels/ComponentReducedLinearModel.cs

@@ -28 +28 @@
 namespace HeuristicLab.Algorithms.DataAnalysis {
   [StorableClass]
-  public class ComponentReducedLinearModel : RegressionModel, IConfidenceRegressionModel {
+  public class ComponentReducedLinearModel : RegressionModel {
     [Storable]
-    private IConfidenceRegressionModel Model;
+    private IRegressionModel Model;
     [Storable]
     private PrincipleComponentTransformation Pca;
@@ -40 +40 @@
       Pca = cloner.Clone(original.Pca);
     }
-    public ComponentReducedLinearModel(string targetVariable, IConfidenceRegressionModel model, PrincipleComponentTransformation pca) : base(targetVariable) {
+    public ComponentReducedLinearModel(string targetVariable, IRegressionModel model, PrincipleComponentTransformation pca) : base(targetVariable) {
       Model = model;
       Pca = pca;
@@ -56 +56 @@
     }
     public override IRegressionSolution CreateRegressionSolution(IRegressionProblemData problemData) {
-      return new ConfidenceRegressionSolution(this, problemData);
-    }
-    public IEnumerable<double> GetEstimatedVariances(IDataset dataset, IEnumerable<int> rows) {
-      var data = ReduceDataset(dataset, rows.ToArray());
-      return Model.GetEstimatedVariances(Pca.TransformDataset(data), Enumerable.Range(0, data.Rows));
+      return new RegressionSolution(this, problemData);
     }