Changeset 5906 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective
- Timestamp:
- 03/31/11 11:22:28 (13 years ago)
- Location:
- trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectiveMeanSquaredErrorEvaluator.cs
r5894 r5906 20 20 #endregion 21 21 22 using System.Linq;23 22 using System.Collections.Generic; 24 23 using HeuristicLab.Common; … … 51 50 double quality = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, solution, EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper, ProblemDataParameter.ActualValue, rows); 52 51 QualityParameter.ActualValue = new DoubleValue(quality); 53 AddEvaluatedNodes(solution.Length * rows.Count());54 52 55 53 return base.Apply(); … … 69 67 SymbolicDataAnalysisTreeInterpreterParameter.ExecutionContext = context; 70 68 EstimationLimitsParameter.ExecutionContext = context; 71 EvaluatedNodesParameter.ExecutionContext = context;72 69 73 70 double mse = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, tree, EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper, problemData, rows); 74 71 75 AddEvaluatedNodes(tree.Length * rows.Count());76 72 77 73 SymbolicDataAnalysisTreeInterpreterParameter.ExecutionContext = null; 78 74 EstimationLimitsParameter.ExecutionContext = null; 79 EvaluatedNodesParameter.ExecutionContext = null;80 75 81 76 return mse; -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/SymbolicRegressionSingleObjectivePearsonRSquaredEvaluator.cs
r5894 r5906 20 20 #endregion 21 21 22 using System;23 using System.Linq;24 22 using System.Collections.Generic; 25 23 using HeuristicLab.Common; … … 52 50 double quality = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, solution, EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper, ProblemDataParameter.ActualValue, rows); 53 51 QualityParameter.ActualValue = new DoubleValue(quality); 54 AddEvaluatedNodes(solution.Length * rows.Count());55 52 56 53 return base.Apply(); … … 69 66 SymbolicDataAnalysisTreeInterpreterParameter.ExecutionContext = context; 70 67 EstimationLimitsParameter.ExecutionContext = context; 71 EvaluatedNodesParameter.ExecutionContext = context;72 68 73 69 double r2 = Calculate(SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, tree, EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper, problemData, rows); 74 AddEvaluatedNodes(tree.Length * rows.Count());75 70 76 71 SymbolicDataAnalysisTreeInterpreterParameter.ExecutionContext = null; 77 72 EstimationLimitsParameter.ExecutionContext = null; 78 EvaluatedNodesParameter.ExecutionContext = null;79 73 80 74 return r2;
Note: See TracChangeset
for help on using the changeset viewer.