Changeset 3884 for trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic

Timestamp:

06/01/10 17:58:03 (14 years ago)

Author:

gkronber

Message:

Worked on support vector regression operators and views. #1009

Location:

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic

Files:

• SimplifiedSymbolicExpressionModelView.cs (modified) (2 diffs)
• SymbolicExpressionModelView.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/SimplifiedSymbolicExpressionModelView.cs

@@ -39 +39 @@
 namespace HeuristicLab.Problems.DataAnalysis.Views.Symbolic {
   [View("Simplified Symbolic Expression Model View")]
-  [Content(typeof(SymbolicRegressionSolution))]
+  [Content(typeof(SymbolicRegressionModel))]
   public partial class SimplifiedSymbolicExpressionModelView : AsynchronousContentView {
-    public new SymbolicRegressionSolution Content {
-      get { return (SymbolicRegressionSolution)base.Content; }
-      set { base.Content = value; }
-    }
-
-
     public SimplifiedSymbolicExpressionModelView()
       : base() {
@@ -52 +46 @@
     }
 
-    protected override void RegisterContentEvents() {
-      base.RegisterContentEvents();
-      Content.ModelChanged += new EventHandler(Content_ModelChanged);
-    }
-
-    protected override void DeregisterContentEvents() {
-      base.DeregisterContentEvents();
-      Content.ModelChanged -= new EventHandler(Content_ModelChanged);
-    }
-
-    void Content_ModelChanged(object sender, EventArgs e) {
-      UpdateTreeChart();
+    public new SymbolicRegressionModel Content {
+      get { return (SymbolicRegressionModel)base.Content; }
+      set { base.Content = value; }
     }
 
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      UpdateTreeChart();
+      if (Content != null)
+        UpdateTreeChart();
+      else
+        viewHost.Content = null;
     }
 
     private void UpdateTreeChart() {
       var simplifier = new SymbolicSimplifier();
-      var simplifiedTree = simplifier.Simplify(Content.Model.SymbolicExpressionTree);
+      var simplifiedTree = simplifier.Simplify(Content.SymbolicExpressionTree);
       viewHost.Content = simplifiedTree;
     }

trunk/sources/HeuristicLab.Problems.DataAnalysis.Views/3.3/Symbolic/SymbolicExpressionModelView.cs

@@ -39 +39 @@
 namespace HeuristicLab.Problems.DataAnalysis.Views.Symbolic {
   [View("Symbolic Expression Model View")]
-  [Content(typeof(SymbolicRegressionSolution))]
+  [Content(typeof(SymbolicRegressionModel),true)]
   public partial class SymbolicExpressionModelView : AsynchronousContentView {
-    public new SymbolicRegressionSolution Content {
-      get { return (SymbolicRegressionSolution)base.Content; }
-      set { base.Content = value; }
-    }
-
     public SymbolicExpressionModelView()
       : base() {
@@ -51 +46 @@
     }
 
-    protected override void RegisterContentEvents() {
-      base.RegisterContentEvents();
-      Content.ModelChanged += new EventHandler(Content_ModelChanged);
-    }
-
-    protected override void DeregisterContentEvents() {
-      base.DeregisterContentEvents();
-      Content.ModelChanged -= new EventHandler(Content_ModelChanged);
-    }
-
-    void Content_ModelChanged(object sender, EventArgs e) {
-      UpdateTreeChart();
+    public new SymbolicRegressionModel Content {
+      get { return (SymbolicRegressionModel)base.Content; }
+      set { base.Content = value; }
     }
 
     protected override void OnContentChanged() {
       base.OnContentChanged();
-      UpdateTreeChart();
+      if (Content != null)
+        UpdateTreeChart();
+      else
+        viewHost.Content = null;
     }
 
     private void UpdateTreeChart() {
-      viewHost.Content = Content.Model.SymbolicExpressionTree;
+      viewHost.Content = Content.SymbolicExpressionTree;
     }
   }