Changeset 12391 for branches/HeuristicLab.Problems.GrammaticalOptimization-gkr/HeuristicLab.Problems.GrammaticalOptimization/Problems/RoyalPairProblem.cs

Timestamp:

05/12/15 20:40:11 (9 years ago)

Author:

gkronber

Message:

#2283: added shuffling of terminal symbols to the royal pair problem to make sure that there is no bias from order of terminal symbols.

File:

• branches/HeuristicLab.Problems.GrammaticalOptimization-gkr/HeuristicLab.Problems.GrammaticalOptimization/Problems/RoyalPairProblem.cs (modified) (3 diffs)

branches/HeuristicLab.Problems.GrammaticalOptimization-gkr/HeuristicLab.Problems.GrammaticalOptimization/Problems/RoyalPairProblem.cs

@@ -5 +5 @@
 using System.Text;
 using System.Text.RegularExpressions;
+using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
+using HeuristicLab.Random;
 
 namespace HeuristicLab.Problems.GrammaticalOptimization {
@@ -13 +15 @@
     private readonly IGrammar grammar;
     private readonly int numTerminals;
-    public string Name { get { return "RoyalPair"; } }
+    public string Name { get { return string.Format("RoyalPair({0})", numTerminals); } }
 
     public RoyalPairProblem(int numTerminals = 2) {
@@ -19 +21 @@
 
       var sentenceSymbol = 'S';
-      var terminalSymbols = Enumerable.Range(0, numTerminals).Select(off => (char)((byte)'a' + off)).ToArray();
+      var terminalSymbols = Enumerable.Range(0, numTerminals).Select(off => (char)((byte)'a' + off)).ToList();
+      terminalSymbols.ShuffleInPlace(new MersenneTwister(31415));
+
       var nonTerminalSymbols = new char[] { sentenceSymbol };