Changeset 18142 for branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4

Timestamp:

12/16/21 11:22:29 (3 years ago)

Author:

chaider

Message:

#3140

• Removed setter from INumericTreeNode
• Fixed SymbolicExpressionImporter check for constants and number individually
• Set exponent of power in DerivativeCalculator to number
• Set number in TreeConstantNodeEditDialog and ExpressionTreeChart
• Fixed setting of VariableRanges in DataAnalysisProblemData

Location:

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4

Files:

• InteractiveSymbolicExpressionTreeChart.cs (modified) (2 diffs)
• TreeEditDialogs/SymbolicExpressionTreeConstantNodeEditDialog.cs (modified) (3 diffs)

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/InteractiveSymbolicExpressionTreeChart.cs

@@ -104 +104 @@
         var symbol = dialog.SelectedSymbol;
         var node = symbol.CreateTreeNode();
-        if (node is INumericTreeNode numTreeNode) {
+        if (node is NumberTreeNode numTreeNode) {
           numTreeNode.Value = double.Parse(dialog.numberValueTextBox.Text);
         } else if (node is VariableTreeNode) {
@@ -132 +132 @@
       ISymbolicExpressionTreeNode newNode = null;
       var result = DialogResult.Cancel;
-      if (node is INumericTreeNode) {
+      if (node is NumberTreeNode) {
         using (var dialog = new NumberNodeEditDialog(node)) {
           dialog.ShowDialog(this);

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic.Views/3.4/TreeEditDialogs/SymbolicExpressionTreeConstantNodeEditDialog.cs

@@ -29 +29 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Views {
   public partial class NumberNodeEditDialog : Form {
-    private INumericTreeNode numberTreeNode;
-    public INumericTreeNode NewNode {
+    private NumberTreeNode numberTreeNode;
+    public NumberTreeNode NewNode {
       get { return numberTreeNode; }
       set {
         if (InvokeRequired)
-          Invoke(new Action<SymbolicExpressionTreeNode>(x => numberTreeNode = (INumericTreeNode)x), value);
+          Invoke(new Action<SymbolicExpressionTreeNode>(x => numberTreeNode = (NumberTreeNode)x), value);
         else
           numberTreeNode = value;
@@ -43 +43 @@
       InitializeComponent();
       oldValueTextBox.TabStop = false; // cannot receive focus using tab key
-      NewNode = (INumericTreeNode)node;
+      NewNode = (NumberTreeNode)node;
       InitializeFields();
     }
@@ -103 +103 @@
       // we impose an extra validation condition: that the new value is different from the original value
       if (numberTreeNode.Value.Equals(value)) return;
-
       numberTreeNode.Value = value;
       DialogResult = DialogResult.OK;