Changeset 5169 for trunk

Timestamp:

12/23/10 11:37:29 (14 years ago)

Author:

mkommend

Message:

Added check for ExecutionContext in scaled evaluators (ticket #1352).

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Evaluators

Files:

• SymbolicRegressionScaledMeanAndVarianceSquaredErrorEvaluator.cs (modified) (1 diff)
• SymbolicRegressionScaledMeanSquaredErrorEvaluator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Evaluators/SymbolicRegressionScaledMeanAndVarianceSquaredErrorEvaluator.cs

@@ -115 +115 @@
       double bias, variance, covariance;
       double mse;
-      if (ApplyScaling.Value) {
-        mse = Calculate(interpreter, solution, LowerEstimationLimit.Value, UpperEstimationLimit.Value, dataset, targetVariable, rows, out beta, out alpha, out meanSE, out varianceSE, out count, out bias, out variance, out covariance);
-        Alpha = new DoubleValue(alpha);
-        Beta = new DoubleValue(beta);
+      if (ExecutionContext != null) {
+        if (ApplyScaling.Value) {
+          mse = Calculate(interpreter, solution, lowerEstimationLimit, upperEstimationLimit, dataset, targetVariable, rows, out beta, out alpha, out meanSE, out varianceSE, out count, out bias, out variance, out covariance);
+          Alpha = new DoubleValue(alpha);
+          Beta = new DoubleValue(beta);
+        } else {
+          mse = CalculateWithScaling(interpreter, solution,lowerEstimationLimit, upperEstimationLimit, dataset, targetVariable, rows, 1, 0, out meanSE, out varianceSE, out count, out bias, out variance, out covariance);
+        }
+        QualityVariance = new DoubleValue(varianceSE);
+        QualitySamples = new IntValue(count);
+        DecompositionBiasParameter.ActualValue = new DoubleValue(bias / meanSE);
+        DecompositionVarianceParameter.ActualValue = new DoubleValue(variance / meanSE);
+        DecompositionCovarianceParameter.ActualValue = new DoubleValue(covariance / meanSE);
       } else {
-        mse = CalculateWithScaling(interpreter, solution, LowerEstimationLimit.Value, UpperEstimationLimit.Value, dataset, targetVariable, rows, 1, 0, out meanSE, out varianceSE, out count, out bias, out variance, out covariance);
-      }
-      QualityVariance = new DoubleValue(varianceSE);
-      QualitySamples = new IntValue(count);
-      DecompositionBiasParameter.ActualValue = new DoubleValue(bias / meanSE);
-      DecompositionVarianceParameter.ActualValue = new DoubleValue(variance / meanSE);
-      DecompositionCovarianceParameter.ActualValue = new DoubleValue(covariance / meanSE);
+        if (ApplyScalingParameter.Value != null && ApplyScalingParameter.Value.Value)
+          mse = Calculate(interpreter, solution, lowerEstimationLimit, upperEstimationLimit, dataset, targetVariable, rows, out beta, out alpha, out meanSE, out varianceSE, out count, out bias, out variance, out covariance);
+        else
+          mse = CalculateWithScaling(interpreter, solution, lowerEstimationLimit, upperEstimationLimit, dataset, targetVariable, rows, 1, 0, out meanSE, out varianceSE, out count, out bias, out variance, out covariance);
+      }
+
       return mse;
     }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Regression/3.3/Symbolic/Evaluators/SymbolicRegressionScaledMeanSquaredErrorEvaluator.cs

@@ -70 +70 @@
       double alpha, beta;
       double mse = Calculate(interpreter, solution, lowerEstimationLimit, upperEstimationLimit, dataset, targetVariable, rows, out beta, out alpha);
-      AlphaParameter.ActualValue = new DoubleValue(alpha);
-      BetaParameter.ActualValue = new DoubleValue(beta);
+      if (ExecutionContext != null) {
+        AlphaParameter.ActualValue = new DoubleValue(alpha);
+        BetaParameter.ActualValue = new DoubleValue(beta);
+      }
       return mse;
     }