Changeset 8916 for branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs

Timestamp:

11/16/12 14:30:54 (11 years ago)

Author:

bburlacu

Message:

#1763: Added HeuristicLab.Problems.DataAnalysis.Symbolic.Classification.Views and HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.Views to the branch. Removed prune button, minor functionality improvements.

Location:

branches/HeuristicLab.TreeSimplifier

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs (modified) (6 diffs)

branches/HeuristicLab.TreeSimplifier/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicDataAnalysisSolutionSimplifierView.cs

@@ -47 +47 @@
       originalValues = new Dictionary<ISymbolicExpressionTreeNode, double>();
       originalVariableNames = new Dictionary<ISymbolicExpressionTreeNode, string>();
-      Caption = "Interactive Solution Simplifier";
+
+      this.Caption = "Interactive Solution Simplifier";
     }
 
@@ -218 +219 @@
       var dialog = (ValueChangeDialog)sender;
       bool flag1 = false, flag2 = false;
-      if (dialog.Content is VariableTreeNode) {
-        var variable = (VariableTreeNode)dialog.Content;
+      var node = dialog.Content;
+
+      if (node is VariableTreeNode) {
+        var variable = dialog.Content as VariableTreeNode;
         var weight = double.Parse(dialog.NewValueTextBox.Text);
         var name = (string)dialog.VariableNameComboBox.SelectedItem;
@@ -232 +235 @@
           variable.VariableName = name;
         }
-      } else if (dialog.Content is ConstantTreeNode) {
-        var constant = (ConstantTreeNode)dialog.Content;
+      } else if (node is ConstantTreeNode) {
+        var constant = dialog.Content as ConstantTreeNode;
         var value = double.Parse(dialog.NewValueTextBox.Text);
         if (!constant.Value.Equals(value)) {
@@ -239 +242 @@
           originalValues[constant] = constant.Value;
           constant.Value = value;
-
         }
       }
@@ -324 +326 @@
     protected abstract void btnOptimizeConstants_Click(object sender, EventArgs e);
 
-    private void btnPrune_Click(object sender, EventArgs e) {
-      btnPrune.Enabled = false;
-      backgroundWorker1.RunWorkerAsync();
-    }
+    //    private void btnPrune_Click(object sender, EventArgs e) {
+    //      btnPrune.Enabled = false;
+    //      backgroundWorker1.RunWorkerAsync();
+    //    }
 
     private void backgroundWorker1_DoWork(object sender, DoWorkEventArgs e) {
@@ -360 +362 @@
         updateInProgress = false;
       }
-      btnPrune.Enabled = true;
+      //      btnPrune.Enabled = true;
     }