Changeset 5906 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Evaluators/SymbolicDataAnalysisEvaluator.cs

Timestamp:

03/31/11 11:22:28 (14 years ago)

Author:

mkommend

Message:

#1411: Reverted changesets regarding the number of evaluated nodes.

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Evaluators/SymbolicDataAnalysisEvaluator.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Evaluators/SymbolicDataAnalysisEvaluator.cs

@@ -44 +44 @@
     private const string EvaluationPartitionParameterName = "EvaluationPartition";
     private const string RelativeNumberOfEvaluatedSamplesParameterName = "RelativeNumberOfEvaluatedSamples";
-    private const string EvaluatedNodesParameterName = "EvaluatedNodes";
 
     public override bool CanChangeName { get { return false; } }
@@ -57 +56 @@
     public ILookupParameter<ISymbolicDataAnalysisExpressionTreeInterpreter> SymbolicDataAnalysisTreeInterpreterParameter {
       get { return (ILookupParameter<ISymbolicDataAnalysisExpressionTreeInterpreter>)Parameters[SymbolicDataAnalysisTreeInterpreterParameterName]; }
-    }
-    public ILookupParameter<DoubleValue> EvaluatedNodesParameter {
-      get { return (ILookupParameter<DoubleValue>)Parameters[EvaluatedNodesParameterName]; }
     }
     public IValueLookupParameter<T> ProblemDataParameter {
@@ -87 +83 @@
       Parameters.Add(new LookupParameter<ISymbolicDataAnalysisExpressionTreeInterpreter>(SymbolicDataAnalysisTreeInterpreterParameterName, "The interpreter that should be used to calculate the output values of the symbolic data analysis tree."));
       Parameters.Add(new LookupParameter<ISymbolicExpressionTree>(SymbolicExpressionTreeParameterName, "The symbolic data analysis solution encoded as a symbolic expression tree."));
-      Parameters.Add(new LookupParameter<DoubleValue>(EvaluatedNodesParameterName, "The total number of evaluated symbolic expression tree nodes."));
       Parameters.Add(new ValueLookupParameter<T>(ProblemDataParameterName, "The problem data on which the symbolic data analysis solution should be evaluated."));
       Parameters.Add(new ValueLookupParameter<IntRange>(EvaluationPartitionParameterName, "The start index of the dataset partition on which the symbolic data analysis solution should be evaluated."));
@@ -107 +102 @@
         .Where(i => i < testPartitionStart || testPartitionEnd <= i);
     }
-
-    protected void AddEvaluatedNodes(double numberOfNodes) {
-      if (EvaluatedNodesParameter.ActualValue == null) {
-        // variable for evaluated nodes does not exist yet
-        // search global scope
-        var scope = ExecutionContext.Scope;
-        while (scope.Parent != null) scope = scope.Parent;
-        // add variable into global scope
-        scope.Variables.Add(new HeuristicLab.Core.Variable(EvaluatedNodesParameter.ActualName, new DoubleValue()));
-      } 
-      double curEvaluatedNodes = EvaluatedNodesParameter.ActualValue.Value;
-      EvaluatedNodesParameter.ActualValue = new DoubleValue(curEvaluatedNodes + numberOfNodes);
-    }
   }
 }