summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Baltescu <pauldb89@gmail.com>2013-11-23 18:39:39 +0000
committerPaul Baltescu <pauldb89@gmail.com>2013-11-23 18:39:39 +0000
commit9cc2e002a064a2e14444669178126d1e96be8230 (patch)
tree56400d2fa8d031c83c57096af306c84b23abcbc5
parent404b47e2d38584627c7090e1a10ceefaf62429a0 (diff)
Fix broken extractor test.
-rw-r--r--configure.ac2
-rw-r--r--extractor/mocks/mock_rule_factory.h4
-rw-r--r--extractor/rule_factory.h5
3 files changed, 8 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 03bae25c..8136a7c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -199,7 +199,7 @@ AC_CONFIG_FILES([mteval/Makefile])
AC_CONFIG_FILES([mteval/meteor_jar.cc])
AC_CONFIG_FILES([decoder/Makefile])
AC_CONFIG_FILES([python/setup.py])
-#AC_CONFIG_FILES([extractor/Makefile])
+AC_CONFIG_FILES([extractor/Makefile])
AC_CONFIG_FILES([word-aligner/Makefile])
# KenLM stuff
diff --git a/extractor/mocks/mock_rule_factory.h b/extractor/mocks/mock_rule_factory.h
index 86a084b5..6b7b6586 100644
--- a/extractor/mocks/mock_rule_factory.h
+++ b/extractor/mocks/mock_rule_factory.h
@@ -7,7 +7,9 @@ namespace extractor {
class MockHieroCachingRuleFactory : public HieroCachingRuleFactory {
public:
- MOCK_METHOD3(GetGrammar, Grammar(const vector<int>& word_ids, const unordered_set<int> blacklisted_sentence_ids, const shared_ptr<DataArray> source_data_array));
+ MOCK_METHOD3(GetGrammar, Grammar(const vector<int>& word_ids, const
+ unordered_set<int>& blacklisted_sentence_ids,
+ const shared_ptr<DataArray> source_data_array));
};
} // namespace extractor
diff --git a/extractor/rule_factory.h b/extractor/rule_factory.h
index df63a9d8..a1ff76e4 100644
--- a/extractor/rule_factory.h
+++ b/extractor/rule_factory.h
@@ -72,7 +72,10 @@ 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,
+ const shared_ptr<DataArray> source_data_array);
protected:
HieroCachingRuleFactory();