Context Navigation

Changeset 18142

Timestamp:

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

Author:

chaider

Message:

#3140

Location:

branches/3140_NumberSymbol

Files:

-                      r18115
+                      r18142
         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) {
 …
       ISymbolicExpressionTreeNode newNode = null;
       var result = DialogResult.Cancel;
       if (node is INumericTreeNode) {
+      if (node is NumberTreeNode) {
         using (var dialog = new NumberNodeEditDialog(node)) {
           dialog.ShowDialog(this);

-                      r18115
+                      r18142
 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;
 …
       InitializeComponent();
       oldValueTextBox.TabStop = false; // cannot receive focus using tab key
       NewNode = (INumericTreeNode)node;
+      NewNode = (NumberTreeNode)node;
       InitializeFields();
+    }
 …
       // 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;

-                      r18130
+                      r18142
           var newPower = (ISymbolicExpressionTreeNode)branch.Clone();
           var f = (ISymbolicExpressionTreeNode)newPower.GetSubtree(0).Clone();
           var newExponent = (INumericTreeNode)numberSy.CreateTreeNode();
           newExponent.Value = ((INumericTreeNode)newPower.GetSubtree(1)).Value - 1;
+          var newExponent = (NumberTreeNode)numberSy.CreateTreeNode();
+          newExponent.Value = ((NumberTreeNode)newPower.GetSubtree(1)).Value - 1;
           return Product(Product(CreateNumber(exponent.Value), newPower), Derive(f, variableName));
         } else throw new NotSupportedException("Cannot derive non-integer powers");

-                      r18115
+                      r18142
             variableTreeNode.Weight = variable.Weight;
           } else if (node.Data is INumericTreeNode existingNumNode) {
             var newNumNode = (INumericTreeNode)treeNodes[i];
+            var newNumNode = (NumberTreeNode)treeNodes[i];
             newNumNode.Value = existingNumNode.Value;
+          }
 …
         var symbol = child.Data.Symbol;
         if (child.Data is INumericTreeNode firstNum) {
+        if (child.Data is NumberTreeNode firstNum) {
           // fold sibling number nodes into the first number
           for (int k = j + 1; k < children.Length; ++k) {

-                      r18123
+                      r18142
         return tree;
       } else if (tokens.Peek().Symbol == TokenSymbol.CONSTANT) {
         var t = (INumericTreeNode)number.CreateTreeNode();
         t.Value = tokens.Dequeue().DoubleValue;
         return t;
+        var value = tokens.Dequeue().DoubleValue;
+        var constant = new Constant() { Value = value };
+        return constant.CreateTreeNode();
       } else if (tokens.Peek().Symbol == TokenSymbol.LBRACKET) {
         Expect(Token.LBRACKET, tokens);
         Expect(Token.NUM, tokens);
         var t = (INumericTreeNode)number.CreateTreeNode();
+        var t = (NumberTreeNode)number.CreateTreeNode();
         if (tokens.Peek().Symbol == TokenSymbol.EQ) {
           Expect(Token.EQ, tokens);

r18100	r18142
26	26	[StorableType("194AFEE6-96E2-4F53-A5AD-D3CCFE928AE5")]
27	27	public interface INumericTreeNode : ISymbolicExpressionTreeNode {
28		double Value { get; ~~set;~~ }
	28	double Value { get; }
29	29	}
30	30	}

-                      r18115
+                      r18142
     public new Constant Symbol => (Constant) base.Symbol;
+    public double Value {
+      get => Symbol.Value;
+      set => throw new System.NotSupportedException("Cannot change the value of a constant.");
+    }
+    public double Value => Symbol.Value;
     [StorableConstructor]

-                      r18140
+                      r18142
       Parameters.Add(new FixedValueParameter<ReadOnlyItemList<ITransformation>>(TransformationsParameterName, "", transformationsList.AsReadOnly()));
+      IntervalCollection varRanges = null;
       if (variableRanges == null) {
         variableRanges = Dataset.GetVariableRanges();
+        varRanges = Dataset.GetVariableRanges();
       }else {
+        foreach (var entry in variableRanges.GetVariableIntervals())
+          VariableRanges.SetInterval(entry.Item1, entry.Item2);
+      }
+      Parameters.Add(new FixedValueParameter<IntervalCollection>(VariableRangesParameterName, variableRanges));
+        varRanges = (IntervalCollection) variableRanges.Clone();
+      }
+      Parameters.Add(new FixedValueParameter<IntervalCollection>(VariableRangesParameterName, varRanges));
       TransformationsParameter.Hidden = true;

Note: See TracChangeset for help on using the changeset viewer.