Changeset 3994

Timestamp:

07/05/10 11:16:55 (14 years ago)

Author:

mkommend

Message:

added GetEnumeratedVariableValues in dataset (ticket #1074)

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Dataset.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis/3.3/Dataset.cs

@@ -36 +36 @@
   public sealed class Dataset : NamedItem, IStringConvertibleMatrix {
     // empty constructor for cloning
-    private Dataset() : base() {
-    }
-    
+    private Dataset()
+      : base() {
+    }
+
     [StorableConstructor]
     protected Dataset(bool deserializing)
@@ -70 +71 @@
       get { return data[rowIndex, columnIndex]; }
     }
-
     public double this[string variableName, int rowIndex] {
       get {
@@ -81 +81 @@
       return GetVariableValues(variableIndex, 0, Rows);
     }
-
     public double[] GetVariableValues(int variableIndex, int start, int end) {
       if (start < 0 || !(start <= end))
@@ -93 +92 @@
       return values;
     }
-
     public double[] GetVariableValues(string variableName) {
       return GetVariableValues(GetVariableIndex(variableName), 0, Rows);
     }
-
     public double[] GetVariableValues(string variableName, int start, int end) {
       return GetVariableValues(GetVariableIndex(variableName), start, end);
     }
 
-    #region Variable name methods
+    public IEnumerable<double> GetEnumeratedVariableValues(int variableIndex) {
+      return GetEnumeratedVariableValues(variableIndex, 0, Rows);
+    }
+    public IEnumerable<double> GetEnumeratedVariableValues(int variableIndex, int start, int end) {
+      if (start < 0 || !(start <= end))
+        throw new ArgumentException("Start must be between 0 and end (" + end + ").");
+      if (end > Rows || end < start)
+        throw new ArgumentException("End must be between start (" + start + ") and dataset rows (" + Rows + ").");
+      for (int i = 0; i < end - start; i++)
+        yield return data[i + start, variableIndex];
+    }
+    public IEnumerable<double> GetEnumeratedVariableValues(string variableName) {
+      return GetEnumeratedVariableValues(GetVariableIndex(variableName), 0, Rows);
+    }
+    public IEnumerable<double> GetEnumeratedVariableValues(string variableName, int start, int end) {
+      return GetEnumeratedVariableValues(GetVariableIndex(variableName), start, end);
+    }
+
+
+
     public string GetVariableName(int variableIndex) {
       return variableNames[variableIndex];
@@ -113 +129 @@
       throw new ArgumentException("The variable name " + variableName + " was not found.");
     }
-    #endregion
 
     public double[,] GetClonedData() {