diff options
| author | Patrick Simianer <p@simianer.de> | 2013-01-21 12:29:43 +0100 |
|---|---|---|
| committer | Patrick Simianer <p@simianer.de> | 2013-01-21 12:29:43 +0100 |
| commit | 0d23f8aecbfaf982cd165ebfc2a1611cefcc7275 (patch) | |
| tree | 8eafa6ea43224ff70635cadd4d6f027d28f4986f /word-aligner | |
| parent | dbc66cd3944321961c5e11d5254fd914f05a98ad (diff) | |
| parent | 7cac43b858f3b681555bf0578f54b1f822c43207 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'word-aligner')
| -rw-r--r-- | word-aligner/Makefile.am | 8 | ||||
| -rw-r--r-- | word-aligner/fast_align.cc | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/word-aligner/Makefile.am b/word-aligner/Makefile.am index 2dcb688e..1f7f78ae 100644 --- a/word-aligner/Makefile.am +++ b/word-aligner/Makefile.am @@ -1,6 +1,8 @@ bin_PROGRAMS = fast_align -fast_align_SOURCES = fast_align.cc ttables.cc -fast_align_LDADD = $(top_srcdir)/utils/libutils.a +fast_align_SOURCES = fast_align.cc ttables.cc da.h ttables.h +fast_align_LDADD = ../utils/libutils.a -AM_CPPFLAGS = -W -Wall $(GTEST_CPPFLAGS) -I$(top_srcdir)/utils -I$(top_srcdir)/training +EXTRA_DIST = aligner.pl ortho-norm support makefiles stemmers + +AM_CPPFLAGS = -W -Wall -I$(top_srcdir) -I$(top_srcdir)/utils -I$(top_srcdir)/training diff --git a/word-aligner/fast_align.cc b/word-aligner/fast_align.cc index 9d698074..9eb1dbc6 100644 --- a/word-aligner/fast_align.cc +++ b/word-aligner/fast_align.cc @@ -213,7 +213,7 @@ int main(int argc, char** argv) { if (favor_diagonal && optimize_tension && iter > 0) { for (int ii = 0; ii < 8; ++ii) { double mod_feat = 0; - unordered_map<pair<short,short>,unsigned>::iterator it = size_counts.begin(); + unordered_map<pair<short,short>,unsigned,boost::hash<pair<short, short> > >::iterator it = size_counts.begin(); for(; it != size_counts.end(); ++it) { const pair<short,short>& p = it->first; for (short j = 1; j <= p.first; ++j) |