Changeset 5529 for branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators

Timestamp:

02/21/11 17:49:23 (14 years ago)

Author:

gkronber

Message:

#1418 Removed grammar specific members from ISymbolicExpressionTreeNode interface.

File:

• branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/ProbabilisticTreeCreator.cs (modified) (5 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Encodings.SymbolicExpressionTreeEncoding/3.4/Creators/ProbabilisticTreeCreator.cs

@@ -216 +216 @@
       int argumentIndex, int maxFunctionDefinitions, int maxFunctionArguments) {
       // determine possible symbols that will lead to the smallest possible tree
-      var possibleSymbols = (from s in parent.GetAllowedSymbols(argumentIndex)
+      var possibleSymbols = (from s in parent.Grammar.GetAllowedSymbols(parent.Symbol, argumentIndex)
                              group s by parent.Grammar.GetMinExpressionLength(s) into g
                              orderby g.Key
@@ -227 +227 @@
       parent.InsertSubTree(argumentIndex, tree);
       InitializeNewTreeNode(random, root, tree, maxFunctionDefinitions, maxFunctionArguments);
-      for (int i = 0; i < tree.GetMinSubtreeCount(); i++) {
+      for (int i = 0; i < tree.Grammar.GetMinSubtreeCount(tree.Symbol); i++) {
         // insert a dummy sub-tree and add the pending extension to the list
         var dummy = new SymbolicExpressionTreeNode();
@@ -285 +285 @@
     private static int SampleArity(IRandom random, ISymbolicExpressionTreeNode node, int targetSize) {
       // select actualArity randomly with the constraint that the sub-trees in the minimal arity can become large enough
-      int minArity = node.GetMinSubtreeCount();
-      int maxArity = node.GetMaxSubtreeCount();
+      int minArity = node.Grammar.GetMinSubtreeCount(node.Symbol);
+      int maxArity = node.Grammar.GetMaxSubtreeCount(node.Symbol);
       if (maxArity > targetSize) {
         maxArity = targetSize;
@@ -294 +294 @@
       long aggregatedLongestExpressionLength = 0;
       for (int i = 0; i < maxArity; i++) {
-        aggregatedLongestExpressionLength += (from s in node.GetAllowedSymbols(i)
+        aggregatedLongestExpressionLength += (from s in node.Grammar.GetAllowedSymbols(node.Symbol, i)
                                               select node.Grammar.GetMaxExpressionLength(s)).Max();
         if (aggregatedLongestExpressionLength < targetSize) minArity = i;
@@ -304 +304 @@
       long aggregatedShortestExpressionLength = 0;
       for (int i = 0; i < maxArity; i++) {
-        aggregatedShortestExpressionLength += (from s in node.GetAllowedSymbols(i)
+        aggregatedShortestExpressionLength += (from s in node.Grammar.GetAllowedSymbols(node.Symbol, i)
                                                select node.Grammar.GetMinExpressionLength(s)).Min();
         if (aggregatedShortestExpressionLength > targetSize) {