Changeset 18065 for branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/InfixExpressionParser.cs

Timestamp:

10/08/21 16:28:53 (3 years ago)

Author:

dpiringe

Message:

#3136

• modified InfixExpressionParser to fully support SubFunctionSymbol
  • created a SubFunctionTreeNode to store the function arguments
• modified StructureTemplateView to regenerate the content state
• first implementation for the main tree build up logic

File:

• branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/InfixExpressionParser.cs (modified) (2 diffs)

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/InfixExpressionParser.cs

@@ -453 +453 @@
             laggedVarNode.Lag = (int)Math.Round(sign * lagToken.doubleVal);
             laggedVarNode.Weight = 1.0;
+          } else if (funcNode.Symbol is SubFunctionSymbol) {
+            var subFunction = funcNode as SubFunctionTreeNode;
+            // input arguments
+            var args = ParseArgList(tokens);
+            IList<string> functionArguments = new List<string>();
+            foreach (var arg in args) 
+              if(arg is VariableTreeNode varTreeNode)
+                functionArguments.Add(varTreeNode.VariableName);
+            subFunction.FunctionArguments = functionArguments;
           } else {
             // functions
@@ -458 +467 @@
             // check number of arguments
             if (funcNode.Symbol.MinimumArity > args.Length || funcNode.Symbol.MaximumArity < args.Length) {
-              throw new ArgumentException(string.Format("Symbol {0} requires between {1} and  {2} arguments.", funcId,
+              throw new ArgumentException(string.Format("Symbol {0} requires between {1} and {2} arguments.", funcId,
                 funcNode.Symbol.MinimumArity, funcNode.Symbol.MaximumArity));
             }