Changeset 16383 for branches/2966_interval_calculation/HeuristicLab.Problems.DataAnalysis/3.4

Timestamp:

12/14/18 14:17:31 (5 years ago)

Author:

chaider

Message:

#2966

• Some renaming and reordering
• Changed GetVariableRanges method in DatasetUtil
• Added cases for substract and divide with arity 1

File:

• branches/2966_interval_calculation/HeuristicLab.Problems.DataAnalysis/3.4/DatasetUtil.cs (modified) (1 diff)

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

@@ -93 +93 @@
     }
 
-    public static Dictionary<string, Interval> GetVariableBoundaries(IDataset dataset, IEnumerable<int> rows = null) {
-      Dictionary<string, Interval> variableBoundaries = new Dictionary<string, Interval>();
+    public static Dictionary<string, Interval> GetVariableRanges(IDataset dataset, IEnumerable<int> rows = null) {
+      Dictionary<string, Interval> variableRanges = new Dictionary<string, Interval>();
 
       foreach (var variable in dataset.VariableNames) {
         var min = double.MaxValue;
         var max = double.MinValue;
+        IEnumerable<double> values = null;
 
-        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;
-          }
+        if (rows == null) values = dataset.GetDoubleValues(variable);
+        else values = dataset.GetDoubleValues(variable, rows);
+
+        foreach (var val in values) {
+          if (val < min) min = val;
+          if (val > max) max = val;
         }
-        variableBoundaries.Add(variable, new Interval(min, max));
+
+        variableRanges.Add(variable, new Interval(min, max));
       }
 
-      return variableBoundaries;
+      return variableRanges;
     }