summaryrefslogtreecommitdiff
path: root/dpmert
diff options
context:
space:
mode:
authorPatrick Simianer <simianer@cl.uni-heidelberg.de>2012-11-05 15:29:46 +0100
committerPatrick Simianer <simianer@cl.uni-heidelberg.de>2012-11-05 15:29:46 +0100
commit6f29f345dc06c1a1033475eac1d1340781d1d603 (patch)
tree6fa4cdd7aefd7d54c9585c2c6274db61bb8b159a /dpmert
parentb510da2e562c695c90d565eb295c749569c59be8 (diff)
parentc615c37501fa8576584a510a9d2bfe2fdd5bace7 (diff)
merge upstream/master
Diffstat (limited to 'dpmert')
-rw-r--r--dpmert/Jamfile32
-rw-r--r--dpmert/line_optimizer.cc5
-rw-r--r--dpmert/lo_test.cc2
3 files changed, 5 insertions, 34 deletions
diff --git a/dpmert/Jamfile b/dpmert/Jamfile
deleted file mode 100644
index bc4b079b..00000000
--- a/dpmert/Jamfile
+++ /dev/null
@@ -1,32 +0,0 @@
-import testing ;
-import lex ;
-import option ;
-
-lib dpmert :
- ces.cc
- error_surface.cc
- line_optimizer.cc
- mert_geometry.cc
- ..//utils
- ..//mteval
- ..//decoder
- ../klm/lm//kenlm
- ..//boost_program_options
- : <include>.
- : :
- <library>..//utils
- <library>..//mteval
- <library>../klm/lm//kenlm
- <library>..//boost_program_options
- <include>.
- ;
-
-all_tests [ glob *_test.cc ] : dpmert : <testing.arg>$(TOP)/dpmert/test_data ;
-
-exe sentserver : sentserver.c : <threading>multi ;
-exe sentclient : sentclient.c ;
-exe mr_dpmert_generate_mapper_input : mr_dpmert_generate_mapper_input.cc dpmert ..//boost_program_options ;
-exe mr_dpmert_map : mr_dpmert_map.cc dpmert ..//boost_program_options ;
-exe mr_dpmert_reduce : mr_dpmert_reduce.cc dpmert ..//boost_program_options ;
-
-alias programs : sentserver sentclient mr_dpmert_generate_mapper_input mr_dpmert_map mr_dpmert_reduce ;
diff --git a/dpmert/line_optimizer.cc b/dpmert/line_optimizer.cc
index 49443fbe..9cf33502 100644
--- a/dpmert/line_optimizer.cc
+++ b/dpmert/line_optimizer.cc
@@ -56,7 +56,10 @@ double LineOptimizer::LineOptimize(
//cerr << "NEW BEST: " << pos << " (score=" << cur_best_score << ")\n";
}
// string xx = metric->DetailedScore(acc); cerr << "---- " << xx;
- // cerr << "---- s=" << sco << "\n";
+#undef SHOW_ERROR_SURFACES
+#ifdef SHOW_ERROR_SURFACES
+ cerr << "x=" << seg.x << "\ts=" << sco << "\n";
+#endif
last_boundary = seg.x;
}
// cerr << "x-boundary=" << seg.x << "\n";
diff --git a/dpmert/lo_test.cc b/dpmert/lo_test.cc
index 2daf87bb..95a08d3d 100644
--- a/dpmert/lo_test.cc
+++ b/dpmert/lo_test.cc
@@ -36,7 +36,7 @@ BOOST_AUTO_TEST_CASE( TestCheckNaN) {
double x = 0;
double y = 0;
double z = x / y;
- BOOST_CHECK_EQUAL(true, isnan(z));
+ BOOST_CHECK_EQUAL(true, std::isnan(z));
}
BOOST_AUTO_TEST_CASE(TestConvexHull) {