Changeset 2289

Timestamp:

08/14/09 15:35:10 (15 years ago)

Author:

mkommend

Message:

• added VisualMatrix to represent data in BubbleChart
• made BubbleChart abstract and added inherited ModelingBubbleChart, which reacts as the BubbleChart
• moved classes between CEDMA.Core and CEDMA.Charting
• deleted unnecessary classes (results, resultsentry)

(ticket #723)

Location:

trunk/sources

Files:

• HeuristicLab.CEDMA.Charting/3.3/BubbleChart.cs (modified) (10 diffs)
• HeuristicLab.CEDMA.Charting/3.3/BubbleChartControl.Designer.cs (modified) (5 diffs)
• HeuristicLab.CEDMA.Charting/3.3/BubbleChartControl.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Charting/3.3/BubbleChartView.cs (modified) (2 diffs)
• HeuristicLab.CEDMA.Charting/3.3/HeuristicLab.CEDMA.Charting-3.3.csproj (modified) (3 diffs)
• HeuristicLab.CEDMA.Charting/3.3/HeuristicLabCedmaChartingPlugin.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Charting/3.3/IResultsViewFactory.cs (moved) (moved from trunk/sources/HeuristicLab.CEDMA.Core/3.3/IResultsViewFactory.cs) (1 diff)
• HeuristicLab.CEDMA.Charting/3.3/ModelingBubbleChart.cs (added)
• HeuristicLab.CEDMA.Charting/3.3/TableResultsView.Designer.cs (moved) (moved from trunk/sources/HeuristicLab.CEDMA.Core/3.3/TableResultsView.Designer.cs)
• HeuristicLab.CEDMA.Charting/3.3/TableResultsView.cs (moved) (moved from trunk/sources/HeuristicLab.CEDMA.Core/3.3/TableResultsView.cs) (5 diffs)
• HeuristicLab.CEDMA.Charting/3.3/TableResultsView.resx (moved) (moved from trunk/sources/HeuristicLab.CEDMA.Core/3.3/TableResultsView.resx)
• HeuristicLab.CEDMA.Charting/3.3/VisualMatrix.cs (added)
• HeuristicLab.CEDMA.Charting/3.3/VisualMatrixRow.cs (added)
• HeuristicLab.CEDMA.Core/3.3/Console.cs (modified) (3 diffs)
• HeuristicLab.CEDMA.Core/3.3/ConsoleEditor.cs (modified) (3 diffs)
• HeuristicLab.CEDMA.Core/3.3/HeuristicLab.CEDMA.Core-3.3.csproj (modified) (4 diffs)
• HeuristicLab.CEDMA.Core/3.3/HeuristicLabCedmaCorePlugin.cs (modified) (1 diff)
• HeuristicLab.CEDMA.Core/3.3/Results.cs (deleted)
• HeuristicLab.CEDMA.Core/3.3/ResultsEntry.cs (deleted)

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

@@ -27 +27 @@
 using HeuristicLab.Charting;
 using System.Windows.Forms;
-using HeuristicLab.CEDMA.Core;
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Core;
 using System.Diagnostics;
+using HeuristicLab.SparseMatrix;
 
 namespace HeuristicLab.CEDMA.Charting {
-  public class BubbleChart : Chart {
-    private const string X_JITTER = "__X_JITTER";
-    private const string Y_JITTER = "__Y_JITTER";
+  public abstract class BubbleChart : Chart {
     private const double maxXJitterPercent = 0.05;
     private const double maxYJitterPercent = 0.05;
@@ -55 +53 @@
     private double maxX = double.NegativeInfinity;
     private double maxY = double.NegativeInfinity;
-    private List<ResultsEntry> filteredEntries;
-    private Results results;
-    private Dictionary<IPrimitive, ResultsEntry> primitiveToEntryDictionary;
-    private Random random = new Random();
-    private Group points;
-
-    public BubbleChart(Results results, PointD lowerLeft, PointD upperRight)
+
+    protected Group points;
+    protected VisualMatrix matrix;
+    protected Dictionary<IPrimitive, VisualMatrixRow> primitiveToMatrixRowDictionary;
+
+    public BubbleChart(VisualMatrix matrix, PointD lowerLeft, PointD upperRight)
       : base(lowerLeft, upperRight) {
-      primitiveToEntryDictionary = new Dictionary<IPrimitive, ResultsEntry>();
-      this.results = results;
-      filteredEntries = new List<ResultsEntry>();
-
-      foreach (var resultsEntry in results.GetEntries()) {
-        if (resultsEntry.Get(X_JITTER) == null)
-          resultsEntry.Set(X_JITTER, random.NextDouble() * 2.0 - 1.0);
-        if (resultsEntry.Get(Y_JITTER) == null)
-          resultsEntry.Set(Y_JITTER, random.NextDouble() * 2.0 - 1.0);
-      }
-      results.Changed += new EventHandler(results_Changed);
-    }
-
-    void results_Changed(object sender, EventArgs e) {
-      Repaint();
-      EnforceUpdate();
-    }
-
-    public BubbleChart(Results results, double x1, double y1, double x2, double y2)
-      : this(results, new PointD(x1, y1), new PointD(x2, y2)) {
+      primitiveToMatrixRowDictionary = new Dictionary<IPrimitive, VisualMatrixRow>();
+      this.matrix = matrix;
+    }
+
+    public BubbleChart(VisualMatrix matrix, double x1, double y1, double x2, double y2)
+      : this(matrix, new PointD(x1, y1), new PointD(x2, y2)) {
     }
 
@@ -103 +86 @@
     }
 
-    internal void SetJitter(double xJitterFactor, double yJitterFactor) {
+    public void SetJitter(double xJitterFactor, double yJitterFactor) {
       this.xJitterFactor = xJitterFactor * maxXJitterPercent * Size.Width;
       this.yJitterFactor = yJitterFactor * maxYJitterPercent * Size.Height;
@@ -115 +98 @@
     }
 
-    private void Repaint() {
+    protected void Repaint() {
       if (xDimension == null || yDimension == null) return;
       double maxSize = 1;
       double minSize = 1;
-      if (sizeDimension != null && results.OrdinalVariables.Contains(sizeDimension)) {
-        var sizes = results.GetEntries()
+      if (sizeDimension != null && matrix.OrdinalVariables.Contains(sizeDimension)) {
+        var sizes = matrix.Rows
           .Select(x => Convert.ToDouble(x.Get(sizeDimension)))
           .Where(size => !double.IsInfinity(size) && size != double.MaxValue && size != double.MinValue)
@@ -132 +115 @@
       UpdateEnabled = false;
       Group.Clear();
-      primitiveToEntryDictionary.Clear();
+      primitiveToMatrixRowDictionary.Clear();
       points = new Group(this);
       Group.Add(new Axis(this, 0, 0, AxisType.Both));
       UpdateViewSize(0, 0, TransformPixelToWorld(new Size(5, 0)).Width);
-      foreach (ResultsEntry r in results.GetEntries().Where(x => x.Visible)) {
+      foreach (VisualMatrixRow r in matrix.Rows.Where(x => x.Visible)) {
         List<double> xs = new List<double>();
         List<double> ys = new List<double>();
@@ -142 +125 @@
         List<object> actualYValues = new List<object>();
         int size;
-        if (results.OrdinalVariables.Contains(xDimension) && r.Get(xDimension) != null) {
-          xs.Add(Convert.ToDouble(r.Get(xDimension)) + (double)r.Get(X_JITTER) * xJitterFactor);
+        if (matrix.OrdinalVariables.Contains(xDimension) && r.Get(xDimension) != null) {
+          xs.Add(Convert.ToDouble(r.Get(xDimension)) + r.XJitter * xJitterFactor);
           actualXValues.Add(r.Get(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);
+        } else if (matrix.CategoricalVariables.Contains(xDimension) && r.Get(xDimension) != null) {
+          xs.Add(matrix.IndexOfCategoricalValue(xDimension, r.Get(xDimension)) + r.XJitter * xJitterFactor);
           actualXValues.Add(r.Get(xDimension));
-        } else if (results.MultiDimensionalCategoricalVariables.Contains(xDimension)) {
+        } else if (matrix.MultiDimensionalCategoricalVariables.Contains(xDimension)) {
           var path = xDimension.Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim());
-          IEnumerable<ResultsEntry> subEntries = (IEnumerable<ResultsEntry>)r.Get(path.ElementAt(0));
-          foreach (ResultsEntry subEntry in subEntries) {
-            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)) {
+          IEnumerable<VisualMatrixRow> subRows = (IEnumerable<VisualMatrixRow>)r.Get(path.ElementAt(0));
+          foreach (VisualMatrixRow subRow in subRows) {
+            if (subRow.Get(path.ElementAt(1)) != null) {
+              xs.Add(matrix.IndexOfCategoricalValue(xDimension, subRow.Get(path.ElementAt(1))) + r.YJitter * xJitterFactor);
+              actualXValues.Add(subRow.Get(path.ElementAt(1)));
+            }
+          }
+        } else if (matrix.MultiDimensionalOrdinalVariables.Contains(xDimension)) {
           var path = xDimension.Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim());
-          IEnumerable<ResultsEntry> subEntries = (IEnumerable<ResultsEntry>)r.Get(path.ElementAt(0));
-          foreach (ResultsEntry subEntry in subEntries) {
-            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);
+          IEnumerable<VisualMatrixRow> subRows = (IEnumerable<VisualMatrixRow>)r.Get(path.ElementAt(0));
+          foreach (VisualMatrixRow subRow in subRows) {
+            if (subRow.Get(path.ElementAt(1)) != null) {
+              xs.Add(Convert.ToDouble(subRow.Get(path.ElementAt(1))) + r.XJitter * xJitterFactor);
+              actualXValues.Add(subRow.Get(path.ElementAt(1)));
+            }
+          }
+        }
+        if (matrix.OrdinalVariables.Contains(yDimension) && r.Get(yDimension) != null) {
+          ys.Add(Convert.ToDouble(r.Get(yDimension)) + r.YJitter * yJitterFactor);
           actualYValues.Add(r.Get(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);
+        } else if (matrix.CategoricalVariables.Contains(yDimension) && r.Get(yDimension) != null) {
+          ys.Add(matrix.IndexOfCategoricalValue(yDimension, r.Get(yDimension)) + r.YJitter * yJitterFactor);
           actualYValues.Add(r.Get(yDimension));
-        } else if (results.MultiDimensionalCategoricalVariables.Contains(yDimension)) {
+        } else if (matrix.MultiDimensionalCategoricalVariables.Contains(yDimension)) {
           var path = yDimension.Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim());
-          IEnumerable<ResultsEntry> subEntries = (IEnumerable<ResultsEntry>)r.Get(path.ElementAt(0));
-          foreach (ResultsEntry subEntry in subEntries) {
-            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)) {
+          IEnumerable<VisualMatrixRow> subRows = (IEnumerable<VisualMatrixRow>)r.Get(path.ElementAt(0));
+          foreach (VisualMatrixRow subRow in subRows) {
+            if (subRow.Get(path.ElementAt(1)) != null) {
+              ys.Add(matrix.IndexOfCategoricalValue(yDimension, subRow.Get(path.ElementAt(1))) + r.YJitter * yJitterFactor);
+              actualYValues.Add(subRow.Get(path.ElementAt(1)));
+            }
+          }
+        } else if (matrix.MultiDimensionalOrdinalVariables.Contains(yDimension)) {
           var path = yDimension.Split(new char[] { ':' }, StringSplitOptions.RemoveEmptyEntries).Select(x => x.Trim());
-          IEnumerable<ResultsEntry> subEntries = (IEnumerable<ResultsEntry>)r.Get(path.ElementAt(0));
-          foreach (ResultsEntry subEntry in subEntries) {
-            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)));
+          IEnumerable<VisualMatrixRow> subRows = (IEnumerable<VisualMatrixRow>)r.Get(path.ElementAt(0));
+          foreach (VisualMatrixRow subRow in subRows) {
+            if (subRow.Get(path.ElementAt(1)) != null) {
+              ys.Add(Convert.ToDouble(subRow.Get(path.ElementAt(1))) + r.YJitter * yJitterFactor);
+              actualYValues.Add(subRow.Get(path.ElementAt(1)));
             }
           }
@@ -208 +191 @@
           if (double.IsInfinity(x) || x == double.MaxValue || x == double.MinValue) x = double.NaN;
           if (double.IsInfinity(y) || y == double.MaxValue || y == double.MinValue) y = double.NaN;
-          if (!double.IsNaN(x) && !double.IsNaN(y) && IsReasonablePoint(new PointD(x,y))) {
+          if (!double.IsNaN(x) && !double.IsNaN(y) && IsReasonablePoint(new PointD(x, y))) {
             string actualXValue = actualXValues[Math.Min(i, actualXValues.Count() - 1)].ToString();
             string actualYValue = actualYValues[Math.Min(i, actualYValues.Count() - 1)].ToString();
@@ -221 +204 @@
             points.Add(c);
             if (!r.Selected) c.IntoBackground();
-            primitiveToEntryDictionary[c] = r;
+            primitiveToMatrixRowDictionary[c] = r;
           }
         }
@@ -230 +213 @@
 
     private bool IsReasonablePoint(PointD pointD) {
-      return pointD.X > LowerLeft.X && pointD.X < UpperRight.X && pointD.Y > LowerLeft.Y && pointD.Y < UpperRight.Y; 
+      return pointD.X > LowerLeft.X && pointD.X < UpperRight.X && pointD.Y > LowerLeft.Y && pointD.Y < UpperRight.Y;
     }
 
@@ -274 +257 @@
     }
 
-    internal ResultsEntry GetResultsEntry(Point point) {
-      ResultsEntry r = null;
+    protected VisualMatrixRow GetMatrixRow(Point point) {
+      VisualMatrixRow r = null;
       IPrimitive p = points.GetPrimitive(TransformPixelToWorld(point));
       if (p != null) {
-        primitiveToEntryDictionary.TryGetValue(p, out r);
+        primitiveToMatrixRowDictionary.TryGetValue(p, out r);
       }
       return r;
     }
 
-    public override void MouseDrag(Point start, Point end, MouseButtons button) {
-      if (button == MouseButtons.Left && Mode == ChartMode.Select) {
-        PointD a = TransformPixelToWorld(start);
-        PointD b = TransformPixelToWorld(end);
-        double minX = Math.Min(a.X, b.X);
-        double minY = Math.Min(a.Y, b.Y);
-        double maxX = Math.Max(a.X, b.X);
-        double maxY = Math.Max(a.Y, b.Y);
-        HeuristicLab.Charting.Rectangle rect = new HeuristicLab.Charting.Rectangle(this, minX, minY, maxX, maxY);
-
-        List<IPrimitive> primitives = new List<IPrimitive>();
-        primitives.AddRange(points.Primitives);
-
-        foreach (FixedSizeCircle p in primitives) {
-          if (rect.ContainsPoint(p.Point)) {
-            ResultsEntry r;
-            primitiveToEntryDictionary.TryGetValue(p, out r);
-            if (r != null) r.ToggleSelected();
-          }
-        }
-        if (primitives.Count() > 0) results.FireChanged();
-      } else {
-        base.MouseDrag(start, end, button);
-      }
-    }
-
-    public override void MouseClick(Point point, MouseButtons button) {
-      if (button == MouseButtons.Left) {
-        ResultsEntry r = GetResultsEntry(point);
-        if (r != null) {
-          r.ToggleSelected();
-          results.FireChanged();
-        }
-      } else {
-        base.MouseClick(point, button);
-      }
-    }
-
-    public override void MouseDoubleClick(Point point, MouseButtons button) {
-      if (button == MouseButtons.Left) {
-        ResultsEntry entry = GetResultsEntry(point);
-        if (entry != null) {
-          var model = (IItem)PersistenceManager.RestoreFromGZip((byte[])entry.Get("PersistedData"));
-          PluginManager.ControlManager.ShowControl(model.CreateView());
-        }
-      } else {
-        base.MouseDoubleClick(point, button);
-      }
-    }
-
-    internal void ToggleSelected() {
-      foreach (ResultsEntry entry in results.GetEntries()) {
+    public virtual void ToggleSelected() {
+      foreach (VisualMatrixRow row in matrix.Rows) {
+        row.ToggleSelected();
+      }
+      matrix.FireChanged();
+    }
+
+    public virtual void ClearSelection() {
+      foreach (VisualMatrixRow entry in matrix.Rows.Where(x => x.Selected)) {
         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()) {
+      matrix.FireChanged();
+    }
+
+    public virtual void ApplyFilter(Func<VisualMatrixRow, bool> filterPred) {
+      foreach (VisualMatrixRow r in matrix.Rows) {
         if (filterPred(r)) {
           r.Visible = false;
           r.Selected = false;
-          filteredEntries.Add(r);
-        } 
-      }
-      results.FireChanged();
-    }
-
-    internal void ClearFilter() {
-      foreach (ResultsEntry r in filteredEntries) {
+        }
+      }
+      matrix.FireChanged();
+    }
+
+    public virtual void ClearFilter() {
+      foreach (VisualMatrixRow r in matrix.Rows.Where(x => !x.Visible)) {
         r.Visible = true;
       }
-      filteredEntries.Clear();
-      results.FireChanged();
+      matrix.FireChanged();
     }
   }

trunk/sources/HeuristicLab.CEDMA.Charting/3.3/BubbleChartControl.Designer.cs

@@ -51 +51 @@
       this.zoomToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.selectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
+      this.clearSelectionMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.invertSelectionToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.filterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
+      this.showHiddenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
-      this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-      this.clearSelectionMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.showHiddenToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
       this.pictureBoxContextMenuStrip.SuspendLayout();
@@ -95 +95 @@
       this.pictureBoxContextMenuStrip.Name = "pictureBoxContextMenuStrip";
       this.pictureBoxContextMenuStrip.Size = new System.Drawing.Size(155, 186);
+      this.pictureBoxContextMenuStrip.Opening += new System.ComponentModel.CancelEventHandler(this.pictureBoxContextMenuStrip_Opening);
       // 
       // moveToolStripMenuItem
@@ -117 +118 @@
       this.selectToolStripMenuItem.Click += new System.EventHandler(this.selectToolStripMenuItem_Click);
       // 
+      // toolStripSeparator1
+      // 
+      this.toolStripSeparator1.Name = "toolStripSeparator1";
+      this.toolStripSeparator1.Size = new System.Drawing.Size(151, 6);
+      // 
+      // clearSelectionMenuItem
+      // 
+      this.clearSelectionMenuItem.Name = "clearSelectionMenuItem";
+      this.clearSelectionMenuItem.Size = new System.Drawing.Size(154, 22);
+      this.clearSelectionMenuItem.Text = "Clear selection";
+      this.clearSelectionMenuItem.Click += new System.EventHandler(this.clearSelectionMenuItem_Click);
+      // 
       // invertSelectionToolStripMenuItem
       // 
@@ -131 +144 @@
       this.filterToolStripMenuItem.Click += new System.EventHandler(this.hideSelectedToolStripMenuItem_Click);
       // 
-      // toolStripSeparator1
-      // 
-      this.toolStripSeparator1.Name = "toolStripSeparator1";
-      this.toolStripSeparator1.Size = new System.Drawing.Size(151, 6);
-      // 
-      // clearSelectionMenuItem
-      // 
-      this.clearSelectionMenuItem.Name = "clearSelectionMenuItem";
-      this.clearSelectionMenuItem.Size = new System.Drawing.Size(154, 22);
-      this.clearSelectionMenuItem.Text = "Clear selection";
-      this.clearSelectionMenuItem.Click += new System.EventHandler(this.clearSelectionMenuItem_Click);
-      // 
       // showHiddenToolStripMenuItem
       // 
@@ -150 +151 @@
       this.showHiddenToolStripMenuItem.Text = "Show hidden";
       this.showHiddenToolStripMenuItem.Click += new System.EventHandler(this.showHiddenToolStripMenuItem_Click);
+      // 
+      // toolTip
+      // 
+      this.toolTip.Popup += new System.Windows.Forms.PopupEventHandler(this.toolTip_Popup);
       // 
       // BubbleChartControl

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

@@ -195 +195 @@
       showHiddenToolStripMenuItem.Enabled = false;
     }
+
+    private void pictureBoxContextMenuStrip_Opening(object sender, CancelEventArgs e) {
+
+    }
+
+    private void toolTip_Popup(object sender, PopupEventArgs e) {
+
+    }
   }
 }

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

@@ -9 +9 @@
 using HeuristicLab.Core;
 using HeuristicLab.CEDMA.Charting;
-using HeuristicLab.CEDMA.Core;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.SparseMatrix;
 
 namespace HeuristicLab.CEDMA.Charting {
   public partial class BubbleChartView : ViewBase {
-    private Results Results {
-      get { return (Results)Item; }
-      set { Item = value; }
-    }
     private const string CONSTANT_SIZE = "<constant>";
     private Label pleaseSelectAxisLabel = new Label();
-    public BubbleChartView(Results results) {
+    public BubbleChartView(VisualMatrix results) {
       InitializeComponent();
-      Results = results;
-      bubbleChartControl.Chart = new BubbleChart(Results, 0, 0, 100, 100);
-      xAxisComboBox.Items.AddRange(Results.OrdinalVariables);
-      xAxisComboBox.Items.AddRange(Results.CategoricalVariables);
-      xAxisComboBox.Items.AddRange(Results.MultiDimensionalCategoricalVariables);
-      xAxisComboBox.Items.AddRange(Results.MultiDimensionalOrdinalVariables);
-      yAxisComboBox.Items.AddRange(Results.OrdinalVariables);
-      yAxisComboBox.Items.AddRange(Results.CategoricalVariables);
-      yAxisComboBox.Items.AddRange(Results.MultiDimensionalCategoricalVariables);
-      yAxisComboBox.Items.AddRange(Results.MultiDimensionalOrdinalVariables);
+      bubbleChartControl.Chart = new ModelingBubbleChart(results, 0, 0, 100, 100);
+      xAxisComboBox.Items.AddRange(results.OrdinalVariables);
+      xAxisComboBox.Items.AddRange(results.CategoricalVariables);
+      xAxisComboBox.Items.AddRange(results.MultiDimensionalCategoricalVariables);
+      xAxisComboBox.Items.AddRange(results.MultiDimensionalOrdinalVariables);
+      yAxisComboBox.Items.AddRange(results.OrdinalVariables);
+      yAxisComboBox.Items.AddRange(results.CategoricalVariables);
+      yAxisComboBox.Items.AddRange(results.MultiDimensionalCategoricalVariables);
+      yAxisComboBox.Items.AddRange(results.MultiDimensionalOrdinalVariables);
       sizeComboBox.Items.Add(CONSTANT_SIZE);
-      sizeComboBox.Items.AddRange(Results.OrdinalVariables);
+      sizeComboBox.Items.AddRange(results.OrdinalVariables);
       sizeComboBox.SelectedItem = sizeComboBox.Items[0];
       yAxisComboBox.SelectedItem = yAxisComboBox.Items[0];
@@ -68 +63 @@
     }
 
-    public IControl CreateView(Results results) {
+    public IControl CreateView(VisualMatrix results) {
       return new BubbleChartView(results);
     }

trunk/sources/HeuristicLab.CEDMA.Charting/3.3/HeuristicLab.CEDMA.Charting-3.3.csproj

@@ -96 +96 @@
     </Compile>
     <Compile Include="HeuristicLabCedmaChartingPlugin.cs" />
+    <Compile Include="IResultsViewFactory.cs" />
+    <Compile Include="ModelingBubbleChart.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="TableResultsView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="TableResultsView.Designer.cs">
+      <DependentUpon>TableResultsView.cs</DependentUpon>
+    </Compile>
+    <Compile Include="VisualMatrix.cs" />
+    <Compile Include="VisualMatrixRow.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\HeuristicLab.CEDMA.Core\3.3\HeuristicLab.CEDMA.Core-3.3.csproj">
-      <Project>{C27DDF6C-84DF-45EF-B82F-57A28DD51166}</Project>
-      <Name>HeuristicLab.CEDMA.Core-3.3</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Charting.Data\3.2\HeuristicLab.Charting.Data-3.2.csproj">
       <Project>{E0740131-AA3E-4A3F-BA03-C9FF8327F4EE}</Project>
@@ -119 +125 @@
       <Name>HeuristicLab.PluginInfrastructure</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.SparseMatrix\3.2\HeuristicLab.SparseMatrix-3.2.csproj">
+      <Project>{1263BB36-1F20-4960-A5CB-530746DBAD77}</Project>
+      <Name>HeuristicLab.SparseMatrix-3.2</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -130 +140 @@
     <EmbeddedResource Include="BubbleChartView.resx">
       <DependentUpon>BubbleChartView.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="TableResultsView.resx">
+      <DependentUpon>TableResultsView.cs</DependentUpon>
     </EmbeddedResource>
   </ItemGroup>

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

@@ -28 +28 @@
   [ClassInfo(Name = "HeuristicLab.CEDMA.Charting-3.3")]
   [PluginFile(Filename = "HeuristicLab.CEDMA.Charting-3.3.dll", Filetype = PluginFileType.Assembly)]
-  [Dependency(Dependency = "HeuristicLab.CEDMA.Core-3.3")]
   [Dependency(Dependency = "HeuristicLab.Charting-3.2")]
   [Dependency(Dependency = "HeuristicLab.Charting.Data-3.2")]
   [Dependency(Dependency = "HeuristicLab.Core-3.2")]
   [Dependency(Dependency = "HeuristicLab.Data-3.2")]
+  [Dependency(Dependency = "HeuristicLab.SparseMatrix-3.2")]
   public class HeuristicLabCedmaCorePlugin : PluginBase {
   }

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

@@ -26 +26 @@
 using HeuristicLab.Core;
 using System.Xml;
-using HeuristicLab.Operators;
 using System.Windows.Forms;
 using HeuristicLab.PluginInfrastructure;
 
-namespace HeuristicLab.CEDMA.Core {
+namespace HeuristicLab.CEDMA.Charting {
   public interface IResultsViewFactory {
     string Name { get; }
-    IControl CreateView(Results results);
+    IControl CreateView(VisualMatrix results);
   }
 }

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

@@ -10 +10 @@
 using HeuristicLab.CEDMA.Core;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.CEDMA.Charting;
 
 namespace HeuristicLab.CEDMA.Core {
 
   public partial class TableResultsView : ViewBase {
-    private Results Results {
-      get { return (Results)Item; }
+    private VisualMatrix VisualMatrix {
+      get { return (VisualMatrix)Item; }
       set { Item = value; }
     }
     private bool suppressEvents;
-    public TableResultsView(Results results) {
+    public TableResultsView(VisualMatrix visualMatrix) {
       suppressEvents = false;
       InitializeComponent();
-      Results = results;
-      results.Changed += new EventHandler(results_Changed);
+      VisualMatrix = visualMatrix;
+      VisualMatrix.Changed += new EventHandler(VisualMatrixChanged);
     }
 
-    void results_Changed(object sender, EventArgs e) {
+    private void VisualMatrixChanged(object sender, EventArgs e) {
       if (suppressEvents) return;
       UpdateControls();
@@ -35 +36 @@
       dataGridView.Rows.Clear();
       dataGridView.Columns.Clear();
-      List<string> attributeNames = Results.SelectModelAttributes().ToList();
-      foreach (var attribute in attributeNames) {
+      foreach (var attribute in VisualMatrix.Attributes) {
         dataGridView.Columns.Add(attribute, attribute);
       }
 
-      var entries = Results.GetEntries();
-      foreach (var entry in entries) {
-        if (entry.Visible) {
+      foreach (var row in VisualMatrix.Rows) {
+        if (row.Visible) {
           int rowIndex = dataGridView.Rows.Add();
-          dataGridView.Rows[rowIndex].Tag = entry;
-          foreach (string attrName in attributeNames) {
-            dataGridView.Rows[rowIndex].Cells[attrName].Value = entry.Get(attrName);
+          dataGridView.Rows[rowIndex].Tag = row;
+          foreach (string attrName in VisualMatrix.Attributes) {
+            dataGridView.Rows[rowIndex].Cells[attrName].Value = row.Get(attrName);
           }
-          if (entry.Selected) dataGridView.Rows[rowIndex].Selected = true;
+          if (row.Selected) dataGridView.Rows[rowIndex].Selected = true;
         }
       }
@@ -58 +57 @@
       if (suppressEvents) return;
       foreach (DataGridViewRow row in dataGridView.Rows) {
-        ((ResultsEntry)row.Tag).Selected = row.Selected;
+        ((VisualMatrixRow)row.Tag).Selected = row.Selected;
       }
       suppressEvents = true;
-      Results.FireChanged();
+      VisualMatrix.FireChanged();
       suppressEvents = false;
     }
@@ -68 +67 @@
       if (e.Button == MouseButtons.Left && e.Clicks == 2) {
         DataGridView.HitTestInfo hitInfo = dataGridView.HitTest(e.X, e.Y);
-        ResultsEntry entry = (ResultsEntry)dataGridView.Rows[hitInfo.RowIndex].Tag;        
+        VisualMatrixRow entry = (VisualMatrixRow)dataGridView.Rows[hitInfo.RowIndex].Tag;        
         var model = (IItem)PersistenceManager.RestoreFromGZip((byte[])entry.Get("PersistedData"));
         PluginManager.ControlManager.ShowControl(model.CreateView());
@@ -82 +81 @@
     }
 
-    public IControl CreateView(Results results) {
-      return new TableResultsView(results);
+    public IControl CreateView(VisualMatrix matrix) {
+      return new TableResultsView(matrix);
     }
 

trunk/sources/HeuristicLab.CEDMA.Core/3.3/Console.cs

@@ -30 +30 @@
 using HeuristicLab.PluginInfrastructure;
 using HeuristicLab.Modeling.Database.SQLServerCompact;
+using HeuristicLab.SparseMatrix;
+using HeuristicLab.Modeling.Database;
+using HeuristicLab.CEDMA.Charting;
 
 namespace HeuristicLab.CEDMA.Core {
   public class Console : ItemBase, IEditable {
     private static readonly string sqlServerCompactConnectionString = @"Data Source=";
+
+    public Console()
+      : base() {
+    }
 
     private string database;
@@ -43 +50 @@
         if (value != database) {
           database = value;
-          results = null;
+          matrix = null;
+          visualMatrix = null;
         }
       }
     }
 
-    private Results results;
-    public Results Results {
+    private Matrix matrix;
+    public Matrix Matrix {
       get {
-        if (results == null) ReloadResults();
-        return results;
+        if (matrix == null) LoadResults();
+        return matrix;
       }
     }
-    public Console()
-      : base() {
+
+    private VisualMatrix visualMatrix;
+    public VisualMatrix VisualMatrix {
+      get {
+        if (matrix == null)
+          visualMatrix = CreateVisualMatrix();
+        return visualMatrix;
+      }
     }
 
@@ -67 +81 @@
     }
 
-    private void ReloadResults() {
-      results = new Results(new DatabaseService(sqlServerCompactConnectionString + Database));
+    private void LoadResults() {
+      matrix = new Matrix();
+      DatabaseService db = new DatabaseService(sqlServerCompactConnectionString + database);
+      db.Connect();
+
+      foreach (var model in db.GetAllModels()) {
+        MatrixRow row = new MatrixRow();
+        foreach (var modelResult in db.GetModelResults(model)) {
+          row.Set(modelResult.Result.Name, modelResult.Value);
+        }
+        row.Set("PersistedData", db.GetModelData(model));
+        row.Set("TargetVariable", model.TargetVariable.Name);
+        row.Set("Algorithm", model.Algorithm.Name);
+        Dictionary<HeuristicLab.Modeling.Database.IVariable, MatrixRow> inputVariableResultsEntries =
+          new Dictionary<HeuristicLab.Modeling.Database.IVariable, MatrixRow>();
+
+        foreach (IInputVariableResult inputVariableResult in db.GetInputVariableResults(model)) {
+          if (!inputVariableResultsEntries.ContainsKey(inputVariableResult.Variable)) {
+            inputVariableResultsEntries[inputVariableResult.Variable] = new MatrixRow();
+            inputVariableResultsEntries[inputVariableResult.Variable].Set("InputVariableName", inputVariableResult.Variable.Name);
+          }
+          inputVariableResultsEntries[inputVariableResult.Variable].Set(inputVariableResult.Result.Name, inputVariableResult.Value);
+        }
+        row.Set("VariableImpacts", inputVariableResultsEntries.Values);
+        matrix.AddRow(row);
+      }
+      db.Disconnect();
+    }
+
+    private VisualMatrix CreateVisualMatrix() {      
+      DatabaseService db = new DatabaseService(sqlServerCompactConnectionString + database);
+      db.Connect();
+      string[] multiDimensionalCategoricalVariables = new string[] { "VariableImpacts: InputVariableName" };
+      string[] multiDimensionalOrdinalVariables = db.GetAllResultsForInputVariables().Select(x => "VariableImpacts: " + x.Name).ToArray();
+      string[] ordinalVariables = db.GetAllResults().Select(r => r.Name).ToArray();
+      string[] categoricalVariables = new string[] { "TargetVariable", "Algorithm" };
+
+      db.Disconnect();
+      VisualMatrix m = new VisualMatrix(Matrix, categoricalVariables, ordinalVariables, multiDimensionalCategoricalVariables, multiDimensionalOrdinalVariables);
+      return m;
     }
   }

trunk/sources/HeuristicLab.CEDMA.Core/3.3/ConsoleEditor.cs

@@ -29 +29 @@
 using HeuristicLab.PluginInfrastructure;
 using System.Drawing;
+using HeuristicLab.CEDMA.Charting;
 
 namespace HeuristicLab.CEDMA.Core {
@@ -36 +37 @@
     private Button openButton;
     private Console console;
+    private VisualMatrix matrix;
 
     public ConsoleEditor(Console console) {
@@ -101 +103 @@
     }
 
-
     private void resultsButton_Click(object sender, EventArgs e) {
       IResultsViewFactory factory = (IResultsViewFactory)viewComboBox.SelectedItem;
-      IControl control = factory.CreateView(console.Results);
+      IControl control = factory.CreateView(console.VisualMatrix);
       PluginManager.ControlManager.ShowControl(control);
     }

trunk/sources/HeuristicLab.CEDMA.Core/3.3/HeuristicLab.CEDMA.Core-3.3.csproj

@@ -88 +88 @@
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="IResultsViewFactory.cs" />
-    <Compile Include="ResultsEntry.cs" />
-    <Compile Include="TableResultsView.cs">
-      <SubType>UserControl</SubType>
-    </Compile>
-    <Compile Include="TableResultsView.Designer.cs">
-      <DependentUpon>TableResultsView.cs</DependentUpon>
-    </Compile>
     <Compile Include="Console.cs" />
     <Compile Include="ConsoleEditor.cs">
@@ -102 +94 @@
     <Compile Include="HeuristicLabCedmaCorePlugin.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Results.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -108 +99 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.CEDMA.Charting\3.3\HeuristicLab.CEDMA.Charting-3.3.csproj">
+      <Project>{1BF17271-5350-476A-8F6D-FC74FA3E82CA}</Project>
+      <Name>HeuristicLab.CEDMA.Charting-3.3</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Core\3.2\HeuristicLab.Core-3.2.csproj">
       <Project>{F43B59AB-2B8C-4570-BC1E-15592086517C}</Project>
       <Name>HeuristicLab.Core-3.2</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.DataAnalysis\3.2\HeuristicLab.DataAnalysis-3.2.csproj">
-      <Project>{7DD3A97A-56E9-462F-90E2-A351FE7AF5C2}</Project>
-      <Name>HeuristicLab.DataAnalysis-3.2</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Data\3.2\HeuristicLab.Data-3.2.csproj">
-      <Project>{F473D9AF-3F09-4296-9F28-3C65118DAFFA}</Project>
-      <Name>HeuristicLab.Data-3.2</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Modeling.Database.SQLServerCompact\3.2\HeuristicLab.Modeling.Database.SQLServerCompact-3.2.csproj">
@@ -128 +115 @@
       <Name>HeuristicLab.Modeling.Database-3.2</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\HeuristicLab.Operators\3.2\HeuristicLab.Operators-3.2.csproj">
-      <Project>{A9983BA2-B3B2-475E-8E2C-62050B71D1C5}</Project>
-      <Name>HeuristicLab.Operators-3.2</Name>
-    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
       <Project>{94186A6A-5176-4402-AE83-886557B53CCA}</Project>
       <Name>HeuristicLab.PluginInfrastructure</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\HeuristicLab.SparseMatrix\3.2\HeuristicLab.SparseMatrix-3.2.csproj">
+      <Project>{1263BB36-1F20-4960-A5CB-530746DBAD77}</Project>
+      <Name>HeuristicLab.SparseMatrix-3.2</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <EmbeddedResource Include="TableResultsView.resx">
-      <DependentUpon>TableResultsView.cs</DependentUpon>
-    </EmbeddedResource>
     <EmbeddedResource Include="ConsoleEditor.resx">
       <DependentUpon>ConsoleEditor.cs</DependentUpon>

trunk/sources/HeuristicLab.CEDMA.Core/3.3/HeuristicLabCedmaCorePlugin.cs

@@ -28 +28 @@
   [ClassInfo(Name = "HeuristicLab.CEDMA.Core-3.3")]
   [PluginFile(Filename = "HeuristicLab.CEDMA.Core-3.3.dll", Filetype = PluginFileType.Assembly)]
-  [Dependency(Dependency = "HeuristicLab.Core-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Data-3.2")]
-  [Dependency(Dependency = "HeuristicLab.DataAnalysis-3.2")]
-  [Dependency(Dependency = "HeuristicLab.Operators-3.2")]
+  [Dependency(Dependency = "HeuristicLab.CEDMA.Charting-3.3")]
+  [Dependency(Dependency = "HeuristicLab.Core-3.2")]  
   [Dependency(Dependency = "HeuristicLab.Modeling.Database-3.2")]
   [Dependency(Dependency = "HeuristicLab.Modeling.Database.SQLServerCompact-3.2")]
+  [Dependency(Dependency = "HeuristicLab.SparseMatrix-3.2")]
   public class HeuristicLabCedmaCorePlugin : PluginBase {
   }