Changeset 5851 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Evaluators

Timestamp:

03/28/11 20:04:51 (14 years ago)

Author:

gkronber

Message:

#1411 added evaluated nodes parameter to symbolic data analysis evaluators.

Location:

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

Files:

• SymbolicDataAnalysisEvaluator.cs (modified) (4 diffs)
• SymbolicDataAnalysisSingleObjectiveEvaluator.cs (modified) (3 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; } }
@@ -56 +57 @@
     public ILookupParameter<ISymbolicDataAnalysisExpressionTreeInterpreter> SymbolicDataAnalysisTreeInterpreterParameter {
       get { return (ILookupParameter<ISymbolicDataAnalysisExpressionTreeInterpreter>)Parameters[SymbolicDataAnalysisTreeInterpreterParameterName]; }
+    }
+    public ILookupParameter<DoubleValue> EvaluatedNodesParameter {
+      get { return (ILookupParameter<DoubleValue>)Parameters[EvaluatedNodesParameterName]; }
     }
     public IValueLookupParameter<T> ProblemDataParameter {
@@ -83 +87 @@
       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."));
@@ -102 +107 @@
         .Where(i => i < testPartitionStart || testPartitionEnd <= i);
     }
+
+    protected void AddEvaluatedNodes(double numberOfNodes) {
+      if (EvaluatedNodesParameter.ActualValue == null) EvaluatedNodesParameter.ActualValue = new DoubleValue();
+      double curEvaluatedNodes = EvaluatedNodesParameter.ActualValue.Value;
+      EvaluatedNodesParameter.ActualValue = new DoubleValue(curEvaluatedNodes + numberOfNodes);
+    }
   }
 }

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

@@ -20 +20 @@
 #endregion
 
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -39 +40 @@
     #endregion
     #region properties
-    public DoubleValue Quality {
-      get { return QualityParameter.ActualValue; }
-      set { QualityParameter.ActualValue = value; }
-    }
     public abstract bool Maximization { get; }
     #endregion
@@ -56 +53 @@
     }
 
-
     public abstract double Evaluate(IExecutionContext context, ISymbolicExpressionTree tree, T problemData, IEnumerable<int> rows);
   }