Changeset 11792 for branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GrammaticalOptimization/SequentialSearch.cs

Timestamp:

01/16/15 18:26:35 (9 years ago)

Author:

gkronber

Message:

#2283 work-in-progress commit (does not compile)

File:

• branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GrammaticalOptimization/SequentialSearch.cs (modified) (6 diffs)

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GrammaticalOptimization/SequentialSearch.cs

@@ -57 +57 @@
       Reset();
 
-      for (int i = 0; !Done() && i < maxIterations; i++) {
+      for (int i = 0; bestQuality < 1.0 && !Done() && i < maxIterations; i++) {
         var phrase = SampleSentence(problem.Grammar);
         // can fail on the last sentence
@@ -76 +76 @@
         }
       }
-
-      // clean up
-      // Reset(); GC.Collect();
     }
 
@@ -100 +97 @@
       while (!phrase.IsTerminal) {
 
+        var newPhrases = GenerateFollowStates(g, phrase);
+        
+        throw new NotImplementedException(); // TODO: reintroduce random-trie checking once the tree of all states has been reintroduced
         //if (n.randomTries < randomTries) {
         //  n.randomTries++;
@@ -107 +107 @@
         //} else {
 
-        var newPhrases = GenerateFollowStates(g, phrase);
-
-        // => select using bandit policy
-        // failure means we simply restart
-        if (!behaviourPolicy.TrySelect(random, phrase, newPhrases, out phrase)) {
-          return false;
-        }
+
+          // => select using bandit policy
+          // failure means we simply restart
+          if (!behaviourPolicy.TrySelect(random, phrase, newPhrases, out phrase)) {
+            return false;
+          }
+        // }
         stateChain.Add(phrase);
         curDepth++;
@@ -125 +125 @@
     private readonly Dictionary<ReadonlySequence, ReadonlySequence[]> cache;
     private IEnumerable<ReadonlySequence> GenerateFollowStates(IGrammar g, ReadonlySequence phrase) {
+      throw new NotImplementedException();
+      // TODO: Replace caching by a tree of all states. tree is only used for easily retrieving the follow-states of a state
       ReadonlySequence[] follow;
-      if (!cache.TryGetValue(phrase, out follow)) {
+      //if (!cache.TryGetValue(phrase, out follow)) {
         char nt = phrase.FirstNonTerminal;
 
@@ -142 +144 @@
           follow[idx++] = new ReadonlySequence(newPhrase);
         }
-        cache[phrase] = follow;
-      }
+      //  cache[phrase] = follow;
+      //}
       return follow;
     }