Changeset 16364 for branches/2966_interval_calculation/HeuristicLab.Problems.DataAnalysis

Timestamp:

12/11/18 14:54:35 (5 years ago)

Author:

chaider

Message:

#2966

• Changed signature of GetSymbolicExressionTreeIntervals methods
• Changed PrepareInterpreterState (removed optinal parameters, takes Dictionary<string, Interval> as input and no dataset anymore)
• Added optional parameter (rows) to GetVariableBoundaries method (allows to use just parts from dataset as input e.g. training/test indices)

File:

• branches/2966_interval_calculation/HeuristicLab.Problems.DataAnalysis/3.4/DatasetUtil.cs (modified) (2 diffs)

branches/2966_interval_calculation/HeuristicLab.Problems.DataAnalysis/3.4/DatasetUtil.cs

@@ -93 +93 @@
     }
 
-    public static Dictionary<string, Interval> GetVariableBoundaries(IDataset dataset) {
+    public static Dictionary<string, Interval> GetVariableBoundaries(IDataset dataset, IEnumerable<int> rows = null) {
       Dictionary<string, Interval> variableBoundaries = new Dictionary<string, Interval>();
 
@@ -100 +100 @@
         var max = double.MinValue;
 
-        foreach (var val in dataset.GetDoubleValues(variable)) {
-          if (val < min) min = val;
-          if (val > max) max = val;
+        if (rows != null) {
+          foreach (int row in rows) {
+            var val = dataset.GetDoubleValue(variable, row);
+            if (val < min) min = val;
+            if (val > max) max = val;
+          }
+        } else {
+          foreach (var val in dataset.GetDoubleValues(variable)) {
+            if (val < min) min = val;
+            if (val > max) max = val;
+          }
         }
         variableBoundaries.Add(variable, new Interval(min, max));