Changeset 10290 for branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/Mappers/GenotypeToPhenotypeMapper.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/GenotypeToPhenotypeMapper.cs (modified) (4 diffs)

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

@@ -24 +24 @@
 using HeuristicLab.Common;
 using HeuristicLab.Core;
+using HeuristicLab.Data;
 using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
@@ -40 +41 @@
     protected GenotypeToPhenotypeMapper() : base() { }
 
-    public abstract SymbolicExpressionTree Map(IRandom random,
+    public abstract SymbolicExpressionTree Map(IRandom random, IntMatrix bounds, int length,
                                                ISymbolicExpressionGrammar grammar,
                                                IntegerVector genotype);
@@ -96 +97 @@
       if (prodRuleCount < 1) return null;
 
-      int prodRuleIndex = genotype[genotypeIndex % genotype.Length] % prodRuleCount;
+      // genotypeIndex % genotype.Length
+      int prodRuleIndex = genotype[genotypeIndex] % prodRuleCount;
 
       var newNode = symbolList.ElementAt(prodRuleIndex).CreateTreeNode();
@@ -109 +111 @@
     /// <param name="random">random number generator</param>
     /// <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>
+    /// <returns>random arity in the interval [minArity, maxArity]</returns>
     protected int SampleArity(IRandom random,
                               ISymbolicExpressionTreeNode node,
-                              int maxAllowedArity,
                               ISymbolicExpressionGrammar grammar) {
 
       int minArity = grammar.GetMinimumSubtreeCount(node.Symbol);
       int maxArity = grammar.GetMaximumSubtreeCount(node.Symbol);
-
-      if (maxAllowedArity < maxArity) {
-        maxArity = maxAllowedArity;
-      }
-
-      if (maxAllowedArity < minArity) {
-        return -1;
-      }
 
       if (minArity == maxArity) {