Changeset 1607 for trunk/sources/HeuristicLab.Visualization

Timestamp:

04/18/09 14:41:05 (16 years ago)

Author:

cbahner

Message:

#519 test cases + code review

Location:

trunk/sources/HeuristicLab.Visualization/3.2

Files:

• AvgAggregator.cs (modified) (2 diffs)
• AvgLineAggregator.cs (modified) (10 diffs)
• MaxAggregator.cs (modified) (1 diff)

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

@@ -22 +22 @@
     #endregion
 
-    private List<IDataRow> dataRowWatches = new List<IDataRow>();
+    private readonly List<IDataRow> dataRowWatches = new List<IDataRow>();
     private double curAvgValue;
 
@@ -126 +126 @@
     }
 
-    public override void RemoveValues(int index, int count) {
+    public override void RemoveValues(int index, int countVals) {
       throw new NotSupportedException();
     }

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

@@ -6 +6 @@
 
     private readonly List<double> dataRow = new List<double>();
+    readonly List<IDataRow> dataRowWatches = new List<IDataRow>();
 
     #region IAggregator Members
 
-    public void AddWatch(IDataRow dataRow) {
-      dataRowWatches.Add(dataRow);
-      dataRow.ValueChanged += dataRow_ValueChanged;
-      dataRow.ValuesChanged += dataRow_ValuesChanged;
-      dataRow.DataRowChanged += dataRow_DataRowChanged;
+    public void AddWatch(IDataRow watchDataRow) {
+      dataRowWatches.Add(watchDataRow);
+      watchDataRow.ValueChanged += dataRow_ValueChanged;
+      watchDataRow.ValuesChanged += dataRow_ValuesChanged;
+      watchDataRow.DataRowChanged += dataRow_DataRowChanged;
     }
 
-    public void RemoveWatch(IDataRow dataRow) {
-
-      dataRowWatches.Remove(dataRow);
-      dataRow.DataRowChanged -= dataRow_DataRowChanged;
-      dataRow.ValuesChanged -= dataRow_ValuesChanged;
-      dataRow.ValueChanged -= dataRow_ValueChanged;
+    public void RemoveWatch(IDataRow watchDataRow) {
+      dataRowWatches.Remove(watchDataRow);
+      watchDataRow.DataRowChanged -= dataRow_DataRowChanged;
+      watchDataRow.ValuesChanged -= dataRow_ValuesChanged;
+      watchDataRow.ValueChanged -= dataRow_ValueChanged;
     }
 
-
     #endregion
-
-    List<IDataRow> dataRowWatches = new List<IDataRow>();
 
     void dataRow_ValueChanged(IDataRow row, double value, int index, Action action) {
       switch (action) {
         case Action.Added:
-          refreshValue(row, value, Action.Added);
+          refreshLastValues(row);
           break;
         case Action.Modified:
@@ -38 +35 @@
           break;
         case Action.Deleted:
-          refreshValue(row, value, Action.Deleted);
+          refreshLastValues(row);
           break;
         default:
           throw new ArgumentOutOfRangeException("action");
       }
-
     }
 
@@ -57 +53 @@
 
     private void refreshValue() {
-      double tmpSum = 0;
+      
       int count = dataRowWatches.Count;
 
       IDataRow firstRow = dataRowWatches[0];
       int count1 = firstRow.Count;
-      System.Console.WriteLine("count: " + count1);
+      Console.WriteLine("count: " + count1);
 
       dataRow.Clear();
@@ -68 +64 @@
       if (dataRowWatches.Count >= 2) {
         for (int i = 0; i < count1; i++) {
-          tmpSum = 0;
+          double tmpSum = 0;
           for (int j = 0; j < count; j++) {
             if (dataRowWatches[j].Count > i) {
@@ -75 +71 @@
           }
 
-          this.dataRow.Add(tmpSum / count);
+          dataRow.Add(tmpSum / count);
           OnValueChanged(tmpSum / count, dataRow.Count - 1, Action.Added);
         }
@@ -81 +77 @@
     }
 
-    private void refreshValue(IDataRow row, double newVal, Action action) {
+    private void refreshLastValues(IDataRow row) {
 
       int index = row.Count - 1;
-
-
-      
-      
       double curAvg = 0;
-//      if (dataRow.Count > 0) {
-//        curAvg = dataRow[0];   //?
-//      } else {
-//        curAvg = 0;
-//      }
-
 
       foreach (IDataRow watch in dataRowWatches) {
         if (watch.Count >= index +1) {
-          curAvg += watch[index];
-          
+          curAvg += watch[index]; 
         }
-        //curAvg += watch[watch.Count - 1];
       }
 
@@ -116 +100 @@
         OnValueChanged(curAvg, dataRow.Count - 1, Action.Modified);  
       }
-
-
-
-//      curAvg *= dataRow.Count * dataRowWatches.Count;
-//      switch (action) {
-//        case Action.Added:
-//          curAvg += newVal;
-//          break;
-//        case Action.Modified:
-//          throw new InvalidOperationException();
-//        case Action.Deleted:
-//          curAvg -= newVal;
-//          break;
-//        default:
-//          throw new ArgumentOutOfRangeException("action");
-//      }
-//
-//      dataRow.Add((curAvg / (dataRow.Count + 1)) / dataRowWatches.Count);
-//      OnValueChanged((curAvg / (dataRow.Count + 1)) / dataRowWatches.Count, dataRow.Count - 1, Action.Added); // nicht immer adden!
-
-      //      double tmpSum = 0;
-      //      int count = dataRowWatches.Count;
-      //
-      //      IDataRow firstRow = dataRowWatches[0];
-      //      int count1 = firstRow.Count;
-      //      System.Console.WriteLine("count: " + count1);
-      //
-      //      dataRow.Clear();
-      //
-      //      if (dataRowWatches.Count >= 2) {
-      //        for (int i = 0; i < count1; i++) {
-      //          tmpSum = 0;
-      //          for (int j = 0; j < count; j++) {
-      //            if (dataRowWatches[j].Count > i) {
-      //              tmpSum += dataRowWatches[j][i];
-      //            }
-      //          }
-      //
-      //          this.dataRow.Add(tmpSum/count);
-      //          OnValueChanged(tmpSum / count, dataRow.Count - 1, Action.Added);
-      //        }
-      //      }
-
-      // evtl nur feuern wenn sich geändert hat (jedes mal?)
-      //OnDataRowChanged(this);
     }
 
@@ -171 +110 @@
 
     public override void AddValue(double value, int index) {
-      throw new NotImplementedException();
+      throw new NotSupportedException();
     }
 
@@ -194 +133 @@
     }
 
-    public override void RemoveValues(int index, int count) {
+    public override void RemoveValues(int index, int countVals) {
       throw new NotSupportedException();
     }
@@ -210 +149 @@
     }
 
-    // TODO calculate min value
     public override double MinValue {
       get { return 0; }
     }
 
-    // TODO calculate max value
     public override double MaxValue {
       get { return 0; }

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

@@ -1 +1 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 
 namespace HeuristicLab.Visualization {