Changeset 6387 for branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views

Timestamp:

06/08/11 10:42:57 (13 years ago)

Author:

mkommend

Message:

#1540: Added min and max arity to symbols and renamed SymbolicExpressionTreeNode.SubtreesCount to SymbolicExpressionTreeNode.SubtreeCount.

Location:

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4

Files:

• SymbolicExpressionGrammarEditorView.cs (modified) (2 diffs)
• SymbolicExpressionTreeChart.cs (modified) (2 diffs)

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionGrammarEditorView.cs

@@ -178 +178 @@
       VisualSymbolicExpressionTreeNode clickedNode = (VisualSymbolicExpressionTreeNode)sender;
       var selectedNode = clickedNode.SymbolicExpressionTreeNode;
-      if (selectedNode.SubtreesCount == 0) {
+      if (selectedNode.SubtreeCount == 0) {
         if (!selectedSymbolicExpressionTreeNodes.Contains(selectedNode))
           selectedSymbolicExpressionTreeNodes.Add(selectedNode);
@@ -349 +349 @@
   [NonDiscoverableType]
   internal class DummySymbol : Symbol {
+    private const int minimumArity = 1;
+    private const int maximumArity = byte.MaxValue;
+
+    public override int MinimumArity {
+      get { return minimumArity; }
+    }
+    public override int MaximumArity {
+      get { return maximumArity; }
+    }
+
     public DummySymbol(DummySymbol original, Cloner cloner) : base(original, cloner) { }
     public DummySymbol(string name) : base(name, "DummySymbol for views") { }

branches/GP.Grammar.Editor/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionTreeChart.cs

@@ -262 +262 @@
 
       //draw terminal node
-      if (node.SubtreesCount == 0) {
+      if (node.SubtreeCount == 0) {
         graphics.FillRectangle(nodeFillBrush, visualTreeNode.X, visualTreeNode.Y, visualTreeNode.Width, visualTreeNode.Height);
         graphics.DrawRectangle(nodeLinePen, visualTreeNode.X, visualTreeNode.Y, visualTreeNode.Width, visualTreeNode.Height);
@@ -280 +280 @@
       //calculate areas for the subtrees according to their tree size and call drawFunctionTree
       Point connectFrom = new Point(visualTreeNode.X + visualTreeNode.Width / 2, visualTreeNode.Y + visualTreeNode.Height);
-      int[] xBoundaries = new int[node.SubtreesCount + 1];
+      int[] xBoundaries = new int[node.SubtreeCount + 1];
       xBoundaries[0] = x;
-      for (int i = 0; i < node.SubtreesCount; i++) {
+      for (int i = 0; i < node.SubtreeCount; i++) {
         xBoundaries[i + 1] = (int)(xBoundaries[i] + (width * (double)node.GetSubtree(i).GetLength()) / (node.GetLength() - 1));
         DrawFunctionTree(node.GetSubtree(i), graphics, xBoundaries[i], y + height,