Changeset 5894 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective
- Timestamp:
- 03/30/11 18:04:03 (14 years ago)
- Location:
- trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveBoundedMeanSquaredErrorEvaluator.cs
r5851 r5894 63 63 IEnumerator<double> originalEnumerator = originalValues.GetEnumerator(); 64 64 IEnumerator<double> estimatedEnumerator = estimatedValues.GetEnumerator(); 65 OnlineMeanSquaredErrorEvaluator mseEvaluator = new OnlineMeanSquaredErrorEvaluator();66 65 double errorSum = 0.0; 67 66 int n = 0; -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectiveMeanSquaredErrorEvaluator.cs
r5851 r5894 58 58 IEnumerable<double> originalValues = problemData.Dataset.GetEnumeratedVariableValues(problemData.TargetVariable, rows); 59 59 IEnumerable<double> boundedEstimationValues = estimatedValues.LimitToRange(lowerEstimationLimit, upperEstimationLimit); 60 return OnlineMeanSquaredErrorEvaluator.Calculate(originalValues, boundedEstimationValues); 60 OnlineEvaluatorError errorState; 61 double mse = OnlineMeanSquaredErrorEvaluator.Calculate(originalValues, boundedEstimationValues, out errorState); 62 if (errorState != OnlineEvaluatorError.None) return double.NaN; 63 else return mse; 61 64 } 62 65 -
trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Classification/3.4/SingleObjective/SymbolicClassificationSingleObjectivePearsonRSquaredEvaluator.cs
r5851 r5894 58 58 IEnumerable<double> estimatedValues = interpreter.GetSymbolicExpressionTreeValues(solution, problemData.Dataset, rows); 59 59 IEnumerable<double> originalValues = problemData.Dataset.GetEnumeratedVariableValues(problemData.TargetVariable, rows); 60 double r2 = OnlinePearsonsRSquaredEvaluator.Calculate(estimatedValues, originalValues); 61 return double.IsNaN(r2) ? 0.0 : r2; 60 OnlineEvaluatorError errorState; 61 double r2 = OnlinePearsonsRSquaredEvaluator.Calculate(estimatedValues, originalValues, out errorState); 62 if (errorState != OnlineEvaluatorError.None) return 0.0; 63 else return r2; 62 64 } 63 65 … … 72 74 SymbolicDataAnalysisTreeInterpreterParameter.ExecutionContext = null; 73 75 EstimationLimitsParameter.ExecutionContext = null; 74 EvaluatedNodesParameter.ExecutionContext = null; 76 EvaluatedNodesParameter.ExecutionContext = null; 75 77 76 78 return r2;
Note: See TracChangeset
for help on using the changeset viewer.