Changeset 18132 for trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisModel.cs

Timestamp:

12/15/21 11:50:57 (2 years ago)

Author:

gkronber

Message:

#3140: merged r18091:18131 from branch to trunk

Location:

trunk

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic (modified) (1 prop)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisModel.cs (modified) (3 diffs)

trunk/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisModel.cs

@@ -115 +115 @@
       if (linearScalingCalculator.ErrorState != OnlineCalculatorError.None) return;
 
-      ConstantTreeNode alphaTreeNode = null;
-      ConstantTreeNode betaTreeNode = null;
+      NumberTreeNode alphaTreeNode = null;
+      NumberTreeNode betaTreeNode = null;
       // check if model has a structure that can be re-used for scaling
       var startNode = SymbolicExpressionTree.Root.GetSubtree(0);
       var addNode = startNode.GetSubtree(0);
       if (addNode.Symbol is Addition && addNode.SubtreeCount == 2) {
-        alphaTreeNode = (ConstantTreeNode)addNode.Subtrees.LastOrDefault(n => n is ConstantTreeNode);
+        alphaTreeNode = (NumberTreeNode)addNode.Subtrees.LastOrDefault(n => n is NumberTreeNode);
         var mulNode = addNode.Subtrees.FirstOrDefault(n => n.Symbol is Multiplication);
         if (mulNode != null) {
-          betaTreeNode = (ConstantTreeNode)mulNode.Subtrees.LastOrDefault(n => n is ConstantTreeNode);
+          betaTreeNode = (NumberTreeNode)mulNode.Subtrees.LastOrDefault(n => n is NumberTreeNode);
         }
       }
@@ -146 +146 @@
         var addition = new Addition();
         var node = addition.CreateTreeNode();
-        var alphaConst = MakeConstant(alpha);
+        var alphaNode = MakeNumber(alpha);
         node.AddSubtree(treeNode);
-        node.AddSubtree(alphaConst);
+        node.AddSubtree(alphaNode);
         return node;
       }
@@ -157 +157 @@
         return treeNode;
       } else {
-        var multipliciation = new Multiplication();
-        var node = multipliciation.CreateTreeNode();
-        var betaConst = MakeConstant(beta);
+        var multiplication = new Multiplication();
+        var node = multiplication.CreateTreeNode();
+        var betaNode = MakeNumber(beta);
         node.AddSubtree(treeNode);
-        node.AddSubtree(betaConst);
+        node.AddSubtree(betaNode);
         return node;
       }
     }
 
-    private static ISymbolicExpressionTreeNode MakeConstant(double c) {
-      var node = (ConstantTreeNode)(new Constant()).CreateTreeNode();
+    private static ISymbolicExpressionTreeNode MakeNumber(double c) {
+      var node = (NumberTreeNode)(new Number()).CreateTreeNode();
       node.Value = c;
       return node;