Changeset 10277 for branches/GrammaticalEvolution

Timestamp:

01/04/14 13:18:52 (11 years ago)

Author:

sawinkle

Message:

#2109: Replaced MinimumArity/MaximumArity with method call GetMinimumSubtreeCount()/GetMaximumSubtreeCount() in /Mappers/GenotypeToPhenotypeMapper.cs.
Now not the total arity (e.g. 1 to 255 for Addition) is taken, but the limited one (e.g. 1 to 1 for Addition).
As a result, the problem with the "broad" trees is solved.

Location:

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/Mappers

Files:

• BreathFirstMapper.cs (modified) (1 diff)
• DepthFirstMapper.cs (modified) (1 diff)
• GenotypeToPhenotypeMapper.cs (modified) (1 diff)

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/Mappers/BreathFirstMapper.cs

@@ -98 +98 @@
 
           var newNode = GetNewChildNode(current.Item1, genotype, grammar, genotypeIndex, random);
-          int arity = SampleArity(random, newNode, maxSubtreeCount - currSubtreeCount);
+          int arity = SampleArity(random, newNode, maxSubtreeCount - currSubtreeCount, grammar);
 
           if (arity < 0) {

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/Mappers/DepthFirstMapper.cs

@@ -101 +101 @@
 
         var newNode = GetNewChildNode(current.Item1, genotype, grammar, genotypeIndex, random);
-        int arity = SampleArity(random, newNode, maxSubtreeCount - currSubtreeCount);
+        int arity = SampleArity(random, newNode, maxSubtreeCount - currSubtreeCount, grammar);
 
         if (arity < 0) {

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/Mappers/GenotypeToPhenotypeMapper.cs

@@ -109 +109 @@
     /// <param name="node">node, for which a random arity is determined</param>
     /// <param name="maxAllowedArity">the resulting arity must not exceed this maximum arity</param>
+    /// <param name="grammar">symbolic expression grammar to use</param>
     /// <returns>random arity in the interval [minArity, maxArity] of the node or
     ///          -1, if minArity exceeds maxAllowedArity</returns>
     protected int SampleArity(IRandom random,
                               ISymbolicExpressionTreeNode node,
-                              int maxAllowedArity) {
-      int minArity = node.Symbol.MinimumArity;
-      int maxArity = node.Symbol.MaximumArity;
+                              int maxAllowedArity,
+                              ISymbolicExpressionGrammar grammar) {
+
+      int minArity = grammar.GetMinimumSubtreeCount(node.Symbol);
+      int maxArity = grammar.GetMaximumSubtreeCount(node.Symbol);
 
       if (maxAllowedArity < maxArity) {