Changeset 11980 for branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization/Problems/SantaFeAntProblem.cs

Timestamp:

02/11/15 13:06:02 (9 years ago)

Author:

gkronber

Message:

#2283: commit before cleanup after EuroCAST

File:

• branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization/Problems/SantaFeAntProblem.cs (modified) (4 diffs)

branches/HeuristicLab.Problems.GrammaticalOptimization/HeuristicLab.Problems.GrammaticalOptimization/Problems/SantaFeAntProblem.cs

@@ -123 +123 @@
 
     public string CanonicalRepresentation(string phrase) {
-      phrase = phrase.Replace("A", ".");
+      //phrase = phrase.Replace("A", ".");
       var sb = new StringBuilder(phrase);
       string canonicalPhrase = phrase;
@@ -133 +133 @@
         canonicalPhrase = sb.ToString();
       } while (canonicalPhrase != oldPhrase);
-      return sb.ToString();
+      return canonicalPhrase;
     }
 
@@ -141 +141 @@
 
 
-      //yield return new Feature("const", 0.0);
+      yield return new Feature(isTerminal + ToString(), 1.0);
       //if (phrase.Length > 0) {
       //  var ant = new Ant(recordTrail: true);
@@ -157 +157 @@
       //}
       //
-      ////yield return new Feature("$" + phrase[0], 1.0);
-      // if (!isTerminal) {
-      //   for (int i = 4; i < phrase.Length; i++) {
-      //     if (grammar.IsNonTerminal(phrase[i])) {
-      //       yield return new Feature(phrase[i - 4].ToString() + phrase[i - 3].ToString() + phrase[i - 2] + phrase[i - 1], 0.1);
-      //       break;
-      //     }
-      //   }
-      // }
+      yield return new Feature("$" + (phrase.Length > 0 ? phrase[0] : ' '), 1.0);
+      if (!isTerminal) {
+        for (int i = 4; i < phrase.Length; i++) {
+          if (!grammar.IsTerminal(phrase[i])) {
+            yield return new Feature(phrase[i - 4].ToString() + phrase[i - 3].ToString() + phrase[i - 2] + phrase[i - 1], 1.0);
+            break;
+          }
+        }
+      }
       // var d = 0;
       // var ls = 0;