Changeset 12391

Timestamp:

05/12/15 20:40:11 (10 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.

Location:

branches/HeuristicLab.Problems.GrammaticalOptimization-gkr

Files:

• HeuristicLab.Problems.GrammaticalOptimization/Grammar.cs (modified) (1 diff)
• HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization.csproj (modified) (1 diff)
• HeuristicLab.Problems.GrammaticalOptimization/Interfaces/IGrammar.cs (modified) (1 diff)
• HeuristicLab.Problems.GrammaticalOptimization/Problems/FindPhrasesProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.GrammaticalOptimization/Problems/RoyalPairProblem.cs (modified) (3 diffs)
• HeuristicLab.Problems.GrammaticalOptimization/Problems/RoyalPhraseSequenceProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.GrammaticalOptimization/Problems/RoyalSequenceProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.GrammaticalOptimization/Problems/SymbolicRegressionPoly10Problem.cs (modified) (1 diff)
• Test/RunMctsExperiments.cs (modified) (2 diffs)

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

@@ -175 +175 @@
     }
 
-    public Sequence CompleteSentenceRandomly(Random random, Sequence phrase, int maxLen) {
+    public Sequence CompleteSentenceRandomly(System.Random random, Sequence phrase, int maxLen) {
       if (phrase.Length > maxLen) throw new ArgumentException();
       if (MinPhraseLength(phrase) > maxLen) throw new ArgumentException();

branches/HeuristicLab.Problems.GrammaticalOptimization-gkr/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization.csproj

@@ -46 +46 @@
       <HintPath>..\HeuristicLab\HeuristicLab.Encodings.SymbolicExpressionTreeEncoding-3.4.dll</HintPath>
     </Reference>
+    <Reference Include="HeuristicLab.Random-3.3">
+      <HintPath>..\..\..\..\..\Program Files\HeuristicLab 3.3\HeuristicLab.Random-3.3.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

branches/HeuristicLab.Problems.GrammaticalOptimization-gkr/HeuristicLab.Problems.GrammaticalOptimization/Interfaces/IGrammar.cs

@@ -20 +20 @@
     int MinPhraseLength(Sequence phrase);
     int MaxPhraseLength(Sequence phrase);
-    Sequence CompleteSentenceRandomly(Random random, Sequence phrase, int maxLen);
+    Sequence CompleteSentenceRandomly(System.Random random, Sequence phrase, int maxLen);
 
     bool IsTerminal(char symbol);

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

@@ -29 +29 @@
     private readonly double decoyReward;
     private readonly bool phrasesAsSets;
+    private readonly int alphabetSize;
+    private readonly int numOptimalPhrases;
+    private readonly int numDecoyPhrases;
     private readonly SortedSet<string> optimalPhrases;
     private readonly SortedSet<string> decoyPhrases;
-    public string Name { get { return "FindPhrases"; } }
+    public string Name { get { return string.Format("FindPhrases({0},{1},{2},{3},{4},{5},{6},{7})", alphabetSize, numPhrases, phraseLen, numOptimalPhrases, numDecoyPhrases, correctReward, decoyReward, phrasesAsSets); } }
 
-    public FindPhrasesProblem(Random rand, int alphabetSize, int numPhrases, int phraseLen, int numOptimalPhrases, int numDecoyPhrases = 1,
+    public FindPhrasesProblem(System.Random rand, int alphabetSize, int numPhrases, int phraseLen, int numOptimalPhrases, int numDecoyPhrases = 1,
       double correctReward = 1.0, double decoyReward = 0.0, bool phrasesAsSets = false) {
       if (alphabetSize <= 0 || alphabetSize > 26) throw new ArgumentException();
@@ -47 +50 @@
       this.decoyReward = decoyReward;
       this.phrasesAsSets = phrasesAsSets;
+      this.alphabetSize = alphabetSize;
+      this.numOptimalPhrases = numOptimalPhrases;
+      this.numDecoyPhrases = numDecoyPhrases;
 
       var sentenceSymbol = 'S';

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 };
 

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

@@ -33 +33 @@
     private readonly SortedSet<string>[] optimalPhrasesForPos;
     public string Name { get { return "RoyalPhraseSequence"; } }
-    public RoyalPhraseSequenceProblem(Random rand, int alphabetSize, int sequenceLen, int phraseLen = 1, int numCorrectPhrases = 1, double correctReward = 1.0, double incorrectReward = 0.0, bool phrasesAsSets = false) {
+    public RoyalPhraseSequenceProblem(System.Random rand, int alphabetSize, int sequenceLen, int phraseLen = 1, int numCorrectPhrases = 1, double correctReward = 1.0, double incorrectReward = 0.0, bool phrasesAsSets = false) {
       if (alphabetSize <= 0 || alphabetSize > 26) throw new ArgumentException();
       if (sequenceLen <= 0) throw new ArgumentException();

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

@@ -24 +24 @@
     private readonly SortedSet<char>[] optimalSymbolsForPos;
     public string Name { get { return "RoyalSequence"; } }
-    public RoyalSequenceProblem(Random rand, int alphabetSize, int sequenceLen, int k = 1, double correctReward = 1.0, double incorrectReward = 0.0) {
+    public RoyalSequenceProblem(System.Random rand, int alphabetSize, int sequenceLen, int k = 1, double correctReward = 1.0, double incorrectReward = 0.0) {
       if (alphabetSize <= 0 || alphabetSize > 26) throw new ArgumentException();
       if (sequenceLen <= 0) throw new ArgumentException();

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

@@ -73 +73 @@
     private void GenerateData() {
       // generate data with fixed seed to make sure that data is always the same
-      var rand = new Random(31415);
+      var rand = new System.Random(31415);
       for (int i = 0; i < N; i++) {
         x[i] = new double[10];

branches/HeuristicLab.Problems.GrammaticalOptimization-gkr/Test/RunMctsExperiments.cs

@@ -180 +180 @@
       };
 
-      var maxSizes = new int[] { 10, 20, 30, 40, 50 };
-      int nReps = 30;
-      int maxIterations = 10000;
+      var maxSizes = new int[] { /*10, 20, 30, 40,*/ 25, 50 };
+      int nReps = 30;
+      int maxIterations = 20000;
       foreach (var instanceFactory in instanceFactories) {
         foreach (var policyFactory in policyFactories) {
@@ -307 +307 @@
       var solver = new SequentialSearch(problem, maxSize, new Random(randSeed), 0,
         new GenericGrammarPolicy(problem, policy, false));
-      var problemName = problem.GetType().Name;
+      var problemName = problem.Name;
       RunSolver(solver, problemName, policy.ToString(), maxIters, maxSize);
     }