Free cookie consent management tool by TermsFeed Policy Generator

Ignore:
Timestamp:
12/01/21 13:40:55 (2 years ago)
Author:
chaider
Message:

#3140

  • some more refactoring
  • added possibility to set value of num nodes in infix parser
  • changed displaying style of number
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/3140_NumberSymbol/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Converters/TreeToAutoDiffTermConverter.cs

    r18093 r18100  
    145145
    146146    private AutoDiff.Term ConvertToAutoDiff(ISymbolicExpressionTreeNode node) {
    147       if (node.Symbol is Num) {
    148         initialConstants.Add(((NumTreeNode)node).Value);
     147      if (node.Symbol is Number) {
     148        initialConstants.Add(((NumberTreeNode)node).Value);
    149149        var var = new AutoDiff.Variable();
    150150        variables.Add(var);
     
    152152      }
    153153
    154       if (node.Symbol is RealConstant) {
    155         initialConstants.Add(((RealConstantTreeNode)node).Value);
     154      if (node.Symbol is Constant) {
     155        initialConstants.Add(((ConstantTreeNode)node).Value);
    156156        var var = new AutoDiff.Variable();
    157157        variables.Add(var);
     
    267267      }
    268268      if (node.Symbol is Power) {
    269         var powerNode = node.GetSubtree(1) as NumTreeNode;
     269        var powerNode = node.GetSubtree(1) as NumberTreeNode;
    270270        if (powerNode == null)
    271271          throw new NotSupportedException("Only integer powers are allowed in parameter optimization. Try to use exp() and log() instead of the power symbol.");
     
    337337          !(n.Symbol is FactorVariable) &&
    338338          !(n.Symbol is LaggedVariable) &&
    339           !(n.Symbol is Num) &&
    340           !(n.Symbol is RealConstant) &&
     339          !(n.Symbol is Number) &&
     340          !(n.Symbol is Constant) &&
    341341          !(n.Symbol is Addition) &&
    342342          !(n.Symbol is Subtraction) &&
Note: See TracChangeset for help on using the changeset viewer.