Changeset 11727 for branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GrammaticalOptimization/ExhaustiveDepthFirstSearch.cs

Timestamp:

12/29/14 11:02:36 (9 years ago)

Author:

gkronber

Message:

#2283: worked on grammatical optimization problem solvers (simple MCTS done)

File:

• branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Algorithms.GrammaticalOptimization/ExhaustiveDepthFirstSearch.cs (modified) (2 diffs)

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

@@ -24 +24 @@
       for (int i = 0; sentenceEnumerator.MoveNext() && i < maxIterations; i++) {
         var sentence = sentenceEnumerator.Current;
-        var quality = problem.Evaluate(sentence);
+        var quality = problem.Evaluate(sentence) / problem.GetBestKnownQuality(maxLen);
         RaiseSolutionEvaluated(sentence, quality);
 
@@ -39 +39 @@
         var phrase = stack.Pop();
 
-        var nt = phrase.First(grammar.IsNonTerminal);
-        var ntIdx = phrase.IndexOf(nt); // TODO perf
+        char nt;
+        int ntIdx;
+        Grammar.FindFirstNonTerminal(grammar, phrase, out nt, out ntIdx);
         var alts = grammar.GetAlternatives(nt);
         foreach (var alt in alts) {