merge

1 files changed, 46 insertions, 15 deletions

diff --git a/mert/Jamfile b/mert/Jamfile
index 924afd57d..bf2a52b2a 100644
--- a/mert/Jamfile
+++ b/mert/Jamfile
@@ -1,33 +1,50 @@
+import testing ;
+
 lib m ;
 
 lib mert_lib :
 Util.cpp
+GzFileBuf.cpp
 FileStream.cpp
 Timer.cpp
-ScoreStats.cpp ScoreArray.cpp ScoreData.cpp
+ScoreStats.cpp
+ScoreArray.cpp
+ScoreData.cpp
 ScoreDataIterator.cpp
-FeatureStats.cpp FeatureArray.cpp FeatureData.cpp
+FeatureStats.cpp
+FeatureArray.cpp
+FeatureData.cpp
 FeatureDataIterator.cpp
+MiraFeatureVector.cpp
+MiraWeightVector.cpp
+HypPackEnumerator.cpp
 Data.cpp
+BleuScorer.cpp
+SemposScorer.cpp
+SemposOverlapping.cpp
+InterpolatedScorer.cpp
 Point.cpp
 PerScorer.cpp
 Scorer.cpp
 ScorerFactory.cpp
 Optimizer.cpp
-TERsrc/alignmentStruct.cpp
-TERsrc/hashMap.cpp
-TERsrc/hashMapStringInfos.cpp
-TERsrc/stringHasher.cpp
-TERsrc/terAlignment.cpp
-TERsrc/terShift.cpp
-TERsrc/hashMapInfos.cpp
-TERsrc/infosHasher.cpp
-TERsrc/stringInfosHasher.cpp
-TERsrc/tercalc.cpp
-TERsrc/tools.cpp
+OptimizerFactory.cpp
+TER/alignmentStruct.cpp
+TER/hashMap.cpp
+TER/hashMapStringInfos.cpp
+TER/stringHasher.cpp
+TER/terAlignment.cpp
+TER/terShift.cpp
+TER/hashMapInfos.cpp
+TER/infosHasher.cpp
+TER/stringInfosHasher.cpp
+TER/tercalc.cpp
+TER/tools.cpp
 TerScorer.cpp
 CderScorer.cpp
 MergeScorer.cpp
+Vocabulary.cpp
+PreProcessFilter.cpp
 ../util//kenutil m ..//z ;
 
 exe mert : mert.cpp mert_lib bleu_lib ../moses/src//ThreadPool ;
@@ -38,8 +55,22 @@ exe evaluator : evaluator.cpp mert_lib bleu_lib ;
 
 exe pro : pro.cpp mert_lib bleu_lib ..//boost_program_options ;
 
-alias programs : mert extractor evaluator pro ;
+exe kbmira : kbmira.cpp mert_lib ..//boost_program_options ;
+
+alias programs : mert extractor evaluator pro kbmira ;
+
+unit-test bleu_scorer_test : BleuScorerTest.cpp mert_lib ..//boost_unit_test_framework ;
+unit-test feature_data_test : FeatureDataTest.cpp mert_lib ..//boost_unit_test_framework ;
+unit-test data_test : DataTest.cpp mert_lib ..//boost_unit_test_framework ;
+unit-test ngram_test : NgramTest.cpp mert_lib ..//boost_unit_test_framework ;
+unit-test optimizer_factory_test : OptimizerFactoryTest.cpp mert_lib ..//boost_unit_test_framework ;
+unit-test point_test : PointTest.cpp mert_lib ..//boost_unit_test_framework ;
+unit-test reference_test : ReferenceTest.cpp mert_lib ..//boost_unit_test_framework ;
+unit-test singleton_test : SingletonTest.cpp mert_lib ..//boost_unit_test_framework ;
+unit-test timer_test : TimerTest.cpp mert_lib ..//boost_unit_test_framework ;
+unit-test util_test : UtilTest.cpp mert_lib ..//boost_unit_test_framework ;
+unit-test vocabulary_test : VocabularyTest.cpp mert_lib ..//boost_unit_test_framework ;
 
 install legacy : programs : <location>. ;
 
-lib bleu_lib : BleuScorer.cpp mert_lib : : : <include>. ;
\ No newline at end of file
+lib bleu_lib : BleuScorer.cpp mert_lib : : : <include>. ;