diff options
| author | Paul Baltescu <pauldb89@gmail.com> | 2013-06-19 15:06:34 +0100 |
|---|---|---|
| committer | Paul Baltescu <pauldb89@gmail.com> | 2013-06-19 15:06:34 +0100 |
| commit | 459775095b46b4625ce26ea5a34001ec74ab3aa8 (patch) | |
| tree | 844d1a650a302114ae619d37b8778ab66207a834 /decoder | |
| parent | 02099a01350a41a99ec400e9b29df08a01d88979 (diff) | |
| parent | 0dc7755f7fb1ef15db5a60c70866aa61b6367898 (diff) | |
Merge branch 'master' of https://github.com/redpony/cdec
Diffstat (limited to 'decoder')
| -rw-r--r-- | decoder/Makefile.am | 1 | ||||
| -rw-r--r-- | decoder/incremental.cc | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/decoder/Makefile.am b/decoder/Makefile.am index 82b50f19..ef98289e 100644 --- a/decoder/Makefile.am +++ b/decoder/Makefile.am @@ -17,6 +17,7 @@ trule_test_SOURCES = trule_test.cc trule_test_LDADD = $(BOOST_UNIT_TEST_FRAMEWORK_LDFLAGS) $(BOOST_UNIT_TEST_FRAMEWORK_LIBS) libcdec.a ../mteval/libmteval.a ../utils/libutils.a cdec_SOURCES = cdec.cc +cdec_LDFLAGS= -rdynamic cdec_LDADD = libcdec.a ../mteval/libmteval.a ../utils/libutils.a ../klm/search/libksearch.a ../klm/lm/libklm.a ../klm/util/libklm_util.a ../klm/util/double-conversion/libklm_util_double.a AM_CPPFLAGS = -DTEST_DATA=\"$(top_srcdir)/decoder/test_data\" -DBOOST_TEST_DYN_LINK -W -Wno-sign-compare -I$(top_srcdir) -I$(top_srcdir)/mteval -I$(top_srcdir)/utils -I$(top_srcdir)/klm diff --git a/decoder/incremental.cc b/decoder/incremental.cc index 85647a44..1537d61e 100644 --- a/decoder/incremental.cc +++ b/decoder/incremental.cc @@ -119,7 +119,7 @@ template <class Model> void Incremental<Model>::ConvertEdge(const search::Contex float score = 0.0; for (std::vector<WordID>::const_iterator word = e.begin(); word != e.end(); ++word) { if (*word <= 0) { - nts.push_back(vertices[in.tail_nodes_[-*word]].RootPartial()); + nts.push_back(vertices[in.tail_nodes_[-*word]].RootAlternate()); if (nts.back().Empty()) return; score += nts.back().Bound(); words.push_back(lm::kMaxWordIndex); |