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

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/3.4

Files:

• Converters/DerivativeCalculator.cs (modified) (1 diff)
• Hashing/SymbolicExpressionTreeHash.cs (modified) (2 diffs)
• Importer/SymbolicExpressionImporter.cs (modified) (1 diff)
• Interfaces/INumericTreeNode.cs (modified) (1 diff)
• Symbols/ConstantTreeNode.cs (modified) (1 diff)

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/DerivativeCalculator.cs

@@ -156 +156 @@
           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");

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Hashing/SymbolicExpressionTreeHash.cs

@@ -215 +215 @@
             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;
           }
@@ -277 +277 @@
 
         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) {

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/SymbolicExpressionImporter.cs

@@ -162 +162 @@
         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);

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interfaces/INumericTreeNode.cs

@@ -26 +26 @@
   [StorableType("194AFEE6-96E2-4F53-A5AD-D3CCFE928AE5")]
   public interface INumericTreeNode : ISymbolicExpressionTreeNode {
-    double Value { get; set; }
+    double Value { get; }
   }
 }

branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/ConstantTreeNode.cs

@@ -30 +30 @@
     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]