Changeset 1961

Timestamp:

05/29/09 17:20:00 (15 years ago)

Author:

cbahner

Message:

#519 FloatingAvgAggregator improvements

File:

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

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

@@ -35 +35 @@
           break;
         case Action.Deleted:
-          refreshLastValues(row);
+          //refreshLastValues(row);
+          refreshValue();
           break;
         default:
@@ -51 +52 @@
 
     private int area = 5;
+
+    public int Area{
+      get { return area; }
+      set { area = value; }
+    } 
+
     private void refreshValue() {
 
@@ -81 +88 @@
     }
 
-#pragma warning disable 168
+
     private void refreshLastValues(IDataRow row) {
-#pragma warning restore 168
-      refreshValue();
+      if (dataRowWatches.Count >= 1) {
+        IDataRow watchedRow = dataRowWatches[0];
+
+        dataRow.Clear();
+
+        for (int i = 0; i < watchedRow.Count; i++) {
+
+          double avgVal = 0;
+          int count = 0;
+          for (int j = Math.Max(0, i - area); j < Math.Min(watchedRow.Count, i + area); j++) {
+            avgVal += watchedRow[j];
+            count++;
+          }
+
+          if (count >= 1)
+            avgVal /= count;
+
+          dataRow.Add(avgVal);
+
+          
+        }
+      }
+      //OnValueChanged(avgVal, dataRow.Count - 1, Action.Added);
+      OnValueChanged(dataRow[dataRow.Count-1], dataRow.Count - 1, Action.Added);
+      
+      double[] changeVals = new double[Math.Min(area, dataRow.Count-1)];
+      for (int i = 0; i < Math.Min(area, dataRow.Count-1); i++)
+      {
+        changeVals[i] = dataRow[Math.Max(0, dataRow.Count - area - 1 + i)];
+      }
+      OnValuesChanged(changeVals, Math.Max(dataRow.Count-area-1, 0), Action.Modified);
+      //OnDataRowChanged(this);        
+      
     }