Changeset 9386 for branches/sluengo/HeuristicLab.Problems.TradeRules/Evaluator/EvaluatorTradeRules.cs

Timestamp:

04/20/13 14:08:49 (11 years ago)

Author:

sluengo

Message:

 

File:

• branches/sluengo/HeuristicLab.Problems.TradeRules/Evaluator/EvaluatorTradeRules.cs (modified) (3 diffs)

branches/sluengo/HeuristicLab.Problems.TradeRules/Evaluator/EvaluatorTradeRules.cs

@@ -44 +44 @@
             double quality = Calculate((ITradeRulesExpresionTree) SymbolicDataAnalysisTreeInterpreterParameter.ActualValue, solution, EstimationLimitsParameter.ActualValue.Lower, EstimationLimitsParameter.ActualValue.Upper, ProblemDataParameter.ActualValue, rows);
             QualityParameter.ActualValue = new DoubleValue(quality);
-            ITradeRulesExpresionTree interpreter = (ITradeRulesExpresionTree)SymbolicDataAnalysisTreeInterpreterParameter.ActualValue;
-            interpreter.clearVariables();
             return base.Apply();
         }
@@ -52 +50 @@
         {
             interpreter.setInitialTraining(initialTraining);
-            interpreter.setInitialTest(initialTest);
+            interpreter.setInitialTest(rows.ToArray()[0]);
             IEnumerable<double> estimatedValues = interpreter.GetSymbolicExpressionTreeValues(solution, problemData.Dataset, rows);
+            interpreter.clearVariables();
+            double tradingCash = OnlineTradeRulesCalculator.Calculate(estimatedValues, problemData, rows);
             
-            double tradingCash = OnlineTradeRulesCalculator.Calculate(estimatedValues, problemData, problemData.TrainingIndices);
-
             return tradingCash;
         }
@@ -69 +67 @@
             EstimationLimitsParameter.ExecutionContext = null;
          
-
             return r2;
         }