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

Timestamp:

10/19/21 13:39:44 (3 years ago)

Author:

dpiringe

Message:

#3136

• added linear scaling support for structure template parameter

File:

• branches/3136_Structural_GP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/StructureTemplate/StructureTemplate.cs (modified) (4 diffs)

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

@@ -19 +19 @@
       set {
         template = value;
-        tree = Parser.Parse(template);
-        GetSubFunctions(Tree);
+        Tree = Parser.Parse(template);
         OnChanged();
       } 
@@ -26 +25 @@
 
     [Storable]
-    private ISymbolicExpressionTree tree;
-    public ISymbolicExpressionTree Tree => tree;
+    private ISymbolicExpressionTree treeWithoutLinearScaling;
+    [Storable]
+    private ISymbolicExpressionTree treeWithLinearScaling;
+    public ISymbolicExpressionTree Tree {
+      get => ApplyLinearScaling ? treeWithLinearScaling : treeWithoutLinearScaling;
+      private set {
+        treeWithLinearScaling = AddLinearScalingTerms(value);
+        treeWithoutLinearScaling = value;
+        SubFunctions = GetSubFunctions();
+      }
+    }
 
     [Storable]
-    public IReadOnlyDictionary<string, SubFunction> SubFunctions { get; private set; } = new Dictionary<string, SubFunction>();
+    public IReadOnlyDictionary<string, SubFunction> SubFunctions { get; private set; }
+
+    [Storable]
+    private bool applyLinearScaling = false;
+    public bool ApplyLinearScaling {
+      get => applyLinearScaling;
+      set {
+        applyLinearScaling = value;
+        //subFunctions = GetSubFunctions();
+        OnChanged();
+      }
+    }
 
     protected InfixExpressionParser Parser { get; set; } = new InfixExpressionParser();
@@ -56 +75 @@
     #endregion
 
-    private void GetSubFunctions(ISymbolicExpressionTree tree) {
+    private Dictionary<string, SubFunction> GetSubFunctions() {
       var subFunctions = new Dictionary<string, SubFunction>();
-      foreach (var node in tree.IterateNodesPrefix())
+      foreach (var node in Tree.IterateNodesPrefix())
         if (node is SubFunctionTreeNode subFunctionTreeNode) {
           if (!subFunctionTreeNode.Arguments.Any())
@@ -77 +96 @@
           }
         }
-      SubFunctions = subFunctions;
+      return subFunctions;
+    }
+
+    private ISymbolicExpressionTree AddLinearScalingTerms(ISymbolicExpressionTree tree) {
+      var clonedTree = (ISymbolicExpressionTree)tree.Clone();
+      var startNode = clonedTree.Root.Subtrees.First();
+      var template = startNode.Subtrees.First();
+
+      var add = new Addition();
+      var addNode = add.CreateTreeNode();
+
+      var mul = new Multiplication();
+      var mulNode = mul.CreateTreeNode();
+
+      var c1 = new Constant();
+      var c1Node = (ConstantTreeNode)c1.CreateTreeNode();
+      c1Node.Value = 0.0;
+      var c2 = new Constant();
+      var c2Node = (ConstantTreeNode)c2.CreateTreeNode();
+      c2Node.Value = 1.0;
+      
+      addNode.AddSubtree(c1Node);
+      addNode.AddSubtree(mulNode);
+      mulNode.AddSubtree(c2Node);
+        
+      startNode.RemoveSubtree(0);
+      startNode.AddSubtree(addNode);
+      mulNode.AddSubtree(template);
+      return clonedTree;
     }