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

Timestamp:

10/15/21 17:00:28 (3 years ago)

Author:

dpiringe

Message:

#3136

• modified the StructureTemplateView to enable colorful tree nodes of type SubFunctionTreeNode
• refactored SubFunctionTreeNode, SubFunction and StructureTemplate

Location:

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

Files:

• SubFunctionSymbol.cs (modified) (1 diff)
• SubFunctionTreeNode.cs (modified) (4 diffs)

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

@@ -9 +9 @@
   [Item("SubFunctionSymbol", "Symbol that represents a sub function.")]
   public class SubFunctionSymbol : Symbol {
-    public override int MinimumArity => 1;
-    public override int MaximumArity => byte.MaxValue;
+    public override int MinimumArity => 0;
+    public override int MaximumArity => 1;
 
     public SubFunctionSymbol() : base("SubFunctionSymbol", "Symbol that represents a sub function.") { }

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 { //TODO: as TerminalNode? -> but has children in a fully builded tree
+  public class SubFunctionTreeNode : SymbolicExpressionTreeNode {
 
     #region Properties
@@ -17 +17 @@
     public IEnumerable<string> Arguments { get; set; } = Enumerable.Empty<string>();
     
-    public SubFunction SubFunction { get; set; }
-
     public string Name { get; set; }
     #endregion
@@ -28 +26 @@
     protected SubFunctionTreeNode(StorableConstructorFlag _) : base(_) { }
 
-    protected SubFunctionTreeNode(SubFunctionTreeNode original, Cloner cloner) : base(original, cloner) {
-      this.SubFunction = original.SubFunction;
-    }
+    protected SubFunctionTreeNode(SubFunctionTreeNode original, Cloner cloner) : base(original, cloner) { }
     #endregion
 
@@ -40 +36 @@
       if (string.IsNullOrEmpty(Name))
         return base.ToString();
-      return Name;
+      return $"{Name}({string.Join(",", Arguments)})";
     }