Changeset 18065 for branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/StructureTemplate/SubFunction.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/StructureTemplate/SubFunction.cs (modified) (4 diffs)

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

@@ -18 +18 @@
     private const string MaximumSymbolicExpressionTreeDepthParameterName = "MaximumSymbolicExpressionTreeDepth";
     private const string MaximumSymbolicExpressionTreeLengthParameterName = "MaximumSymbolicExpressionTreeLength";
+    private const string FunctionArgumentsParameterName = "Function Arguments";
     #endregion
 
@@ -24 +25 @@
     public IFixedValueParameter<IntValue> MaximumSymbolicExpressionTreeDepthParameter => (IFixedValueParameter<IntValue>)Parameters[MaximumSymbolicExpressionTreeDepthParameterName];
     public IFixedValueParameter<IntValue> MaximumSymbolicExpressionTreeLengthParameter => (IFixedValueParameter<IntValue>)Parameters[MaximumSymbolicExpressionTreeLengthParameterName];
+    public IValueParameter<ReadOnlyItemList<StringValue>> FunctionArgumentsParameter => (IValueParameter<ReadOnlyItemList<StringValue>>)Parameters[FunctionArgumentsParameterName];
     #endregion
 
@@ -41 +43 @@
       set => MaximumSymbolicExpressionTreeLengthParameter.Value.Value = value;
     }
+
+    public IEnumerable<string> FunctionArguments {
+      get => FunctionArgumentsParameter.Value.Select(x => x.Value); 
+      set {
+        var varSym = (Variable)Grammar.GetSymbol("Variable");
+        if (varSym == null)
+          throw new ArgumentException($"No variable symbol existent.");
+
+        FunctionArgumentsParameter.Value = new ItemList<StringValue>(value.Select(x => new StringValue(x))).AsReadOnly();
+
+        varSym.AllVariableNames = FunctionArguments;
+        varSym.VariableNames = FunctionArguments;
+        varSym.Enabled = true;
+      } 
+    }
     #endregion
 
@@ -48 +65 @@
       Parameters.Add(new FixedValueParameter<IntValue>(MaximumSymbolicExpressionTreeDepthParameterName, new IntValue(10)));
       Parameters.Add(new FixedValueParameter<IntValue>(MaximumSymbolicExpressionTreeLengthParameterName, new IntValue(30)));
+      Parameters.Add(new ValueParameter<ReadOnlyItemList<StringValue>>(FunctionArgumentsParameterName, new ReadOnlyItemList<StringValue>()));
     }