Changeset 17080 for trunk/HeuristicLab.Algorithms.DataAnalysis.DecisionTrees/3.4/MetaModels

Timestamp:

07/05/19 11:08:57 (5 years ago)

Author:

gkronber

Message:

#2847: more changes for renaming the M5 plugin

Location:

trunk/HeuristicLab.Algorithms.DataAnalysis.DecisionTrees/3.4/MetaModels

Files:

• RegressionNodeTreeModel.cs (modified) (3 diffs)
• RegressionRuleModel.cs (modified) (2 diffs)
• RegressionRuleSetModel.cs (modified) (1 diff)

trunk/HeuristicLab.Algorithms.DataAnalysis.DecisionTrees/3.4/MetaModels/RegressionNodeTreeModel.cs

@@ -71 +71 @@
     #region IM5Model
     public void Build(IReadOnlyList<int> trainingRows, IReadOnlyList<int> pruningRows, IScope statescope, ResultCollection results, CancellationToken cancellationToken) {
-      var regressionTreeParams = (RegressionTreeParameters)statescope.Variables[M5Regression.RegressionTreeParameterVariableName].Value;
+      var regressionTreeParams = (RegressionTreeParameters)statescope.Variables[DecisionTreeRegression.RegressionTreeParameterVariableName].Value;
       //start with one node
       if (Root == null)
@@ -87 +87 @@
 
     public void Update(IReadOnlyList<int> rows, IScope statescope, CancellationToken cancellationToken) {
-      var regressionTreeParams = (RegressionTreeParameters)statescope.Variables[M5Regression.RegressionTreeParameterVariableName].Value;
+      var regressionTreeParams = (RegressionTreeParameters)statescope.Variables[DecisionTreeRegression.RegressionTreeParameterVariableName].Value;
       regressionTreeParams.LeafModel.Build(this, rows, statescope, cancellationToken);
     }
 
     public static void Initialize(IScope stateScope) {
-      var param = (RegressionTreeParameters)stateScope.Variables[M5Regression.RegressionTreeParameterVariableName].Value;
+      var param = (RegressionTreeParameters)stateScope.Variables[DecisionTreeRegression.RegressionTreeParameterVariableName].Value;
       stateScope.Variables.Add(new Variable(RootVariableName, RegressionNodeModel.CreateNode(param.TargetVariable, param)));
     }
@@ -98 +98 @@
 
     public void BuildModel(IReadOnlyList<int> trainingRows, IReadOnlyList<int> pruningRows, IScope statescope, ResultCollection results, CancellationToken cancellationToken) {
-      var regressionTreeParams = (RegressionTreeParameters)statescope.Variables[M5Regression.RegressionTreeParameterVariableName].Value;
+      var regressionTreeParams = (RegressionTreeParameters)statescope.Variables[DecisionTreeRegression.RegressionTreeParameterVariableName].Value;
       //start with one node
       Root = RegressionNodeModel.CreateNode(regressionTreeParams.TargetVariable, regressionTreeParams);

trunk/HeuristicLab.Algorithms.DataAnalysis.DecisionTrees/3.4/MetaModels/RegressionRuleModel.cs

@@ -83 +83 @@
 
     public void Build(IReadOnlyList<int> trainingRows, IReadOnlyList<int> pruningRows, IScope statescope, ResultCollection results, CancellationToken cancellationToken) {
-      var regressionTreeParams = (RegressionTreeParameters)statescope.Variables[M5Regression.RegressionTreeParameterVariableName].Value;
+      var regressionTreeParams = (RegressionTreeParameters)statescope.Variables[DecisionTreeRegression.RegressionTreeParameterVariableName].Value;
       variables = regressionTreeParams.AllowedInputVariables.ToList();
 
@@ -109 +109 @@
 
     public void Update(IReadOnlyList<int> rows, IScope statescope, CancellationToken cancellationToken) {
-      var regressionTreeParams = (RegressionTreeParameters)statescope.Variables[M5Regression.RegressionTreeParameterVariableName].Value;
+      var regressionTreeParams = (RegressionTreeParameters)statescope.Variables[DecisionTreeRegression.RegressionTreeParameterVariableName].Value;
       int np;
       RuleModel = regressionTreeParams.LeafModel.BuildModel(rows, regressionTreeParams, cancellationToken, out np);

trunk/HeuristicLab.Algorithms.DataAnalysis.DecisionTrees/3.4/MetaModels/RegressionRuleSetModel.cs

@@ -77 +77 @@
     #region IM5Model
     public void Build(IReadOnlyList<int> trainingRows, IReadOnlyList<int> pruningRows, IScope stateScope, ResultCollection results, CancellationToken cancellationToken) {
-      var regressionTreeParams = (RegressionTreeParameters)stateScope.Variables[M5Regression.RegressionTreeParameterVariableName].Value;
+      var regressionTreeParams = (RegressionTreeParameters)stateScope.Variables[DecisionTreeRegression.RegressionTreeParameterVariableName].Value;
       var ruleSetState = (RuleSetState)stateScope.Variables[RuleSetStateVariableName].Value;