Context Navigation

HeuristicLab.Problems.GrammaticalOptimization

Timestamp:

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

Author:

gkronber

Message:

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

Location:

Files:

r11742	r11792
40	40
41	41	public string CanonicalRepresentation(string terminalPhrase) {
	42	throw new NotImplementedException();
42	43	return terminalPhrase;
43	44	}

r11742	r11792
8	8	double BestKnownQuality(int maxLen);
9	9	IGrammar Grammar { get; }
10		double Evaluate(~~string~~ sentence);
11		~~string CanonicalRepresentation(string~~ terminalPhrase);
	10	double Evaluate(ReadonlySequence sentence);
	11	ReadonlySequence CanonicalRepresentation(ReadonlySequence terminalPhrase);
12	12	}
13	13	}

r11742	r11792
81	81
82	82	public string CanonicalRepresentation(string terminalPhrase) {
	83	throw new NotImplementedException();
83	84	return terminalPhrase;
84	85	}

r11747	r11792
81	81
82	82	public string CanonicalRepresentation(string terminalPhrase) {
	83	throw new NotImplementedException();
83	84	return terminalPhrase;
84	85	}

-                      r11770
+                      r11792
     // right now only + and * is supported
     private Dictionary<string, string> cache = new Dictionary<string, string>();
+    //private Dictionary<string, string> cache = new Dictionary<string, string>();
     public string CanonicalRepresentation(string phrase) {
       string res;
       if (!cache.TryGetValue(phrase, out res)) {
         var terms = phrase.Split('+').Select(t => t.Replace("*", ""));
         var terminalTerms = terms.Where(t => t.All(ch => grammar.IsTerminal(ch)));
         var nonTerminalTerms = terms.Where(t => t.Any(ch => grammar.IsNonTerminal(ch)));
+      //if (!cache.TryGetValue(phrase, out res)) {
+      var terms = phrase.Split('+').Select(t => t.Replace("*", ""));
+      var terminalTerms = terms.Where(t => t.All(ch => grammar.IsTerminal(ch)));
+      var nonTerminalTerms = terms.Where(t => t.Any(ch => grammar.IsNonTerminal(ch)));
         res = string.Join("+", terminalTerms.Select(term => CanonicalTerm(term)).OrderBy(term => term).Concat(nonTerminalTerms.Select(term => CanonicalTerm(term))));
         cache[phrase] = res;
+      }
+      res = string.Join("+", terminalTerms.Select(term => CanonicalTerm(term)).OrderBy(term => term).Concat(nonTerminalTerms.Select(term => CanonicalTerm(term))));
+      //cache[phrase] = res;
+      //}
       return res;
+    }

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