Changeset 1984 for trunk/sources

Timestamp:

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

Author:

mstoeger

Message:

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

Location:

trunk/sources

Files:

• HeuristicLab.Visualization.Test/3.2/LineChartTests.cs (modified) (1 diff)
• HeuristicLab.Visualization/3.2/DataRow.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Visualization.Test/3.2/LineChartTests.cs

@@ -302 +302 @@
 
       row.ModifyValues(new double[] {5, 5}, 1);
+
+      model.AddDataRow(row);
+
+      f.ShowDialog();
+    }
+
+    [Test]
+    public void TestRemoveValueFromDataRow() {
+      LineChartTestForm f = new LineChartTestForm(model);
+
+      IDataRow row = new DataRow();
+      row.AddValue(0);
+      row.AddValue(20);
+      row.AddValue(100);
+      row.AddValue(50);
+
+      row.RemoveValue(2);
+
+      model.AddDataRow(row);
+
+      f.ShowDialog();
+    }
+
+    [Test]
+    public void TestRemoveValuesFromDataRow() {
+      LineChartTestForm f = new LineChartTestForm(model);
+
+      IDataRow row = new DataRow();
+      row.AddValue(0);
+      row.AddValue(20);
+      row.AddValue(100);
+      row.AddValue(50);
+
+      row.RemoveValues(1, 2);
 
       model.AddDataRow(row);

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])