diff options
| author | Patrick Simianer <p@simianer.de> | 2013-12-04 20:13:07 +0100 |
|---|---|---|
| committer | Patrick Simianer <p@simianer.de> | 2013-12-04 20:13:07 +0100 |
| commit | 9ff43d7c8e076aaa8790bacbd4b2cfe636a55a97 (patch) | |
| tree | e1e0265b18ffc854f24209cb36b2c836100f099b /extractor/rule_factory.h | |
| parent | e59cdac5253df7ab57296d347245d1a8f4d8b287 (diff) | |
| parent | 407b100cd3e4ae987504b53101151fba287ad999 (diff) | |
fix merge conflict
Diffstat (limited to 'extractor/rule_factory.h')
| -rw-r--r-- | extractor/rule_factory.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/extractor/rule_factory.h b/extractor/rule_factory.h index df63a9d8..1a9fa2af 100644 --- a/extractor/rule_factory.h +++ b/extractor/rule_factory.h @@ -72,7 +72,9 @@ class HieroCachingRuleFactory { // Constructs SCFG rules for a given sentence. // (See class description for more details.) - virtual Grammar GetGrammar(const vector<int>& word_ids, const unordered_set<int>& blacklisted_sentence_ids, const shared_ptr<DataArray> source_data_array); + virtual Grammar GetGrammar( + const vector<int>& word_ids, + const unordered_set<int>& blacklisted_sentence_ids); protected: HieroCachingRuleFactory(); |