Changeset 15470 for branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/M5Regression/LeafTypes

Timestamp:

11/10/17 12:56:36 (6 years ago)

Author:

bwerth

Message:

#2847 worked on M5Regression

File:

• branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/M5Regression/LeafTypes/ComponentReductionLinearLeaf.cs (modified) (2 diffs)

branches/M5Regression/HeuristicLab.Algorithms.DataAnalysis/3.4/M5Regression/LeafTypes/ComponentReductionLinearLeaf.cs

@@ -58 +58 @@
     public IConfidenceRegressionModel BuildModel(IRegressionProblemData pd, IRandom random,
       CancellationToken cancellation, out int noParameters) {
-      var pca = PrincipleComponentAnalysisStatic.Create(pd.Dataset, pd.TrainingIndices, pd.AllowedInputVariables, true);
-      var pcdata = pca.ProjectProblem(pd);
+      var pca = PrincipleComponentTransformation.CreateProjection(pd.Dataset, pd.TrainingIndices, pd.AllowedInputVariables, true);
+      var pcdata = pca.TransformProblemData(pd);
       ComponentReducedLinearModel bestModel = null;
       var bestCvrmse = double.MaxValue;
@@ -65 +65 @@
       for (var i = 1; i <= Math.Min(NoComponents, pd.AllowedInputVariables.Count()); i++) {
         var pd2 = (IRegressionProblemData) pcdata.Clone();
-        var inputs = new HashSet<string>(pca.Names.Take(i));
+        var inputs = new HashSet<string>(pca.ComponentNames.Take(i));
         foreach (var v in pd2.InputVariables.CheckedItems.ToArray())
           pd2.InputVariables.SetItemCheckedState(v.Value, inputs.Contains(v.Value.Value));