Context Navigation

Changeset 18157 for branches/3136_Structural_GP

Timestamp:

12/17/21 16:59:18 (3 years ago)

Author:

dpiringe

Message:

#3136

Location:

branches/3136_Structural_GP

Files:

-                      r18146
+                      r18157
           var power = node.GetSubtree(1);
           if(power is INumericTreeNode numNode && Math.Truncate(numNode.Value) == numNode.Value) {
+          if (power is INumericTreeNode numNode && Math.Truncate(numNode.Value) == numNode.Value) {
             strBuilder.Append(" ").Append(token).Append(" ").Append(numNode.Value.ToString(formatString, numberFormat));
           } else {
 …
           strBuilder.Append(")");
+        }
+      } else if (node.Symbol is SubFunctionSymbol) {
+        FormatRecursively(node.GetSubtree(0), strBuilder, numberFormat, formatString, parameters);
       } else if (node.SubtreeCount == 1) {
         var token = GetToken(node.Symbol);
 …
             // negative value
             strBuilder.Append("(").Append(numNode.Value.ToString(formatString, numberFormat))
                       .Append(")");
+                      .Append(")");
           } else {
             AppendNumber(strBuilder, parameters, numNode.Value, formatString, numberFormat);

r18146	r18157
155	155	FormatRecursively(node.GetSubtree(1), strBuilder);
156	156	strBuilder.Append(" , 2) ) )");
	157	} else if (node.Symbol is SubFunctionSymbol) {
	158	FormatRecursively(node.GetSubtree(0), strBuilder);
157	159	} else {
158	160	throw new NotSupportedException("Formatting of symbol: " + node.Symbol + " not supported for C# symbolic expression tree formatter.");

r18146	r18157
310	310	stringBuilder.Append(FormatRecursively(node.GetSubtree(1)));
311	311	stringBuilder.Append("), 1.0, -1.0)");
	312	} else if (symbol is SubFunctionSymbol) {
	313	stringBuilder.Append(FormatRecursively(node.GetSubtree(0)));
312	314	} else {
313	315	throw new NotImplementedException("Excel export of " + node.Symbol + " is not implemented.");

-                      r18146
+                      r18157
         paramIdx++;
         strBuilder.Append(@" \left( " + p + @"\cdot ");
+      } else if (node.Symbol is SubFunctionSymbol) {
+        // to nothing, skip symbol
       } else {
         throw new NotImplementedException("Export of " + node.Symbol + " is not implemented.");
 …
         paramIdx++;
         strBuilder.Append(@" +  \left( 1 - " + p + @" \right) \cdot ");
+      } else if (node.Symbol is SubFunctionSymbol) {
+        throw new InvalidOperationException();
       } else {
         throw new NotImplementedException("Export of " + node.Symbol + " is not implemented.");
 …
       } else if (node.Symbol is VariableCondition) {
         strBuilder.Append(@"\right) ");
+      } else if (node.Symbol is SubFunctionSymbol) {
       } else {
         throw new NotImplementedException("Export of " + node.Symbol + " is not implemented.");

r18146	r18157
388	388	stringBuilder.Append(FormatRecursively(node.GetSubtree(0)));
389	389	currentLag -= laggedNode.Lag;
	390	} else if (symbol is SubFunctionSymbol) {
	391	stringBuilder.Append(FormatRecursively(node.GetSubtree(0)));
390	392	} else {
391	393	stringBuilder.Append("ERROR");

r18146	r18157
122	122	} else if (node.Symbol is Root) {
123	123	FormatRoot(node, strBuilder);
	124	} else if (node.Symbol is SubFunctionSymbol) {
	125	FormatRecursively(node.GetSubtree(0), strBuilder);
124	126	} else {
125	127	throw new NotSupportedException("Formatting of symbol: " + node.Symbol + " is not supported.");

r18146	r18157
204	204	else if (node is INumericTreeNode)
205	205	FormatNumericTreeNode(node, strBuilder);
	206	else if (symbol is SubFunctionSymbol)
	207	FormatRecursively(node.GetSubtree(0), strBuilder);
206	208	else
207	209	throw new NotSupportedException("Formatting of symbol: " + symbol + " not supported for Python symbolic expression tree formatter.");

r18146	r18157
184	184	} else if (symbol is BinaryFactorVariable \|\| symbol is FactorVariable) {
185	185	stringBuilder.Append("factor variables are not supported");
	186	} else if (symbol is SubFunctionSymbol) {
	187	stringBuilder.Append(FormatRecursively(node.GetSubtree(0)));
186	188	} else {
187	189	stringBuilder.Append("(");

r18146	r18157
157	157	} else if (node.Symbol is Root) {
158	158	FormatRoot(level, node, strBuilder);
	159	} else if (node.Symbol is SubFunctionSymbol) {
	160	FormatRecursively(level, node.GetSubtree(0), strBuilder);
159	161	} else {
160	162	throw new NotSupportedException("Formatting of symbol: " + node.Symbol + " not supported for TSQL symbolic expression tree formatter.");

-                      r18146
+                      r18157
         { "XOR", new Xor()},
         { "DIFF", new Derivative()},
+        { "LAG", new LaggedVariable() }/*,
+        { "F", new SubFunctionSymbol() }*/
+        { "LAG", new LaggedVariable() }
       };

-                      r18146
+                      r18157
       StringBuilder strBuilder = new StringBuilder();
       if (Indent) strBuilder.Append(' ', indentLength);
+      if (node.Subtrees.Any()) { // internal node
+      if(node.Symbol is SubFunctionSymbol) {
+        return FormatRecursively(node.GetSubtree(0), indentLength);
+      } else if (node.Subtrees.Any()) { // internal node
         strBuilder.Append("(");
         if (node.Symbol is Addition) {

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