Changeset 2139 for trunk/sources/HeuristicLab.CEDMA.Charting/3.3/BubbleChart.cs

Timestamp:

07/06/09 21:54:04 (15 years ago)

Author:

gkronber

Message:

Implemented filtering of result entries in bubble chart and table view. #691 (CEDMA result views should allow filtering of displayed results)

File:

• trunk/sources/HeuristicLab.CEDMA.Charting/3.3/BubbleChart.cs (modified) (11 diffs)

trunk/sources/HeuristicLab.CEDMA.Charting/3.3/BubbleChart.cs

@@ -56 +56 @@
     private double maxX = double.NegativeInfinity;
     private double maxY = double.NegativeInfinity;
-    private List<ResultsEntry> records;
+    private List<ResultsEntry> filteredEntries;
     private Results results;
     private Dictionary<IPrimitive, ResultsEntry> primitiveToEntryDictionary;
@@ -64 +64 @@
     public BubbleChart(Results results, PointD lowerLeft, PointD upperRight)
       : base(lowerLeft, upperRight) {
-      records = new List<ResultsEntry>();
+      //      records = new List<ResultsEntry>();
       primitiveToEntryDictionary = new Dictionary<IPrimitive, ResultsEntry>();
       this.results = results;
+      filteredEntries = new List<ResultsEntry>();
 
       foreach (var resultsEntry in results.GetEntries()) {
@@ -73 +74 @@
         if (resultsEntry.Get(Y_JITTER) == null)
           resultsEntry.Set(Y_JITTER, random.NextDouble() * 2.0 - 1.0);
-        records.Add(resultsEntry);
+        //        records.Add(resultsEntry);
       }
 
@@ -123 +124 @@
       double minSize = 1;
       if (sizeDimension != null && results.OrdinalVariables.Contains(sizeDimension)) {
-        var sizes = records
+        var sizes = results.GetEntries()
           .Select(x => Convert.ToDouble(x.Get(sizeDimension)))
           .Where(size => !double.IsInfinity(size) && size != double.MaxValue && size != double.MinValue)
@@ -139 +140 @@
       Group.Add(new Axis(this, 0, 0, AxisType.Both));
       UpdateViewSize(0, 0, 5);
-      foreach (ResultsEntry r in records) {
+      foreach (ResultsEntry r in results.GetEntries().Where(x => x.Visible)) {
         List<double> xs = new List<double>();
         List<double> ys = new List<double>();
@@ -145 +146 @@
         List<object> actualYValues = new List<object>();
         int size;
-        if (results.OrdinalVariables.Contains(xDimension)) {
+        if (results.OrdinalVariables.Contains(xDimension) && r.Get(xDimension) != null) {
           xs.Add(Convert.ToDouble(r.Get(xDimension)) + (double)r.Get(X_JITTER) * xJitterFactor);
           actualXValues.Add(r.Get(xDimension));
-        } else if (results.CategoricalVariables.Contains(xDimension)) {
+        } else if (results.CategoricalVariables.Contains(xDimension) && r.Get(xDimension) != null) {
           xs.Add(results.IndexOfCategoricalValue(xDimension, r.Get(xDimension)) + (double)r.Get(X_JITTER) * xJitterFactor);
           actualXValues.Add(r.Get(xDimension));
@@ -155 +156 @@
           IEnumerable<ResultsEntry> subEntries = (IEnumerable<ResultsEntry>)r.Get(path.ElementAt(0));
           foreach (ResultsEntry subEntry in subEntries) {
-            xs.Add(results.IndexOfCategoricalValue(xDimension, subEntry.Get(path.ElementAt(1))) + (double)r.Get(X_JITTER) * xJitterFactor);
-            actualXValues.Add(subEntry.Get(path.ElementAt(1)));
+            if (subEntry.Get(path.ElementAt(1)) != null) {
+              xs.Add(results.IndexOfCategoricalValue(xDimension, subEntry.Get(path.ElementAt(1))) + (double)r.Get(X_JITTER) * xJitterFactor);
+              actualXValues.Add(subEntry.Get(path.ElementAt(1)));
+            }
           }
         } else if (results.MultiDimensionalOrdinalVariables.Contains(xDimension)) {
@@ -162 +165 @@
           IEnumerable<ResultsEntry> subEntries = (IEnumerable<ResultsEntry>)r.Get(path.ElementAt(0));
           foreach (ResultsEntry subEntry in subEntries) {
-            xs.Add(Convert.ToDouble(subEntry.Get(path.ElementAt(1))) + (double)r.Get(X_JITTER) * xJitterFactor);
-            actualXValues.Add(subEntry.Get(path.ElementAt(1)));
-          }
-        }
-        if (results.OrdinalVariables.Contains(yDimension)) {
+            if (subEntry.Get(path.ElementAt(1)) != null) {
+              xs.Add(Convert.ToDouble(subEntry.Get(path.ElementAt(1))) + (double)r.Get(X_JITTER) * xJitterFactor);
+              actualXValues.Add(subEntry.Get(path.ElementAt(1)));
+            }
+          }
+        }
+        if (results.OrdinalVariables.Contains(yDimension) && r.Get(yDimension) != null) {
           ys.Add(Convert.ToDouble(r.Get(yDimension)) + (double)r.Get(Y_JITTER) * yJitterFactor);
           actualYValues.Add(r.Get(yDimension));
-        } else if (results.CategoricalVariables.Contains(yDimension)) {
+        } else if (results.CategoricalVariables.Contains(yDimension) && r.Get(yDimension) != null) {
           ys.Add(results.IndexOfCategoricalValue(yDimension, r.Get(yDimension)) + (double)r.Get(Y_JITTER) * yJitterFactor);
           actualYValues.Add(r.Get(yDimension));
@@ -176 +181 @@
           IEnumerable<ResultsEntry> subEntries = (IEnumerable<ResultsEntry>)r.Get(path.ElementAt(0));
           foreach (ResultsEntry subEntry in subEntries) {
-            ys.Add(results.IndexOfCategoricalValue(yDimension, subEntry.Get(path.ElementAt(1))) + (double)r.Get(Y_JITTER) * yJitterFactor);
-            actualYValues.Add(subEntry.Get(path.ElementAt(1)));
+            if (subEntry.Get(path.ElementAt(1)) != null) {
+              ys.Add(results.IndexOfCategoricalValue(yDimension, subEntry.Get(path.ElementAt(1))) + (double)r.Get(Y_JITTER) * yJitterFactor);
+              actualYValues.Add(subEntry.Get(path.ElementAt(1)));
+            }
           }
         } else if (results.MultiDimensionalOrdinalVariables.Contains(yDimension)) {
@@ -183 +190 @@
           IEnumerable<ResultsEntry> subEntries = (IEnumerable<ResultsEntry>)r.Get(path.ElementAt(0));
           foreach (ResultsEntry subEntry in subEntries) {
-            ys.Add(Convert.ToDouble(subEntry.Get(path.ElementAt(1))) + (double)r.Get(Y_JITTER) * yJitterFactor);
-            actualYValues.Add(subEntry.Get(path.ElementAt(1)));
+            if (subEntry.Get(path.ElementAt(1)) != null) {
+              ys.Add(Convert.ToDouble(subEntry.Get(path.ElementAt(1))) + (double)r.Get(Y_JITTER) * yJitterFactor);
+              actualYValues.Add(subEntry.Get(path.ElementAt(1)));
+            }
           }
         }
@@ -324 +333 @@
       }
     }
+
+    internal void ToggleSelected() {
+      foreach (ResultsEntry entry in results.GetEntries()) {
+        entry.ToggleSelected();
+      }
+      results.FireChanged();
+    }
+
+    internal void ClearSelection() {
+      foreach (ResultsEntry entry in results.GetEntries().Where(x=>x.Selected)) {
+        entry.ToggleSelected();
+      }
+      results.FireChanged();
+    }
+
+    internal void ApplyFilter(Func<ResultsEntry, bool> filterPred) {
+      foreach (ResultsEntry r in results.GetEntries()) {
+        if (filterPred(r)) {
+          r.Visible = false;
+          r.Selected = false;
+          filteredEntries.Add(r);
+        } 
+      }
+      results.FireChanged();
+    }
+
+    internal void ClearFilter() {
+      foreach (ResultsEntry r in filteredEntries) {
+        r.Visible = true;
+      }
+      filteredEntries.Clear();
+      results.FireChanged();
+    }
   }
 }