Changeset 12509 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic

Timestamp:

06/25/15 13:46:24 (10 years ago)

Author:

mkommend

Message:

#2276: Reintegrated branch for dataset refactoring.

Location:

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

Files:

• Model.cs (modified) (1 diff)
• SingleObjective/ProfitEvaluator.cs (modified) (1 diff)
• SingleObjective/SharpeRatioEvaluator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/Model.cs

@@ -47 +47 @@
     }
 
-    public IEnumerable<double> GetSignals(Dataset dataset, IEnumerable<int> rows) {
+    public IEnumerable<double> GetSignals(IDataset dataset, IEnumerable<int> rows) {
       ISymbolicDataAnalysisExpressionTreeInterpreter interpreter = Interpreter;
       ISymbolicExpressionTree tree = SymbolicExpressionTree;

trunk/sources/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SingleObjective/ProfitEvaluator.cs

@@ -66 +66 @@
     }
 
-    private static IEnumerable<double> GetSignals(ISymbolicDataAnalysisExpressionTreeInterpreter interpreter, ISymbolicExpressionTree solution, Dataset dataset, IEnumerable<int> rows) {
+    private static IEnumerable<double> GetSignals(ISymbolicDataAnalysisExpressionTreeInterpreter interpreter, ISymbolicExpressionTree solution, IDataset dataset, IEnumerable<int> rows) {
       return Model.GetSignals(interpreter.GetSymbolicExpressionTreeValues(solution, dataset, rows));
     }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Trading/3.4/Symbolic/SingleObjective/SharpeRatioEvaluator.cs

@@ -66 +66 @@
     }
 
-    private static IEnumerable<double> GetSignals(ISymbolicDataAnalysisExpressionTreeInterpreter interpreter, ISymbolicExpressionTree solution, Dataset dataset, IEnumerable<int> rows) {
+    private static IEnumerable<double> GetSignals(ISymbolicDataAnalysisExpressionTreeInterpreter interpreter, ISymbolicExpressionTree solution, IDataset dataset, IEnumerable<int> rows) {
       return Model.GetSignals(interpreter.GetSymbolicExpressionTreeValues(solution, dataset, rows));
     }