Changeset 1796 for trunk/sources/HeuristicLab.GP.StructureIdentification.TimeSeries

Timestamp:

05/14/09 13:46:57 (16 years ago)

Author:

gkronber

Message:

Refactored GP evaluation to make it possible to use different evaluators to interpret function trees. #615 (Evaluation of HL3 function trees should be equivalent to evaluation in HL2)

Location:

trunk/sources/HeuristicLab.GP.StructureIdentification.TimeSeries/3.3

Files:

• AveragePercentageChangeEvaluator.cs (modified) (3 diffs)
• ProfitEvaluator.cs (modified) (2 diffs)
• TheilInequalityCoefficientEvaluator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.GP.StructureIdentification.TimeSeries/3.3/AveragePercentageChangeEvaluator.cs

@@ -42 +42 @@
     }
 
-    public override void Evaluate(IScope scope, BakedTreeEvaluator evaluator, HeuristicLab.DataAnalysis.Dataset dataset, int targetVariable, int start, int end, bool updateTargetValues) {
+    public override void Evaluate(IScope scope, ITreeEvaluator evaluator, IFunctionTree tree, HeuristicLab.DataAnalysis.Dataset dataset, int targetVariable, int start, int end, bool updateTargetValues) {
       bool differential = GetVariableValue<BoolData>("Differential", scope, true).Data;
       DoubleData apc = GetVariableValue<DoubleData>("APC", scope, false, false);
@@ -58 +58 @@
           prevOriginal = dataset.GetValue(sample - 1, targetVariable);
           originalPercentageChange = (dataset.GetValue(sample, targetVariable) - prevOriginal) / prevOriginal;
-          estimatedPercentageChange = (evaluator.Evaluate(sample) - prevOriginal) / prevOriginal;
+          estimatedPercentageChange = (evaluator.Evaluate(tree, sample) - prevOriginal) / prevOriginal;
           if (updateTargetValues) {
             dataset.SetValue(sample, targetVariable, estimatedPercentageChange * prevOriginal + prevOriginal);
@@ -64 +64 @@
         } else {
           originalPercentageChange = dataset.GetValue(sample, targetVariable);
-          estimatedPercentageChange = evaluator.Evaluate(sample);
+          estimatedPercentageChange = evaluator.Evaluate(tree, sample);
           if (updateTargetValues) {
             dataset.SetValue(sample, targetVariable, estimatedPercentageChange);

trunk/sources/HeuristicLab.GP.StructureIdentification.TimeSeries/3.3/ProfitEvaluator.cs

@@ -43 +43 @@
     }
 
-    public override void Evaluate(IScope scope, BakedTreeEvaluator evaluator, HeuristicLab.DataAnalysis.Dataset dataset, int targetVariable, int start, int end, bool updateTargetValues) {
+    public override void Evaluate(IScope scope, ITreeEvaluator evaluator, IFunctionTree tree, HeuristicLab.DataAnalysis.Dataset dataset, int targetVariable, int start, int end, bool updateTargetValues) {
       int exchangeRateVarIndex = GetVariableValue<IntData>("ExchangeRate", scope, true).Data;
       double transactionCost = GetVariableValue<DoubleData>("TransactionCost", scope, true).Data;
@@ -58 +58 @@
         exchangeRate = dataset.GetValue(sample, exchangeRateVarIndex);
         double originalPercentageChange = dataset.GetValue(sample, targetVariable);
-        double estimatedPercentageChange = evaluator.Evaluate(sample);
+        double estimatedPercentageChange = evaluator.Evaluate(tree, sample);
         if (updateTargetValues) {
           dataset.SetValue(sample, targetVariable, estimatedPercentageChange);

trunk/sources/HeuristicLab.GP.StructureIdentification.TimeSeries/3.3/TheilInequalityCoefficientEvaluator.cs

@@ -54 +54 @@
     }
 
-    public override void Evaluate(IScope scope, BakedTreeEvaluator evaluator, Dataset dataset, int targetVariable, int start, int end, bool updateTargetValues) {
+    public override void Evaluate(IScope scope, ITreeEvaluator evaluator, IFunctionTree tree, Dataset dataset, int targetVariable, int start, int end, bool updateTargetValues) {
       #region create result variables
       DoubleData theilInequaliy = GetVariableValue<DoubleData>("TheilInequalityCoefficient", scope, false, false);
@@ -85 +85 @@
       for (int sample = start; sample < end; sample++) {
         double prevValue = dataset.GetValue(sample - 1, targetVariable);
-        double estimatedChange = evaluator.Evaluate(sample) - prevValue;
+        double estimatedChange = evaluator.Evaluate(tree, sample) - prevValue;
         double originalChange = dataset.GetValue(sample, targetVariable) - prevValue;
         if (updateTargetValues) {