Changeset 1984 for trunk/sources/HeuristicLab.Visualization/3.2/DataRow.cs

Timestamp:

05/31/09 21:47:55 (15 years ago)

Author:

mstoeger

Message:

bugfixes in DataRow.RemoveValues (updating min/max-values). #498

File:

• trunk/sources/HeuristicLab.Visualization/3.2/DataRow.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Visualization/3.2/DataRow.cs

@@ -113 +113 @@
 
     public override void RemoveValue(int index) {
-      double remVal = dataRow[index];
-      //check if index is valid
       if (index >= 0 && index < dataRow.Count) {
+        UpdateMinMaxValueForRemovedValue(index); // bad runtime but works
+        double removedValue = dataRow[index];
         dataRow.RemoveAt(index);
-        OnValueChanged(remVal, index, Action.Deleted);
+        OnValueChanged(removedValue, index, Action.Deleted);
       } else {
         throw new IndexOutOfRangeException();
@@ -124 +124 @@
 
     public override void RemoveValues(int index, int count) {
-      double[] remValues = new double[count]; //removed values
-      int j = 0;
-
-      //check if count is valid
       if (count > 0) {
-        //check if index is valid
         if ((index >= 0) && (index + count <= dataRow.Count)) {
-          for (int i = index; i < (index + count); i++) {
-            remValues.SetValue(i, j);
-            dataRow.RemoveAt(i);
-            j++;
+          double[] removedValues = new double[count];
+          for (int i = 0; i < count; i++) {
+            removedValues[i] = dataRow[index + i];
+            UpdateMinMaxValueForRemovedValue(index); // bad runtime but works
+            dataRow.RemoveAt(index);
           }
-          OnValuesChanged(remValues, index, Action.Deleted);
+          OnValuesChanged(removedValues, index, Action.Deleted);
         } else {
           throw new IndexOutOfRangeException();
@@ -165 +161 @@
     }
 
+    private void UpdateMinMaxValueForRemovedValue(int removedValueIndex) {
+      if (minValue == dataRow[removedValueIndex] || maxValue == dataRow[removedValueIndex]) {
+        minValue = double.MaxValue;
+        maxValue = double.MinValue;
+
+        for (int i = 0; i < dataRow.Count; i++) {
+          if (i != removedValueIndex) {
+            UpdateMinMaxValue(dataRow[i]);
+          }
+        }
+      }
+    }
+
     private void UpdateMinMaxValue(double newValue, int oldValueIndex) {
       if (minValue != dataRow[oldValueIndex] && maxValue != dataRow[oldValueIndex])