diff options
| author | Paul Baltescu <pauldb89@gmail.com> | 2013-05-23 20:42:26 +0100 |
|---|---|---|
| committer | Paul Baltescu <pauldb89@gmail.com> | 2013-05-23 20:42:26 +0100 |
| commit | 1f9e57479e1c03d208e0b2b7bf007426e8a16dab (patch) | |
| tree | 41176fdd936eba591cd2d88ea1f7a2ad76f8cc36 /extractor/mocks | |
| parent | 124878154b88819d35e78a42b854054bfc90e1b1 (diff) | |
| parent | fc3d47b81448c7537ed7951aea81ddcbd95bc18a (diff) | |
Merge branch 'master' of github.com:pauldb89/cdec
Diffstat (limited to 'extractor/mocks')
| -rw-r--r-- | extractor/mocks/mock_alignment.h | 2 | ||||
| -rw-r--r-- | extractor/mocks/mock_rule_extractor_helper.h | 12 | ||||
| -rw-r--r-- | extractor/mocks/mock_target_phrase_extractor.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/extractor/mocks/mock_alignment.h b/extractor/mocks/mock_alignment.h index 299c3d1c..1d123cd8 100644 --- a/extractor/mocks/mock_alignment.h +++ b/extractor/mocks/mock_alignment.h @@ -4,7 +4,7 @@ namespace extractor { -typedef vector<pair<int, int> > SentenceLinks; +typedef vector<pair<int, int>> SentenceLinks; class MockAlignment : public Alignment { public: diff --git a/extractor/mocks/mock_rule_extractor_helper.h b/extractor/mocks/mock_rule_extractor_helper.h index 468468f6..b5ab323f 100644 --- a/extractor/mocks/mock_rule_extractor_helper.h +++ b/extractor/mocks/mock_rule_extractor_helper.h @@ -18,7 +18,7 @@ class MockRuleExtractorHelper : public RuleExtractorHelper { const vector<int>&, const vector<int>&, int)); MOCK_CONST_METHOD4(CheckTightPhrases, bool(const vector<int>&, const vector<int>&, const vector<int>&, int)); - MOCK_CONST_METHOD1(GetGapOrder, vector<int>(const vector<pair<int, int> >&)); + MOCK_CONST_METHOD1(GetGapOrder, vector<int>(const vector<pair<int, int>>&)); MOCK_CONST_METHOD4(GetSourceIndexes, Indexes(const vector<int>&, const vector<int>&, int, int)); @@ -36,8 +36,8 @@ class MockRuleExtractorHelper : public RuleExtractorHelper { return find_fix_point; } - bool GetGaps(vector<pair<int, int> >& source_gaps, - vector<pair<int, int> >& target_gaps, + bool GetGaps(vector<pair<int, int>>& source_gaps, + vector<pair<int, int>>& target_gaps, const vector<int>&, const vector<int>&, const vector<int>&, const vector<int>&, const vector<int>&, const vector<int>&, int, int, int, int, int, int, int& num_symbols, @@ -52,7 +52,7 @@ class MockRuleExtractorHelper : public RuleExtractorHelper { void SetUp( int target_phrase_low, int target_phrase_high, int source_back_low, int source_back_high, bool find_fix_point, - vector<pair<int, int> > source_gaps, vector<pair<int, int> > target_gaps, + vector<pair<int, int>> source_gaps, vector<pair<int, int>> target_gaps, int num_symbols, bool met_constraints, bool get_gaps) { this->target_phrase_low = target_phrase_low; this->target_phrase_high = target_phrase_high; @@ -72,8 +72,8 @@ class MockRuleExtractorHelper : public RuleExtractorHelper { int source_back_low; int source_back_high; bool find_fix_point; - vector<pair<int, int> > source_gaps; - vector<pair<int, int> > target_gaps; + vector<pair<int, int>> source_gaps; + vector<pair<int, int>> target_gaps; int num_symbols; bool met_constraints; bool get_gaps; diff --git a/extractor/mocks/mock_target_phrase_extractor.h b/extractor/mocks/mock_target_phrase_extractor.h index 6aad853c..a8d45631 100644 --- a/extractor/mocks/mock_target_phrase_extractor.h +++ b/extractor/mocks/mock_target_phrase_extractor.h @@ -9,7 +9,7 @@ typedef pair<Phrase, PhraseAlignment> PhraseExtract; class MockTargetPhraseExtractor : public TargetPhraseExtractor { public: MOCK_CONST_METHOD6(ExtractPhrases, vector<PhraseExtract>( - const vector<pair<int, int> > &, const vector<int>&, int, int, + const vector<pair<int, int>>&, const vector<int>&, int, int, const unordered_map<int, int>&, int)); }; |