Changeset 14255 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionModelMathView.cs

Timestamp:

08/16/16 12:04:56 (8 years ago)

Author:

pfleck

Message:

#2632

• Added the name of the target variable in plots and charts (scatter, line, ...).
• Renamed MathSymbolicDataAnalysisModelView and added two subclasses for regression and classification that shows the name of the target variable in the equation. (added and used a new Format method to the LatexFormatter that uses the actual target name when encountering the StartSymbol)

File:

• trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionModelMathView.cs (moved) (moved from trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/MathSymbolicDataAnalysisModelView.cs) (1 diff)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views/3.4/SymbolicRegressionModelMathView.cs

@@ -20 +20 @@
 #endregion
 
-using System;
-using System.IO;
-using System.Windows.Forms;
 using HeuristicLab.MainForm;
-using HeuristicLab.MainForm.WindowsForms;
+using HeuristicLab.Problems.DataAnalysis.Symbolic.Views;
 
-namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views {
+namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views {
   [View("Mathematical Representation")]
-  [Content(typeof(ISymbolicDataAnalysisModel))]
-  public partial class MathSymbolicDataAnalysisModelView : AsynchronousContentView {
-    private SymbolicDataAnalysisExpressionLatexFormatter formatter = new SymbolicDataAnalysisExpressionLatexFormatter();
-    public MathSymbolicDataAnalysisModelView()
-      : base() {
-      InitializeComponent();
-      webBrowser.ScrollBarsEnabled = true;
-      webBrowser.ScriptErrorsSuppressed = false;
+  [Content(typeof(ISymbolicRegressionModel))]
+  public partial class SymbolicRegressionModelMathView : SymbolicDataAnalysisModelMathView {
 
-      // update for the first time after page has loaded
-      webBrowser.DocumentCompleted += (sender, args) => RefreshHtmlPage();
+    public SymbolicRegressionModelMathView() : base() { }
 
-      string hlDir = Path.GetFullPath(AppDomain.CurrentDomain.BaseDirectory);
-      webBrowser.Navigate("file://" + Path.Combine(hlDir, "displayModelFrame.html"));
-    }
-
-    public new ISymbolicDataAnalysisModel Content {
-      get { return (ISymbolicDataAnalysisModel)base.Content; }
+    public new ISymbolicRegressionModel Content {
+      get { return (ISymbolicRegressionModel)base.Content; }
       set { base.Content = value; }
     }
 
-    protected override void OnContentChanged() {
-      base.OnContentChanged();
-      RefreshHtmlPage();
-    }
-
-    private void RefreshHtmlPage() {
-      // only update if the page has loaded already
-      if (webBrowser.Document == null || webBrowser.Document.Body == null) return;
-
-      if (Content != null) {
-        HtmlElement newElement = webBrowser.Document.GetElementById("model");
-        newElement.InnerText = formatter.Format(Content.SymbolicExpressionTree);
-        webBrowser.Document.InvokeScript("refreshModel");
-      } else {
-        HtmlElement newElement = webBrowser.Document.GetElementById("model");
-        newElement.InnerText = string.Empty;
-      }
+    protected override string GetFormattedTree() {
+      return Formatter.Format(Content.SymbolicExpressionTree, Content.TargetVariable);
     }
   }