Changeset 6999 for trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views

Timestamp:

11/16/11 13:58:19 (13 years ago)

Author:

mkommend

Message:

#1479:

• Renamed symbolic classification sample.
• Updated samples unit test to use new features of the SymbolicExpressionGrammar.
• Updated symbolic regression and classification sample.
• Filtered symbolic in AllowedChildSymbolsView.

File:

• trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionGrammarAllowedChildSymbolsControl.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding.Views/3.4/SymbolicExpressionGrammarAllowedChildSymbolsControl.cs

@@ -96 +96 @@
         for (int i = 0; i < Grammar.GetMaximumSubtreeCount(Symbol); i++) {
           var node = new DummySymbol("Subtree " + i).CreateTreeNode();
+          var groupSymbols = grammar.GetAllowedChildSymbols(Symbol, i).OfType<GroupSymbol>().ToList();
           foreach (var childSymbol in Grammar.GetAllowedChildSymbols(Symbol, i)) {
-            node.AddSubtree(new SymbolicExpressionTreeNode(childSymbol));
+            if (!groupSymbols.Any(g => g != childSymbol && g.Flatten().Contains(childSymbol)))
+              node.AddSubtree(new SymbolicExpressionTreeNode(childSymbol));
           }
           tree.Root.AddSubtree(node);