Changeset 1983

Timestamp:

05/31/09 21:26:27 (16 years ago)

Author:

mstoeger

Message:

bugfixes in DataRow.Add/ModifyValues (checking indexes, updating min/max-values). #498

Location:

trunk/sources

Files:

• HeuristicLab.Visualization.Test/3.2/LineChartTests.cs (modified) (2 diffs)
• HeuristicLab.Visualization/3.2/DataRow.cs (modified) (5 diffs)

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

@@ -219 +219 @@
 
     [Test]
-    public void TestInsertValuesInDataRow() {
+    public void TestAddValueToDataRow() {
+      LineChartTestForm f = new LineChartTestForm(model);
+
+      IDataRow row = new DataRow();
+      row.AddValue(0);
+      row.AddValue(10);
+      row.AddValue(-5);
+
+      model.AddDataRow(row);
+
+      f.ShowDialog();
+    }
+
+    [Test]
+    public void TestAddValuesToDataRow() {
+      LineChartTestForm f = new LineChartTestForm(model);
+
+      IDataRow row = new DataRow();
+      row.AddValues(new double[] {0, 10, -5});
+
+      model.AddDataRow(row);
+
+      f.ShowDialog();
+    }
+
+    [Test]
+    public void TestInsertValueInDataRow() {
       LineChartTestForm f = new LineChartTestForm(model);
 
@@ -228 +254 @@
       row.AddValue(10, 1);
       row.AddValue(10, 2);
+
+      model.AddDataRow(row);
+
+      f.ShowDialog();
+    }
+
+    [Test]
+    public void TestInsertValuesInDataRow() {
+      LineChartTestForm f = new LineChartTestForm(model);
+
+      IDataRow row = new DataRow();
+      row.AddValue(0);
+      row.AddValue(5);
+
+      row.AddValues(new double[] {10, 10}, 1);
+
+      model.AddDataRow(row);
+
+      f.ShowDialog();
+    }
+
+    [Test]
+    public void TestModifyValueInDataRow() {
+      LineChartTestForm f = new LineChartTestForm(model);
+
+      IDataRow row = new DataRow();
+      row.AddValue(0);
+      row.AddValue(100);
+      row.AddValue(0);
+
+      row.ModifyValue(5, 1);
+
+      model.AddDataRow(row);
+
+      f.ShowDialog();
+    }
+
+    [Test]
+    public void TestModifyValuesInDataRow() {
+      LineChartTestForm f = new LineChartTestForm(model);
+
+      IDataRow row = new DataRow();
+      row.AddValue(0);
+      row.AddValue(100);
+      row.AddValue(100);
+      row.AddValue(0);
+
+      row.ModifyValues(new double[] {5, 5}, 1);
 
       model.AddDataRow(row);

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

@@ -2 +2 @@
 using System.Drawing;
 using System.Collections.Generic;
-using HeuristicLab.Visualization.LabelProvider;
 
 namespace HeuristicLab.Visualization {
@@ -76 +75 @@
 
     public override void AddValues(double[] values, int index) {
-      int j = index;
-
-      //check if index to start changes is valid
-      if (index >=0 && (index + values.Length) < dataRow.Count) {
-        foreach (double d in values) {
-          dataRow.Insert(j, d);
-          j++;
+      if (index >= 0 && index < dataRow.Count) {
+        for (int i = 0; i < values.Length; i++) {
+          double value = values[i];
+          UpdateMinMaxValue(value);
+          dataRow.Insert(index + i, value);
         }
         OnValuesChanged(values, index, Action.Added);
@@ -93 +90 @@
       //check if index is valid
       if (index >= 0 && index < dataRow.Count) {
+        UpdateMinMaxValue(value, index); // bad runtime but works
         dataRow[index] = value;
         OnValueChanged(value, index, Action.Modified);
@@ -101 +99 @@
 
     public override void ModifyValues(double[] values, int index) {
-      int startInd = index;
-      int modInd = index;
-
       //check if index to start modification is valid
-      if (startInd >=0 && startInd + values.Length < dataRow.Count) {
-        foreach (double d in values) {
-          dataRow[modInd] = d;
-          modInd++;
+      if (index >= 0 && index + values.Length < dataRow.Count) {
+        for (int i = 0; i < values.Length; i++) {
+          double value = values[i];
+          UpdateMinMaxValue(value, index + i); // bad runtime but works
+          dataRow[index+i] = value;
         }
-        OnValuesChanged(values, startInd, Action.Modified);
+        OnValuesChanged(values, index, Action.Modified);
       } else {
         throw new IndexOutOfRangeException();
@@ -169 +165 @@
     }
 
+    private void UpdateMinMaxValue(double newValue, int oldValueIndex) {
+      if (minValue != dataRow[oldValueIndex] && maxValue != dataRow[oldValueIndex])
+        UpdateMinMaxValue(newValue);
+      else {
+        minValue = double.MaxValue;
+        maxValue = double.MinValue;
+
+        for (int i = 0; i < dataRow.Count; i++) {
+          double value = oldValueIndex != i ? dataRow[i] : newValue;
+          UpdateMinMaxValue(value);
+        }
+      }
+    }
+
     private void UpdateMinMaxValue(double value) {
       maxValue = Math.Max(value, maxValue);