Changeset 18067 for branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Timestamp:

10/14/21 17:59:53 (3 years ago)

Author:

dpiringe

Message:

#3136

• changed the StructureTemplateView -> nodes of type SubFunctionTreeNode are now clickable
  • still need to overhaul the UI elements
• added a way to parse SubFunctionTreeNode with a unique name in InfixExpressionParser

Location:

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4

Files:

• Importer/InfixExpressionParser.cs (modified) (4 diffs)
• StructureTemplate/StructureTemplate.cs (modified) (1 diff)
• StructureTemplate/SubFunction.cs (modified) (1 diff)
• Symbols/SubFunctionTreeNode.cs (modified) (2 diffs)

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

@@ -81 +81 @@
     internal static readonly BidirectionalLookup<string, ISymbol>
       knownSymbols = new BidirectionalLookup<string, ISymbol>(StringComparer.InvariantCulture, new SymbolComparer());
+    internal static readonly SubFunctionSymbol subFunctionSymbol = new SubFunctionSymbol();
 
     private Constant constant = new Constant();
@@ -137 +138 @@
         { "XOR", new Xor()},
         { "DIFF", new Derivative()},
-        { "LAG", new LaggedVariable() },
-        { "F", new SubFunctionSymbol() }
+        { "LAG", new LaggedVariable() }/*,
+        { "F", new SubFunctionSymbol() }*/
       };
 
@@ -341 +342 @@
 
     private ISymbol GetSymbol(string tok) {
-      var symb = knownSymbols.GetByFirst(tok).FirstOrDefault();
-      if (symb == null) throw new ArgumentException(string.Format("Unknown token {0} found.", tok));
-      return symb;
+      if(knownSymbols.ContainsFirst(tok))
+        return knownSymbols.GetByFirst(tok).FirstOrDefault();
+      else
+        return subFunctionSymbol;
     }
 
@@ -453 +455 @@
             laggedVarNode.Lag = (int)Math.Round(sign * lagToken.doubleVal);
             laggedVarNode.Weight = 1.0;
-          } else if (funcNode.Symbol is SubFunctionSymbol) {
+          } else if (funcNode.Symbol is SubFunctionSymbol) { // SubFunction
             var subFunction = funcNode as SubFunctionTreeNode;
+            subFunction.Name = next.strVal;
             // input arguments
             var args = ParseArgList(tokens);
-            IList<string> functionArguments = new List<string>();
+            IList<string> arguments = new List<string>();
             foreach (var arg in args) 
               if(arg is VariableTreeNode varTreeNode)
-                functionArguments.Add(varTreeNode.VariableName);
-            subFunction.FunctionArguments = functionArguments;
+                arguments.Add(varTreeNode.VariableName);
+            subFunction.Arguments = arguments;
           } else {
             // functions

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/StructureTemplate/StructureTemplate.cs

@@ -62 +62 @@
         if (node is SubFunctionTreeNode subFunctionTreeNode) { 
           var subFunction = new SubFunction() { 
-            Name = $"f{count++}({string.Join(",", subFunctionTreeNode.FunctionArguments)})", 
-            FunctionArguments = subFunctionTreeNode.FunctionArguments 
+            Name = $"f{count++}({string.Join(",", subFunctionTreeNode.Arguments)})", 
+            FunctionArguments = subFunctionTreeNode.Arguments 
           };
           subFunctionTreeNode.SubFunction = subFunction;

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/StructureTemplate/SubFunction.cs

@@ -44 +44 @@
     }
 
-    public IEnumerable<string> FunctionArguments {
+    public IEnumerable<string> FunctionArguments { // TODO: gehört weg
       get => FunctionArgumentsParameter.Value.Select(x => x.Value); 
       set {

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/SubFunctionTreeNode.cs

@@ -10 +10 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [StorableType("05130B5F-0125-4367-A4E9-C42D1085024E")]
-  public class SubFunctionTreeNode : SymbolicExpressionTreeNode {
+  public class SubFunctionTreeNode : SymbolicExpressionTreeNode { //TODO: as TerminalNode? -> but has children in a fully builded tree
 
     #region Properties
     public new SubFunctionSymbol Symbol => (SubFunctionSymbol)base.Symbol;
 
-    public IEnumerable<string> FunctionArguments { get; set; } = Enumerable.Empty<string>();
+    public IEnumerable<string> Arguments { get; set; } = Enumerable.Empty<string>();
     
     public SubFunction SubFunction { get; set; }
+
+    public string Name { get; set; }
     #endregion
 
@@ -34 +36 @@
     public override IDeepCloneable Clone(Cloner cloner) => new SubFunctionTreeNode(this, cloner);
     #endregion
+
+    public override string ToString() {
+      if (string.IsNullOrEmpty(Name))
+        return base.ToString();
+      return Name;
+    }
+    
   }
 }