From bbcd1a02103fa4d9f4dcdc605d438c13e0dc7085 Mon Sep 17 00:00:00 2001 From: Paul Baltescu Date: Wed, 6 Mar 2013 17:13:13 +0000 Subject: Fix broken test & includes. --- extractor/features/feature.h | 3 +-- extractor/features/max_lex_source_given_target.cc | 4 ++-- .../features/max_lex_source_given_target_test.cc | 8 ++++---- extractor/features/max_lex_target_given_source.cc | 4 ++-- .../features/max_lex_target_given_source_test.cc | 8 ++++---- extractor/mocks/mock_alignment.h | 2 +- extractor/mocks/mock_data_array.h | 2 +- extractor/mocks/mock_fast_intersector.h | 6 +++--- extractor/mocks/mock_feature.h | 2 +- extractor/mocks/mock_matchings_finder.h | 4 ++-- extractor/mocks/mock_precomputation.h | 2 +- extractor/mocks/mock_rule_extractor.h | 8 ++++---- extractor/mocks/mock_rule_extractor_helper.h | 2 +- extractor/mocks/mock_rule_factory.h | 4 ++-- extractor/mocks/mock_sampler.h | 4 ++-- extractor/mocks/mock_scorer.h | 4 ++-- extractor/mocks/mock_suffix_array.h | 6 +++--- extractor/mocks/mock_target_phrase_extractor.h | 2 +- extractor/mocks/mock_translation_table.h | 2 +- extractor/mocks/mock_vocabulary.h | 2 +- extractor/precomputation_test.cc | 19 +++++++++---------- 21 files changed, 48 insertions(+), 50 deletions(-) diff --git a/extractor/features/feature.h b/extractor/features/feature.h index de2827bc..6693ccbf 100644 --- a/extractor/features/feature.h +++ b/extractor/features/feature.h @@ -3,8 +3,7 @@ #include -//TODO(pauldb): include headers nicely. -#include "../phrase.h" +#include "phrase.h" using namespace std; diff --git a/extractor/features/max_lex_source_given_target.cc b/extractor/features/max_lex_source_given_target.cc index 3ffe598c..65d0ec68 100644 --- a/extractor/features/max_lex_source_given_target.cc +++ b/extractor/features/max_lex_source_given_target.cc @@ -2,8 +2,8 @@ #include -#include "../data_array.h" -#include "../translation_table.h" +#include "data_array.h" +#include "translation_table.h" namespace extractor { namespace features { diff --git a/extractor/features/max_lex_source_given_target_test.cc b/extractor/features/max_lex_source_given_target_test.cc index c1edb483..7f6aae41 100644 --- a/extractor/features/max_lex_source_given_target_test.cc +++ b/extractor/features/max_lex_source_given_target_test.cc @@ -4,10 +4,10 @@ #include #include -#include "../mocks/mock_translation_table.h" -#include "../mocks/mock_vocabulary.h" -#include "../data_array.h" -#include "../phrase_builder.h" +#include "data_array.h" +#include "mocks/mock_translation_table.h" +#include "mocks/mock_vocabulary.h" +#include "phrase_builder.h" #include "max_lex_source_given_target.h" using namespace std; diff --git a/extractor/features/max_lex_target_given_source.cc b/extractor/features/max_lex_target_given_source.cc index 30140d80..33783054 100644 --- a/extractor/features/max_lex_target_given_source.cc +++ b/extractor/features/max_lex_target_given_source.cc @@ -2,8 +2,8 @@ #include -#include "../data_array.h" -#include "../translation_table.h" +#include "data_array.h" +#include "translation_table.h" namespace extractor { namespace features { diff --git a/extractor/features/max_lex_target_given_source_test.cc b/extractor/features/max_lex_target_given_source_test.cc index 9ceb13e5..6d0efd9c 100644 --- a/extractor/features/max_lex_target_given_source_test.cc +++ b/extractor/features/max_lex_target_given_source_test.cc @@ -4,10 +4,10 @@ #include #include -#include "../mocks/mock_translation_table.h" -#include "../mocks/mock_vocabulary.h" -#include "../data_array.h" -#include "../phrase_builder.h" +#include "data_array.h" +#include "mocks/mock_translation_table.h" +#include "mocks/mock_vocabulary.h" +#include "phrase_builder.h" #include "max_lex_target_given_source.h" using namespace std; diff --git a/extractor/mocks/mock_alignment.h b/extractor/mocks/mock_alignment.h index 3d745e9d..299c3d1c 100644 --- a/extractor/mocks/mock_alignment.h +++ b/extractor/mocks/mock_alignment.h @@ -1,6 +1,6 @@ #include -#include "../alignment.h" +#include "alignment.h" namespace extractor { diff --git a/extractor/mocks/mock_data_array.h b/extractor/mocks/mock_data_array.h index cf9f3671..6f85abb4 100644 --- a/extractor/mocks/mock_data_array.h +++ b/extractor/mocks/mock_data_array.h @@ -1,6 +1,6 @@ #include -#include "../data_array.h" +#include "data_array.h" namespace extractor { diff --git a/extractor/mocks/mock_fast_intersector.h b/extractor/mocks/mock_fast_intersector.h index 665add65..f0b628d7 100644 --- a/extractor/mocks/mock_fast_intersector.h +++ b/extractor/mocks/mock_fast_intersector.h @@ -1,8 +1,8 @@ #include -#include "../fast_intersector.h" -#include "../phrase.h" -#include "../phrase_location.h" +#include "fast_intersector.h" +#include "phrase.h" +#include "phrase_location.h" namespace extractor { diff --git a/extractor/mocks/mock_feature.h b/extractor/mocks/mock_feature.h index 19ba4de9..0b0f0ead 100644 --- a/extractor/mocks/mock_feature.h +++ b/extractor/mocks/mock_feature.h @@ -1,6 +1,6 @@ #include -#include "../features/feature.h" +#include "features/feature.h" namespace extractor { namespace features { diff --git a/extractor/mocks/mock_matchings_finder.h b/extractor/mocks/mock_matchings_finder.h index ffbb06c7..827526fd 100644 --- a/extractor/mocks/mock_matchings_finder.h +++ b/extractor/mocks/mock_matchings_finder.h @@ -1,7 +1,7 @@ #include -#include "../matchings_finder.h" -#include "../phrase_location.h" +#include "matchings_finder.h" +#include "phrase_location.h" namespace extractor { diff --git a/extractor/mocks/mock_precomputation.h b/extractor/mocks/mock_precomputation.h index 64934b94..8753343e 100644 --- a/extractor/mocks/mock_precomputation.h +++ b/extractor/mocks/mock_precomputation.h @@ -1,6 +1,6 @@ #include -#include "../precomputation.h" +#include "precomputation.h" namespace extractor { diff --git a/extractor/mocks/mock_rule_extractor.h b/extractor/mocks/mock_rule_extractor.h index 28b644b0..aad11651 100644 --- a/extractor/mocks/mock_rule_extractor.h +++ b/extractor/mocks/mock_rule_extractor.h @@ -1,9 +1,9 @@ #include -#include "../phrase.h" -#include "../phrase_builder.h" -#include "../rule.h" -#include "../rule_extractor.h" +#include "phrase.h" +#include "phrase_builder.h" +#include "rule.h" +#include "rule_extractor.h" namespace extractor { diff --git a/extractor/mocks/mock_rule_extractor_helper.h b/extractor/mocks/mock_rule_extractor_helper.h index 3b0ac0f5..cf196ab5 100644 --- a/extractor/mocks/mock_rule_extractor_helper.h +++ b/extractor/mocks/mock_rule_extractor_helper.h @@ -2,7 +2,7 @@ #include -#include "../rule_extractor_helper.h" +#include "rule_extractor_helper.h" using namespace std; diff --git a/extractor/mocks/mock_rule_factory.h b/extractor/mocks/mock_rule_factory.h index 11cb9ab5..7389b396 100644 --- a/extractor/mocks/mock_rule_factory.h +++ b/extractor/mocks/mock_rule_factory.h @@ -1,7 +1,7 @@ #include -#include "../grammar.h" -#include "../rule_factory.h" +#include "grammar.h" +#include "rule_factory.h" namespace extractor { diff --git a/extractor/mocks/mock_sampler.h b/extractor/mocks/mock_sampler.h index 7022f7b3..75c43c27 100644 --- a/extractor/mocks/mock_sampler.h +++ b/extractor/mocks/mock_sampler.h @@ -1,7 +1,7 @@ #include -#include "../phrase_location.h" -#include "../sampler.h" +#include "phrase_location.h" +#include "sampler.h" namespace extractor { diff --git a/extractor/mocks/mock_scorer.h b/extractor/mocks/mock_scorer.h index 4d593ddf..cc0c444d 100644 --- a/extractor/mocks/mock_scorer.h +++ b/extractor/mocks/mock_scorer.h @@ -1,7 +1,7 @@ #include -#include "../scorer.h" -#include "../features/feature.h" +#include "scorer.h" +#include "features/feature.h" namespace extractor { diff --git a/extractor/mocks/mock_suffix_array.h b/extractor/mocks/mock_suffix_array.h index 6886232a..7018acc7 100644 --- a/extractor/mocks/mock_suffix_array.h +++ b/extractor/mocks/mock_suffix_array.h @@ -3,9 +3,9 @@ #include #include -#include "../data_array.h" -#include "../phrase_location.h" -#include "../suffix_array.h" +#include "data_array.h" +#include "phrase_location.h" +#include "suffix_array.h" using namespace std; diff --git a/extractor/mocks/mock_target_phrase_extractor.h b/extractor/mocks/mock_target_phrase_extractor.h index e5e9aeab..6aad853c 100644 --- a/extractor/mocks/mock_target_phrase_extractor.h +++ b/extractor/mocks/mock_target_phrase_extractor.h @@ -1,6 +1,6 @@ #include -#include "../target_phrase_extractor.h" +#include "target_phrase_extractor.h" namespace extractor { diff --git a/extractor/mocks/mock_translation_table.h b/extractor/mocks/mock_translation_table.h index 358c854f..307e4282 100644 --- a/extractor/mocks/mock_translation_table.h +++ b/extractor/mocks/mock_translation_table.h @@ -1,6 +1,6 @@ #include -#include "../translation_table.h" +#include "translation_table.h" namespace extractor { diff --git a/extractor/mocks/mock_vocabulary.h b/extractor/mocks/mock_vocabulary.h index 802c29b4..042c9ce2 100644 --- a/extractor/mocks/mock_vocabulary.h +++ b/extractor/mocks/mock_vocabulary.h @@ -1,6 +1,6 @@ #include -#include "../vocabulary.h" +#include "vocabulary.h" namespace extractor { diff --git a/extractor/precomputation_test.cc b/extractor/precomputation_test.cc index 04e3850d..363febb7 100644 --- a/extractor/precomputation_test.cc +++ b/extractor/precomputation_test.cc @@ -40,7 +40,6 @@ TEST_F(PrecomputationTest, TestCollocations) { Precomputation precomputation(suffix_array, 3, 3, 10, 5, 1, 4, 2); Index collocations = precomputation.GetCollocations(); - EXPECT_EQ(-1, precomputation.NON_TERMINAL); vector key = {2, 3, -1, 2}; vector expected_value = {1, 5, 1, 8, 5, 8, 5, 11, 8, 11}; EXPECT_EQ(expected_value, collocations[key]); @@ -69,33 +68,33 @@ TEST_F(PrecomputationTest, TestCollocations) { expected_value = {1, 6, 1, 9, 5, 9}; EXPECT_EQ(expected_value, collocations[key]); - key = {2, -1, 2, -1, 2}; + key = {2, -1, 2, -2, 2}; expected_value = {1, 5, 8, 5, 8, 11}; EXPECT_EQ(expected_value, collocations[key]); - key = {2, -1, 2, -1, 3}; + key = {2, -1, 2, -2, 3}; expected_value = {1, 5, 9}; EXPECT_EQ(expected_value, collocations[key]); - key = {2, -1, 3, -1, 2}; + key = {2, -1, 3, -2, 2}; expected_value = {1, 6, 8, 5, 9, 11}; EXPECT_EQ(expected_value, collocations[key]); - key = {2, -1, 3, -1, 3}; + key = {2, -1, 3, -2, 3}; expected_value = {1, 6, 9}; EXPECT_EQ(expected_value, collocations[key]); - key = {3, -1, 2, -1, 2}; + key = {3, -1, 2, -2, 2}; expected_value = {2, 5, 8, 2, 5, 11, 2, 8, 11, 6, 8, 11}; EXPECT_EQ(expected_value, collocations[key]); - key = {3, -1, 2, -1, 3}; + key = {3, -1, 2, -2, 3}; expected_value = {2, 5, 9}; EXPECT_EQ(expected_value, collocations[key]); - key = {3, -1, 3, -1, 2}; + key = {3, -1, 3, -2, 2}; expected_value = {2, 6, 8, 2, 6, 11, 2, 9, 11, 6, 9, 11}; EXPECT_EQ(expected_value, collocations[key]); - key = {3, -1, 3, -1, 3}; + key = {3, -1, 3, -2, 3}; expected_value = {2, 6, 9}; EXPECT_EQ(expected_value, collocations[key]); // Exceeds max_rule_symbols. - key = {2, -1, 2, -1, 2, 3}; + key = {2, -1, 2, -2, 2, 3}; EXPECT_EQ(0, collocations.count(key)); // Contains non frequent pattern. key = {2, -1, 5}; -- cgit v1.2.3