Changeset 12509 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression

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.Symbolic.Regression/3.4

Files:

• SingleObjective/Evaluators/SymbolicRegressionConstantOptimizationEvaluator.cs (modified) (1 diff)
• SymbolicRegressionModel.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/Evaluators/SymbolicRegressionConstantOptimizationEvaluator.cs

@@ -202 +202 @@
       int info;
 
-      Dataset ds = problemData.Dataset;
+      IDataset ds = problemData.Dataset;
       double[,] x = new double[rows.Count(), variableNames.Count];
       int row = 0;

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SymbolicRegressionModel.cs

@@ -47 +47 @@
     }
 
-    public IEnumerable<double> GetEstimatedValues(Dataset dataset, IEnumerable<int> rows) {
+    public IEnumerable<double> GetEstimatedValues(IDataset dataset, IEnumerable<int> rows) {
       return Interpreter.GetSymbolicExpressionTreeValues(SymbolicExpressionTree, dataset, rows)
         .LimitToRange(LowerEstimationLimit, UpperEstimationLimit);