Changeset 18211 for trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

Timestamp:

01/27/22 11:02:45 (3 years ago)

Author:

gkronber

Message:

#3145: refactored infix formatter to improve output (less parenthesis) and added unit tests to test that the infix formatter works correclty.

Location:

trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4

Files:

• Interfaces/ISymbolicExpressionTreeNode.cs (modified) (1 diff)
• SymbolicExpressionTreeNode.cs (modified) (1 diff)

trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Interfaces/ISymbolicExpressionTreeNode.cs

@@ -50 +50 @@
     void InsertSubtree(int index, ISymbolicExpressionTreeNode tree);
     void RemoveSubtree(int index);
+    void ReplaceSubtree(int index, ISymbolicExpressionTreeNode tree);
+    void ReplaceSubtree(ISymbolicExpressionTreeNode orig, ISymbolicExpressionTreeNode repl);
 
     void ResetLocalParameters(IRandom random);

trunk/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/SymbolicExpressionTreeNode.cs

@@ -177 +177 @@
       ResetCachedValues();
     }
+    public virtual void ReplaceSubtree(int index, ISymbolicExpressionTreeNode repl) {
+      subtrees[index].Parent = null;
+      subtrees[index] = repl;
+      repl.Parent = this;
+      ResetCachedValues();
+    }
+    public virtual void ReplaceSubtree(ISymbolicExpressionTreeNode old, ISymbolicExpressionTreeNode repl) {
+      var index = IndexOfSubtree(old);
+      subtrees[index].Parent = null;
+      subtrees[index] = repl;
+      repl.Parent = this;
+      ResetCachedValues();
+    }
 
     public IEnumerable<ISymbolicExpressionTreeNode> IterateNodesBreadth() {