1 files changed, 22 insertions, 1 deletions
diff --git a/extractor/Makefile.am b/extractor/Makefile.am
index 844c0ef3..ded06239 100644
--- a/extractor/Makefile.am
+++ b/extractor/Makefile.am
@@ -3,22 +3,27 @@ bin_PROGRAMS = compile run_extractor
 noinst_PROGRAMS = \
   binary_search_merger_test \
   data_array_test \
+  intersector_test \
   linear_merger_test \
   matching_comparator_test \
   matching_test \
   matchings_finder_test \
   phrase_test \
   precomputation_test \
+  sampler_test \
   suffix_array_test \
   veb_test
 
-TESTS = precomputation_test
+TESTS = sampler_test
 #TESTS = binary_search_merger_test \
 #  data_array_test \
+#  intersector_test \
 #  linear_merger_test \
 #  matching_comparator_test \
 #  matching_test \
+#  matchings_finder_test \
 #  phrase_test \
+#  precomputation_test \
 #  suffix_array_test \
 #  veb_test
 
@@ -26,6 +31,8 @@ binary_search_merger_test_SOURCES = binary_search_merger_test.cc
 binary_search_merger_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) $(GMOCK_LDFLAGS) $(GMOCK_LIBS) libextractor.a
 data_array_test_SOURCES = data_array_test.cc
 data_array_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) libextractor.a
+intersector_test_SOURCES = intersector_test.cc
+intersector_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) $(GMOCK_LDFLAGS) $(GMOCK_LIBS) libextractor.a
 linear_merger_test_SOURCES = linear_merger_test.cc
 linear_merger_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) $(GMOCK_LDFLAGS) $(GMOCK_LIBS) libextractor.a
 matching_comparator_test_SOURCES = matching_comparator_test.cc
@@ -40,6 +47,8 @@ precomputation_test_SOURCES = precomputation_test.cc
 precomputation_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) $(GMOCK_LDFLAGS) $(GMOCK_LIBS) libextractor.a
 suffix_array_test_SOURCES = suffix_array_test.cc
 suffix_array_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) $(GMOCK_LDFLAGS) $(GMOCK_LIBS) libextractor.a
+sampler_test_SOURCES = sampler_test.cc
+sampler_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) $(GMOCK_LDFLAGS) $(GMOCK_LIBS) libextractor.a
 veb_test_SOURCES = veb_test.cc
 veb_test_LDADD = $(GTEST_LDFLAGS) $(GTEST_LIBS) libextractor.a
 
@@ -62,6 +71,15 @@ libextractor_a_SOURCES = \
   alignment.cc \
   binary_search_merger.cc \
   data_array.cc \
+  features/count_source_target.cc \
+  features/feature.cc \
+  features/is_source_singleton.cc \
+  features/is_source_target_singleton.cc \
+  features/max_lex_source_given_target.cc \
+  features/max_lex_target_given_source.cc \
+  features/sample_source_count.cc \
+  features/target_given_source_coherent.cc \
+  grammar.cc \
   grammar_extractor.cc \
   matching.cc \
   matching_comparator.cc \
@@ -73,8 +91,11 @@ libextractor_a_SOURCES = \
   phrase_builder.cc \
   phrase_location.cc \
   precomputation.cc \
+  rule.cc \
   rule_extractor.cc \
   rule_factory.cc \
+  sampler.cc \
+  scorer.cc \
   suffix_array.cc \
   translation_table.cc \
   veb.cc \