Changeset 3244 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding

Timestamp:

03/31/10 18:34:34 (14 years ago)

Author:

gkronber

Message:

Integrated graphical symbolic expression tree view from model analyzer. #937 (Data types and operators for symbolic expression tree encoding)

Location:

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3

Files:

• SymbolicExpressionTree.cs (modified) (3 diffs)
• SymbolicExpressionTreeNode.cs (modified) (4 diffs)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTree.cs

@@ -1 +1 @@
 #region License Information
 /* HeuristicLab
- * Copyright (C) 2002-2008 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
+ * Copyright (C) 2002-2010 Heuristic and Evolutionary Algorithms Laboratory (HEAL)
  *
  * This file is part of HeuristicLab.
@@ -21 +21 @@
 
 using System;
+using System.Linq;
 using System.Collections.Generic;
 using System.Text;
@@ -60 +61 @@
     public SymbolicExpressionTree(SymbolicExpressionTreeNode root) : base() { }
 
+    public IEnumerable<SymbolicExpressionTreeNode> IterateNodesPrefix() {
+      return IterateNodesPrefix(root);
+    }
+    private IEnumerable<SymbolicExpressionTreeNode> IterateNodesPrefix(SymbolicExpressionTreeNode node) {
+      yield return node;
+      foreach (var subtree in node.SubTrees) {
+        foreach (var n in IterateNodesPrefix(subtree))
+          yield return n;
+      }
+    }
+    public IEnumerable<SymbolicExpressionTreeNode> IterateNodesPostfix() {
+      return IterateNodesPostfix(root);
+    }
+    private IEnumerable<SymbolicExpressionTreeNode> IterateNodesPostfix(SymbolicExpressionTreeNode node) {
+      foreach (var subtree in node.SubTrees) {
+        foreach (var n in IterateNodesPrefix(subtree))
+          yield return n;
+      }
+      yield return node;
+    }
+
     public override IDeepCloneable Clone(Cloner cloner) {
       SymbolicExpressionTree clone = new SymbolicExpressionTree();

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.3/SymbolicExpressionTreeNode.cs

@@ -26 +26 @@
 using System.Xml;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Data;
 
 namespace HeuristicLab.Encodings.SymbolicExpressionTreeEncoding {
@@ -49 +50 @@
     //}
 
-    internal virtual bool HasLocalParameters {
+    public virtual bool HasLocalParameters {
       get { return false; }
     }
@@ -62 +63 @@
     }
 
-    internal int GetSize() {
+    public int GetSize() {
       int size = 1;
       foreach (SymbolicExpressionTreeNode tree in SubTrees) size += tree.GetSize();
@@ -68 +69 @@
     }
 
-    internal int GetHeight() {
+    public int GetHeight() {
       int maxHeight = 0;
       foreach (SymbolicExpressionTreeNode tree in SubTrees) maxHeight = Math.Max(maxHeight, tree.GetHeight());