Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
03/31/11 11:22:28 (13 years ago)
Author:
mkommend
Message:

#1411: Reverted changesets regarding the number of evaluated nodes.

Location:
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveMeanSquaredErrorTreeSizeEvaluator.cs

    r5894 r5906  
    2020#endregion
    2121
    22 using System.Linq;
    2322using System.Collections.Generic;
    2423using HeuristicLab.Common;
    … …  
    5049      double[] qualities = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, solution, EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper, ProblemDataParameter.ActualValue, rows);
    5150      QualitiesParameter.ActualValue = new DoubleArray(qualities);
    52       AddEvaluatedNodes(solution.Length * rows.Count());
    5351      return base.Apply();
    5452    }
    … …  
    6765      SymbolicDataAnalysisTreeInterpreterParameter.ExecutionContext = context;
    6866      EstimationLimitsParameter.ExecutionContext = context;
    69       EvaluatedNodesParameter.ExecutionContext = context;
    7067
    7168      double[] quality = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, tree, EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper, problemData, rows);
    72       AddEvaluatedNodes(tree.Length * rows.Count());
    7369
    7470      SymbolicDataAnalysisTreeInterpreterParameter.ExecutionContext = null;
    7571      EstimationLimitsParameter.ExecutionContext = null;
    76       EvaluatedNodesParameter.ExecutionContext = null;
    7772
    7873      return quality;

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectivePearsonRSquaredTreeSizeEvaluator.cs

    r5894 r5906  
    2020#endregion
    2121
    22 using System;
    23 using System.Linq;
    2422using System.Collections.Generic;
    2523using HeuristicLab.Common;
    … …  
    5149      double[] qualities = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, solution, EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper, ProblemDataParameter.ActualValue, rows);
    5250      QualitiesParameter.ActualValue = new DoubleArray(qualities);
    53       AddEvaluatedNodes(solution.Length * rows.Count());
    5451      return base.Apply();
    5552    }
    … …  
    6764      SymbolicDataAnalysisTreeInterpreterParameter.ExecutionContext = context;
    6865      EstimationLimitsParameter.ExecutionContext = context;
    69       EvaluatedNodesParameter.ExecutionContext = context;
    7066
    7167      double[] quality = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, tree, EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper, problemData, rows);
    72       AddEvaluatedNodes(tree.Length * rows.Count());
    7368
    7469      SymbolicDataAnalysisTreeInterpreterParameter.ExecutionContext = null;
    7570      EstimationLimitsParameter.ExecutionContext = null;
    76       EvaluatedNodesParameter.ExecutionContext = null;
    7771
    7872      return quality;

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveMeanSquaredErrorEvaluator.cs

    r5894 r5906  
    2020#endregion
    2121
    22 using System.Linq;
    2322using System.Collections.Generic;
    2423using HeuristicLab.Common;
    … …  
    5150      double quality = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, solution, EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper, ProblemDataParameter.ActualValue, rows);
    5251      QualityParameter.ActualValue = new DoubleValue(quality);
    53       AddEvaluatedNodes(solution.Length * rows.Count());
    5452
    5553      return base.Apply();
    … …  
    6967      SymbolicDataAnalysisTreeInterpreterParameter.ExecutionContext = context;
    7068      EstimationLimitsParameter.ExecutionContext = context;
    71       EvaluatedNodesParameter.ExecutionContext = context;
    7269
    7370      double mse = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, tree, EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper, problemData, rows);
    7471
    75       AddEvaluatedNodes(tree.Length * rows.Count());
    7672
    7773      SymbolicDataAnalysisTreeInterpreterParameter.ExecutionContext = null;
    7874      EstimationLimitsParameter.ExecutionContext = null;
    79       EvaluatedNodesParameter.ExecutionContext = null;
    8075
    8176      return mse;

  • trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator.cs

    r5894 r5906  
    2020#endregion
    2121
    22 using System;
    23 using System.Linq;
    2422using System.Collections.Generic;
    2523using HeuristicLab.Common;
    … …  
    5250      double quality = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, solution, EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper, ProblemDataParameter.ActualValue, rows);
    5351      QualityParameter.ActualValue = new DoubleValue(quality);
    54       AddEvaluatedNodes(solution.Length * rows.Count());
    5552
    5653      return base.Apply();
    … …  
    6966      SymbolicDataAnalysisTreeInterpreterParameter.ExecutionContext = context;
    7067      EstimationLimitsParameter.ExecutionContext = context;
    71       EvaluatedNodesParameter.ExecutionContext = context;
    7268
    7369      double r2 = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, tree, EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper, problemData, rows);
    74       AddEvaluatedNodes(tree.Length * rows.Count());
    7570
    7671      SymbolicDataAnalysisTreeInterpreterParameter.ExecutionContext = null;
    7772      EstimationLimitsParameter.ExecutionContext = null;
    78       EvaluatedNodesParameter.ExecutionContext = null;
    7973
    8074      return r2;
Note: See TracChangeset for help on using the changeset viewer.