Changeset 155 for trunk/sources/HeuristicLab.StructureIdentification/Evaluation/VarianceAccountedForEvaluator.cs

Timestamp:

04/22/08 18:05:14 (16 years ago)

Author:

gkronber

Message:

merged FunctionsAndStructIdRefactoring-branch (r142, r143, r144, r145, r146, r147, r148, r149, r152, r153) back into the trunk (ticket #112)

File:

• trunk/sources/HeuristicLab.StructureIdentification/Evaluation/VarianceAccountedForEvaluator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.StructureIdentification/Evaluation/VarianceAccountedForEvaluator.cs

@@ -34 +34 @@
     public override string Description {
       get {
-        return @"Evaluates 'OperatorTree' for all samples of 'DataSet' and calculates 
+        return @"Evaluates 'FunctionTree' for all samples of 'DataSet' and calculates 
 the variance-accounted-for quality measure for the estimated values vs. the real values of 'TargetVariable'.
 
@@ -53 +53 @@
 
 
-    public override double Evaluate(IScope scope, IFunction function, int targetVariable, Dataset dataset) {
+    public override double Evaluate(IScope scope, IFunctionTree functionTree, int targetVariable, Dataset dataset) {
       double[] errors = new double[dataset.Rows];
       double[] originalTargetVariableValues = new double[dataset.Rows];
       double targetMean = dataset.GetMean(targetVariable);
       for(int sample = 0; sample < dataset.Rows; sample++) {
-        double estimated = function.Evaluate(dataset, sample);
+        double estimated = functionTree.Evaluate(dataset, sample);
         double original = dataset.GetValue(sample, targetVariable);
         if(!double.IsNaN(original) && !double.IsInfinity(original)) {