Changeset 18062

Timestamp:

10/01/21 10:55:19 (3 years ago)

Author:

dpiringe

Message:

#3136

• added a new Symbol SubFunctionSymbol for sub functions
• modified InfixExpressionParser to support SubFunctionSymbol (parsing of variableNames still in work)
• modified StructuredSymbolicRegressionSingleObjectiveProblem to extract sub functions and add them to MultiEncoding

Location:

branches/3136_Structural_GP

Files:

• HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/StructuredSymbolicRegressionSingleObjectiveProblem.cs (modified) (4 diffs)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/HeuristicLab.Problems.DataAnalysis.Symbolic-3.4.csproj (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Importer/InfixExpressionParser.cs (modified) (1 diff)
• HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Symbols/SubFunctionSymbol.cs (added)

branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic.Regression/3.4/SingleObjective/StructuredSymbolicRegressionSingleObjectiveProblem.cs

@@ -11 +11 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Data;
+using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
 
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic.Regression.SingleObjective {
@@ -27 +28 @@
     public IValueParameter<IRegressionProblemData> ProblemDataParameter => (IValueParameter<IRegressionProblemData>)Parameters[ProblemDataParameterName];
     public IFixedValueParameter<StringValue> StructureDefinitionParameter => (IFixedValueParameter<StringValue>)Parameters[StructureDefinitionParameterName];
-    public IValueParameter<ISymbolicDataAnalysisGrammar> GrammarParameter => (IValueParameter<ISymbolicDataAnalysisGrammar>)Parameters[GrammarParameterName];
+    public IValueParameter<ISymbolicDataAnalysisGrammar> GrammarParameter => (IValueParameter<ISymbolicDataAnalysisGrammar>)Parameters[GrammarParameterName]; // könnte auch weg?
     #endregion
 
@@ -61 +62 @@
     #region Constructors & Cloning
     public StructuredSymbolicRegressionSingleObjectiveProblem() {
-      Parameters.Add(new ValueParameter<RegressionProblemData>(ProblemDataParameterName, new RegressionProblemData()));
-      Parameters.Add(new FixedValueParameter<StringValue>(StructureDefinitionParameterName, new StringValue("")));
-      Parameters.Add(new ValueParameter<ISymbolicDataAnalysisGrammar>(GrammarParameterName, new LinearScalingGrammar()));
+      var problemData = new ShapeConstrainedRegressionProblemData();
+      var grammar = new LinearScalingGrammar();
+      var varSym = (Variable)grammar.GetSymbol("Variable");
+      varSym.AllVariableNames = problemData.InputVariables.Select(x => x.Value);
+      varSym.VariableNames = problemData.InputVariables.Select(x => x.Value);
+      varSym.Enabled = true;
+
+      Parameters.Add(new ValueParameter<RegressionProblemData>(ProblemDataParameterName, problemData));
+      Parameters.Add(new FixedValueParameter<StringValue>(StructureDefinitionParameterName, new StringValue("e^f(x)/F(y)")));
+      Parameters.Add(new ValueParameter<ISymbolicDataAnalysisGrammar>(GrammarParameterName, grammar));
+      var parser = new InfixExpressionParser();
+      var tree = parser.Parse(StructureDefinition); 
+      
+      GetSubFunctions(tree);
     }
 
@@ -77 +89 @@
     #endregion
 
+    public void GetSubFunctions(ISymbolicExpressionTree tree) {
+      int count = 1;
+      foreach(var node in tree.IterateNodesPrefix())
+        if(node.Symbol is SubFunctionSymbol)
+          Encoding.Add(new SymbolicExpressionTreeEncoding($"f{count++}", Grammar/*new LinearScalingGrammar()*/, 25, 8));
+    }
+
     public override double Evaluate(Individual individual, IRandom random) {
+      foreach(var kvp in individual.Values) {
+        if(kvp.Value is SymbolicExpressionTree tree) {
+          foreach(var n in tree.IterateNodesPrefix()) {
+            if(n.Symbol is Variable v) {
+              var t = v.VariableNames;
+            }
+          }
+          Console.WriteLine(tree);
+        }
+      }
       return 0.0;
     }

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

@@ -245 +245 @@
     <Compile Include="Symbols\CubeRoot.cs" />
     <Compile Include="Symbols\HyperbolicTangent.cs" />
+    <Compile Include="Symbols\SubFunctionSymbol.cs" />
     <Compile Include="Symbols\VariableBase.cs" />
     <Compile Include="Symbols\VariableTreeNodeBase.cs" />

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

@@ -138 +138 @@
         { "DIFF", new Derivative()},
         { "LAG", new LaggedVariable() },
+        { "F", new SubFunctionSymbol() }
       };