Changeset 10290 for branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/Mappers/BreathFirstMapper.cs

Timestamp:

01/06/14 20:41:57 (10 years ago)

Author:

sawinkle

Message:

#2109:

• Implemented PIGEMapper. Due to that, it was necessary to modify the Map method interface to additionally take the bounds and length of the genotype.
• Corrected and simplified the different mappers. Simplified the SampleArity method of /Mappers/GenotypeToPhenotypeMapper.cs

File:

• branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/Mappers/BreathFirstMapper.cs (modified) (5 diffs)

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

@@ -24 +24 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -54 +55 @@
     /// <param name="genotype">integer vector, which should be mapped to a tree</param>
     /// <returns>phenotype (a symbolic expression tree)</returns>
-    public override SymbolicExpressionTree Map(IRandom random,
+    public override SymbolicExpressionTree Map(IRandom random, IntMatrix bounds, int length,
                                                ISymbolicExpressionGrammar grammar,
                                                IntegerVector genotype) {
@@ -87 +88 @@
 
       int genotypeIndex = 0;
-      int currSubtreeCount = 1;
-
       queue.Enqueue(new Tuple<ISymbolicExpressionTreeNode, int>(startNode, 1));
 
-      while ((currSubtreeCount < maxSubtreeCount) && (queue.Count > 0)) {
+      while (queue.Count > 0) {
 
         Tuple<ISymbolicExpressionTreeNode, int> current = queue.Dequeue();
@@ -98 +97 @@
         for (int i = 0; i < current.Item2; ++i) {
 
-          var newNode = GetNewChildNode(current.Item1, genotype, grammar, genotypeIndex, random);
-          int arity = SampleArity(random, newNode, maxSubtreeCount - currSubtreeCount, grammar);
-
-          if (arity < 0) {
+          if (genotypeIndex >= maxSubtreeCount) {
+            // if all genomes were used, only add terminal nodes to the remaining subtrees
             current.Item1.AddSubtree(GetRandomTerminalNode(current.Item1, grammar, random));
           } else {
+            var newNode = GetNewChildNode(current.Item1, genotype, grammar, genotypeIndex, random);
+            int arity = SampleArity(random, newNode, grammar);
+
             current.Item1.AddSubtree(newNode);
             genotypeIndex++;
-            currSubtreeCount += arity;
             if (arity > 0) {
               // new node has subtrees so enqueue the node 
@@ -114 +113 @@
         }
       }
-
-      // maximum allowed subtree count was already reached, but there are still
-      // incomplete subtrees (non-terminal symbols) in the tree
-      // -> fill them with terminal symbols
-      while (queue.Count > 0) {
-        Tuple<ISymbolicExpressionTreeNode, int> current = queue.Dequeue();
-        for (int i = 0; i < current.Item2; ++i) {
-          current.Item1.AddSubtree(GetRandomTerminalNode(current.Item1, grammar, random));
-        }
-      }
     }
   }