Merge branch 'master' of https://github.com/redpony/cdec

1 files changed, 4 insertions, 2 deletions

diff --git a/extractor/grammar_extractor.cc b/extractor/grammar_extractor.cc
index 8050ce7b..487abcaf 100644
--- a/extractor/grammar_extractor.cc
+++ b/extractor/grammar_extractor.cc
@@ -3,11 +3,13 @@
 #include <iterator>
 #include <sstream>
 #include <vector>
+#include <unordered_set>
 
 #include "grammar.h"
 #include "rule.h"
 #include "rule_factory.h"
 #include "vocabulary.h"
+#include "data_array.h"
 
 using namespace std;
 
@@ -32,10 +34,10 @@ GrammarExtractor::GrammarExtractor(
     vocabulary(vocabulary),
     rule_factory(rule_factory) {}
 
-Grammar GrammarExtractor::GetGrammar(const string& sentence) {
+Grammar GrammarExtractor::GetGrammar(const string& sentence, const unordered_set<int>& blacklisted_sentence_ids, const shared_ptr<DataArray> source_data_array) {
   vector<string> words = TokenizeSentence(sentence);
   vector<int> word_ids = AnnotateWords(words);
-  return rule_factory->GetGrammar(word_ids);
+  return rule_factory->GetGrammar(word_ids, blacklisted_sentence_ids, source_data_array);
 }
 
 vector<string> GrammarExtractor::TokenizeSentence(const string& sentence) {