Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
04/04/11 15:38:16 (14 years ago)
Author:
mkommend
Message:

#1453: Renamed IOnlineEvaluator to IOnlineCalculator

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

Legend:

Unmodified
Added
Removed
  • TabularUnified trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectiveMeanSquaredErrorTreeSizeEvaluator.cs

    r5906 r5942  
    5656      IEnumerable<double> originalValues = problemData.Dataset.GetEnumeratedVariableValues(problemData.TargetVariable, rows);
    5757      IEnumerable<double> boundedEstimationValues = estimatedValues.LimitToRange(lowerEstimationLimit, upperEstimationLimit);
    58       OnlineEvaluatorError errorState;
    59       double mse = OnlineMeanSquaredErrorEvaluator.Calculate(originalValues, boundedEstimationValues, out errorState);
    60       if (errorState != OnlineEvaluatorError.None) mse = double.NaN;
     58      OnlineCalculatorError errorState;
     59      double mse = OnlineMeanSquaredErrorCalculator.Calculate(originalValues, boundedEstimationValues, out errorState);
     60      if (errorState != OnlineCalculatorError.None) mse = double.NaN;
    6161      return new double[2] { mse, solution.Length };
    6262    }
  • TabularUnified trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/MultiObjective/SymbolicRegressionMultiObjectivePearsonRSquaredTreeSizeEvaluator.cs

    r5906 r5942  
    5555      IEnumerable<double> estimatedValues = interpreter.GetSymbolicExpressionTreeValues(solution, problemData.Dataset, rows);
    5656      IEnumerable<double> originalValues = problemData.Dataset.GetEnumeratedVariableValues(problemData.TargetVariable, rows);
    57       OnlineEvaluatorError errorState;
    58       double r2 = OnlinePearsonsRSquaredEvaluator.Calculate(estimatedValues, originalValues, out errorState);
    59       if (errorState != OnlineEvaluatorError.None) r2 = 0.0;
     57      OnlineCalculatorError errorState;
     58      double r2 = OnlinePearsonsRSquaredCalculator.Calculate(estimatedValues, originalValues, out errorState);
     59      if (errorState != OnlineCalculatorError.None) r2 = 0.0;
    6060      return new double[] { r2, solution.Length };
    6161    }
Note: See TracChangeset for help on using the changeset viewer.