Changeset 567 for trunk

Timestamp:

09/14/08 16:16:20 (16 years ago)

Author:

gkronber

Message:

implemented a view that shows the model itself and a line chart and a scatter plot showing original and predicted values. #269 (Functionality to open a chart with predicted vs. original values of any model)

Location:

trunk/sources/HeuristicLab.CEDMA.Charting

Files:

• BubbleChart.cs (modified) (4 diffs)
• BubbleChartControl.Designer.cs (modified) (4 diffs)
• BubbleChartControl.cs (modified) (5 diffs)
• HeuristicLab.CEDMA.Charting.csproj (modified) (4 diffs)
• ModelView.Designer.cs (added)
• ModelView.cs (added)
• ModelView.resx (added)
• Record.cs (modified) (3 diffs)
• ResultList.cs (modified) (5 diffs)
• ResultListView.cs (modified) (2 diffs)

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

@@ -160 +160 @@
             UpdateViewSize(x, y, size);
             int alpha = CalculateAlpha(size);
-            Pen pen = new Pen(Color.FromArgb(alpha, r.Selected ? selectionColor: defaultColor));
+            Pen pen = new Pen(Color.FromArgb(alpha, r.Selected ? selectionColor : defaultColor));
             Brush brush = pen.Brush;
             FixedSizeCircle c = new FixedSizeCircle(this, x, y, size, pen, brush);
-            c.ToolTipText = CreateToolTipText(r);
+            c.ToolTipText = r.GetToolTipText();
             points.Add(c);
             primitiveToRecordDictionary[c] = r;
@@ -172 +172 @@
         UpdateEnabled = true;
       }
-    }
-
-    private string CreateToolTipText(Record r) {
-      StringBuilder b = new StringBuilder();
-      foreach(KeyValuePair<string, double> v in r.Values) {
-        b.Append(v.Key).Append(" = ").Append(v.Value).AppendLine();
-      }
-      return b.ToString();
     }
 
@@ -220 +212 @@
     }
 
-    public override void MouseClick(Point point, MouseButtons button) {
-      if(button == MouseButtons.Left) {
-        Record r;
-        IPrimitive p = points.GetPrimitive(TransformPixelToWorld(point));
-        if(p != null) {
-          primitiveToRecordDictionary.TryGetValue(p, out r);
-          if(r != null) r.ToggleSelected();
-          results.FireChanged();
-        }
-      } else base.MouseClick(point, button);
-    }
-
-    public override void MouseDoubleClick(Point point, MouseButtons button) {
-      if(button == MouseButtons.Left) {
-        Record r;
-        IPrimitive p = points.GetPrimitive(TransformPixelToWorld(point));
-        if(p != null) {
-          primitiveToRecordDictionary.TryGetValue(p, out r);
-          if(r != null) results.OpenModel(r);
-        }
-      } else base.MouseDoubleClick(point, button);
-    }
+    internal Record GetRecord(Point point) {
+      Record r = null;
+      IPrimitive p = points.GetPrimitive(TransformPixelToWorld(point));
+      if(p != null) {
+        primitiveToRecordDictionary.TryGetValue(p, out r);
+      }
+      return r;
+    }
+
 
     public override void MouseDrag(Point start, Point end, MouseButtons button) {
@@ -261 +240 @@
           }
         }
-        results.FireChanged();
       } else {
         base.MouseDrag(start, end, button);

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

@@ -48 +48 @@
       this.pictureBox = new System.Windows.Forms.PictureBox();
       this.pictureBoxContextMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components);
+      this.moveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.zoomToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
       this.selectToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem();
-      this.toolStripMenuItem2 = new System.Windows.Forms.ToolStripSeparator();
       this.toolTip = new System.Windows.Forms.ToolTip(this.components);
       ((System.ComponentModel.ISupportInitialize)(this.pictureBox)).BeginInit();
@@ -80 +80 @@
       // 
       this.pictureBoxContextMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.moveToolStripMenuItem,
             this.zoomToolStripMenuItem,
-            this.selectToolStripMenuItem,
-            this.toolStripMenuItem2});
+            this.selectToolStripMenuItem});
       this.pictureBoxContextMenuStrip.Name = "pictureBoxContextMenuStrip";
-      this.pictureBoxContextMenuStrip.Size = new System.Drawing.Size(104, 54);
+      this.pictureBoxContextMenuStrip.Size = new System.Drawing.Size(153, 92);
+      // 
+      // moveToolStripMenuItem
+      // 
+      this.moveToolStripMenuItem.Name = "moveToolStripMenuItem";
+      this.moveToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
+      this.moveToolStripMenuItem.Text = "Move";
+      this.moveToolStripMenuItem.Click += new System.EventHandler(this.moveToolStripMenuItem_Click);
       // 
       // zoomToolStripMenuItem
       // 
       this.zoomToolStripMenuItem.Name = "zoomToolStripMenuItem";
-      this.zoomToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+      this.zoomToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
       this.zoomToolStripMenuItem.Text = "&Zoom";
       this.zoomToolStripMenuItem.Click += new System.EventHandler(this.zoomToolStripMenuItem_Click);
@@ -96 +103 @@
       // 
       this.selectToolStripMenuItem.Name = "selectToolStripMenuItem";
-      this.selectToolStripMenuItem.Size = new System.Drawing.Size(103, 22);
+      this.selectToolStripMenuItem.Size = new System.Drawing.Size(152, 22);
       this.selectToolStripMenuItem.Text = "&Select";
       this.selectToolStripMenuItem.Click += new System.EventHandler(this.selectToolStripMenuItem_Click);
-      // 
-      // toolStripMenuItem2
-      // 
-      this.toolStripMenuItem2.Name = "toolStripMenuItem2";
-      this.toolStripMenuItem2.Size = new System.Drawing.Size(100, 6);
       // 
       // BubbleChartControl
@@ -126 +128 @@
     protected System.Windows.Forms.ToolStripMenuItem zoomToolStripMenuItem;
     protected System.Windows.Forms.ToolStripMenuItem selectToolStripMenuItem;
-    protected System.Windows.Forms.ToolStripSeparator toolStripMenuItem2;
+    private System.Windows.Forms.ToolStripMenuItem moveToolStripMenuItem;
 
   }

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

@@ -34 +34 @@
     private Bitmap bitmap;
     private bool renderingRequired;
+    private Point mousePosition;
+    private Record clickedRecord;
     private Point buttonDownPoint;
-    private Point mousePosition;
-    private int mouseClickCount;
-    private DateTime lastRendered = DateTime.Now;
+
     private BubbleChart myChart;
     public BubbleChart Chart {
@@ -82 +82 @@
 
     private void pictureBox_MouseDown(object sender, MouseEventArgs e) {
+      clickedRecord = null;
       buttonDownPoint = e.Location;
-      mouseClickCount = e.Clicks;
+      if(e.Button == MouseButtons.Left || e.Button == MouseButtons.Right) {
+        clickedRecord = Chart.GetRecord(buttonDownPoint);
+      }
     }
     private void pictureBox_MouseUp(object sender, MouseEventArgs e) {
@@ -100 +103 @@
             Chart.MouseDrag(lowerLeft, upperRight, e.Button);
           }
+        } else if(Chart.Mode == ChartMode.Move) {
         }
       } else if(e.Button == MouseButtons.Middle) {
         if(Chart.Mode == ChartMode.Zoom) {
-          if(mouseClickCount == 1) Chart.ZoomOut();
-          else if(mouseClickCount == 2) Chart.Unzoom();
+          Chart.ZoomOut();
         }
       }
@@ -138 +141 @@
       SetMode(ChartMode.Select);
     }
+    private void moveToolStripMenuItem_Click(object sender, EventArgs e) {
+      SetMode(ChartMode.Move);
+    }
 
     private void GenerateImage() {
@@ -162 +168 @@
       zoomToolStripMenuItem.Checked = false;
       selectToolStripMenuItem.Checked = false;
+      moveToolStripMenuItem.Checked = false;
       if(mode == ChartMode.Zoom) zoomToolStripMenuItem.Checked = true;
       else if(mode == ChartMode.Select) selectToolStripMenuItem.Checked = true;
+      else if(mode == ChartMode.Move) moveToolStripMenuItem.Checked = true;
       Chart.Mode = mode;
     }
 
     private void pictureBox_MouseClick(object sender, MouseEventArgs e) {
-      Chart.MouseClick(e.Location, e.Button);
+      if(clickedRecord != null) clickedRecord.ToggleSelected();
     }
 
     private void pictureBox_MouseDoubleClick(object sender, MouseEventArgs e) {
-      Chart.MouseDoubleClick(e.Location, e.Button);
+      if(clickedRecord != null) clickedRecord.OpenModel();
     }
   }

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

@@ -73 +73 @@
       <DependentUpon>BubbleChartControl.cs</DependentUpon>
     </Compile>
+    <Compile Include="ModelView.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="ModelView.Designer.cs">
+      <DependentUpon>ModelView.cs</DependentUpon>
+    </Compile>
     <Compile Include="Record.cs" />
     <Compile Include="HeuristicLabCedmaChartingPlugin.cs" />
@@ -90 +96 @@
       <Name>HeuristicLab.CEDMA.DB.Interfaces</Name>
     </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Charting.Data\HeuristicLab.Charting.Data.csproj">
+      <Project>{E0740131-AA3E-4A3F-BA03-C9FF8327F4EE}</Project>
+      <Name>HeuristicLab.Charting.Data</Name>
+    </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.Charting\HeuristicLab.Charting.csproj">
       <Project>{B462D3CC-8866-42F0-9832-AD0967613B72}</Project>
@@ -97 +107 @@
       <Project>{F43B59AB-2B8C-4570-BC1E-15592086517C}</Project>
       <Name>HeuristicLab.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.DataAnalysis\HeuristicLab.DataAnalysis.csproj">
+      <Project>{7DD3A97A-56E9-462F-90E2-A351FE7AF5C2}</Project>
+      <Name>HeuristicLab.DataAnalysis</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Data\HeuristicLab.Data.csproj">
+      <Project>{F473D9AF-3F09-4296-9F28-3C65118DAFFA}</Project>
+      <Name>HeuristicLab.Data</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Functions\HeuristicLab.Functions.csproj">
+      <Project>{B95CA6E2-34BC-4430-994D-BD6E99375319}</Project>
+      <Name>HeuristicLab.Functions</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\HeuristicLab.Logging\HeuristicLab.Logging.csproj">
+      <Project>{4095C92C-5A4C-44BC-9963-5F384CF5CC3F}</Project>
+      <Name>HeuristicLab.Logging</Name>
     </ProjectReference>
     <ProjectReference Include="..\HeuristicLab.PluginInfrastructure\HeuristicLab.PluginInfrastructure.csproj">
@@ -110 +136 @@
     <EmbeddedResource Include="BubbleChartControl.resx">
       <DependentUpon>BubbleChartControl.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="ModelView.resx">
+      <DependentUpon>ModelView.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>

trunk/sources/HeuristicLab.CEDMA.Charting/Record.cs

@@ -68 +68 @@
     public const string Y_JITTER = "__Y_JITTER";
 
+    public event EventHandler OnSelectionChanged;
+
     private Dictionary<string, double> values = new Dictionary<string, double>();
-    public Dictionary<string, double> Values {
-      get {
-        return values;
-      }
-    }
+    private ResultList resultList;
 
     private bool selected = false;
@@ -80 +78 @@
     private string uri;
     public string Uri { get { return uri; } }
-    public Record(string uri) {
+    public Record(ResultList resultList, string uri) {
       this.uri = uri;
+      this.resultList = resultList;
     }
 
     public void Set(string name, double value) {
-      Values.Add(name, value);
+      values.Add(name, value);
     }
 
     public double Get(string name) {
-      if(name == null || !Values.ContainsKey(name)) return double.NaN;
-      return Values[name];
+      if(name == null || !values.ContainsKey(name)) return double.NaN;
+      return values[name];
     }
 
@@ -96 +95 @@
       selected = !selected;
       if(OnSelectionChanged != null) OnSelectionChanged(this, new EventArgs());
+      resultList.FireChanged();
     }
 
-    public event EventHandler OnSelectionChanged;
+    internal string GetToolTipText() {
+      StringBuilder b = new StringBuilder();
+      foreach(KeyValuePair<string, double> v in values) {
+        if(v.Key != X_JITTER && v.Key != Y_JITTER) {
+          b.Append(v.Key).Append(" = ").Append(v.Value).AppendLine();
+        }
+      }
+      return b.ToString();
+    }
+
+    internal void OpenModel() {
+      resultList.OpenModel(this);
+    }
   }
 }

trunk/sources/HeuristicLab.CEDMA.Charting/ResultList.cs

@@ -31 +31 @@
 using System.IO;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Logging;
+using HeuristicLab.Data;
+using HeuristicLab.DataAnalysis;
+using HeuristicLab.Functions;
+using HeuristicLab.Charting.Data;
+using System.Drawing;
 
 namespace HeuristicLab.CEDMA.Charting {
@@ -55 +61 @@
     private readonly Entity treeHeightPredicate = new Entity(cedmaNS + "TreeHeight");
     private readonly Entity rawDataPredicate = new Entity(cedmaNS + "rawData");
+    private readonly Entity hasModelPredicate = new Entity(cedmaNS + "hasModel");
     private readonly Entity anyEntity = new Entity(null);
+    private Dictionary<Record, Dataset> datasets;
 
     private IStore store;
@@ -102 +110 @@
       foreach(Statement[] ss in results) {
         if(ss.Length > 0) {
-          Record r = new Record(ss[0].Subject.Uri);
+          Record r = new Record(this, ss[0].Subject.Uri);
           r.Set(Record.X_JITTER, random.NextDouble() * 2.0 - 1.0);
           r.Set(Record.Y_JITTER, random.NextDouble() * 2.0 - 1.0);
@@ -132 +140 @@
       : base() {
       records = new List<Record>();
+      datasets = new Dictionary<Record, Dataset>();
       predicateToVariableName = new Dictionary<Entity, string>();
       predicateToVariableName[targetVariablePredicate] = Record.TARGET_VARIABLE;
@@ -148 +157 @@
     }
 
-    internal void OpenModel(Record r) {
-      IList<Statement> s = store.Select(new Statement(new Entity(r.Uri), rawDataPredicate, anyEntity));
-      if(s.Count == 1) {
-        string rawData = ((SerializedLiteral)s[0].Property).RawData;
+    internal void OpenModel(Record record) {
+      IList<Statement> modelResults = store.Select(new Statement(new Entity(record.Uri), rawDataPredicate, anyEntity));
+      if(modelResults.Count == 1) {
+        string rawData = ((SerializedLiteral)modelResults[0].Property).RawData;
         XmlDocument doc = new XmlDocument();
         doc.LoadXml(rawData);
-        IItem item = (IItem)PersistenceManager.Restore(doc.ChildNodes[1], new Dictionary<Guid, IStorable>());
-        PluginManager.ControlManager.ShowControl(item.CreateView());
+        IFunctionTree tree = (IFunctionTree)PersistenceManager.Restore(doc.ChildNodes[1], new Dictionary<Guid, IStorable>());
+        int targetVariable = (int)record.Get(Record.TARGET_VARIABLE);
+        Dataset dataset = GetDataset(record);
+
+        ModelView modelView = new ModelView(dataset, tree, targetVariable);
+        PluginManager.ControlManager.ShowControl(modelView);
       }
+    }
+
+    private Dataset GetDataset(Record record) {
+      if(!datasets.ContainsKey(record)) {
+        IList<Statement> result = store.Select(new Statement(anyEntity, hasModelPredicate, new Entity(record.Uri)));
+        if(result.Count == 1) {
+          IList<Statement> datasetResult = store.Select(new Statement(result[0].Subject, rawDataPredicate, anyEntity));
+          if(datasetResult.Count == 1) {
+            string rawData = ((SerializedLiteral)datasetResult[0].Property).RawData;
+            XmlDocument doc = new XmlDocument();
+            doc.LoadXml(rawData);
+            Dataset dataset = (Dataset)PersistenceManager.Restore(doc.ChildNodes[1], new Dictionary<Guid, IStorable>());
+            datasets.Add(record, dataset);
+          }
+        }
+      }
+      return datasets[record];
     }
   }

trunk/sources/HeuristicLab.CEDMA.Charting/ResultListView.cs

@@ -15 +15 @@
     private const string FREQUENCY = "<Frequency>";
     private const string CONSTANT_SIZE = "<constant>";
-    private double xJitterFactor = 0.0;
-    private double yJitterFactor = 0.0;
-    private double maxXJitterPercent = .1;
-    private double maxYJitterPercent = .1;
 
     public ResultListView(ResultList results) {
@@ -37 +33 @@
 
     private void yAxisComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-      yJitterFactor = 0.0;
-      yTrackBar.Value = 0;
       UpdateChart();
     }
 
     private void xAxisComboBox_SelectedIndexChanged(object sender, EventArgs e) {
-      xJitterFactor = 0.0;
-      xTrackBar.Value = 0;
       UpdateChart();
     }