Changeset 12391 for branches/HeuristicLab.Problems.GrammaticalOptimization-gkr/HeuristicLab.Problems.GrammaticalOptimization/Problems/FindPhrasesProblem.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/FindPhrasesProblem.cs (modified) (2 diffs)

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