Context Navigation

HeuristicLab.Problems.GrammaticalOptimization

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:

Files:

r12294	r12391
175	175	}
176	176
177		public Sequence CompleteSentenceRandomly(Random random, Sequence phrase, int maxLen) {
	177	public Sequence CompleteSentenceRandomly(System.Random random, Sequence phrase, int maxLen) {
178	178	if (phrase.Length > maxLen) throw new ArgumentException();
179	179	if (MinPhraseLength(phrase) > maxLen) throw new ArgumentException();

-                      r12290
+                      r12391
       <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" />

r11848	r12391
20	20	int MinPhraseLength(Sequence phrase);
21	21	int MaxPhraseLength(Sequence phrase);
22		Sequence CompleteSentenceRandomly(Random random, Sequence phrase, int maxLen);
	22	Sequence CompleteSentenceRandomly(System.Random random, Sequence phrase, int maxLen);
23	23
24	24	bool IsTerminal(char symbol);

-                      r12290
+                      r12391
     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();
 …
       this.decoyReward = decoyReward;
       this.phrasesAsSets = phrasesAsSets;
+      this.alphabetSize = alphabetSize;
+      this.numOptimalPhrases = numOptimalPhrases;
+      this.numDecoyPhrases = numDecoyPhrases;
       var sentenceSymbol = 'S';

-                      r12290
+                      r12391
 using System.Text;
 using System.Text.RegularExpressions;
+using HeuristicLab.Common;
 using HeuristicLab.Encodings.SymbolicExpressionTreeEncoding;
+using HeuristicLab.Random;
 namespace HeuristicLab.Problems.GrammaticalOptimization {
 …
     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) {
 …
       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 };

r12290	r12391
33	33	private readonly SortedSet<string>[] optimalPhrasesForPos;
34	34	public string Name { get { return "RoyalPhraseSequence"; } }
35		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) {
	35	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) {
36	36	if (alphabetSize <= 0 \|\| alphabetSize > 26) throw new ArgumentException();
37	37	if (sequenceLen <= 0) throw new ArgumentException();

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

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

Note: See TracChangeset for help on using the changeset viewer.