23 files changed, 133 insertions, 7 deletions
diff --git a/extractor/features/count_source_target.cc b/extractor/features/count_source_target.cc
index 9441b451..db0385e0 100644
--- a/extractor/features/count_source_target.cc
+++ b/extractor/features/count_source_target.cc
@@ -2,6 +2,9 @@
 
 #include <cmath>
 
+namespace extractor {
+namespace features {
+
 double CountSourceTarget::Score(const FeatureContext& context) const {
   return log10(1 + context.pair_count);
 }
@@ -9,3 +12,6 @@ double CountSourceTarget::Score(const FeatureContext& context) const {
 string CountSourceTarget::GetName() const {
   return "CountEF";
 }
+
+} // namespace features
+} // namespace extractor
diff --git a/extractor/features/count_source_target.h b/extractor/features/count_source_target.h
index a2481944..dec78883 100644
--- a/extractor/features/count_source_target.h
+++ b/extractor/features/count_source_target.h
@@ -3,6 +3,9 @@
 
 #include "feature.h"
 
+namespace extractor {
+namespace features {
+
 class CountSourceTarget : public Feature {
  public:
   double Score(const FeatureContext& context) const;
@@ -10,4 +13,7 @@ class CountSourceTarget : public Feature {
   string GetName() const;
 };
 
+} // namespace features
+} // namespace extractor
+
 #endif
diff --git a/extractor/features/count_source_target_test.cc b/extractor/features/count_source_target_test.cc
index 22633bb6..1fd0c2aa 100644
--- a/extractor/features/count_source_target_test.cc
+++ b/extractor/features/count_source_target_test.cc
@@ -8,6 +8,8 @@
 using namespace std;
 using namespace ::testing;
 
+namespace extractor {
+namespace features {
 namespace {
 
 class CountSourceTargetTest : public Test {
@@ -29,4 +31,6 @@ TEST_F(CountSourceTargetTest, TestScore) {
   EXPECT_EQ(1.0, feature->Score(context));
 }
 
-}  // namespace
+} // namespace
+} // namespace features
+} // namespace extractor
diff --git a/extractor/features/feature.cc b/extractor/features/feature.cc
index 876f5f8f..939bcc59 100644
--- a/extractor/features/feature.cc
+++ b/extractor/features/feature.cc
@@ -1,5 +1,11 @@
 #include "feature.h"
 
+namespace extractor {
+namespace features {
+
 const double Feature::MAX_SCORE = 99.0;
 
 Feature::~Feature() {}
+
+} // namespace features
+} // namespace extractor
diff --git a/extractor/features/feature.h b/extractor/features/feature.h
index aca58401..de2827bc 100644
--- a/extractor/features/feature.h
+++ b/extractor/features/feature.h
@@ -8,6 +8,9 @@
 
 using namespace std;
 
+namespace extractor {
+namespace features {
+
 struct FeatureContext {
   FeatureContext(const Phrase& source_phrase, const Phrase& target_phrase,
                  double source_phrase_count, int pair_count, int num_samples) :
@@ -33,4 +36,7 @@ class Feature {
   static const double MAX_SCORE;
 };
 
+} // namespace features
+} // namespace extractor
+
 #endif
diff --git a/extractor/features/is_source_singleton.cc b/extractor/features/is_source_singleton.cc
index 98d4e5fe..ab54e51a 100644
--- a/extractor/features/is_source_singleton.cc
+++ b/extractor/features/is_source_singleton.cc
@@ -2,6 +2,9 @@
 
 #include <cmath>
 
+namespace extractor {
+namespace features {
+
 double IsSourceSingleton::Score(const FeatureContext& context) const {
   return context.source_phrase_count == 1;
 }
@@ -9,3 +12,6 @@ double IsSourceSingleton::Score(const FeatureContext& context) const {
 string IsSourceSingleton::GetName() const {
   return "IsSingletonF";
 }
+
+} // namespace features
+} // namespace extractor
diff --git a/extractor/features/is_source_singleton.h b/extractor/features/is_source_singleton.h
index 7cc72828..30f76c6d 100644
--- a/extractor/features/is_source_singleton.h
+++ b/extractor/features/is_source_singleton.h
@@ -3,6 +3,9 @@
 
 #include "feature.h"
 
+namespace extractor {
+namespace features {
+
 class IsSourceSingleton : public Feature {
  public:
   double Score(const FeatureContext& context) const;
@@ -10,4 +13,7 @@ class IsSourceSingleton : public Feature {
   string GetName() const;
 };
 
+} // namespace features
+} // namespace extractor
+
 #endif
diff --git a/extractor/features/is_source_singleton_test.cc b/extractor/features/is_source_singleton_test.cc
index 8c71e593..f4266671 100644
--- a/extractor/features/is_source_singleton_test.cc
+++ b/extractor/features/is_source_singleton_test.cc
@@ -8,6 +8,8 @@
 using namespace std;
 using namespace ::testing;
 
+namespace extractor {
+namespace features {
 namespace {
 
 class IsSourceSingletonTest : public Test {
@@ -32,4 +34,6 @@ TEST_F(IsSourceSingletonTest, TestScore) {
   EXPECT_EQ(1, feature->Score(context));
 }
 
-}  // namespace
+} // namespace
+} // namespace features
+} // namespace extractor
diff --git a/extractor/features/is_source_target_singleton.cc b/extractor/features/is_source_target_singleton.cc
index 31d36532..03b3c62c 100644
--- a/extractor/features/is_source_target_singleton.cc
+++ b/extractor/features/is_source_target_singleton.cc
@@ -2,6 +2,9 @@
 
 #include <cmath>
 
+namespace extractor {
+namespace features {
+
 double IsSourceTargetSingleton::Score(const FeatureContext& context) const {
   return context.pair_count == 1;
 }
@@ -9,3 +12,6 @@ double IsSourceTargetSingleton::Score(const FeatureContext& context) const {
 string IsSourceTargetSingleton::GetName() const {
   return "IsSingletonFE";
 }
+
+} // namespace features
+} // namespace extractor
diff --git a/extractor/features/is_source_target_singleton.h b/extractor/features/is_source_target_singleton.h
index 58913b74..12fb6ee6 100644
--- a/extractor/features/is_source_target_singleton.h
+++ b/extractor/features/is_source_target_singleton.h
@@ -3,6 +3,9 @@
 
 #include "feature.h"
 
+namespace extractor {
+namespace features {
+
 class IsSourceTargetSingleton : public Feature {
  public:
   double Score(const FeatureContext& context) const;
@@ -10,4 +13,7 @@ class IsSourceTargetSingleton : public Feature {
   string GetName() const;
 };
 
+} // namespace features
+} // namespace extractor
+
 #endif
diff --git a/extractor/features/is_source_target_singleton_test.cc b/extractor/features/is_source_target_singleton_test.cc
index a51f77c9..929635b0 100644
--- a/extractor/features/is_source_target_singleton_test.cc
+++ b/extractor/features/is_source_target_singleton_test.cc
@@ -8,6 +8,8 @@
 using namespace std;
 using namespace ::testing;
 
+namespace extractor {
+namespace features {
 namespace {
 
 class IsSourceTargetSingletonTest : public Test {
@@ -32,4 +34,6 @@ TEST_F(IsSourceTargetSingletonTest, TestScore) {
   EXPECT_EQ(1, feature->Score(context));
 }
 
-}  // namespace
+} // namespace
+} // namespace features
+} // namespace extractor
diff --git a/extractor/features/max_lex_source_given_target.cc b/extractor/features/max_lex_source_given_target.cc
index 21f5c76a..3ffe598c 100644
--- a/extractor/features/max_lex_source_given_target.cc
+++ b/extractor/features/max_lex_source_given_target.cc
@@ -5,6 +5,9 @@
 #include "../data_array.h"
 #include "../translation_table.h"
 
+namespace extractor {
+namespace features {
+
 MaxLexSourceGivenTarget::MaxLexSourceGivenTarget(
     shared_ptr<TranslationTable> table) :
     table(table) {}
@@ -29,3 +32,6 @@ double MaxLexSourceGivenTarget::Score(const FeatureContext& context) const {
 string MaxLexSourceGivenTarget::GetName() const {
   return "MaxLexFgivenE";
 }
+
+} // namespace features
+} // namespace extractor
diff --git a/extractor/features/max_lex_source_given_target.h b/extractor/features/max_lex_source_given_target.h
index e87c1c8e..bfa7ef1b 100644
--- a/extractor/features/max_lex_source_given_target.h
+++ b/extractor/features/max_lex_source_given_target.h
@@ -7,8 +7,12 @@
 
 using namespace std;
 
+namespace extractor {
+
 class TranslationTable;
 
+namespace features {
+
 class MaxLexSourceGivenTarget : public Feature {
  public:
   MaxLexSourceGivenTarget(shared_ptr<TranslationTable> table);
@@ -21,4 +25,7 @@ class MaxLexSourceGivenTarget : public Feature {
   shared_ptr<TranslationTable> table;
 };
 
+} // namespace features
+} // namespace extractor
+
 #endif
diff --git a/extractor/features/max_lex_source_given_target_test.cc b/extractor/features/max_lex_source_given_target_test.cc
index 5fd41f8b..c1edb483 100644
--- a/extractor/features/max_lex_source_given_target_test.cc
+++ b/extractor/features/max_lex_source_given_target_test.cc
@@ -13,6 +13,8 @@
 using namespace std;
 using namespace ::testing;
 
+namespace extractor {
+namespace features {
 namespace {
 
 class MaxLexSourceGivenTargetTest : public Test {
@@ -71,4 +73,6 @@ TEST_F(MaxLexSourceGivenTargetTest, TestScore) {
   EXPECT_EQ(99 - log10(18), feature->Score(context));
 }
 
-}  // namespace
+} // namespace
+} // namespace features
+} // namespace extractor
diff --git a/extractor/features/max_lex_target_given_source.cc b/extractor/features/max_lex_target_given_source.cc
index f2bc2474..30140d80 100644
--- a/extractor/features/max_lex_target_given_source.cc
+++ b/extractor/features/max_lex_target_given_source.cc
@@ -5,6 +5,9 @@
 #include "../data_array.h"
 #include "../translation_table.h"
 
+namespace extractor {
+namespace features {
+
 MaxLexTargetGivenSource::MaxLexTargetGivenSource(
     shared_ptr<TranslationTable> table) :
     table(table) {}
@@ -29,3 +32,6 @@ double MaxLexTargetGivenSource::Score(const FeatureContext& context) const {
 string MaxLexTargetGivenSource::GetName() const {
   return "MaxLexEgivenF";
 }
+
+} // namespace features
+} // namespace extractor
diff --git a/extractor/features/max_lex_target_given_source.h b/extractor/features/max_lex_target_given_source.h
index 9585ff04..66cf0914 100644
--- a/extractor/features/max_lex_target_given_source.h
+++ b/extractor/features/max_lex_target_given_source.h
@@ -7,8 +7,12 @@
 
 using namespace std;
 
+namespace extractor {
+
 class TranslationTable;
 
+namespace features {
+
 class MaxLexTargetGivenSource : public Feature {
  public:
   MaxLexTargetGivenSource(shared_ptr<TranslationTable> table);
@@ -21,4 +25,7 @@ class MaxLexTargetGivenSource : public Feature {
   shared_ptr<TranslationTable> table;
 };
 
+} // namespace features
+} // namespace extractor
+
 #endif
diff --git a/extractor/features/max_lex_target_given_source_test.cc b/extractor/features/max_lex_target_given_source_test.cc
index c8701bf7..9ceb13e5 100644
--- a/extractor/features/max_lex_target_given_source_test.cc
+++ b/extractor/features/max_lex_target_given_source_test.cc
@@ -13,6 +13,8 @@
 using namespace std;
 using namespace ::testing;
 
+namespace extractor {
+namespace features {
 namespace {
 
 class MaxLexTargetGivenSourceTest : public Test {
@@ -71,4 +73,6 @@ TEST_F(MaxLexTargetGivenSourceTest, TestScore) {
   EXPECT_EQ(-log10(36), feature->Score(context));
 }
 
-}  // namespace
+} // namespace
+} // namespace features
+} // namespace extractor
diff --git a/extractor/features/sample_source_count.cc b/extractor/features/sample_source_count.cc
index 88b645b1..b110fc51 100644
--- a/extractor/features/sample_source_count.cc
+++ b/extractor/features/sample_source_count.cc
@@ -2,6 +2,9 @@
 
 #include <cmath>
 
+namespace extractor {
+namespace features {
+
 double SampleSourceCount::Score(const FeatureContext& context) const {
   return log10(1 + context.num_samples);
 }
@@ -9,3 +12,6 @@ double SampleSourceCount::Score(const FeatureContext& context) const {
 string SampleSourceCount::GetName() const {
   return "SampleCountF";
 }
+
+} // namespace features
+} // namespace extractor
diff --git a/extractor/features/sample_source_count.h b/extractor/features/sample_source_count.h
index 62d236c8..53c7f954 100644
--- a/extractor/features/sample_source_count.h
+++ b/extractor/features/sample_source_count.h
@@ -3,6 +3,9 @@
 
 #include "feature.h"
 
+namespace extractor {
+namespace features {
+
 class SampleSourceCount : public Feature {
  public:
   double Score(const FeatureContext& context) const;
@@ -10,4 +13,7 @@ class SampleSourceCount : public Feature {
   string GetName() const;
 };
 
+} // namespace features
+} // namespace extractor
+
 #endif
diff --git a/extractor/features/sample_source_count_test.cc b/extractor/features/sample_source_count_test.cc
index 7d226104..63856b9d 100644
--- a/extractor/features/sample_source_count_test.cc
+++ b/extractor/features/sample_source_count_test.cc
@@ -9,6 +9,8 @@
 using namespace std;
 using namespace ::testing;
 
+namespace extractor {
+namespace features {
 namespace {
 
 class SampleSourceCountTest : public Test {
@@ -33,4 +35,6 @@ TEST_F(SampleSourceCountTest, TestScore) {
   EXPECT_EQ(1.0, feature->Score(context));
 }
 
-}  // namespace
+} // namespace
+} // namespace features
+} // namespace extractor
diff --git a/extractor/features/target_given_source_coherent.cc b/extractor/features/target_given_source_coherent.cc
index 274b3364..c4551d88 100644
--- a/extractor/features/target_given_source_coherent.cc
+++ b/extractor/features/target_given_source_coherent.cc
@@ -2,6 +2,9 @@
 
 #include <cmath>
 
+namespace extractor {
+namespace features {
+
 double TargetGivenSourceCoherent::Score(const FeatureContext& context) const {
   double prob = (double) context.pair_count / context.num_samples;
   return prob > 0 ? -log10(prob) : MAX_SCORE;
@@ -10,3 +13,6 @@ double TargetGivenSourceCoherent::Score(const FeatureContext& context) const {
 string TargetGivenSourceCoherent::GetName() const {
   return "EgivenFCoherent";
 }
+
+} // namespace features
+} // namespace extractor
diff --git a/extractor/features/target_given_source_coherent.h b/extractor/features/target_given_source_coherent.h
index 09c8edb1..80d9f617 100644
--- a/extractor/features/target_given_source_coherent.h
+++ b/extractor/features/target_given_source_coherent.h
@@ -3,6 +3,9 @@
 
 #include "feature.h"
 
+namespace extractor {
+namespace features {
+
 class TargetGivenSourceCoherent : public Feature {
  public:
   double Score(const FeatureContext& context) const;
@@ -10,4 +13,7 @@ class TargetGivenSourceCoherent : public Feature {
   string GetName() const;
 };
 
+} // namespace features
+} // namespace extractor
+
 #endif
diff --git a/extractor/features/target_given_source_coherent_test.cc b/extractor/features/target_given_source_coherent_test.cc
index c54c06c2..454105e1 100644
--- a/extractor/features/target_given_source_coherent_test.cc
+++ b/extractor/features/target_given_source_coherent_test.cc
@@ -8,6 +8,8 @@
 using namespace std;
 using namespace ::testing;
 
+namespace extractor {
+namespace features {
 namespace {
 
 class TargetGivenSourceCoherentTest : public Test {
@@ -32,4 +34,6 @@ TEST_F(TargetGivenSourceCoherentTest, TestScore) {
   EXPECT_EQ(99.0, feature->Score(context));
 }
 
-}  // namespace
+} // namespace
+} // namespace features
+} // namespace extractor