Changeset 5894 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4

Timestamp:

03/30/11 18:04:03 (14 years ago)

Author:

gkronber

Message:

#1453: Added an ErrorState property to online evaluators to indicate if the result value is valid or if there has been an error in the calculation. Adapted all classes that use one of the online evaluators to check this property.

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/InteractiveSymbolicRegressionSolutionSimplifierView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/InteractiveSymbolicRegressionSolutionSimplifierView.cs

@@ -78 +78 @@
         .ToArray();
       var targetValues = dataset.GetEnumeratedVariableValues(targetVariable, rows);
-
-      double originalR2 = OnlinePearsonsRSquaredEvaluator.Calculate(targetValues, originalOutput);
+      OnlineEvaluatorError errorState;
+      double originalR2 = OnlinePearsonsRSquaredEvaluator.Calculate(targetValues, originalOutput, out errorState);
+      if (errorState != OnlineEvaluatorError.None) originalR2 = 0.0;
 
       foreach (ISymbolicExpressionTreeNode node in nodes) {
@@ -87 +88 @@
         SwitchNode(parent, node, replacementNode);
         var newOutput = interpreter.GetSymbolicExpressionTreeValues(tree, dataset, rows);
-        double newR2 = OnlinePearsonsRSquaredEvaluator.Calculate(targetValues, newOutput);
+        double newR2 = OnlinePearsonsRSquaredEvaluator.Calculate(targetValues, newOutput, out errorState);
+        if (errorState != OnlineEvaluatorError.None) newR2 = 0.0;
 
         // impact = 0 if no change