diff options
1469 files changed, 1222 insertions, 766 deletions
diff --git a/.gitignore b/.gitignore index ab42a4b4a..ab42a4b4a 100755..100644 --- a/.gitignore +++ b/.gitignore diff --git a/BUILD-INSTRUCTIONS.txt b/BUILD-INSTRUCTIONS.txt index e5c0ad8ea..e5c0ad8ea 100755..100644 --- a/BUILD-INSTRUCTIONS.txt +++ b/BUILD-INSTRUCTIONS.txt diff --git a/OnDiskPt/Jamfile b/OnDiskPt/Jamfile index f9811c05b..f9811c05b 100755..100644 --- a/OnDiskPt/Jamfile +++ b/OnDiskPt/Jamfile diff --git a/OnDiskPt/Main.cpp b/OnDiskPt/Main.cpp index a078b96ff..a078b96ff 100755..100644 --- a/OnDiskPt/Main.cpp +++ b/OnDiskPt/Main.cpp diff --git a/OnDiskPt/Main.h b/OnDiskPt/Main.h index 2db4eb864..2db4eb864 100755..100644 --- a/OnDiskPt/Main.h +++ b/OnDiskPt/Main.h diff --git a/OnDiskPt/OnDiskWrapper.cpp b/OnDiskPt/OnDiskWrapper.cpp index 79b0563a8..79b0563a8 100755..100644 --- a/OnDiskPt/OnDiskWrapper.cpp +++ b/OnDiskPt/OnDiskWrapper.cpp diff --git a/OnDiskPt/OnDiskWrapper.h b/OnDiskPt/OnDiskWrapper.h index c49afdda1..c49afdda1 100755..100644 --- a/OnDiskPt/OnDiskWrapper.h +++ b/OnDiskPt/OnDiskWrapper.h diff --git a/OnDiskPt/Phrase.cpp b/OnDiskPt/Phrase.cpp index b6ccd0721..b6ccd0721 100755..100644 --- a/OnDiskPt/Phrase.cpp +++ b/OnDiskPt/Phrase.cpp diff --git a/OnDiskPt/Phrase.h b/OnDiskPt/Phrase.h index 093510e64..093510e64 100755..100644 --- a/OnDiskPt/Phrase.h +++ b/OnDiskPt/Phrase.h diff --git a/OnDiskPt/PhraseNode.cpp b/OnDiskPt/PhraseNode.cpp index 0b5491963..0b5491963 100755..100644 --- a/OnDiskPt/PhraseNode.cpp +++ b/OnDiskPt/PhraseNode.cpp diff --git a/OnDiskPt/PhraseNode.h b/OnDiskPt/PhraseNode.h index e4704d142..e4704d142 100755..100644 --- a/OnDiskPt/PhraseNode.h +++ b/OnDiskPt/PhraseNode.h diff --git a/OnDiskPt/SourcePhrase.cpp b/OnDiskPt/SourcePhrase.cpp index 595748c70..595748c70 100755..100644 --- a/OnDiskPt/SourcePhrase.cpp +++ b/OnDiskPt/SourcePhrase.cpp diff --git a/OnDiskPt/SourcePhrase.h b/OnDiskPt/SourcePhrase.h index b4ae46705..b4ae46705 100755..100644 --- a/OnDiskPt/SourcePhrase.h +++ b/OnDiskPt/SourcePhrase.h diff --git a/OnDiskPt/TargetPhrase.cpp b/OnDiskPt/TargetPhrase.cpp index 182181bbf..182181bbf 100755..100644 --- a/OnDiskPt/TargetPhrase.cpp +++ b/OnDiskPt/TargetPhrase.cpp diff --git a/OnDiskPt/TargetPhrase.h b/OnDiskPt/TargetPhrase.h index 85b8ceeef..85b8ceeef 100755..100644 --- a/OnDiskPt/TargetPhrase.h +++ b/OnDiskPt/TargetPhrase.h diff --git a/OnDiskPt/TargetPhraseCollection.cpp b/OnDiskPt/TargetPhraseCollection.cpp index c9fe92745..c9fe92745 100755..100644 --- a/OnDiskPt/TargetPhraseCollection.cpp +++ b/OnDiskPt/TargetPhraseCollection.cpp diff --git a/OnDiskPt/TargetPhraseCollection.h b/OnDiskPt/TargetPhraseCollection.h index 6d95fb356..6d95fb356 100755..100644 --- a/OnDiskPt/TargetPhraseCollection.h +++ b/OnDiskPt/TargetPhraseCollection.h diff --git a/OnDiskPt/Vocab.cpp b/OnDiskPt/Vocab.cpp index 1e9e4186a..1e9e4186a 100755..100644 --- a/OnDiskPt/Vocab.cpp +++ b/OnDiskPt/Vocab.cpp diff --git a/OnDiskPt/Vocab.h b/OnDiskPt/Vocab.h index 360aedf4a..360aedf4a 100755..100644 --- a/OnDiskPt/Vocab.h +++ b/OnDiskPt/Vocab.h diff --git a/OnDiskPt/Word.cpp b/OnDiskPt/Word.cpp index a8d4c683a..a8d4c683a 100755..100644 --- a/OnDiskPt/Word.cpp +++ b/OnDiskPt/Word.cpp diff --git a/OnDiskPt/Word.h b/OnDiskPt/Word.h index 0c0b55a09..0c0b55a09 100755..100644 --- a/OnDiskPt/Word.h +++ b/OnDiskPt/Word.h diff --git a/contrib/Extract_TMX_Corpus/LanguageCodes.txt b/contrib/Extract_TMX_Corpus/LanguageCodes.txt index 22ca66c73..22ca66c73 100755..100644 --- a/contrib/Extract_TMX_Corpus/LanguageCodes.txt +++ b/contrib/Extract_TMX_Corpus/LanguageCodes.txt diff --git a/contrib/Extract_TMX_Corpus/LanguagePairs.txt b/contrib/Extract_TMX_Corpus/LanguagePairs.txt index d2ffd094e..d2ffd094e 100755..100644 --- a/contrib/Extract_TMX_Corpus/LanguagePairs.txt +++ b/contrib/Extract_TMX_Corpus/LanguagePairs.txt diff --git a/contrib/Extract_TMX_Corpus/_READ_ME_FIRST.txt b/contrib/Extract_TMX_Corpus/_READ_ME_FIRST.txt index 4709b8240..4709b8240 100755..100644 --- a/contrib/Extract_TMX_Corpus/_READ_ME_FIRST.txt +++ b/contrib/Extract_TMX_Corpus/_READ_ME_FIRST.txt diff --git a/contrib/Extract_TMX_Corpus/gpl.txt b/contrib/Extract_TMX_Corpus/gpl.txt index 818433ecc..818433ecc 100755..100644 --- a/contrib/Extract_TMX_Corpus/gpl.txt +++ b/contrib/Extract_TMX_Corpus/gpl.txt diff --git a/contrib/Moses2TMX/LanguageCodes.txt b/contrib/Moses2TMX/LanguageCodes.txt index 22ca66c73..22ca66c73 100755..100644 --- a/contrib/Moses2TMX/LanguageCodes.txt +++ b/contrib/Moses2TMX/LanguageCodes.txt diff --git a/contrib/Moses2TMX/_READ_ME_FIRST.txt b/contrib/Moses2TMX/_READ_ME_FIRST.txt index cbc667a31..cbc667a31 100755..100644 --- a/contrib/Moses2TMX/_READ_ME_FIRST.txt +++ b/contrib/Moses2TMX/_READ_ME_FIRST.txt diff --git a/contrib/Moses2TMX/gpl.txt b/contrib/Moses2TMX/gpl.txt index 818433ecc..818433ecc 100755..100644 --- a/contrib/Moses2TMX/gpl.txt +++ b/contrib/Moses2TMX/gpl.txt diff --git a/contrib/checkplf/checkplf.cpp b/contrib/checkplf/checkplf.cpp index f8de29e8e..f8de29e8e 100755..100644 --- a/contrib/checkplf/checkplf.cpp +++ b/contrib/checkplf/checkplf.cpp diff --git a/contrib/eppex/ISS.h b/contrib/eppex/ISS.h index 7921fcbf8..7921fcbf8 100755..100644 --- a/contrib/eppex/ISS.h +++ b/contrib/eppex/ISS.h diff --git a/contrib/eppex/IndexedPhrasesPair.h b/contrib/eppex/IndexedPhrasesPair.h index 18e3a39fd..18e3a39fd 100755..100644 --- a/contrib/eppex/IndexedPhrasesPair.h +++ b/contrib/eppex/IndexedPhrasesPair.h diff --git a/contrib/eppex/LossyCounter.h b/contrib/eppex/LossyCounter.h index 57cce079d..57cce079d 100755..100644 --- a/contrib/eppex/LossyCounter.h +++ b/contrib/eppex/LossyCounter.h diff --git a/contrib/eppex/Makefile.am b/contrib/eppex/Makefile.am index 970cc5d61..970cc5d61 100755..100644 --- a/contrib/eppex/Makefile.am +++ b/contrib/eppex/Makefile.am diff --git a/contrib/eppex/Makefile.in b/contrib/eppex/Makefile.in index 80fca7ce6..80fca7ce6 100755..100644 --- a/contrib/eppex/Makefile.in +++ b/contrib/eppex/Makefile.in diff --git a/contrib/eppex/SafeGetline.h b/contrib/eppex/SafeGetline.h index 6030359dc..6030359dc 100755..100644 --- a/contrib/eppex/SafeGetline.h +++ b/contrib/eppex/SafeGetline.h diff --git a/contrib/eppex/aclocal.m4 b/contrib/eppex/aclocal.m4 index c0ce22463..c0ce22463 100755..100644 --- a/contrib/eppex/aclocal.m4 +++ b/contrib/eppex/aclocal.m4 diff --git a/contrib/eppex/config.h.in b/contrib/eppex/config.h.in index 51e717c8b..51e717c8b 100755..100644 --- a/contrib/eppex/config.h.in +++ b/contrib/eppex/config.h.in diff --git a/contrib/eppex/configure b/contrib/eppex/configure index 6aab92d7b..6aab92d7b 100755..100644 --- a/contrib/eppex/configure +++ b/contrib/eppex/configure diff --git a/contrib/eppex/configure.ac b/contrib/eppex/configure.ac index 6c64b77af..6c64b77af 100755..100644 --- a/contrib/eppex/configure.ac +++ b/contrib/eppex/configure.ac diff --git a/contrib/eppex/counter.cpp b/contrib/eppex/counter.cpp index 403e18a08..403e18a08 100755..100644 --- a/contrib/eppex/counter.cpp +++ b/contrib/eppex/counter.cpp diff --git a/contrib/eppex/depcomp b/contrib/eppex/depcomp index 04701da53..04701da53 100755..100644 --- a/contrib/eppex/depcomp +++ b/contrib/eppex/depcomp diff --git a/contrib/eppex/eppex.cpp b/contrib/eppex/eppex.cpp index d382890d2..d382890d2 100755..100644 --- a/contrib/eppex/eppex.cpp +++ b/contrib/eppex/eppex.cpp diff --git a/contrib/eppex/install-sh b/contrib/eppex/install-sh index 4d4a9519e..4d4a9519e 100755..100644 --- a/contrib/eppex/install-sh +++ b/contrib/eppex/install-sh diff --git a/contrib/eppex/m4/ax_boost_base.m4 b/contrib/eppex/m4/ax_boost_base.m4 index 2e5afd091..2e5afd091 100755..100644 --- a/contrib/eppex/m4/ax_boost_base.m4 +++ b/contrib/eppex/m4/ax_boost_base.m4 diff --git a/contrib/eppex/missing b/contrib/eppex/missing index 894e786e1..894e786e1 100755..100644 --- a/contrib/eppex/missing +++ b/contrib/eppex/missing diff --git a/contrib/eppex/phrase-extract.cpp b/contrib/eppex/phrase-extract.cpp index 5dff43b78..5dff43b78 100755..100644 --- a/contrib/eppex/phrase-extract.cpp +++ b/contrib/eppex/phrase-extract.cpp diff --git a/contrib/eppex/phrase-extract.h b/contrib/eppex/phrase-extract.h index c01dd3ee2..c01dd3ee2 100755..100644 --- a/contrib/eppex/phrase-extract.h +++ b/contrib/eppex/phrase-extract.h diff --git a/contrib/eppex/shared.cpp b/contrib/eppex/shared.cpp index 670df1c0f..670df1c0f 100755..100644 --- a/contrib/eppex/shared.cpp +++ b/contrib/eppex/shared.cpp diff --git a/contrib/eppex/shared.h b/contrib/eppex/shared.h index 2ed70d336..2ed70d336 100755..100644 --- a/contrib/eppex/shared.h +++ b/contrib/eppex/shared.h diff --git a/contrib/eppex/typedefs.h b/contrib/eppex/typedefs.h index 0665c4aa4..0665c4aa4 100755..100644 --- a/contrib/eppex/typedefs.h +++ b/contrib/eppex/typedefs.h diff --git a/contrib/lmserver/AUTHORS b/contrib/lmserver/AUTHORS index 4d9dfd0cd..4d9dfd0cd 100755..100644 --- a/contrib/lmserver/AUTHORS +++ b/contrib/lmserver/AUTHORS diff --git a/contrib/lmserver/BUILD b/contrib/lmserver/BUILD index 2f4d9ace4..2f4d9ace4 100755..100644 --- a/contrib/lmserver/BUILD +++ b/contrib/lmserver/BUILD diff --git a/contrib/lmserver/COPYING b/contrib/lmserver/COPYING index cdfc50626..cdfc50626 100755..100644 --- a/contrib/lmserver/COPYING +++ b/contrib/lmserver/COPYING diff --git a/contrib/lmserver/ChangeLog b/contrib/lmserver/ChangeLog index 4083f59b8..4083f59b8 100755..100644 --- a/contrib/lmserver/ChangeLog +++ b/contrib/lmserver/ChangeLog diff --git a/contrib/lmserver/Makefile.am b/contrib/lmserver/Makefile.am index ec06d0da2..ec06d0da2 100755..100644 --- a/contrib/lmserver/Makefile.am +++ b/contrib/lmserver/Makefile.am diff --git a/contrib/lmserver/Makefile.in b/contrib/lmserver/Makefile.in index 3d62eb5fd..3d62eb5fd 100755..100644 --- a/contrib/lmserver/Makefile.in +++ b/contrib/lmserver/Makefile.in diff --git a/contrib/lmserver/NEWS b/contrib/lmserver/NEWS index e69de29bb..e69de29bb 100755..100644 --- a/contrib/lmserver/NEWS +++ b/contrib/lmserver/NEWS diff --git a/contrib/lmserver/README b/contrib/lmserver/README index dd9dde134..dd9dde134 100755..100644 --- a/contrib/lmserver/README +++ b/contrib/lmserver/README diff --git a/contrib/lmserver/aclocal.m4 b/contrib/lmserver/aclocal.m4 index 01ee4a076..01ee4a076 100755..100644 --- a/contrib/lmserver/aclocal.m4 +++ b/contrib/lmserver/aclocal.m4 diff --git a/contrib/lmserver/compile b/contrib/lmserver/compile index 1b1d23216..1b1d23216 100755..100644 --- a/contrib/lmserver/compile +++ b/contrib/lmserver/compile diff --git a/contrib/lmserver/config.guess b/contrib/lmserver/config.guess index 2313a174e..2313a174e 100755..100644 --- a/contrib/lmserver/config.guess +++ b/contrib/lmserver/config.guess diff --git a/contrib/lmserver/config.h.in b/contrib/lmserver/config.h.in index afdac98b6..afdac98b6 100755..100644 --- a/contrib/lmserver/config.h.in +++ b/contrib/lmserver/config.h.in diff --git a/contrib/lmserver/config.status b/contrib/lmserver/config.status index 490bcaf91..490bcaf91 100755..100644 --- a/contrib/lmserver/config.status +++ b/contrib/lmserver/config.status diff --git a/contrib/lmserver/config.sub b/contrib/lmserver/config.sub index ba16ebf55..ba16ebf55 100755..100644 --- a/contrib/lmserver/config.sub +++ b/contrib/lmserver/config.sub diff --git a/contrib/lmserver/configure b/contrib/lmserver/configure index 69a1a6f02..69a1a6f02 100755..100644 --- a/contrib/lmserver/configure +++ b/contrib/lmserver/configure diff --git a/contrib/lmserver/configure.ac b/contrib/lmserver/configure.ac index 62ab5dc02..62ab5dc02 100755..100644 --- a/contrib/lmserver/configure.ac +++ b/contrib/lmserver/configure.ac diff --git a/contrib/lmserver/daemon.c b/contrib/lmserver/daemon.c index 9cb7884d0..9cb7884d0 100755..100644 --- a/contrib/lmserver/daemon.c +++ b/contrib/lmserver/daemon.c diff --git a/contrib/lmserver/depcomp b/contrib/lmserver/depcomp index e5f9736c7..e5f9736c7 100755..100644 --- a/contrib/lmserver/depcomp +++ b/contrib/lmserver/depcomp diff --git a/contrib/lmserver/examples/LMClient.java b/contrib/lmserver/examples/LMClient.java index ee1a42e28..ee1a42e28 100755..100644 --- a/contrib/lmserver/examples/LMClient.java +++ b/contrib/lmserver/examples/LMClient.java diff --git a/contrib/lmserver/examples/LMClient.pm b/contrib/lmserver/examples/LMClient.pm index 78f1e03ab..78f1e03ab 100755..100644 --- a/contrib/lmserver/examples/LMClient.pm +++ b/contrib/lmserver/examples/LMClient.pm diff --git a/contrib/lmserver/examples/lmclient.cc b/contrib/lmserver/examples/lmclient.cc index 4ce5be380..4ce5be380 100755..100644 --- a/contrib/lmserver/examples/lmclient.cc +++ b/contrib/lmserver/examples/lmclient.cc diff --git a/contrib/lmserver/install-sh b/contrib/lmserver/install-sh index a5897de6e..a5897de6e 100755..100644 --- a/contrib/lmserver/install-sh +++ b/contrib/lmserver/install-sh diff --git a/contrib/lmserver/lmserver.c b/contrib/lmserver/lmserver.c index d3aa685cc..d3aa685cc 100755..100644 --- a/contrib/lmserver/lmserver.c +++ b/contrib/lmserver/lmserver.c diff --git a/contrib/lmserver/lmserver.h b/contrib/lmserver/lmserver.h index 1afdd133b..1afdd133b 100755..100644 --- a/contrib/lmserver/lmserver.h +++ b/contrib/lmserver/lmserver.h diff --git a/contrib/lmserver/missing b/contrib/lmserver/missing index 1c8ff7049..1c8ff7049 100755..100644 --- a/contrib/lmserver/missing +++ b/contrib/lmserver/missing diff --git a/contrib/lmserver/srilm.cc b/contrib/lmserver/srilm.cc index 657bed3c4..657bed3c4 100755..100644 --- a/contrib/lmserver/srilm.cc +++ b/contrib/lmserver/srilm.cc diff --git a/contrib/lmserver/srilm.h b/contrib/lmserver/srilm.h index d9b00ef92..d9b00ef92 100755..100644 --- a/contrib/lmserver/srilm.h +++ b/contrib/lmserver/srilm.h diff --git a/contrib/lmserver/stamp-h1 b/contrib/lmserver/stamp-h1 index 4547fe1b5..4547fe1b5 100755..100644 --- a/contrib/lmserver/stamp-h1 +++ b/contrib/lmserver/stamp-h1 diff --git a/contrib/lmserver/stats.h b/contrib/lmserver/stats.h index 895dfcd10..895dfcd10 100755..100644 --- a/contrib/lmserver/stats.h +++ b/contrib/lmserver/stats.h diff --git a/contrib/lmserver/thread.c b/contrib/lmserver/thread.c index 7fc9d0463..7fc9d0463 100755..100644 --- a/contrib/lmserver/thread.c +++ b/contrib/lmserver/thread.c diff --git a/contrib/memscore/Makefile.am b/contrib/memscore/Makefile.am index 1cf79f2b3..1cf79f2b3 100755..100644 --- a/contrib/memscore/Makefile.am +++ b/contrib/memscore/Makefile.am diff --git a/contrib/memscore/Makefile.in b/contrib/memscore/Makefile.in index fa1f6e9f5..fa1f6e9f5 100755..100644 --- a/contrib/memscore/Makefile.in +++ b/contrib/memscore/Makefile.in diff --git a/contrib/memscore/aclocal.m4 b/contrib/memscore/aclocal.m4 index fcc48b927..fcc48b927 100755..100644 --- a/contrib/memscore/aclocal.m4 +++ b/contrib/memscore/aclocal.m4 diff --git a/contrib/memscore/config.h.in b/contrib/memscore/config.h.in index 05b54369c..05b54369c 100755..100644 --- a/contrib/memscore/config.h.in +++ b/contrib/memscore/config.h.in diff --git a/contrib/memscore/configure b/contrib/memscore/configure index 3849f2c29..3849f2c29 100755..100644 --- a/contrib/memscore/configure +++ b/contrib/memscore/configure diff --git a/contrib/memscore/configure.ac b/contrib/memscore/configure.ac index 23af85df2..23af85df2 100755..100644 --- a/contrib/memscore/configure.ac +++ b/contrib/memscore/configure.ac diff --git a/contrib/memscore/datastorage.h b/contrib/memscore/datastorage.h index 0eb4cded1..0eb4cded1 100755..100644 --- a/contrib/memscore/datastorage.h +++ b/contrib/memscore/datastorage.h diff --git a/contrib/memscore/depcomp b/contrib/memscore/depcomp index 04701da53..04701da53 100755..100644 --- a/contrib/memscore/depcomp +++ b/contrib/memscore/depcomp diff --git a/contrib/memscore/install-sh b/contrib/memscore/install-sh index 4d4a9519e..4d4a9519e 100755..100644 --- a/contrib/memscore/install-sh +++ b/contrib/memscore/install-sh diff --git a/contrib/memscore/lexdecom.cpp b/contrib/memscore/lexdecom.cpp index b0a47f440..b0a47f440 100755..100644 --- a/contrib/memscore/lexdecom.cpp +++ b/contrib/memscore/lexdecom.cpp diff --git a/contrib/memscore/lexdecom.h b/contrib/memscore/lexdecom.h index 1d87caf66..1d87caf66 100755..100644 --- a/contrib/memscore/lexdecom.h +++ b/contrib/memscore/lexdecom.h diff --git a/contrib/memscore/m4/ax_boost_base.m4 b/contrib/memscore/m4/ax_boost_base.m4 index 2e5afd091..2e5afd091 100755..100644 --- a/contrib/memscore/m4/ax_boost_base.m4 +++ b/contrib/memscore/m4/ax_boost_base.m4 diff --git a/contrib/memscore/memscore.cpp b/contrib/memscore/memscore.cpp index c723b236e..c723b236e 100755..100644 --- a/contrib/memscore/memscore.cpp +++ b/contrib/memscore/memscore.cpp diff --git a/contrib/memscore/memscore.h b/contrib/memscore/memscore.h index 9b17691e1..9b17691e1 100755..100644 --- a/contrib/memscore/memscore.h +++ b/contrib/memscore/memscore.h diff --git a/contrib/memscore/missing b/contrib/memscore/missing index 894e786e1..894e786e1 100755..100644 --- a/contrib/memscore/missing +++ b/contrib/memscore/missing diff --git a/contrib/memscore/phraselm.cpp b/contrib/memscore/phraselm.cpp index 0f94f4326..0f94f4326 100755..100644 --- a/contrib/memscore/phraselm.cpp +++ b/contrib/memscore/phraselm.cpp diff --git a/contrib/memscore/phraselm.h b/contrib/memscore/phraselm.h index 62e8f08d4..62e8f08d4 100755..100644 --- a/contrib/memscore/phraselm.h +++ b/contrib/memscore/phraselm.h diff --git a/contrib/memscore/phrasetable.cpp b/contrib/memscore/phrasetable.cpp index 9f430c289..9f430c289 100755..100644 --- a/contrib/memscore/phrasetable.cpp +++ b/contrib/memscore/phrasetable.cpp diff --git a/contrib/memscore/phrasetable.h b/contrib/memscore/phrasetable.h index 14d68d702..14d68d702 100755..100644 --- a/contrib/memscore/phrasetable.h +++ b/contrib/memscore/phrasetable.h diff --git a/contrib/memscore/scorer-impl.h b/contrib/memscore/scorer-impl.h index bc544f12e..bc544f12e 100755..100644 --- a/contrib/memscore/scorer-impl.h +++ b/contrib/memscore/scorer-impl.h diff --git a/contrib/memscore/scorer.cpp b/contrib/memscore/scorer.cpp index e8cf4ce49..e8cf4ce49 100755..100644 --- a/contrib/memscore/scorer.cpp +++ b/contrib/memscore/scorer.cpp diff --git a/contrib/memscore/scorer.h b/contrib/memscore/scorer.h index 332f014c5..332f014c5 100755..100644 --- a/contrib/memscore/scorer.h +++ b/contrib/memscore/scorer.h diff --git a/contrib/memscore/statistic.h b/contrib/memscore/statistic.h index 2061a6608..2061a6608 100755..100644 --- a/contrib/memscore/statistic.h +++ b/contrib/memscore/statistic.h diff --git a/contrib/memscore/timestamp.h b/contrib/memscore/timestamp.h index fadb9cc8b..fadb9cc8b 100755..100644 --- a/contrib/memscore/timestamp.h +++ b/contrib/memscore/timestamp.h diff --git a/contrib/moses-for-mere-mortals/READ_ME_FIRST.txt b/contrib/moses-for-mere-mortals/READ_ME_FIRST.txt index fd5c71b18..fd5c71b18 100755..100644 --- a/contrib/moses-for-mere-mortals/READ_ME_FIRST.txt +++ b/contrib/moses-for-mere-mortals/READ_ME_FIRST.txt diff --git a/contrib/moses-for-mere-mortals/Windows-add-ins/Extract_TMX_Corpus-1.043/LanguageCodes.txt b/contrib/moses-for-mere-mortals/Windows-add-ins/Extract_TMX_Corpus-1.043/LanguageCodes.txt index 22ca66c73..22ca66c73 100755..100644 --- a/contrib/moses-for-mere-mortals/Windows-add-ins/Extract_TMX_Corpus-1.043/LanguageCodes.txt +++ b/contrib/moses-for-mere-mortals/Windows-add-ins/Extract_TMX_Corpus-1.043/LanguageCodes.txt diff --git a/contrib/moses-for-mere-mortals/Windows-add-ins/Extract_TMX_Corpus-1.043/LanguagePairs.txt b/contrib/moses-for-mere-mortals/Windows-add-ins/Extract_TMX_Corpus-1.043/LanguagePairs.txt index d2ffd094e..d2ffd094e 100755..100644 --- a/contrib/moses-for-mere-mortals/Windows-add-ins/Extract_TMX_Corpus-1.043/LanguagePairs.txt +++ b/contrib/moses-for-mere-mortals/Windows-add-ins/Extract_TMX_Corpus-1.043/LanguagePairs.txt diff --git a/contrib/moses-for-mere-mortals/Windows-add-ins/Extract_TMX_Corpus-1.043/_READ_ME_FIRST.txt b/contrib/moses-for-mere-mortals/Windows-add-ins/Extract_TMX_Corpus-1.043/_READ_ME_FIRST.txt index c84dd4ac4..c84dd4ac4 100755..100644 --- a/contrib/moses-for-mere-mortals/Windows-add-ins/Extract_TMX_Corpus-1.043/_READ_ME_FIRST.txt +++ b/contrib/moses-for-mere-mortals/Windows-add-ins/Extract_TMX_Corpus-1.043/_READ_ME_FIRST.txt diff --git a/contrib/moses-for-mere-mortals/Windows-add-ins/Extract_TMX_Corpus-1.043/gpl.txt b/contrib/moses-for-mere-mortals/Windows-add-ins/Extract_TMX_Corpus-1.043/gpl.txt index 818433ecc..818433ecc 100755..100644 --- a/contrib/moses-for-mere-mortals/Windows-add-ins/Extract_TMX_Corpus-1.043/gpl.txt +++ b/contrib/moses-for-mere-mortals/Windows-add-ins/Extract_TMX_Corpus-1.043/gpl.txt diff --git a/contrib/moses-for-mere-mortals/Windows-add-ins/Moses2TMX-1.032/LanguageCodes.txt b/contrib/moses-for-mere-mortals/Windows-add-ins/Moses2TMX-1.032/LanguageCodes.txt index 22ca66c73..22ca66c73 100755..100644 --- a/contrib/moses-for-mere-mortals/Windows-add-ins/Moses2TMX-1.032/LanguageCodes.txt +++ b/contrib/moses-for-mere-mortals/Windows-add-ins/Moses2TMX-1.032/LanguageCodes.txt diff --git a/contrib/moses-for-mere-mortals/Windows-add-ins/Moses2TMX-1.032/_READ_ME_FIRST.txt b/contrib/moses-for-mere-mortals/Windows-add-ins/Moses2TMX-1.032/_READ_ME_FIRST.txt index d661dd136..d661dd136 100755..100644 --- a/contrib/moses-for-mere-mortals/Windows-add-ins/Moses2TMX-1.032/_READ_ME_FIRST.txt +++ b/contrib/moses-for-mere-mortals/Windows-add-ins/Moses2TMX-1.032/_READ_ME_FIRST.txt diff --git a/contrib/moses-for-mere-mortals/Windows-add-ins/Moses2TMX-1.032/gpl.txt b/contrib/moses-for-mere-mortals/Windows-add-ins/Moses2TMX-1.032/gpl.txt index 818433ecc..818433ecc 100755..100644 --- a/contrib/moses-for-mere-mortals/Windows-add-ins/Moses2TMX-1.032/gpl.txt +++ b/contrib/moses-for-mere-mortals/Windows-add-ins/Moses2TMX-1.032/gpl.txt diff --git a/contrib/moses-for-mere-mortals/all.css b/contrib/moses-for-mere-mortals/all.css index e83379dd4..e83379dd4 100755..100644 --- a/contrib/moses-for-mere-mortals/all.css +++ b/contrib/moses-for-mere-mortals/all.css diff --git a/contrib/moses-for-mere-mortals/docs/Help-Tutorial.doc b/contrib/moses-for-mere-mortals/docs/Help-Tutorial.doc Binary files differindex 2d03240c4..2d03240c4 100755..100644 --- a/contrib/moses-for-mere-mortals/docs/Help-Tutorial.doc +++ b/contrib/moses-for-mere-mortals/docs/Help-Tutorial.doc diff --git a/contrib/moses-for-mere-mortals/docs/Overview.jpeg b/contrib/moses-for-mere-mortals/docs/Overview.jpeg Binary files differindex 9b4b1b0f2..9b4b1b0f2 100755..100644 --- a/contrib/moses-for-mere-mortals/docs/Overview.jpeg +++ b/contrib/moses-for-mere-mortals/docs/Overview.jpeg diff --git a/contrib/moses-for-mere-mortals/docs/Quick-Start-Guide.doc b/contrib/moses-for-mere-mortals/docs/Quick-Start-Guide.doc Binary files differindex eac30c951..eac30c951 100755..100644 --- a/contrib/moses-for-mere-mortals/docs/Quick-Start-Guide.doc +++ b/contrib/moses-for-mere-mortals/docs/Quick-Start-Guide.doc diff --git a/contrib/moses-for-mere-mortals/docs/all.css b/contrib/moses-for-mere-mortals/docs/all.css index e83379dd4..e83379dd4 100755..100644 --- a/contrib/moses-for-mere-mortals/docs/all.css +++ b/contrib/moses-for-mere-mortals/docs/all.css diff --git a/contrib/moses-for-mere-mortals/docs/thanks.html b/contrib/moses-for-mere-mortals/docs/thanks.html index afddba9f8..afddba9f8 100755..100644 --- a/contrib/moses-for-mere-mortals/docs/thanks.html +++ b/contrib/moses-for-mere-mortals/docs/thanks.html diff --git a/contrib/moses-for-mere-mortals/index.html b/contrib/moses-for-mere-mortals/index.html index 537e4db99..537e4db99 100755..100644 --- a/contrib/moses-for-mere-mortals/index.html +++ b/contrib/moses-for-mere-mortals/index.html diff --git a/contrib/moses-for-mere-mortals/scripts/create-1.37 b/contrib/moses-for-mere-mortals/scripts/create-1.37 index 932eb5e92..932eb5e92 100755..100644 --- a/contrib/moses-for-mere-mortals/scripts/create-1.37 +++ b/contrib/moses-for-mere-mortals/scripts/create-1.37 diff --git a/contrib/moses-for-mere-mortals/scripts/make-test-files-0.14 b/contrib/moses-for-mere-mortals/scripts/make-test-files-0.14 index c0807496d..c0807496d 100755..100644 --- a/contrib/moses-for-mere-mortals/scripts/make-test-files-0.14 +++ b/contrib/moses-for-mere-mortals/scripts/make-test-files-0.14 diff --git a/contrib/moses-for-mere-mortals/scripts/modified-scripts/READ_ME_FIRST b/contrib/moses-for-mere-mortals/scripts/modified-scripts/READ_ME_FIRST index d63fbea8e..d63fbea8e 100755..100644 --- a/contrib/moses-for-mere-mortals/scripts/modified-scripts/READ_ME_FIRST +++ b/contrib/moses-for-mere-mortals/scripts/modified-scripts/READ_ME_FIRST diff --git a/contrib/moses-for-mere-mortals/scripts/modified-scripts/nonbreaking_prefix.pt b/contrib/moses-for-mere-mortals/scripts/modified-scripts/nonbreaking_prefix.pt index a50e7245d..a50e7245d 100755..100644 --- a/contrib/moses-for-mere-mortals/scripts/modified-scripts/nonbreaking_prefix.pt +++ b/contrib/moses-for-mere-mortals/scripts/modified-scripts/nonbreaking_prefix.pt diff --git a/contrib/moses-for-mere-mortals/scripts/score-0.85 b/contrib/moses-for-mere-mortals/scripts/score-0.85 index ebe161feb..ebe161feb 100755..100644 --- a/contrib/moses-for-mere-mortals/scripts/score-0.85 +++ b/contrib/moses-for-mere-mortals/scripts/score-0.85 diff --git a/contrib/moses-for-mere-mortals/scripts/train-1.11 b/contrib/moses-for-mere-mortals/scripts/train-1.11 index dc65cf5d6..dc65cf5d6 100755..100644 --- a/contrib/moses-for-mere-mortals/scripts/train-1.11 +++ b/contrib/moses-for-mere-mortals/scripts/train-1.11 diff --git a/contrib/moses-for-mere-mortals/scripts/transfer-training-to-another-location-0.07 b/contrib/moses-for-mere-mortals/scripts/transfer-training-to-another-location-0.07 index ab593a678..ab593a678 100755..100644 --- a/contrib/moses-for-mere-mortals/scripts/transfer-training-to-another-location-0.07 +++ b/contrib/moses-for-mere-mortals/scripts/transfer-training-to-another-location-0.07 diff --git a/contrib/moses-for-mere-mortals/scripts/translate-1.32 b/contrib/moses-for-mere-mortals/scripts/translate-1.32 index 4f5c14052..4f5c14052 100755..100644 --- a/contrib/moses-for-mere-mortals/scripts/translate-1.32 +++ b/contrib/moses-for-mere-mortals/scripts/translate-1.32 diff --git a/contrib/other-builds/CreateOnDisk.vcxproj b/contrib/other-builds/CreateOnDisk.vcxproj index 7d2e1ea0e..7d2e1ea0e 100755..100644 --- a/contrib/other-builds/CreateOnDisk.vcxproj +++ b/contrib/other-builds/CreateOnDisk.vcxproj diff --git a/contrib/other-builds/CreateOnDisk.xcodeproj/project.pbxproj b/contrib/other-builds/CreateOnDisk.xcodeproj/project.pbxproj index d86b94fdf..d86b94fdf 100755..100644 --- a/contrib/other-builds/CreateOnDisk.xcodeproj/project.pbxproj +++ b/contrib/other-builds/CreateOnDisk.xcodeproj/project.pbxproj diff --git a/contrib/other-builds/OnDiskPt.vcxproj b/contrib/other-builds/OnDiskPt.vcxproj index 2b1ea574b..2b1ea574b 100755..100644 --- a/contrib/other-builds/OnDiskPt.vcxproj +++ b/contrib/other-builds/OnDiskPt.vcxproj diff --git a/contrib/other-builds/OnDiskPt.xcodeproj/project.pbxproj b/contrib/other-builds/OnDiskPt.xcodeproj/project.pbxproj index de24f4c5e..de24f4c5e 100755..100644 --- a/contrib/other-builds/OnDiskPt.xcodeproj/project.pbxproj +++ b/contrib/other-builds/OnDiskPt.xcodeproj/project.pbxproj diff --git a/contrib/other-builds/moses-chart-cmd.vcxproj b/contrib/other-builds/moses-chart-cmd.vcxproj index 27b260f6f..27b260f6f 100755..100644 --- a/contrib/other-builds/moses-chart-cmd.vcxproj +++ b/contrib/other-builds/moses-chart-cmd.vcxproj diff --git a/contrib/other-builds/moses-chart-cmd.xcodeproj/project.pbxproj b/contrib/other-builds/moses-chart-cmd.xcodeproj/project.pbxproj index 68b98f760..68b98f760 100755..100644 --- a/contrib/other-builds/moses-chart-cmd.xcodeproj/project.pbxproj +++ b/contrib/other-builds/moses-chart-cmd.xcodeproj/project.pbxproj diff --git a/contrib/other-builds/moses-cmd.vcxproj b/contrib/other-builds/moses-cmd.vcxproj index 0d3126b98..0d3126b98 100755..100644 --- a/contrib/other-builds/moses-cmd.vcxproj +++ b/contrib/other-builds/moses-cmd.vcxproj diff --git a/contrib/other-builds/moses-cmd.xcodeproj/project.pbxproj b/contrib/other-builds/moses-cmd.xcodeproj/project.pbxproj index e3e80b479..e3e80b479 100755..100644 --- a/contrib/other-builds/moses-cmd.xcodeproj/project.pbxproj +++ b/contrib/other-builds/moses-cmd.xcodeproj/project.pbxproj diff --git a/contrib/other-builds/moses.sln b/contrib/other-builds/moses.sln index 1e2d4eb45..1e2d4eb45 100755..100644 --- a/contrib/other-builds/moses.sln +++ b/contrib/other-builds/moses.sln diff --git a/contrib/other-builds/moses.vcxproj b/contrib/other-builds/moses.vcxproj index 1366995f3..1366995f3 100755..100644 --- a/contrib/other-builds/moses.vcxproj +++ b/contrib/other-builds/moses.vcxproj diff --git a/contrib/other-builds/moses.xcodeproj/project.pbxproj b/contrib/other-builds/moses.xcodeproj/project.pbxproj index 018d67f7e..018d67f7e 100755..100644 --- a/contrib/other-builds/moses.xcodeproj/project.pbxproj +++ b/contrib/other-builds/moses.xcodeproj/project.pbxproj diff --git a/contrib/reranking/data/README b/contrib/reranking/data/README index 59b20b32d..59b20b32d 100755..100644 --- a/contrib/reranking/data/README +++ b/contrib/reranking/data/README diff --git a/contrib/reranking/data/nbest.small b/contrib/reranking/data/nbest.small index 0fcbc44ce..0fcbc44ce 100755..100644 --- a/contrib/reranking/data/nbest.small +++ b/contrib/reranking/data/nbest.small diff --git a/contrib/reranking/data/weights b/contrib/reranking/data/weights index c6b6c1ac0..c6b6c1ac0 100755..100644 --- a/contrib/reranking/data/weights +++ b/contrib/reranking/data/weights diff --git a/contrib/reranking/src/Hypo.cpp b/contrib/reranking/src/Hypo.cpp index 0ceb21abd..0ceb21abd 100755..100644 --- a/contrib/reranking/src/Hypo.cpp +++ b/contrib/reranking/src/Hypo.cpp diff --git a/contrib/reranking/src/Hypo.h b/contrib/reranking/src/Hypo.h index a85410289..a85410289 100755..100644 --- a/contrib/reranking/src/Hypo.h +++ b/contrib/reranking/src/Hypo.h diff --git a/contrib/reranking/src/Main.cpp b/contrib/reranking/src/Main.cpp index a91be8e73..a91be8e73 100755..100644 --- a/contrib/reranking/src/Main.cpp +++ b/contrib/reranking/src/Main.cpp diff --git a/contrib/reranking/src/Makefile b/contrib/reranking/src/Makefile index 7b0ec6945..7b0ec6945 100755..100644 --- a/contrib/reranking/src/Makefile +++ b/contrib/reranking/src/Makefile diff --git a/contrib/reranking/src/NBest.cpp b/contrib/reranking/src/NBest.cpp index 24a0f60c3..24a0f60c3 100755..100644 --- a/contrib/reranking/src/NBest.cpp +++ b/contrib/reranking/src/NBest.cpp diff --git a/contrib/reranking/src/NBest.h b/contrib/reranking/src/NBest.h index 9a4aa9447..9a4aa9447 100755..100644 --- a/contrib/reranking/src/NBest.h +++ b/contrib/reranking/src/NBest.h diff --git a/contrib/reranking/src/ParameterNBest.cpp b/contrib/reranking/src/ParameterNBest.cpp index 005f3890c..005f3890c 100755..100644 --- a/contrib/reranking/src/ParameterNBest.cpp +++ b/contrib/reranking/src/ParameterNBest.cpp diff --git a/contrib/reranking/src/ParameterNBest.h b/contrib/reranking/src/ParameterNBest.h index bc554d4b9..bc554d4b9 100755..100644 --- a/contrib/reranking/src/ParameterNBest.h +++ b/contrib/reranking/src/ParameterNBest.h diff --git a/contrib/reranking/src/Tools.cpp b/contrib/reranking/src/Tools.cpp index 8312c3370..8312c3370 100755..100644 --- a/contrib/reranking/src/Tools.cpp +++ b/contrib/reranking/src/Tools.cpp diff --git a/contrib/reranking/src/Tools.h b/contrib/reranking/src/Tools.h index eb71746b0..eb71746b0 100755..100644 --- a/contrib/reranking/src/Tools.h +++ b/contrib/reranking/src/Tools.h diff --git a/contrib/server/Jamfile b/contrib/server/Jamfile index 211ab05f9..211ab05f9 100755..100644 --- a/contrib/server/Jamfile +++ b/contrib/server/Jamfile diff --git a/contrib/server/mosesserver.cpp b/contrib/server/mosesserver.cpp index 5609fac30..5609fac30 100755..100644 --- a/contrib/server/mosesserver.cpp +++ b/contrib/server/mosesserver.cpp diff --git a/contrib/server/sgclient_weightUpdate.perl b/contrib/server/sgclient_weightUpdate.perl index 4a0a67bbe..736ab9b84 100755 --- a/contrib/server/sgclient_weightUpdate.perl +++ b/contrib/server/sgclient_weightUpdate.perl @@ -5,7 +5,7 @@ use Frontier::Client; my $output_suffix = $ARGV[0]; $output_suffix = "" if (not $output_suffix); -my $port = "50007"; +my $port = "50015"; my $url = "http://localhost:".$port."/RPC2"; my $server = Frontier::Client->new('url' => $url, 'encoding' => 'UTF-8'); my $verbose=0; diff --git a/contrib/sigtest-filter/Makefile b/contrib/sigtest-filter/Makefile index ddefc907b..ddefc907b 100755..100644 --- a/contrib/sigtest-filter/Makefile +++ b/contrib/sigtest-filter/Makefile diff --git a/contrib/sigtest-filter/README.txt b/contrib/sigtest-filter/README.txt index b21129b89..b21129b89 100755..100644 --- a/contrib/sigtest-filter/README.txt +++ b/contrib/sigtest-filter/README.txt diff --git a/contrib/sigtest-filter/WIN32_functions.cpp b/contrib/sigtest-filter/WIN32_functions.cpp index 60ddd340c..60ddd340c 100755..100644 --- a/contrib/sigtest-filter/WIN32_functions.cpp +++ b/contrib/sigtest-filter/WIN32_functions.cpp diff --git a/contrib/sigtest-filter/WIN32_functions.h b/contrib/sigtest-filter/WIN32_functions.h index 6a719392e..6a719392e 100755..100644 --- a/contrib/sigtest-filter/WIN32_functions.h +++ b/contrib/sigtest-filter/WIN32_functions.h diff --git a/contrib/sigtest-filter/check-install b/contrib/sigtest-filter/check-install index ba4f431e0..ba4f431e0 100755..100644 --- a/contrib/sigtest-filter/check-install +++ b/contrib/sigtest-filter/check-install diff --git a/contrib/sigtest-filter/filter-pt.cpp b/contrib/sigtest-filter/filter-pt.cpp index b0828ae33..b0828ae33 100755..100644 --- a/contrib/sigtest-filter/filter-pt.cpp +++ b/contrib/sigtest-filter/filter-pt.cpp diff --git a/contrib/sigtest-filter/sigtest-filter.sln b/contrib/sigtest-filter/sigtest-filter.sln index 517b06238..517b06238 100755..100644 --- a/contrib/sigtest-filter/sigtest-filter.sln +++ b/contrib/sigtest-filter/sigtest-filter.sln diff --git a/contrib/sigtest-filter/sigtest-filter.vcproj b/contrib/sigtest-filter/sigtest-filter.vcproj index a961ac61d..a961ac61d 100755..100644 --- a/contrib/sigtest-filter/sigtest-filter.vcproj +++ b/contrib/sigtest-filter/sigtest-filter.vcproj diff --git a/contrib/synlm/hhmm/LICENSE b/contrib/synlm/hhmm/LICENSE index 25b5b7097..25b5b7097 100755..100644 --- a/contrib/synlm/hhmm/LICENSE +++ b/contrib/synlm/hhmm/LICENSE diff --git a/contrib/synlm/hhmm/rvtl/include/nl-archetypeset.h b/contrib/synlm/hhmm/rvtl/include/nl-archetypeset.h index 914e85e92..914e85e92 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-archetypeset.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-archetypeset.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-array.h b/contrib/synlm/hhmm/rvtl/include/nl-array.h index 0dfb74b44..0dfb74b44 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-array.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-array.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-beam.h b/contrib/synlm/hhmm/rvtl/include/nl-beam.h index 398babe21..398babe21 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-beam.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-beam.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-const.h b/contrib/synlm/hhmm/rvtl/include/nl-const.h index 3d6023f39..3d6023f39 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-const.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-const.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-cpt.h b/contrib/synlm/hhmm/rvtl/include/nl-cpt.h index 67a1a1021..67a1a1021 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-cpt.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-cpt.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-crf.h b/contrib/synlm/hhmm/rvtl/include/nl-crf.h index 44744ad03..44744ad03 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-crf.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-crf.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-denot.h b/contrib/synlm/hhmm/rvtl/include/nl-denot.h index 0b50663a1..0b50663a1 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-denot.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-denot.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-dtree-cont.h b/contrib/synlm/hhmm/rvtl/include/nl-dtree-cont.h index cf6b00d28..cf6b00d28 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-dtree-cont.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-dtree-cont.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-dtree.h b/contrib/synlm/hhmm/rvtl/include/nl-dtree.h index 2396f395c..2396f395c 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-dtree.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-dtree.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-fixedmatrix.h b/contrib/synlm/hhmm/rvtl/include/nl-fixedmatrix.h index dbb9d9d9d..dbb9d9d9d 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-fixedmatrix.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-fixedmatrix.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-gauss.h b/contrib/synlm/hhmm/rvtl/include/nl-gauss.h index a2213086f..a2213086f 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-gauss.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-gauss.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-hash.h b/contrib/synlm/hhmm/rvtl/include/nl-hash.h index 809284db9..809284db9 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-hash.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-hash.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-heap.h b/contrib/synlm/hhmm/rvtl/include/nl-heap.h index 31be6ed75..31be6ed75 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-heap.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-heap.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-hmm.h b/contrib/synlm/hhmm/rvtl/include/nl-hmm.h index 2f6cd0104..2f6cd0104 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-hmm.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-hmm.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-hmm2.h b/contrib/synlm/hhmm/rvtl/include/nl-hmm2.h index 711d589be..711d589be 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-hmm2.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-hmm2.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-hmmloop.h b/contrib/synlm/hhmm/rvtl/include/nl-hmmloop.h index c476b4271..c476b4271 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-hmmloop.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-hmmloop.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-iomacros.h b/contrib/synlm/hhmm/rvtl/include/nl-iomacros.h index ccb2eb095..ccb2eb095 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-iomacros.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-iomacros.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-linsep.h b/contrib/synlm/hhmm/rvtl/include/nl-linsep.h index ac3ef3312..ac3ef3312 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-linsep.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-linsep.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-list.h b/contrib/synlm/hhmm/rvtl/include/nl-list.h index 65f07f8b5..65f07f8b5 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-list.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-list.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-matrix.h b/contrib/synlm/hhmm/rvtl/include/nl-matrix.h index c8c18f8e1..c8c18f8e1 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-matrix.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-matrix.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-mixture.h b/contrib/synlm/hhmm/rvtl/include/nl-mixture.h index 2da5aacb2..2da5aacb2 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-mixture.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-mixture.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-modelfile.h b/contrib/synlm/hhmm/rvtl/include/nl-modelfile.h index dc6bec487..dc6bec487 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-modelfile.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-modelfile.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-oblidtree.h b/contrib/synlm/hhmm/rvtl/include/nl-oblidtree.h index 24c82e313..24c82e313 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-oblidtree.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-oblidtree.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-prob.h b/contrib/synlm/hhmm/rvtl/include/nl-prob.h index 76cf2fb57..76cf2fb57 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-prob.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-prob.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-probmodel.h b/contrib/synlm/hhmm/rvtl/include/nl-probmodel.h index 2dcff7b30..2dcff7b30 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-probmodel.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-probmodel.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-racpt.h b/contrib/synlm/hhmm/rvtl/include/nl-racpt.h index 5d1502f1f..5d1502f1f 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-racpt.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-racpt.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-randvar.h b/contrib/synlm/hhmm/rvtl/include/nl-randvar.h index 66cc0b8f2..66cc0b8f2 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-randvar.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-randvar.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-refrv.h b/contrib/synlm/hhmm/rvtl/include/nl-refrv.h index 1e4eca4fd..1e4eca4fd 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-refrv.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-refrv.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-safeids.h b/contrib/synlm/hhmm/rvtl/include/nl-safeids.h index 50837c366..50837c366 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-safeids.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-safeids.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-stream.h b/contrib/synlm/hhmm/rvtl/include/nl-stream.h index 8f743e12b..8f743e12b 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-stream.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-stream.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-string.h b/contrib/synlm/hhmm/rvtl/include/nl-string.h index ce3f68aa3..ce3f68aa3 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-string.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-string.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-stringindex.h b/contrib/synlm/hhmm/rvtl/include/nl-stringindex.h index 22931f081..22931f081 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-stringindex.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-stringindex.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-tetrahex.h b/contrib/synlm/hhmm/rvtl/include/nl-tetrahex.h index d77e4f471..d77e4f471 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-tetrahex.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-tetrahex.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-timer.h b/contrib/synlm/hhmm/rvtl/include/nl-timer.h index 3fa7c5387..3fa7c5387 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-timer.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-timer.h diff --git a/contrib/synlm/hhmm/rvtl/include/nl-tree.h b/contrib/synlm/hhmm/rvtl/include/nl-tree.h index 102c5c0b3..102c5c0b3 100755..100644 --- a/contrib/synlm/hhmm/rvtl/include/nl-tree.h +++ b/contrib/synlm/hhmm/rvtl/include/nl-tree.h diff --git a/contrib/synlm/hhmm/wsjparse/include/HHMMLangModel-gf.h b/contrib/synlm/hhmm/wsjparse/include/HHMMLangModel-gf.h index 3987d6969..3987d6969 100755..100644 --- a/contrib/synlm/hhmm/wsjparse/include/HHMMLangModel-gf.h +++ b/contrib/synlm/hhmm/wsjparse/include/HHMMLangModel-gf.h diff --git a/contrib/synlm/hhmm/wsjparse/include/TextObsModel.h b/contrib/synlm/hhmm/wsjparse/include/TextObsModel.h index 5e277e857..5e277e857 100755..100644 --- a/contrib/synlm/hhmm/wsjparse/include/TextObsModel.h +++ b/contrib/synlm/hhmm/wsjparse/include/TextObsModel.h diff --git a/contrib/synlm/hhmm/wsjparse/include/TextObsVars.h b/contrib/synlm/hhmm/wsjparse/include/TextObsVars.h index c32a6cbc1..c32a6cbc1 100755..100644 --- a/contrib/synlm/hhmm/wsjparse/include/TextObsVars.h +++ b/contrib/synlm/hhmm/wsjparse/include/TextObsVars.h diff --git a/contrib/web/bin/nonbreaking_prefixes/nonbreaking_prefix.de b/contrib/web/bin/nonbreaking_prefixes/nonbreaking_prefix.de index c24f2080f..c24f2080f 100755..100644 --- a/contrib/web/bin/nonbreaking_prefixes/nonbreaking_prefix.de +++ b/contrib/web/bin/nonbreaking_prefixes/nonbreaking_prefix.de diff --git a/contrib/web/bin/nonbreaking_prefixes/nonbreaking_prefix.el b/contrib/web/bin/nonbreaking_prefixes/nonbreaking_prefix.el index 7bb3d490a..7bb3d490a 100755..100644 --- a/contrib/web/bin/nonbreaking_prefixes/nonbreaking_prefix.el +++ b/contrib/web/bin/nonbreaking_prefixes/nonbreaking_prefix.el diff --git a/contrib/web/bin/nonbreaking_prefixes/nonbreaking_prefix.en b/contrib/web/bin/nonbreaking_prefixes/nonbreaking_prefix.en index 7e7a8ce2e..7e7a8ce2e 100755..100644 --- a/contrib/web/bin/nonbreaking_prefixes/nonbreaking_prefix.en +++ b/contrib/web/bin/nonbreaking_prefixes/nonbreaking_prefix.en diff --git a/contrib/web/index.cgi b/contrib/web/index.cgi index dcc20b0aa..dcc20b0aa 100755..100644 --- a/contrib/web/index.cgi +++ b/contrib/web/index.cgi diff --git a/contrib/web/index.js b/contrib/web/index.js index 1d917ce73..1d917ce73 100755..100644 --- a/contrib/web/index.js +++ b/contrib/web/index.js diff --git a/contrib/web/lib/RemoteProcess.pm b/contrib/web/lib/RemoteProcess.pm index 1a414cd77..1a414cd77 100755..100644 --- a/contrib/web/lib/RemoteProcess.pm +++ b/contrib/web/lib/RemoteProcess.pm diff --git a/contrib/web/lib/Subprocess.pm b/contrib/web/lib/Subprocess.pm index adc7a853a..adc7a853a 100755..100644 --- a/contrib/web/lib/Subprocess.pm +++ b/contrib/web/lib/Subprocess.pm diff --git a/contrib/web/translate.cgi b/contrib/web/translate.cgi index ece7109fc..ece7109fc 100755..100644 --- a/contrib/web/translate.cgi +++ b/contrib/web/translate.cgi diff --git a/cruise-control/README b/cruise-control/README index 3d65d7aac..3d65d7aac 100755..100644 --- a/cruise-control/README +++ b/cruise-control/README diff --git a/cruise-control/config.ems b/cruise-control/config.ems index eee15ec72..eee15ec72 100755..100644 --- a/cruise-control/config.ems +++ b/cruise-control/config.ems diff --git a/cruise-control/example.config b/cruise-control/example.config index 203dbb0b0..203dbb0b0 100755..100644 --- a/cruise-control/example.config +++ b/cruise-control/example.config diff --git a/cruise-control/web/html_templates.php b/cruise-control/web/html_templates.php index 83f6cc879..83f6cc879 100755..100644 --- a/cruise-control/web/html_templates.php +++ b/cruise-control/web/html_templates.php diff --git a/cruise-control/web/index.php b/cruise-control/web/index.php index 3d6aee6ae..3d6aee6ae 100755..100644 --- a/cruise-control/web/index.php +++ b/cruise-control/web/index.php diff --git a/cruise-control/web/log_wrapper.php b/cruise-control/web/log_wrapper.php index af03db016..af03db016 100755..100644 --- a/cruise-control/web/log_wrapper.php +++ b/cruise-control/web/log_wrapper.php diff --git a/cruise-control/web/show_commit.php b/cruise-control/web/show_commit.php index bcb5e5732..bcb5e5732 100755..100644 --- a/cruise-control/web/show_commit.php +++ b/cruise-control/web/show_commit.php diff --git a/jam-files/LICENSE_1_0.txt b/jam-files/LICENSE_1_0.txt index 36b7cd93c..36b7cd93c 100755..100644 --- a/jam-files/LICENSE_1_0.txt +++ b/jam-files/LICENSE_1_0.txt diff --git a/jam-files/boost-build/boost-build.jam b/jam-files/boost-build/boost-build.jam index 73db0497b..73db0497b 100755..100644 --- a/jam-files/boost-build/boost-build.jam +++ b/jam-files/boost-build/boost-build.jam diff --git a/jam-files/boost-build/bootstrap.jam b/jam-files/boost-build/bootstrap.jam index af3e8bf50..af3e8bf50 100755..100644 --- a/jam-files/boost-build/bootstrap.jam +++ b/jam-files/boost-build/bootstrap.jam diff --git a/jam-files/boost-build/build-system.jam b/jam-files/boost-build/build-system.jam index 9f9c884cc..9f9c884cc 100755..100644 --- a/jam-files/boost-build/build-system.jam +++ b/jam-files/boost-build/build-system.jam diff --git a/jam-files/boost-build/build/ac.jam b/jam-files/boost-build/build/ac.jam index 6768f358c..6768f358c 100755..100644 --- a/jam-files/boost-build/build/ac.jam +++ b/jam-files/boost-build/build/ac.jam diff --git a/jam-files/boost-build/build/alias.jam b/jam-files/boost-build/build/alias.jam index 48019cb98..48019cb98 100755..100644 --- a/jam-files/boost-build/build/alias.jam +++ b/jam-files/boost-build/build/alias.jam diff --git a/jam-files/boost-build/build/build-request.jam b/jam-files/boost-build/build/build-request.jam index 8a1f7b0eb..8a1f7b0eb 100755..100644 --- a/jam-files/boost-build/build/build-request.jam +++ b/jam-files/boost-build/build/build-request.jam diff --git a/jam-files/boost-build/build/configure.jam b/jam-files/boost-build/build/configure.jam index 14c1328af..14c1328af 100755..100644 --- a/jam-files/boost-build/build/configure.jam +++ b/jam-files/boost-build/build/configure.jam diff --git a/jam-files/boost-build/build/feature.jam b/jam-files/boost-build/build/feature.jam index 6f54adefb..6f54adefb 100755..100644 --- a/jam-files/boost-build/build/feature.jam +++ b/jam-files/boost-build/build/feature.jam diff --git a/jam-files/boost-build/build/generators.jam b/jam-files/boost-build/build/generators.jam index 1515525f2..1515525f2 100755..100644 --- a/jam-files/boost-build/build/generators.jam +++ b/jam-files/boost-build/build/generators.jam diff --git a/jam-files/boost-build/build/modifiers.jam b/jam-files/boost-build/build/modifiers.jam index 6b0093433..6b0093433 100755..100644 --- a/jam-files/boost-build/build/modifiers.jam +++ b/jam-files/boost-build/build/modifiers.jam diff --git a/jam-files/boost-build/build/project.jam b/jam-files/boost-build/build/project.jam index c9967613b..c9967613b 100755..100644 --- a/jam-files/boost-build/build/project.jam +++ b/jam-files/boost-build/build/project.jam diff --git a/jam-files/boost-build/build/property-set.jam b/jam-files/boost-build/build/property-set.jam index 70fd90cde..70fd90cde 100755..100644 --- a/jam-files/boost-build/build/property-set.jam +++ b/jam-files/boost-build/build/property-set.jam diff --git a/jam-files/boost-build/build/property.jam b/jam-files/boost-build/build/property.jam index a2ad5226b..a2ad5226b 100755..100644 --- a/jam-files/boost-build/build/property.jam +++ b/jam-files/boost-build/build/property.jam diff --git a/jam-files/boost-build/build/readme.txt b/jam-files/boost-build/build/readme.txt index c3dddd8d7..c3dddd8d7 100755..100644 --- a/jam-files/boost-build/build/readme.txt +++ b/jam-files/boost-build/build/readme.txt diff --git a/jam-files/boost-build/build/scanner.jam b/jam-files/boost-build/build/scanner.jam index d6042ea2c..d6042ea2c 100755..100644 --- a/jam-files/boost-build/build/scanner.jam +++ b/jam-files/boost-build/build/scanner.jam diff --git a/jam-files/boost-build/build/targets.jam b/jam-files/boost-build/build/targets.jam index a70532ce7..a70532ce7 100755..100644 --- a/jam-files/boost-build/build/targets.jam +++ b/jam-files/boost-build/build/targets.jam diff --git a/jam-files/boost-build/build/toolset.jam b/jam-files/boost-build/build/toolset.jam index f2036d999..f2036d999 100755..100644 --- a/jam-files/boost-build/build/toolset.jam +++ b/jam-files/boost-build/build/toolset.jam diff --git a/jam-files/boost-build/build/type.jam b/jam-files/boost-build/build/type.jam index 1a7a57823..1a7a57823 100755..100644 --- a/jam-files/boost-build/build/type.jam +++ b/jam-files/boost-build/build/type.jam diff --git a/jam-files/boost-build/build/version.jam b/jam-files/boost-build/build/version.jam index 7626ddda8..7626ddda8 100755..100644 --- a/jam-files/boost-build/build/version.jam +++ b/jam-files/boost-build/build/version.jam diff --git a/jam-files/boost-build/build/virtual-target.jam b/jam-files/boost-build/build/virtual-target.jam index 2e8446bcc..2e8446bcc 100755..100644 --- a/jam-files/boost-build/build/virtual-target.jam +++ b/jam-files/boost-build/build/virtual-target.jam diff --git a/jam-files/boost-build/kernel/boost-build.jam b/jam-files/boost-build/kernel/boost-build.jam index 377f6ec02..377f6ec02 100755..100644 --- a/jam-files/boost-build/kernel/boost-build.jam +++ b/jam-files/boost-build/kernel/boost-build.jam diff --git a/jam-files/boost-build/kernel/bootstrap.jam b/jam-files/boost-build/kernel/bootstrap.jam index 89048af92..89048af92 100755..100644 --- a/jam-files/boost-build/kernel/bootstrap.jam +++ b/jam-files/boost-build/kernel/bootstrap.jam diff --git a/jam-files/boost-build/kernel/class.jam b/jam-files/boost-build/kernel/class.jam index b8e55af35..b8e55af35 100755..100644 --- a/jam-files/boost-build/kernel/class.jam +++ b/jam-files/boost-build/kernel/class.jam diff --git a/jam-files/boost-build/kernel/errors.jam b/jam-files/boost-build/kernel/errors.jam index 63b11e867..63b11e867 100755..100644 --- a/jam-files/boost-build/kernel/errors.jam +++ b/jam-files/boost-build/kernel/errors.jam diff --git a/jam-files/boost-build/kernel/modules.jam b/jam-files/boost-build/kernel/modules.jam index 1f75354fc..1f75354fc 100755..100644 --- a/jam-files/boost-build/kernel/modules.jam +++ b/jam-files/boost-build/kernel/modules.jam diff --git a/jam-files/boost-build/options/help.jam b/jam-files/boost-build/options/help.jam index b507e1edd..b507e1edd 100755..100644 --- a/jam-files/boost-build/options/help.jam +++ b/jam-files/boost-build/options/help.jam diff --git a/jam-files/boost-build/site-config.jam b/jam-files/boost-build/site-config.jam index ad22d6744..ad22d6744 100755..100644 --- a/jam-files/boost-build/site-config.jam +++ b/jam-files/boost-build/site-config.jam diff --git a/jam-files/boost-build/tools/acc.jam b/jam-files/boost-build/tools/acc.jam index f04c9dc87..f04c9dc87 100755..100644 --- a/jam-files/boost-build/tools/acc.jam +++ b/jam-files/boost-build/tools/acc.jam diff --git a/jam-files/boost-build/tools/bison.jam b/jam-files/boost-build/tools/bison.jam index 0689d4bd8..0689d4bd8 100755..100644 --- a/jam-files/boost-build/tools/bison.jam +++ b/jam-files/boost-build/tools/bison.jam diff --git a/jam-files/boost-build/tools/boostbook-config.jam b/jam-files/boost-build/tools/boostbook-config.jam index 6e3f3ddc1..6e3f3ddc1 100755..100644 --- a/jam-files/boost-build/tools/boostbook-config.jam +++ b/jam-files/boost-build/tools/boostbook-config.jam diff --git a/jam-files/boost-build/tools/boostbook.jam b/jam-files/boost-build/tools/boostbook.jam index 3a5964c62..3a5964c62 100755..100644 --- a/jam-files/boost-build/tools/boostbook.jam +++ b/jam-files/boost-build/tools/boostbook.jam diff --git a/jam-files/boost-build/tools/borland.jam b/jam-files/boost-build/tools/borland.jam index 6e43ca93a..6e43ca93a 100755..100644 --- a/jam-files/boost-build/tools/borland.jam +++ b/jam-files/boost-build/tools/borland.jam diff --git a/jam-files/boost-build/tools/builtin.jam b/jam-files/boost-build/tools/builtin.jam index 148e7308d..148e7308d 100755..100644 --- a/jam-files/boost-build/tools/builtin.jam +++ b/jam-files/boost-build/tools/builtin.jam diff --git a/jam-files/boost-build/tools/cast.jam b/jam-files/boost-build/tools/cast.jam index 6c84922f1..6c84922f1 100755..100644 --- a/jam-files/boost-build/tools/cast.jam +++ b/jam-files/boost-build/tools/cast.jam diff --git a/jam-files/boost-build/tools/clang-darwin.jam b/jam-files/boost-build/tools/clang-darwin.jam index a8abc7d6a..a8abc7d6a 100755..100644 --- a/jam-files/boost-build/tools/clang-darwin.jam +++ b/jam-files/boost-build/tools/clang-darwin.jam diff --git a/jam-files/boost-build/tools/clang-linux.jam b/jam-files/boost-build/tools/clang-linux.jam index 036d749e6..036d749e6 100755..100644 --- a/jam-files/boost-build/tools/clang-linux.jam +++ b/jam-files/boost-build/tools/clang-linux.jam diff --git a/jam-files/boost-build/tools/clang.jam b/jam-files/boost-build/tools/clang.jam index e0ac9a553..e0ac9a553 100755..100644 --- a/jam-files/boost-build/tools/clang.jam +++ b/jam-files/boost-build/tools/clang.jam diff --git a/jam-files/boost-build/tools/common.jam b/jam-files/boost-build/tools/common.jam index df914d9d4..df914d9d4 100755..100644 --- a/jam-files/boost-build/tools/common.jam +++ b/jam-files/boost-build/tools/common.jam diff --git a/jam-files/boost-build/tools/como-linux.jam b/jam-files/boost-build/tools/como-linux.jam index 5c554c8f8..5c554c8f8 100755..100644 --- a/jam-files/boost-build/tools/como-linux.jam +++ b/jam-files/boost-build/tools/como-linux.jam diff --git a/jam-files/boost-build/tools/como-win.jam b/jam-files/boost-build/tools/como-win.jam index d21a70d6f..d21a70d6f 100755..100644 --- a/jam-files/boost-build/tools/como-win.jam +++ b/jam-files/boost-build/tools/como-win.jam diff --git a/jam-files/boost-build/tools/como.jam b/jam-files/boost-build/tools/como.jam index 04a05a94b..04a05a94b 100755..100644 --- a/jam-files/boost-build/tools/como.jam +++ b/jam-files/boost-build/tools/como.jam diff --git a/jam-files/boost-build/tools/convert.jam b/jam-files/boost-build/tools/convert.jam index ac1d70101..ac1d70101 100755..100644 --- a/jam-files/boost-build/tools/convert.jam +++ b/jam-files/boost-build/tools/convert.jam diff --git a/jam-files/boost-build/tools/cw-config.jam b/jam-files/boost-build/tools/cw-config.jam index 1211b7c04..1211b7c04 100755..100644 --- a/jam-files/boost-build/tools/cw-config.jam +++ b/jam-files/boost-build/tools/cw-config.jam diff --git a/jam-files/boost-build/tools/cw.jam b/jam-files/boost-build/tools/cw.jam index ddcbfeb2b..ddcbfeb2b 100755..100644 --- a/jam-files/boost-build/tools/cw.jam +++ b/jam-files/boost-build/tools/cw.jam diff --git a/jam-files/boost-build/tools/darwin.jam b/jam-files/boost-build/tools/darwin.jam index 283dface9..283dface9 100755..100644 --- a/jam-files/boost-build/tools/darwin.jam +++ b/jam-files/boost-build/tools/darwin.jam diff --git a/jam-files/boost-build/tools/dmc.jam b/jam-files/boost-build/tools/dmc.jam index 8af8725a8..8af8725a8 100755..100644 --- a/jam-files/boost-build/tools/dmc.jam +++ b/jam-files/boost-build/tools/dmc.jam diff --git a/jam-files/boost-build/tools/docutils.jam b/jam-files/boost-build/tools/docutils.jam index bf0616174..bf0616174 100755..100644 --- a/jam-files/boost-build/tools/docutils.jam +++ b/jam-files/boost-build/tools/docutils.jam diff --git a/jam-files/boost-build/tools/doxygen-config.jam b/jam-files/boost-build/tools/doxygen-config.jam index 2cd2ccaeb..2cd2ccaeb 100755..100644 --- a/jam-files/boost-build/tools/doxygen-config.jam +++ b/jam-files/boost-build/tools/doxygen-config.jam diff --git a/jam-files/boost-build/tools/doxygen.jam b/jam-files/boost-build/tools/doxygen.jam index 8394848dd..8394848dd 100755..100644 --- a/jam-files/boost-build/tools/doxygen.jam +++ b/jam-files/boost-build/tools/doxygen.jam diff --git a/jam-files/boost-build/tools/doxygen/windows-paths-check.doxyfile b/jam-files/boost-build/tools/doxygen/windows-paths-check.doxyfile index 9b969df9c..9b969df9c 100755..100644 --- a/jam-files/boost-build/tools/doxygen/windows-paths-check.doxyfile +++ b/jam-files/boost-build/tools/doxygen/windows-paths-check.doxyfile diff --git a/jam-files/boost-build/tools/doxygen/windows-paths-check.hpp b/jam-files/boost-build/tools/doxygen/windows-paths-check.hpp index e69de29bb..e69de29bb 100755..100644 --- a/jam-files/boost-build/tools/doxygen/windows-paths-check.hpp +++ b/jam-files/boost-build/tools/doxygen/windows-paths-check.hpp diff --git a/jam-files/boost-build/tools/fop.jam b/jam-files/boost-build/tools/fop.jam index c24b8725f..c24b8725f 100755..100644 --- a/jam-files/boost-build/tools/fop.jam +++ b/jam-files/boost-build/tools/fop.jam diff --git a/jam-files/boost-build/tools/fortran.jam b/jam-files/boost-build/tools/fortran.jam index 37665825e..37665825e 100755..100644 --- a/jam-files/boost-build/tools/fortran.jam +++ b/jam-files/boost-build/tools/fortran.jam diff --git a/jam-files/boost-build/tools/gcc.jam b/jam-files/boost-build/tools/gcc.jam index f7b0da542..f7b0da542 100755..100644 --- a/jam-files/boost-build/tools/gcc.jam +++ b/jam-files/boost-build/tools/gcc.jam diff --git a/jam-files/boost-build/tools/generate.jam b/jam-files/boost-build/tools/generate.jam index 6732fa355..6732fa355 100755..100644 --- a/jam-files/boost-build/tools/generate.jam +++ b/jam-files/boost-build/tools/generate.jam diff --git a/jam-files/boost-build/tools/gettext.jam b/jam-files/boost-build/tools/gettext.jam index 99a43ffe9..99a43ffe9 100755..100644 --- a/jam-files/boost-build/tools/gettext.jam +++ b/jam-files/boost-build/tools/gettext.jam diff --git a/jam-files/boost-build/tools/gfortran.jam b/jam-files/boost-build/tools/gfortran.jam index 0aa69b85c..0aa69b85c 100755..100644 --- a/jam-files/boost-build/tools/gfortran.jam +++ b/jam-files/boost-build/tools/gfortran.jam diff --git a/jam-files/boost-build/tools/hp_cxx.jam b/jam-files/boost-build/tools/hp_cxx.jam index 86cd783e2..86cd783e2 100755..100644 --- a/jam-files/boost-build/tools/hp_cxx.jam +++ b/jam-files/boost-build/tools/hp_cxx.jam diff --git a/jam-files/boost-build/tools/hpfortran.jam b/jam-files/boost-build/tools/hpfortran.jam index 96e8d18b5..96e8d18b5 100755..100644 --- a/jam-files/boost-build/tools/hpfortran.jam +++ b/jam-files/boost-build/tools/hpfortran.jam diff --git a/jam-files/boost-build/tools/ifort.jam b/jam-files/boost-build/tools/ifort.jam index eb7c19881..eb7c19881 100755..100644 --- a/jam-files/boost-build/tools/ifort.jam +++ b/jam-files/boost-build/tools/ifort.jam diff --git a/jam-files/boost-build/tools/intel-darwin.jam b/jam-files/boost-build/tools/intel-darwin.jam index aa0fd8fb6..aa0fd8fb6 100755..100644 --- a/jam-files/boost-build/tools/intel-darwin.jam +++ b/jam-files/boost-build/tools/intel-darwin.jam diff --git a/jam-files/boost-build/tools/intel-linux.jam b/jam-files/boost-build/tools/intel-linux.jam index d9164add8..d9164add8 100755..100644 --- a/jam-files/boost-build/tools/intel-linux.jam +++ b/jam-files/boost-build/tools/intel-linux.jam diff --git a/jam-files/boost-build/tools/intel-win.jam b/jam-files/boost-build/tools/intel-win.jam index 691b5dce9..691b5dce9 100755..100644 --- a/jam-files/boost-build/tools/intel-win.jam +++ b/jam-files/boost-build/tools/intel-win.jam diff --git a/jam-files/boost-build/tools/intel.jam b/jam-files/boost-build/tools/intel.jam index 67038aa28..67038aa28 100755..100644 --- a/jam-files/boost-build/tools/intel.jam +++ b/jam-files/boost-build/tools/intel.jam diff --git a/jam-files/boost-build/tools/lex.jam b/jam-files/boost-build/tools/lex.jam index 75d641318..75d641318 100755..100644 --- a/jam-files/boost-build/tools/lex.jam +++ b/jam-files/boost-build/tools/lex.jam diff --git a/jam-files/boost-build/tools/make.jam b/jam-files/boost-build/tools/make.jam index 085672857..085672857 100755..100644 --- a/jam-files/boost-build/tools/make.jam +++ b/jam-files/boost-build/tools/make.jam diff --git a/jam-files/boost-build/tools/mc.jam b/jam-files/boost-build/tools/mc.jam index 578377735..578377735 100755..100644 --- a/jam-files/boost-build/tools/mc.jam +++ b/jam-files/boost-build/tools/mc.jam diff --git a/jam-files/boost-build/tools/message.jam b/jam-files/boost-build/tools/message.jam index 212d8542c..212d8542c 100755..100644 --- a/jam-files/boost-build/tools/message.jam +++ b/jam-files/boost-build/tools/message.jam diff --git a/jam-files/boost-build/tools/midl.jam b/jam-files/boost-build/tools/midl.jam index 0aa5dda31..0aa5dda31 100755..100644 --- a/jam-files/boost-build/tools/midl.jam +++ b/jam-files/boost-build/tools/midl.jam diff --git a/jam-files/boost-build/tools/mipspro.jam b/jam-files/boost-build/tools/mipspro.jam index 417eaefcf..417eaefcf 100755..100644 --- a/jam-files/boost-build/tools/mipspro.jam +++ b/jam-files/boost-build/tools/mipspro.jam diff --git a/jam-files/boost-build/tools/mpi.jam b/jam-files/boost-build/tools/mpi.jam index 0fe490bec..0fe490bec 100755..100644 --- a/jam-files/boost-build/tools/mpi.jam +++ b/jam-files/boost-build/tools/mpi.jam diff --git a/jam-files/boost-build/tools/msvc-config.jam b/jam-files/boost-build/tools/msvc-config.jam index 6c71e3b00..6c71e3b00 100755..100644 --- a/jam-files/boost-build/tools/msvc-config.jam +++ b/jam-files/boost-build/tools/msvc-config.jam diff --git a/jam-files/boost-build/tools/msvc.jam b/jam-files/boost-build/tools/msvc.jam index e33a66d22..e33a66d22 100755..100644 --- a/jam-files/boost-build/tools/msvc.jam +++ b/jam-files/boost-build/tools/msvc.jam diff --git a/jam-files/boost-build/tools/notfile.jam b/jam-files/boost-build/tools/notfile.jam index 97a5b0e87..97a5b0e87 100755..100644 --- a/jam-files/boost-build/tools/notfile.jam +++ b/jam-files/boost-build/tools/notfile.jam diff --git a/jam-files/boost-build/tools/package.jam b/jam-files/boost-build/tools/package.jam index 198c22315..198c22315 100755..100644 --- a/jam-files/boost-build/tools/package.jam +++ b/jam-files/boost-build/tools/package.jam diff --git a/jam-files/boost-build/tools/pathscale.jam b/jam-files/boost-build/tools/pathscale.jam index 454e34547..454e34547 100755..100644 --- a/jam-files/boost-build/tools/pathscale.jam +++ b/jam-files/boost-build/tools/pathscale.jam diff --git a/jam-files/boost-build/tools/pch.jam b/jam-files/boost-build/tools/pch.jam index 0c6e98fac..0c6e98fac 100755..100644 --- a/jam-files/boost-build/tools/pch.jam +++ b/jam-files/boost-build/tools/pch.jam diff --git a/jam-files/boost-build/tools/pgi.jam b/jam-files/boost-build/tools/pgi.jam index 3a35c6447..3a35c6447 100755..100644 --- a/jam-files/boost-build/tools/pgi.jam +++ b/jam-files/boost-build/tools/pgi.jam diff --git a/jam-files/boost-build/tools/python-config.jam b/jam-files/boost-build/tools/python-config.jam index 40aa825bc..40aa825bc 100755..100644 --- a/jam-files/boost-build/tools/python-config.jam +++ b/jam-files/boost-build/tools/python-config.jam diff --git a/jam-files/boost-build/tools/python.jam b/jam-files/boost-build/tools/python.jam index 66f2aabec..66f2aabec 100755..100644 --- a/jam-files/boost-build/tools/python.jam +++ b/jam-files/boost-build/tools/python.jam diff --git a/jam-files/boost-build/tools/qcc.jam b/jam-files/boost-build/tools/qcc.jam index 4f2a4fc14..4f2a4fc14 100755..100644 --- a/jam-files/boost-build/tools/qcc.jam +++ b/jam-files/boost-build/tools/qcc.jam diff --git a/jam-files/boost-build/tools/qt.jam b/jam-files/boost-build/tools/qt.jam index 8aa7ca266..8aa7ca266 100755..100644 --- a/jam-files/boost-build/tools/qt.jam +++ b/jam-files/boost-build/tools/qt.jam diff --git a/jam-files/boost-build/tools/qt3.jam b/jam-files/boost-build/tools/qt3.jam index f82cf0ac3..f82cf0ac3 100755..100644 --- a/jam-files/boost-build/tools/qt3.jam +++ b/jam-files/boost-build/tools/qt3.jam diff --git a/jam-files/boost-build/tools/qt4.jam b/jam-files/boost-build/tools/qt4.jam index 771b9344f..771b9344f 100755..100644 --- a/jam-files/boost-build/tools/qt4.jam +++ b/jam-files/boost-build/tools/qt4.jam diff --git a/jam-files/boost-build/tools/quickbook-config.jam b/jam-files/boost-build/tools/quickbook-config.jam index e983a78a8..e983a78a8 100755..100644 --- a/jam-files/boost-build/tools/quickbook-config.jam +++ b/jam-files/boost-build/tools/quickbook-config.jam diff --git a/jam-files/boost-build/tools/quickbook.jam b/jam-files/boost-build/tools/quickbook.jam index 6de2d42f8..6de2d42f8 100755..100644 --- a/jam-files/boost-build/tools/quickbook.jam +++ b/jam-files/boost-build/tools/quickbook.jam diff --git a/jam-files/boost-build/tools/rc.jam b/jam-files/boost-build/tools/rc.jam index 9964d339b..9964d339b 100755..100644 --- a/jam-files/boost-build/tools/rc.jam +++ b/jam-files/boost-build/tools/rc.jam diff --git a/jam-files/boost-build/tools/stage.jam b/jam-files/boost-build/tools/stage.jam index 296e7558e..296e7558e 100755..100644 --- a/jam-files/boost-build/tools/stage.jam +++ b/jam-files/boost-build/tools/stage.jam diff --git a/jam-files/boost-build/tools/stlport.jam b/jam-files/boost-build/tools/stlport.jam index 62eebda5f..62eebda5f 100755..100644 --- a/jam-files/boost-build/tools/stlport.jam +++ b/jam-files/boost-build/tools/stlport.jam diff --git a/jam-files/boost-build/tools/sun.jam b/jam-files/boost-build/tools/sun.jam index 0ca927d3e..0ca927d3e 100755..100644 --- a/jam-files/boost-build/tools/sun.jam +++ b/jam-files/boost-build/tools/sun.jam diff --git a/jam-files/boost-build/tools/symlink.jam b/jam-files/boost-build/tools/symlink.jam index b33e8260c..b33e8260c 100755..100644 --- a/jam-files/boost-build/tools/symlink.jam +++ b/jam-files/boost-build/tools/symlink.jam diff --git a/jam-files/boost-build/tools/testing-aux.jam b/jam-files/boost-build/tools/testing-aux.jam index 525dafd0c..525dafd0c 100755..100644 --- a/jam-files/boost-build/tools/testing-aux.jam +++ b/jam-files/boost-build/tools/testing-aux.jam diff --git a/jam-files/boost-build/tools/testing.jam b/jam-files/boost-build/tools/testing.jam index c42075b78..c42075b78 100755..100644 --- a/jam-files/boost-build/tools/testing.jam +++ b/jam-files/boost-build/tools/testing.jam diff --git a/jam-files/boost-build/tools/types/asm.jam b/jam-files/boost-build/tools/types/asm.jam index a340db36a..a340db36a 100755..100644 --- a/jam-files/boost-build/tools/types/asm.jam +++ b/jam-files/boost-build/tools/types/asm.jam diff --git a/jam-files/boost-build/tools/types/cpp.jam b/jam-files/boost-build/tools/types/cpp.jam index 3159cdd77..3159cdd77 100755..100644 --- a/jam-files/boost-build/tools/types/cpp.jam +++ b/jam-files/boost-build/tools/types/cpp.jam diff --git a/jam-files/boost-build/tools/types/exe.jam b/jam-files/boost-build/tools/types/exe.jam index 47109513a..47109513a 100755..100644 --- a/jam-files/boost-build/tools/types/exe.jam +++ b/jam-files/boost-build/tools/types/exe.jam diff --git a/jam-files/boost-build/tools/types/html.jam b/jam-files/boost-build/tools/types/html.jam index 5cd337d09..5cd337d09 100755..100644 --- a/jam-files/boost-build/tools/types/html.jam +++ b/jam-files/boost-build/tools/types/html.jam diff --git a/jam-files/boost-build/tools/types/lib.jam b/jam-files/boost-build/tools/types/lib.jam index 854ab8fd5..854ab8fd5 100755..100644 --- a/jam-files/boost-build/tools/types/lib.jam +++ b/jam-files/boost-build/tools/types/lib.jam diff --git a/jam-files/boost-build/tools/types/obj.jam b/jam-files/boost-build/tools/types/obj.jam index 6afbcaa6f..6afbcaa6f 100755..100644 --- a/jam-files/boost-build/tools/types/obj.jam +++ b/jam-files/boost-build/tools/types/obj.jam diff --git a/jam-files/boost-build/tools/types/objc.jam b/jam-files/boost-build/tools/types/objc.jam index 709cbd0c7..709cbd0c7 100755..100644 --- a/jam-files/boost-build/tools/types/objc.jam +++ b/jam-files/boost-build/tools/types/objc.jam diff --git a/jam-files/boost-build/tools/types/preprocessed.jam b/jam-files/boost-build/tools/types/preprocessed.jam index c9187ba67..c9187ba67 100755..100644 --- a/jam-files/boost-build/tools/types/preprocessed.jam +++ b/jam-files/boost-build/tools/types/preprocessed.jam diff --git a/jam-files/boost-build/tools/types/qt.jam b/jam-files/boost-build/tools/types/qt.jam index 6d1dfbd42..6d1dfbd42 100755..100644 --- a/jam-files/boost-build/tools/types/qt.jam +++ b/jam-files/boost-build/tools/types/qt.jam diff --git a/jam-files/boost-build/tools/types/register.jam b/jam-files/boost-build/tools/types/register.jam index 203992ca9..203992ca9 100755..100644 --- a/jam-files/boost-build/tools/types/register.jam +++ b/jam-files/boost-build/tools/types/register.jam diff --git a/jam-files/boost-build/tools/types/rsp.jam b/jam-files/boost-build/tools/types/rsp.jam index bdf8a7c98..bdf8a7c98 100755..100644 --- a/jam-files/boost-build/tools/types/rsp.jam +++ b/jam-files/boost-build/tools/types/rsp.jam diff --git a/jam-files/boost-build/tools/unix.jam b/jam-files/boost-build/tools/unix.jam index 75949851a..75949851a 100755..100644 --- a/jam-files/boost-build/tools/unix.jam +++ b/jam-files/boost-build/tools/unix.jam diff --git a/jam-files/boost-build/tools/vacpp.jam b/jam-files/boost-build/tools/vacpp.jam index f4080fc04..f4080fc04 100755..100644 --- a/jam-files/boost-build/tools/vacpp.jam +++ b/jam-files/boost-build/tools/vacpp.jam diff --git a/jam-files/boost-build/tools/whale.jam b/jam-files/boost-build/tools/whale.jam index 9335ff0c0..9335ff0c0 100755..100644 --- a/jam-files/boost-build/tools/whale.jam +++ b/jam-files/boost-build/tools/whale.jam diff --git a/jam-files/boost-build/tools/xlf.jam b/jam-files/boost-build/tools/xlf.jam index e7fcc6086..e7fcc6086 100755..100644 --- a/jam-files/boost-build/tools/xlf.jam +++ b/jam-files/boost-build/tools/xlf.jam diff --git a/jam-files/boost-build/tools/xsltproc-config.jam b/jam-files/boost-build/tools/xsltproc-config.jam index de54a2eb3..de54a2eb3 100755..100644 --- a/jam-files/boost-build/tools/xsltproc-config.jam +++ b/jam-files/boost-build/tools/xsltproc-config.jam diff --git a/jam-files/boost-build/tools/xsltproc.jam b/jam-files/boost-build/tools/xsltproc.jam index 96f5170be..96f5170be 100755..100644 --- a/jam-files/boost-build/tools/xsltproc.jam +++ b/jam-files/boost-build/tools/xsltproc.jam diff --git a/jam-files/boost-build/tools/xsltproc/included.xsl b/jam-files/boost-build/tools/xsltproc/included.xsl index ef86394a9..ef86394a9 100755..100644 --- a/jam-files/boost-build/tools/xsltproc/included.xsl +++ b/jam-files/boost-build/tools/xsltproc/included.xsl diff --git a/jam-files/boost-build/tools/xsltproc/test.xml b/jam-files/boost-build/tools/xsltproc/test.xml index 57c8ba187..57c8ba187 100755..100644 --- a/jam-files/boost-build/tools/xsltproc/test.xml +++ b/jam-files/boost-build/tools/xsltproc/test.xml diff --git a/jam-files/boost-build/tools/xsltproc/test.xsl b/jam-files/boost-build/tools/xsltproc/test.xsl index a142c91dd..a142c91dd 100755..100644 --- a/jam-files/boost-build/tools/xsltproc/test.xsl +++ b/jam-files/boost-build/tools/xsltproc/test.xsl diff --git a/jam-files/boost-build/tools/zlib.jam b/jam-files/boost-build/tools/zlib.jam index f9138fd57..f9138fd57 100755..100644 --- a/jam-files/boost-build/tools/zlib.jam +++ b/jam-files/boost-build/tools/zlib.jam diff --git a/jam-files/boost-build/user-config.jam b/jam-files/boost-build/user-config.jam index 81091a684..81091a684 100755..100644 --- a/jam-files/boost-build/user-config.jam +++ b/jam-files/boost-build/user-config.jam diff --git a/jam-files/boost-build/util/assert.jam b/jam-files/boost-build/util/assert.jam index abedad525..abedad525 100755..100644 --- a/jam-files/boost-build/util/assert.jam +++ b/jam-files/boost-build/util/assert.jam diff --git a/jam-files/boost-build/util/container.jam b/jam-files/boost-build/util/container.jam index dd4963938..dd4963938 100755..100644 --- a/jam-files/boost-build/util/container.jam +++ b/jam-files/boost-build/util/container.jam diff --git a/jam-files/boost-build/util/doc.jam b/jam-files/boost-build/util/doc.jam index a75155882..a75155882 100755..100644 --- a/jam-files/boost-build/util/doc.jam +++ b/jam-files/boost-build/util/doc.jam diff --git a/jam-files/boost-build/util/indirect.jam b/jam-files/boost-build/util/indirect.jam index ec63f1920..ec63f1920 100755..100644 --- a/jam-files/boost-build/util/indirect.jam +++ b/jam-files/boost-build/util/indirect.jam diff --git a/jam-files/boost-build/util/numbers.jam b/jam-files/boost-build/util/numbers.jam index 665347d31..665347d31 100755..100644 --- a/jam-files/boost-build/util/numbers.jam +++ b/jam-files/boost-build/util/numbers.jam diff --git a/jam-files/boost-build/util/option.jam b/jam-files/boost-build/util/option.jam index f6dc37522..f6dc37522 100755..100644 --- a/jam-files/boost-build/util/option.jam +++ b/jam-files/boost-build/util/option.jam diff --git a/jam-files/boost-build/util/order.jam b/jam-files/boost-build/util/order.jam index a74fc8c84..a74fc8c84 100755..100644 --- a/jam-files/boost-build/util/order.jam +++ b/jam-files/boost-build/util/order.jam diff --git a/jam-files/boost-build/util/os.jam b/jam-files/boost-build/util/os.jam index daef27f77..daef27f77 100755..100644 --- a/jam-files/boost-build/util/os.jam +++ b/jam-files/boost-build/util/os.jam diff --git a/jam-files/boost-build/util/path.jam b/jam-files/boost-build/util/path.jam index ea26b816b..ea26b816b 100755..100644 --- a/jam-files/boost-build/util/path.jam +++ b/jam-files/boost-build/util/path.jam diff --git a/jam-files/boost-build/util/print.jam b/jam-files/boost-build/util/print.jam index 708d21aba..708d21aba 100755..100644 --- a/jam-files/boost-build/util/print.jam +++ b/jam-files/boost-build/util/print.jam diff --git a/jam-files/boost-build/util/regex.jam b/jam-files/boost-build/util/regex.jam index 234c36f62..234c36f62 100755..100644 --- a/jam-files/boost-build/util/regex.jam +++ b/jam-files/boost-build/util/regex.jam diff --git a/jam-files/boost-build/util/sequence.jam b/jam-files/boost-build/util/sequence.jam index 73919a65d..73919a65d 100755..100644 --- a/jam-files/boost-build/util/sequence.jam +++ b/jam-files/boost-build/util/sequence.jam diff --git a/jam-files/boost-build/util/set.jam b/jam-files/boost-build/util/set.jam index fc179134f..fc179134f 100755..100644 --- a/jam-files/boost-build/util/set.jam +++ b/jam-files/boost-build/util/set.jam diff --git a/jam-files/boost-build/util/string.jam b/jam-files/boost-build/util/string.jam index a39ed119e..a39ed119e 100755..100644 --- a/jam-files/boost-build/util/string.jam +++ b/jam-files/boost-build/util/string.jam diff --git a/jam-files/boost-build/util/utility.jam b/jam-files/boost-build/util/utility.jam index c46747f58..c46747f58 100755..100644 --- a/jam-files/boost-build/util/utility.jam +++ b/jam-files/boost-build/util/utility.jam diff --git a/jam-files/engine/Jambase b/jam-files/engine/Jambase index 94f8fbde5..94f8fbde5 100755..100644 --- a/jam-files/engine/Jambase +++ b/jam-files/engine/Jambase diff --git a/jam-files/engine/boost-jam.spec b/jam-files/engine/boost-jam.spec index bc572fc96..bc572fc96 100755..100644 --- a/jam-files/engine/boost-jam.spec +++ b/jam-files/engine/boost-jam.spec diff --git a/jam-files/engine/boost-no-inspect b/jam-files/engine/boost-no-inspect index 8a06f3a70..8a06f3a70 100755..100644 --- a/jam-files/engine/boost-no-inspect +++ b/jam-files/engine/boost-no-inspect diff --git a/jam-files/engine/build.bat b/jam-files/engine/build.bat index f927b7697..f927b7697 100755..100644 --- a/jam-files/engine/build.bat +++ b/jam-files/engine/build.bat diff --git a/jam-files/engine/build.jam b/jam-files/engine/build.jam index 266b07a17..266b07a17 100755..100644 --- a/jam-files/engine/build.jam +++ b/jam-files/engine/build.jam diff --git a/jam-files/engine/build_vms.com b/jam-files/engine/build_vms.com index 965b63424..965b63424 100755..100644 --- a/jam-files/engine/build_vms.com +++ b/jam-files/engine/build_vms.com diff --git a/jam-files/engine/builtins.c b/jam-files/engine/builtins.c index b28a484ec..b28a484ec 100755..100644 --- a/jam-files/engine/builtins.c +++ b/jam-files/engine/builtins.c diff --git a/jam-files/engine/builtins.h b/jam-files/engine/builtins.h index 5fed07c96..5fed07c96 100755..100644 --- a/jam-files/engine/builtins.h +++ b/jam-files/engine/builtins.h diff --git a/jam-files/engine/class.c b/jam-files/engine/class.c index ff4ec5680..ff4ec5680 100755..100644 --- a/jam-files/engine/class.c +++ b/jam-files/engine/class.c diff --git a/jam-files/engine/class.h b/jam-files/engine/class.h index f7faeff62..f7faeff62 100755..100644 --- a/jam-files/engine/class.h +++ b/jam-files/engine/class.h diff --git a/jam-files/engine/command.c b/jam-files/engine/command.c index d2ea06814..d2ea06814 100755..100644 --- a/jam-files/engine/command.c +++ b/jam-files/engine/command.c diff --git a/jam-files/engine/command.h b/jam-files/engine/command.h index ddd38e689..ddd38e689 100755..100644 --- a/jam-files/engine/command.h +++ b/jam-files/engine/command.h diff --git a/jam-files/engine/compile.c b/jam-files/engine/compile.c index 2c049aae5..2c049aae5 100755..100644 --- a/jam-files/engine/compile.c +++ b/jam-files/engine/compile.c diff --git a/jam-files/engine/compile.h b/jam-files/engine/compile.h index 7d5191f0e..7d5191f0e 100755..100644 --- a/jam-files/engine/compile.h +++ b/jam-files/engine/compile.h diff --git a/jam-files/engine/debian/changelog b/jam-files/engine/debian/changelog index 29084289c..29084289c 100755..100644 --- a/jam-files/engine/debian/changelog +++ b/jam-files/engine/debian/changelog diff --git a/jam-files/engine/debian/control b/jam-files/engine/debian/control index c7f151932..c7f151932 100755..100644 --- a/jam-files/engine/debian/control +++ b/jam-files/engine/debian/control diff --git a/jam-files/engine/debian/copyright b/jam-files/engine/debian/copyright index f72e4e3a9..f72e4e3a9 100755..100644 --- a/jam-files/engine/debian/copyright +++ b/jam-files/engine/debian/copyright diff --git a/jam-files/engine/debian/jam.man.sgml b/jam-files/engine/debian/jam.man.sgml index ee21d4d83..ee21d4d83 100755..100644 --- a/jam-files/engine/debian/jam.man.sgml +++ b/jam-files/engine/debian/jam.man.sgml diff --git a/jam-files/engine/debian/rules b/jam-files/engine/debian/rules index 756052a3b..756052a3b 100755..100644 --- a/jam-files/engine/debian/rules +++ b/jam-files/engine/debian/rules diff --git a/jam-files/engine/debug.c b/jam-files/engine/debug.c index 7290555a7..7290555a7 100755..100644 --- a/jam-files/engine/debug.c +++ b/jam-files/engine/debug.c diff --git a/jam-files/engine/debug.h b/jam-files/engine/debug.h index 115a88735..115a88735 100755..100644 --- a/jam-files/engine/debug.h +++ b/jam-files/engine/debug.h diff --git a/jam-files/engine/execcmd.h b/jam-files/engine/execcmd.h index 67f2b839c..67f2b839c 100755..100644 --- a/jam-files/engine/execcmd.h +++ b/jam-files/engine/execcmd.h diff --git a/jam-files/engine/execmac.c b/jam-files/engine/execmac.c index 2ddddedd1..2ddddedd1 100755..100644 --- a/jam-files/engine/execmac.c +++ b/jam-files/engine/execmac.c diff --git a/jam-files/engine/execnt.c b/jam-files/engine/execnt.c index 764204518..764204518 100755..100644 --- a/jam-files/engine/execnt.c +++ b/jam-files/engine/execnt.c diff --git a/jam-files/engine/execunix.c b/jam-files/engine/execunix.c index ef9dba003..ef9dba003 100755..100644 --- a/jam-files/engine/execunix.c +++ b/jam-files/engine/execunix.c diff --git a/jam-files/engine/execvms.c b/jam-files/engine/execvms.c index 729917d35..729917d35 100755..100644 --- a/jam-files/engine/execvms.c +++ b/jam-files/engine/execvms.c diff --git a/jam-files/engine/expand.c b/jam-files/engine/expand.c index d8e58827c..d8e58827c 100755..100644 --- a/jam-files/engine/expand.c +++ b/jam-files/engine/expand.c diff --git a/jam-files/engine/expand.h b/jam-files/engine/expand.h index cc25d1909..cc25d1909 100755..100644 --- a/jam-files/engine/expand.h +++ b/jam-files/engine/expand.h diff --git a/jam-files/engine/filemac.c b/jam-files/engine/filemac.c index e69aa648f..e69aa648f 100755..100644 --- a/jam-files/engine/filemac.c +++ b/jam-files/engine/filemac.c diff --git a/jam-files/engine/filent.c b/jam-files/engine/filent.c index ab1895767..ab1895767 100755..100644 --- a/jam-files/engine/filent.c +++ b/jam-files/engine/filent.c diff --git a/jam-files/engine/fileos2.c b/jam-files/engine/fileos2.c index af2373ea8..af2373ea8 100755..100644 --- a/jam-files/engine/fileos2.c +++ b/jam-files/engine/fileos2.c diff --git a/jam-files/engine/filesys.c b/jam-files/engine/filesys.c index eb62ed406..eb62ed406 100755..100644 --- a/jam-files/engine/filesys.c +++ b/jam-files/engine/filesys.c diff --git a/jam-files/engine/filesys.h b/jam-files/engine/filesys.h index efc081d12..efc081d12 100755..100644 --- a/jam-files/engine/filesys.h +++ b/jam-files/engine/filesys.h diff --git a/jam-files/engine/fileunix.c b/jam-files/engine/fileunix.c index 680c3f539..680c3f539 100755..100644 --- a/jam-files/engine/fileunix.c +++ b/jam-files/engine/fileunix.c diff --git a/jam-files/engine/filevms.c b/jam-files/engine/filevms.c index d2ab2047f..d2ab2047f 100755..100644 --- a/jam-files/engine/filevms.c +++ b/jam-files/engine/filevms.c diff --git a/jam-files/engine/frames.c b/jam-files/engine/frames.c index 84889f09e..84889f09e 100755..100644 --- a/jam-files/engine/frames.c +++ b/jam-files/engine/frames.c diff --git a/jam-files/engine/frames.h b/jam-files/engine/frames.h index 693d77fa0..693d77fa0 100755..100644 --- a/jam-files/engine/frames.h +++ b/jam-files/engine/frames.h diff --git a/jam-files/engine/glob.c b/jam-files/engine/glob.c index 527d6c808..527d6c808 100755..100644 --- a/jam-files/engine/glob.c +++ b/jam-files/engine/glob.c diff --git a/jam-files/engine/hash.c b/jam-files/engine/hash.c index fbd1a8993..fbd1a8993 100755..100644 --- a/jam-files/engine/hash.c +++ b/jam-files/engine/hash.c diff --git a/jam-files/engine/hash.h b/jam-files/engine/hash.h index 7195b4146..7195b4146 100755..100644 --- a/jam-files/engine/hash.h +++ b/jam-files/engine/hash.h diff --git a/jam-files/engine/hcache.c b/jam-files/engine/hcache.c index 70bb798cc..70bb798cc 100755..100644 --- a/jam-files/engine/hcache.c +++ b/jam-files/engine/hcache.c diff --git a/jam-files/engine/hcache.h b/jam-files/engine/hcache.h index c316e3bca..c316e3bca 100755..100644 --- a/jam-files/engine/hcache.h +++ b/jam-files/engine/hcache.h diff --git a/jam-files/engine/hdrmacro.c b/jam-files/engine/hdrmacro.c index 43031d48f..43031d48f 100755..100644 --- a/jam-files/engine/hdrmacro.c +++ b/jam-files/engine/hdrmacro.c diff --git a/jam-files/engine/hdrmacro.h b/jam-files/engine/hdrmacro.h index 08cc11160..08cc11160 100755..100644 --- a/jam-files/engine/hdrmacro.h +++ b/jam-files/engine/hdrmacro.h diff --git a/jam-files/engine/headers.c b/jam-files/engine/headers.c index b9d8f6370..b9d8f6370 100755..100644 --- a/jam-files/engine/headers.c +++ b/jam-files/engine/headers.c diff --git a/jam-files/engine/headers.h b/jam-files/engine/headers.h index 624475fe7..624475fe7 100755..100644 --- a/jam-files/engine/headers.h +++ b/jam-files/engine/headers.h diff --git a/jam-files/engine/jam.c b/jam-files/engine/jam.c index e11d082bc..e11d082bc 100755..100644 --- a/jam-files/engine/jam.c +++ b/jam-files/engine/jam.c diff --git a/jam-files/engine/jam.h b/jam-files/engine/jam.h index 73a7a04c5..73a7a04c5 100755..100644 --- a/jam-files/engine/jam.h +++ b/jam-files/engine/jam.h diff --git a/jam-files/engine/jambase.c b/jam-files/engine/jambase.c index b15282bc3..b15282bc3 100755..100644 --- a/jam-files/engine/jambase.c +++ b/jam-files/engine/jambase.c diff --git a/jam-files/engine/jambase.h b/jam-files/engine/jambase.h index c05ec7922..c05ec7922 100755..100644 --- a/jam-files/engine/jambase.h +++ b/jam-files/engine/jambase.h diff --git a/jam-files/engine/jamgram.c b/jam-files/engine/jamgram.c index b1fa0835d..b1fa0835d 100755..100644 --- a/jam-files/engine/jamgram.c +++ b/jam-files/engine/jamgram.c diff --git a/jam-files/engine/jamgram.h b/jam-files/engine/jamgram.h index 3cb765641..3cb765641 100755..100644 --- a/jam-files/engine/jamgram.h +++ b/jam-files/engine/jamgram.h diff --git a/jam-files/engine/jamgram.y b/jam-files/engine/jamgram.y index c26b1e1b6..c26b1e1b6 100755..100644 --- a/jam-files/engine/jamgram.y +++ b/jam-files/engine/jamgram.y diff --git a/jam-files/engine/jamgram.yy b/jam-files/engine/jamgram.yy index 152434871..152434871 100755..100644 --- a/jam-files/engine/jamgram.yy +++ b/jam-files/engine/jamgram.yy diff --git a/jam-files/engine/jamgramtab.h b/jam-files/engine/jamgramtab.h index a0fd43f6a..a0fd43f6a 100755..100644 --- a/jam-files/engine/jamgramtab.h +++ b/jam-files/engine/jamgramtab.h diff --git a/jam-files/engine/lists.c b/jam-files/engine/lists.c index ebabb63e9..ebabb63e9 100755..100644 --- a/jam-files/engine/lists.c +++ b/jam-files/engine/lists.c diff --git a/jam-files/engine/lists.h b/jam-files/engine/lists.h index 1dc598274..1dc598274 100755..100644 --- a/jam-files/engine/lists.h +++ b/jam-files/engine/lists.h diff --git a/jam-files/engine/make.c b/jam-files/engine/make.c index c871f0be2..c871f0be2 100755..100644 --- a/jam-files/engine/make.c +++ b/jam-files/engine/make.c diff --git a/jam-files/engine/make.h b/jam-files/engine/make.h index b372263e1..b372263e1 100755..100644 --- a/jam-files/engine/make.h +++ b/jam-files/engine/make.h diff --git a/jam-files/engine/make1.c b/jam-files/engine/make1.c index 8001f3339..8001f3339 100755..100644 --- a/jam-files/engine/make1.c +++ b/jam-files/engine/make1.c diff --git a/jam-files/engine/md5.c b/jam-files/engine/md5.c index c35d96c5e..c35d96c5e 100755..100644 --- a/jam-files/engine/md5.c +++ b/jam-files/engine/md5.c diff --git a/jam-files/engine/md5.h b/jam-files/engine/md5.h index 698c995d8..698c995d8 100755..100644 --- a/jam-files/engine/md5.h +++ b/jam-files/engine/md5.h diff --git a/jam-files/engine/mem.c b/jam-files/engine/mem.c index 6a11fb38a..6a11fb38a 100755..100644 --- a/jam-files/engine/mem.c +++ b/jam-files/engine/mem.c diff --git a/jam-files/engine/mem.h b/jam-files/engine/mem.h index 71b2fb4be..71b2fb4be 100755..100644 --- a/jam-files/engine/mem.h +++ b/jam-files/engine/mem.h diff --git a/jam-files/engine/mkjambase.c b/jam-files/engine/mkjambase.c index cdf599820..cdf599820 100755..100644 --- a/jam-files/engine/mkjambase.c +++ b/jam-files/engine/mkjambase.c diff --git a/jam-files/engine/modules.c b/jam-files/engine/modules.c index 729525941..729525941 100755..100644 --- a/jam-files/engine/modules.c +++ b/jam-files/engine/modules.c diff --git a/jam-files/engine/modules.h b/jam-files/engine/modules.h index 60053a239..60053a239 100755..100644 --- a/jam-files/engine/modules.h +++ b/jam-files/engine/modules.h diff --git a/jam-files/engine/modules/order.c b/jam-files/engine/modules/order.c index d77943a79..d77943a79 100755..100644 --- a/jam-files/engine/modules/order.c +++ b/jam-files/engine/modules/order.c diff --git a/jam-files/engine/modules/path.c b/jam-files/engine/modules/path.c index f5d096224..f5d096224 100755..100644 --- a/jam-files/engine/modules/path.c +++ b/jam-files/engine/modules/path.c diff --git a/jam-files/engine/modules/property-set.c b/jam-files/engine/modules/property-set.c index 2b0fb5d97..2b0fb5d97 100755..100644 --- a/jam-files/engine/modules/property-set.c +++ b/jam-files/engine/modules/property-set.c diff --git a/jam-files/engine/modules/readme.txt b/jam-files/engine/modules/readme.txt index 2edf6e17f..2edf6e17f 100755..100644 --- a/jam-files/engine/modules/readme.txt +++ b/jam-files/engine/modules/readme.txt diff --git a/jam-files/engine/modules/regex.c b/jam-files/engine/modules/regex.c index d048ba1de..d048ba1de 100755..100644 --- a/jam-files/engine/modules/regex.c +++ b/jam-files/engine/modules/regex.c diff --git a/jam-files/engine/modules/sequence.c b/jam-files/engine/modules/sequence.c index bda80d94c..bda80d94c 100755..100644 --- a/jam-files/engine/modules/sequence.c +++ b/jam-files/engine/modules/sequence.c diff --git a/jam-files/engine/modules/set.c b/jam-files/engine/modules/set.c index f8219403c..f8219403c 100755..100644 --- a/jam-files/engine/modules/set.c +++ b/jam-files/engine/modules/set.c diff --git a/jam-files/engine/native.c b/jam-files/engine/native.c index 4c2899595..4c2899595 100755..100644 --- a/jam-files/engine/native.c +++ b/jam-files/engine/native.c diff --git a/jam-files/engine/native.h b/jam-files/engine/native.h index 3fc710b9c..3fc710b9c 100755..100644 --- a/jam-files/engine/native.h +++ b/jam-files/engine/native.h diff --git a/jam-files/engine/newstr.c b/jam-files/engine/newstr.c index 6a229eb21..6a229eb21 100755..100644 --- a/jam-files/engine/newstr.c +++ b/jam-files/engine/newstr.c diff --git a/jam-files/engine/newstr.h b/jam-files/engine/newstr.h index 84a4d7b6d..84a4d7b6d 100755..100644 --- a/jam-files/engine/newstr.h +++ b/jam-files/engine/newstr.h diff --git a/jam-files/engine/option.c b/jam-files/engine/option.c index d25e5e8ad..d25e5e8ad 100755..100644 --- a/jam-files/engine/option.c +++ b/jam-files/engine/option.c diff --git a/jam-files/engine/option.h b/jam-files/engine/option.h index 99ef620da..99ef620da 100755..100644 --- a/jam-files/engine/option.h +++ b/jam-files/engine/option.h diff --git a/jam-files/engine/output.c b/jam-files/engine/output.c index 483c6ca9e..483c6ca9e 100755..100644 --- a/jam-files/engine/output.c +++ b/jam-files/engine/output.c diff --git a/jam-files/engine/output.h b/jam-files/engine/output.h index 9e9876cfc..9e9876cfc 100755..100644 --- a/jam-files/engine/output.h +++ b/jam-files/engine/output.h diff --git a/jam-files/engine/parse.c b/jam-files/engine/parse.c index 9114fa057..9114fa057 100755..100644 --- a/jam-files/engine/parse.c +++ b/jam-files/engine/parse.c diff --git a/jam-files/engine/parse.h b/jam-files/engine/parse.h index e324972f7..e324972f7 100755..100644 --- a/jam-files/engine/parse.h +++ b/jam-files/engine/parse.h diff --git a/jam-files/engine/patchlevel.h b/jam-files/engine/patchlevel.h index 699efd84b..699efd84b 100755..100644 --- a/jam-files/engine/patchlevel.h +++ b/jam-files/engine/patchlevel.h diff --git a/jam-files/engine/pathmac.c b/jam-files/engine/pathmac.c index e2c250e33..e2c250e33 100755..100644 --- a/jam-files/engine/pathmac.c +++ b/jam-files/engine/pathmac.c diff --git a/jam-files/engine/pathsys.h b/jam-files/engine/pathsys.h index 737758105..737758105 100755..100644 --- a/jam-files/engine/pathsys.h +++ b/jam-files/engine/pathsys.h diff --git a/jam-files/engine/pathunix.c b/jam-files/engine/pathunix.c index 2daad14b7..2daad14b7 100755..100644 --- a/jam-files/engine/pathunix.c +++ b/jam-files/engine/pathunix.c diff --git a/jam-files/engine/pathvms.c b/jam-files/engine/pathvms.c index 975fe5a57..975fe5a57 100755..100644 --- a/jam-files/engine/pathvms.c +++ b/jam-files/engine/pathvms.c diff --git a/jam-files/engine/pwd.c b/jam-files/engine/pwd.c index 90c8eb175..90c8eb175 100755..100644 --- a/jam-files/engine/pwd.c +++ b/jam-files/engine/pwd.c diff --git a/jam-files/engine/pwd.h b/jam-files/engine/pwd.h index 37cb531e4..37cb531e4 100755..100644 --- a/jam-files/engine/pwd.h +++ b/jam-files/engine/pwd.h diff --git a/jam-files/engine/regexp.c b/jam-files/engine/regexp.c index 30197a2fe..30197a2fe 100755..100644 --- a/jam-files/engine/regexp.c +++ b/jam-files/engine/regexp.c diff --git a/jam-files/engine/regexp.h b/jam-files/engine/regexp.h index 9d4604f60..9d4604f60 100755..100644 --- a/jam-files/engine/regexp.h +++ b/jam-files/engine/regexp.h diff --git a/jam-files/engine/rules.c b/jam-files/engine/rules.c index a0be1d340..a0be1d340 100755..100644 --- a/jam-files/engine/rules.c +++ b/jam-files/engine/rules.c diff --git a/jam-files/engine/rules.h b/jam-files/engine/rules.h index 806a1469c..806a1469c 100755..100644 --- a/jam-files/engine/rules.h +++ b/jam-files/engine/rules.h diff --git a/jam-files/engine/scan.c b/jam-files/engine/scan.c index 11c44c0e2..11c44c0e2 100755..100644 --- a/jam-files/engine/scan.c +++ b/jam-files/engine/scan.c diff --git a/jam-files/engine/scan.h b/jam-files/engine/scan.h index 3fad1c24c..3fad1c24c 100755..100644 --- a/jam-files/engine/scan.h +++ b/jam-files/engine/scan.h diff --git a/jam-files/engine/search.c b/jam-files/engine/search.c index 6c23d97a1..6c23d97a1 100755..100644 --- a/jam-files/engine/search.c +++ b/jam-files/engine/search.c diff --git a/jam-files/engine/search.h b/jam-files/engine/search.h index c364cac03..c364cac03 100755..100644 --- a/jam-files/engine/search.h +++ b/jam-files/engine/search.h diff --git a/jam-files/engine/strings.c b/jam-files/engine/strings.c index 895612377..895612377 100755..100644 --- a/jam-files/engine/strings.c +++ b/jam-files/engine/strings.c diff --git a/jam-files/engine/strings.h b/jam-files/engine/strings.h index 33c77bd7f..33c77bd7f 100755..100644 --- a/jam-files/engine/strings.h +++ b/jam-files/engine/strings.h diff --git a/jam-files/engine/subst.c b/jam-files/engine/subst.c index 75524ecc1..75524ecc1 100755..100644 --- a/jam-files/engine/subst.c +++ b/jam-files/engine/subst.c diff --git a/jam-files/engine/timestamp.c b/jam-files/engine/timestamp.c index 8a59c8c0e..8a59c8c0e 100755..100644 --- a/jam-files/engine/timestamp.c +++ b/jam-files/engine/timestamp.c diff --git a/jam-files/engine/timestamp.h b/jam-files/engine/timestamp.h index f57527639..f57527639 100755..100644 --- a/jam-files/engine/timestamp.h +++ b/jam-files/engine/timestamp.h diff --git a/jam-files/engine/variable.c b/jam-files/engine/variable.c index 795f34584..795f34584 100755..100644 --- a/jam-files/engine/variable.c +++ b/jam-files/engine/variable.c diff --git a/jam-files/engine/variable.h b/jam-files/engine/variable.h index 5c49e3ca5..5c49e3ca5 100755..100644 --- a/jam-files/engine/variable.h +++ b/jam-files/engine/variable.h diff --git a/jam-files/engine/w32_getreg.c b/jam-files/engine/w32_getreg.c index 5a06f43e9..5a06f43e9 100755..100644 --- a/jam-files/engine/w32_getreg.c +++ b/jam-files/engine/w32_getreg.c diff --git a/jam-files/engine/yyacc.c b/jam-files/engine/yyacc.c index b5efc96b5..b5efc96b5 100755..100644 --- a/jam-files/engine/yyacc.c +++ b/jam-files/engine/yyacc.c diff --git a/lm/COPYING b/lm/COPYING index 94a9ed024..94a9ed024 100755..100644 --- a/lm/COPYING +++ b/lm/COPYING diff --git a/lm/COPYING.LESSER b/lm/COPYING.LESSER index cca7fc278..cca7fc278 100755..100644 --- a/lm/COPYING.LESSER +++ b/lm/COPYING.LESSER diff --git a/lm/Jamfile b/lm/Jamfile index 19cbaec4b..19cbaec4b 100755..100644 --- a/lm/Jamfile +++ b/lm/Jamfile diff --git a/lm/LICENSE b/lm/LICENSE index ea98515f4..ea98515f4 100755..100644 --- a/lm/LICENSE +++ b/lm/LICENSE diff --git a/lm/README b/lm/README index d9307ed05..d9307ed05 100755..100644 --- a/lm/README +++ b/lm/README diff --git a/lm/bhiksha.cc b/lm/bhiksha.cc index cdeafb478..cdeafb478 100755..100644 --- a/lm/bhiksha.cc +++ b/lm/bhiksha.cc diff --git a/lm/bhiksha.hh b/lm/bhiksha.hh index 5182ee2e7..5182ee2e7 100755..100644 --- a/lm/bhiksha.hh +++ b/lm/bhiksha.hh diff --git a/lm/binary_format.cc b/lm/binary_format.cc index ab0166a65..ab0166a65 100755..100644 --- a/lm/binary_format.cc +++ b/lm/binary_format.cc diff --git a/lm/binary_format.hh b/lm/binary_format.hh index 71209b2a6..71209b2a6 100755..100644 --- a/lm/binary_format.hh +++ b/lm/binary_format.hh diff --git a/lm/blank.hh b/lm/blank.hh index 4da812096..4da812096 100755..100644 --- a/lm/blank.hh +++ b/lm/blank.hh diff --git a/lm/build_binary.cc b/lm/build_binary.cc index e235cc5a3..e235cc5a3 100755..100644 --- a/lm/build_binary.cc +++ b/lm/build_binary.cc diff --git a/lm/config.cc b/lm/config.cc index 297589a47..297589a47 100755..100644 --- a/lm/config.cc +++ b/lm/config.cc diff --git a/lm/config.hh b/lm/config.hh index 8564661bf..8564661bf 100755..100644 --- a/lm/config.hh +++ b/lm/config.hh diff --git a/lm/enumerate_vocab.hh b/lm/enumerate_vocab.hh index 27263621e..27263621e 100755..100644 --- a/lm/enumerate_vocab.hh +++ b/lm/enumerate_vocab.hh diff --git a/lm/facade.hh b/lm/facade.hh index 8b1860176..8b1860176 100755..100644 --- a/lm/facade.hh +++ b/lm/facade.hh diff --git a/lm/left.hh b/lm/left.hh index 41f71f849..41f71f849 100755..100644 --- a/lm/left.hh +++ b/lm/left.hh diff --git a/lm/left_test.cc b/lm/left_test.cc index c85e5efa8..c85e5efa8 100755..100644 --- a/lm/left_test.cc +++ b/lm/left_test.cc diff --git a/lm/lm.xcodeproj/project.pbxproj b/lm/lm.xcodeproj/project.pbxproj index 14ea5097f..14ea5097f 100755..100644 --- a/lm/lm.xcodeproj/project.pbxproj +++ b/lm/lm.xcodeproj/project.pbxproj diff --git a/lm/lm_exception.cc b/lm/lm_exception.cc index 0b572e984..0b572e984 100755..100644 --- a/lm/lm_exception.cc +++ b/lm/lm_exception.cc diff --git a/lm/lm_exception.hh b/lm/lm_exception.hh index f607ced16..f607ced16 100755..100644 --- a/lm/lm_exception.hh +++ b/lm/lm_exception.hh diff --git a/lm/max_order.hh b/lm/max_order.hh index 71cd23dd2..71cd23dd2 100755..100644 --- a/lm/max_order.hh +++ b/lm/max_order.hh diff --git a/lm/model.cc b/lm/model.cc index 042955efd..042955efd 100755..100644 --- a/lm/model.cc +++ b/lm/model.cc diff --git a/lm/model.hh b/lm/model.hh index 731d60b7e..731d60b7e 100755..100644 --- a/lm/model.hh +++ b/lm/model.hh diff --git a/lm/model_test.cc b/lm/model_test.cc index 461704d43..461704d43 100755..100644 --- a/lm/model_test.cc +++ b/lm/model_test.cc diff --git a/lm/model_type.hh b/lm/model_type.hh index 5057ed251..5057ed251 100755..100644 --- a/lm/model_type.hh +++ b/lm/model_type.hh diff --git a/lm/ngram_query.cc b/lm/ngram_query.cc index 1b2cd5db3..1b2cd5db3 100755..100644 --- a/lm/ngram_query.cc +++ b/lm/ngram_query.cc diff --git a/lm/quantize.cc b/lm/quantize.cc index 8de37e827..8de37e827 100755..100644 --- a/lm/quantize.cc +++ b/lm/quantize.cc diff --git a/lm/quantize.hh b/lm/quantize.hh index 6d130a577..6d130a577 100755..100644 --- a/lm/quantize.hh +++ b/lm/quantize.hh diff --git a/lm/read_arpa.cc b/lm/read_arpa.cc index 05f761be6..05f761be6 100755..100644 --- a/lm/read_arpa.cc +++ b/lm/read_arpa.cc diff --git a/lm/read_arpa.hh b/lm/read_arpa.hh index ab996bde7..ab996bde7 100755..100644 --- a/lm/read_arpa.hh +++ b/lm/read_arpa.hh diff --git a/lm/return.hh b/lm/return.hh index 1b55091b2..1b55091b2 100755..100644 --- a/lm/return.hh +++ b/lm/return.hh diff --git a/lm/search_hashed.cc b/lm/search_hashed.cc index f803b632e..f803b632e 100755..100644 --- a/lm/search_hashed.cc +++ b/lm/search_hashed.cc diff --git a/lm/search_hashed.hh b/lm/search_hashed.hh index 96b03013e..96b03013e 100755..100644 --- a/lm/search_hashed.hh +++ b/lm/search_hashed.hh diff --git a/lm/search_trie.cc b/lm/search_trie.cc index f36d9c53c..f36d9c53c 100755..100644 --- a/lm/search_trie.cc +++ b/lm/search_trie.cc diff --git a/lm/search_trie.hh b/lm/search_trie.hh index caa7a05e2..caa7a05e2 100755..100644 --- a/lm/search_trie.hh +++ b/lm/search_trie.hh diff --git a/lm/test.arpa b/lm/test.arpa index ef214eae3..ef214eae3 100755..100644 --- a/lm/test.arpa +++ b/lm/test.arpa diff --git a/lm/test_nounk.arpa b/lm/test_nounk.arpa index 060733d98..060733d98 100755..100644 --- a/lm/test_nounk.arpa +++ b/lm/test_nounk.arpa diff --git a/lm/trie.cc b/lm/trie.cc index 20075bb83..20075bb83 100755..100644 --- a/lm/trie.cc +++ b/lm/trie.cc diff --git a/lm/trie.hh b/lm/trie.hh index ebe9910f0..ebe9910f0 100755..100644 --- a/lm/trie.hh +++ b/lm/trie.hh diff --git a/lm/trie_sort.cc b/lm/trie_sort.cc index 9d1d5f27f..9d1d5f27f 100755..100644 --- a/lm/trie_sort.cc +++ b/lm/trie_sort.cc diff --git a/lm/trie_sort.hh b/lm/trie_sort.hh index 3036319df..3036319df 100755..100644 --- a/lm/trie_sort.hh +++ b/lm/trie_sort.hh diff --git a/lm/virtual_interface.cc b/lm/virtual_interface.cc index 17a74c3c1..17a74c3c1 100755..100644 --- a/lm/virtual_interface.cc +++ b/lm/virtual_interface.cc diff --git a/lm/virtual_interface.hh b/lm/virtual_interface.hh index 6a5a0196f..6a5a0196f 100755..100644 --- a/lm/virtual_interface.hh +++ b/lm/virtual_interface.hh diff --git a/lm/vocab.cc b/lm/vocab.cc index c10743ceb..c10743ceb 100755..100644 --- a/lm/vocab.cc +++ b/lm/vocab.cc diff --git a/lm/vocab.hh b/lm/vocab.hh index 48db3d627..48db3d627 100755..100644 --- a/lm/vocab.hh +++ b/lm/vocab.hh diff --git a/lm/weights.hh b/lm/weights.hh index 1f38cf5e1..1f38cf5e1 100755..100644 --- a/lm/weights.hh +++ b/lm/weights.hh diff --git a/lm/word_index.hh b/lm/word_index.hh index 67841c30a..67841c30a 100755..100644 --- a/lm/word_index.hh +++ b/lm/word_index.hh diff --git a/mert/BleuScorer.cpp b/mert/BleuScorer.cpp index 4779205ac..4779205ac 100755..100644 --- a/mert/BleuScorer.cpp +++ b/mert/BleuScorer.cpp diff --git a/mert/BleuScorer.h b/mert/BleuScorer.h index abd80478c..abd80478c 100755..100644 --- a/mert/BleuScorer.h +++ b/mert/BleuScorer.h diff --git a/mert/CderScorer.cpp b/mert/CderScorer.cpp index fc8d69f5f..fc8d69f5f 100755..100644 --- a/mert/CderScorer.cpp +++ b/mert/CderScorer.cpp diff --git a/mert/CderScorer.h b/mert/CderScorer.h index 359ac31e9..359ac31e9 100755..100644 --- a/mert/CderScorer.h +++ b/mert/CderScorer.h diff --git a/mert/Data.cpp b/mert/Data.cpp index c23c121ac..c23c121ac 100755..100644 --- a/mert/Data.cpp +++ b/mert/Data.cpp diff --git a/mert/Data.h b/mert/Data.h index f2610c8dd..f2610c8dd 100755..100644 --- a/mert/Data.h +++ b/mert/Data.h diff --git a/mert/FeatureArray.cpp b/mert/FeatureArray.cpp index dbf601bdf..dbf601bdf 100755..100644 --- a/mert/FeatureArray.cpp +++ b/mert/FeatureArray.cpp diff --git a/mert/FeatureArray.h b/mert/FeatureArray.h index f96c6d7d4..f96c6d7d4 100755..100644 --- a/mert/FeatureArray.h +++ b/mert/FeatureArray.h diff --git a/mert/FeatureData.cpp b/mert/FeatureData.cpp index 04c6430ce..04c6430ce 100755..100644 --- a/mert/FeatureData.cpp +++ b/mert/FeatureData.cpp diff --git a/mert/FeatureData.h b/mert/FeatureData.h index 75c532896..75c532896 100755..100644 --- a/mert/FeatureData.h +++ b/mert/FeatureData.h diff --git a/mert/FeatureDataIterator.cpp b/mert/FeatureDataIterator.cpp index c11664817..c11664817 100755..100644 --- a/mert/FeatureDataIterator.cpp +++ b/mert/FeatureDataIterator.cpp diff --git a/mert/FeatureDataIterator.h b/mert/FeatureDataIterator.h index 81f072970..81f072970 100755..100644 --- a/mert/FeatureDataIterator.h +++ b/mert/FeatureDataIterator.h diff --git a/mert/FeatureStats.cpp b/mert/FeatureStats.cpp index a02c4c3d3..a02c4c3d3 100755..100644 --- a/mert/FeatureStats.cpp +++ b/mert/FeatureStats.cpp diff --git a/mert/FeatureStats.h b/mert/FeatureStats.h index 39bffa93e..39bffa93e 100755..100644 --- a/mert/FeatureStats.h +++ b/mert/FeatureStats.h diff --git a/mert/FileStream.cpp b/mert/FileStream.cpp index 11fd58e26..11fd58e26 100755..100644 --- a/mert/FileStream.cpp +++ b/mert/FileStream.cpp diff --git a/mert/FileStream.h b/mert/FileStream.h index afa8d9a29..afa8d9a29 100755..100644 --- a/mert/FileStream.h +++ b/mert/FileStream.h diff --git a/mert/Jamfile b/mert/Jamfile index 924afd57d..924afd57d 100755..100644 --- a/mert/Jamfile +++ b/mert/Jamfile diff --git a/mert/MergeScorer.cpp b/mert/MergeScorer.cpp index 0b9de73f1..0b9de73f1 100755..100644 --- a/mert/MergeScorer.cpp +++ b/mert/MergeScorer.cpp diff --git a/mert/MergeScorer.h b/mert/MergeScorer.h index 10e034ac6..10e034ac6 100755..100644 --- a/mert/MergeScorer.h +++ b/mert/MergeScorer.h diff --git a/mert/Optimizer.cpp b/mert/Optimizer.cpp index 73fabb9ad..73fabb9ad 100755..100644 --- a/mert/Optimizer.cpp +++ b/mert/Optimizer.cpp diff --git a/mert/Optimizer.h b/mert/Optimizer.h index aa588994d..aa588994d 100755..100644 --- a/mert/Optimizer.h +++ b/mert/Optimizer.h diff --git a/mert/PerScorer.cpp b/mert/PerScorer.cpp index 765cb0876..765cb0876 100755..100644 --- a/mert/PerScorer.cpp +++ b/mert/PerScorer.cpp diff --git a/mert/PerScorer.h b/mert/PerScorer.h index 800a3caf1..800a3caf1 100755..100644 --- a/mert/PerScorer.h +++ b/mert/PerScorer.h diff --git a/mert/Point.cpp b/mert/Point.cpp index 322f10f77..322f10f77 100755..100644 --- a/mert/Point.cpp +++ b/mert/Point.cpp diff --git a/mert/Point.h b/mert/Point.h index 55d173215..55d173215 100755..100644 --- a/mert/Point.h +++ b/mert/Point.h diff --git a/mert/ScopedVector.h b/mert/ScopedVector.h index 1fbce88b7..1fbce88b7 100755..100644 --- a/mert/ScopedVector.h +++ b/mert/ScopedVector.h diff --git a/mert/ScoreArray.cpp b/mert/ScoreArray.cpp index b26b93114..b26b93114 100755..100644 --- a/mert/ScoreArray.cpp +++ b/mert/ScoreArray.cpp diff --git a/mert/ScoreArray.h b/mert/ScoreArray.h index 1240a704a..1240a704a 100755..100644 --- a/mert/ScoreArray.h +++ b/mert/ScoreArray.h diff --git a/mert/ScoreData.cpp b/mert/ScoreData.cpp index 914245bf7..914245bf7 100755..100644 --- a/mert/ScoreData.cpp +++ b/mert/ScoreData.cpp diff --git a/mert/ScoreData.h b/mert/ScoreData.h index cb4fb30f9..cb4fb30f9 100755..100644 --- a/mert/ScoreData.h +++ b/mert/ScoreData.h diff --git a/mert/ScoreDataIterator.cpp b/mert/ScoreDataIterator.cpp index 4cac63c54..4cac63c54 100755..100644 --- a/mert/ScoreDataIterator.cpp +++ b/mert/ScoreDataIterator.cpp diff --git a/mert/ScoreDataIterator.h b/mert/ScoreDataIterator.h index 4633b8651..4633b8651 100755..100644 --- a/mert/ScoreDataIterator.h +++ b/mert/ScoreDataIterator.h diff --git a/mert/ScoreStats.cpp b/mert/ScoreStats.cpp index eb1750983..eb1750983 100755..100644 --- a/mert/ScoreStats.cpp +++ b/mert/ScoreStats.cpp diff --git a/mert/ScoreStats.h b/mert/ScoreStats.h index 43a6f1f23..43a6f1f23 100755..100644 --- a/mert/ScoreStats.h +++ b/mert/ScoreStats.h diff --git a/mert/Scorer.cpp b/mert/Scorer.cpp index 0bde898f0..0bde898f0 100755..100644 --- a/mert/Scorer.cpp +++ b/mert/Scorer.cpp diff --git a/mert/Scorer.h b/mert/Scorer.h index c36f2e03a..c36f2e03a 100755..100644 --- a/mert/Scorer.h +++ b/mert/Scorer.h diff --git a/mert/ScorerFactory.cpp b/mert/ScorerFactory.cpp index 2f47092ef..2f47092ef 100755..100644 --- a/mert/ScorerFactory.cpp +++ b/mert/ScorerFactory.cpp diff --git a/mert/ScorerFactory.h b/mert/ScorerFactory.h index f6054c770..f6054c770 100755..100644 --- a/mert/ScorerFactory.h +++ b/mert/ScorerFactory.h diff --git a/mert/TERsrc/alignmentStruct.cpp b/mert/TERsrc/alignmentStruct.cpp index 15b4a8032..15b4a8032 100755..100644 --- a/mert/TERsrc/alignmentStruct.cpp +++ b/mert/TERsrc/alignmentStruct.cpp diff --git a/mert/TERsrc/alignmentStruct.h b/mert/TERsrc/alignmentStruct.h index 27e8c35d3..27e8c35d3 100755..100644 --- a/mert/TERsrc/alignmentStruct.h +++ b/mert/TERsrc/alignmentStruct.h diff --git a/mert/TERsrc/bestShiftStruct.h b/mert/TERsrc/bestShiftStruct.h index 141ebdeb8..141ebdeb8 100755..100644 --- a/mert/TERsrc/bestShiftStruct.h +++ b/mert/TERsrc/bestShiftStruct.h diff --git a/mert/TERsrc/hashMap.cpp b/mert/TERsrc/hashMap.cpp index 469167aaa..469167aaa 100755..100644 --- a/mert/TERsrc/hashMap.cpp +++ b/mert/TERsrc/hashMap.cpp diff --git a/mert/TERsrc/hashMap.h b/mert/TERsrc/hashMap.h index c3e4578e5..c3e4578e5 100755..100644 --- a/mert/TERsrc/hashMap.h +++ b/mert/TERsrc/hashMap.h diff --git a/mert/TERsrc/hashMapInfos.cpp b/mert/TERsrc/hashMapInfos.cpp index 9cd431196..9cd431196 100755..100644 --- a/mert/TERsrc/hashMapInfos.cpp +++ b/mert/TERsrc/hashMapInfos.cpp diff --git a/mert/TERsrc/hashMapInfos.h b/mert/TERsrc/hashMapInfos.h index f4a46acf8..f4a46acf8 100755..100644 --- a/mert/TERsrc/hashMapInfos.h +++ b/mert/TERsrc/hashMapInfos.h diff --git a/mert/TERsrc/hashMapStringInfos.cpp b/mert/TERsrc/hashMapStringInfos.cpp index 0fbb0a98a..0fbb0a98a 100755..100644 --- a/mert/TERsrc/hashMapStringInfos.cpp +++ b/mert/TERsrc/hashMapStringInfos.cpp diff --git a/mert/TERsrc/hashMapStringInfos.h b/mert/TERsrc/hashMapStringInfos.h index 7912be0a2..7912be0a2 100755..100644 --- a/mert/TERsrc/hashMapStringInfos.h +++ b/mert/TERsrc/hashMapStringInfos.h diff --git a/mert/TERsrc/infosHasher.cpp b/mert/TERsrc/infosHasher.cpp index 654b0b26f..654b0b26f 100755..100644 --- a/mert/TERsrc/infosHasher.cpp +++ b/mert/TERsrc/infosHasher.cpp diff --git a/mert/TERsrc/infosHasher.h b/mert/TERsrc/infosHasher.h index 8bc2ccd00..8bc2ccd00 100755..100644 --- a/mert/TERsrc/infosHasher.h +++ b/mert/TERsrc/infosHasher.h diff --git a/mert/TERsrc/stringHasher.cpp b/mert/TERsrc/stringHasher.cpp index 24fde0e32..24fde0e32 100755..100644 --- a/mert/TERsrc/stringHasher.cpp +++ b/mert/TERsrc/stringHasher.cpp diff --git a/mert/TERsrc/stringHasher.h b/mert/TERsrc/stringHasher.h index 0894812f0..0894812f0 100755..100644 --- a/mert/TERsrc/stringHasher.h +++ b/mert/TERsrc/stringHasher.h diff --git a/mert/TERsrc/stringInfosHasher.cpp b/mert/TERsrc/stringInfosHasher.cpp index 3e02e7a20..3e02e7a20 100755..100644 --- a/mert/TERsrc/stringInfosHasher.cpp +++ b/mert/TERsrc/stringInfosHasher.cpp diff --git a/mert/TERsrc/stringInfosHasher.h b/mert/TERsrc/stringInfosHasher.h index e9324cc47..e9324cc47 100755..100644 --- a/mert/TERsrc/stringInfosHasher.h +++ b/mert/TERsrc/stringInfosHasher.h diff --git a/mert/TERsrc/terAlignment.cpp b/mert/TERsrc/terAlignment.cpp index 87be53b11..87be53b11 100755..100644 --- a/mert/TERsrc/terAlignment.cpp +++ b/mert/TERsrc/terAlignment.cpp diff --git a/mert/TERsrc/terAlignment.h b/mert/TERsrc/terAlignment.h index bca00ead3..bca00ead3 100755..100644 --- a/mert/TERsrc/terAlignment.h +++ b/mert/TERsrc/terAlignment.h diff --git a/mert/TERsrc/terShift.cpp b/mert/TERsrc/terShift.cpp index 428803849..428803849 100755..100644 --- a/mert/TERsrc/terShift.cpp +++ b/mert/TERsrc/terShift.cpp diff --git a/mert/TERsrc/terShift.h b/mert/TERsrc/terShift.h index a54ba633d..a54ba633d 100755..100644 --- a/mert/TERsrc/terShift.h +++ b/mert/TERsrc/terShift.h diff --git a/mert/TERsrc/tercalc.cpp b/mert/TERsrc/tercalc.cpp index e16f692e8..e16f692e8 100755..100644 --- a/mert/TERsrc/tercalc.cpp +++ b/mert/TERsrc/tercalc.cpp diff --git a/mert/TERsrc/tercalc.h b/mert/TERsrc/tercalc.h index cf205ccbb..cf205ccbb 100755..100644 --- a/mert/TERsrc/tercalc.h +++ b/mert/TERsrc/tercalc.h diff --git a/mert/TERsrc/tools.cpp b/mert/TERsrc/tools.cpp index 2d910ec05..2d910ec05 100755..100644 --- a/mert/TERsrc/tools.cpp +++ b/mert/TERsrc/tools.cpp diff --git a/mert/TERsrc/tools.h b/mert/TERsrc/tools.h index df681a2b2..df681a2b2 100755..100644 --- a/mert/TERsrc/tools.h +++ b/mert/TERsrc/tools.h diff --git a/mert/TODO b/mert/TODO index 2559e78b5..2559e78b5 100755..100644 --- a/mert/TODO +++ b/mert/TODO diff --git a/mert/TerScorer.cpp b/mert/TerScorer.cpp index 3f4ca65e8..3f4ca65e8 100755..100644 --- a/mert/TerScorer.cpp +++ b/mert/TerScorer.cpp diff --git a/mert/TerScorer.h b/mert/TerScorer.h index 0e9996a99..0e9996a99 100755..100644 --- a/mert/TerScorer.h +++ b/mert/TerScorer.h diff --git a/mert/Timer.cpp b/mert/Timer.cpp index 373eb4a2e..373eb4a2e 100755..100644 --- a/mert/Timer.cpp +++ b/mert/Timer.cpp diff --git a/mert/Timer.h b/mert/Timer.h index 403547620..403547620 100755..100644 --- a/mert/Timer.h +++ b/mert/Timer.h diff --git a/mert/Types.h b/mert/Types.h index 1d0fd0dd0..1d0fd0dd0 100755..100644 --- a/mert/Types.h +++ b/mert/Types.h diff --git a/mert/Util.cpp b/mert/Util.cpp index 3769c71e7..3769c71e7 100755..100644 --- a/mert/Util.cpp +++ b/mert/Util.cpp diff --git a/mert/Util.h b/mert/Util.h index da68685c3..da68685c3 100755..100644 --- a/mert/Util.h +++ b/mert/Util.h diff --git a/mert/evaluator.cpp b/mert/evaluator.cpp index c1d6039da..c1d6039da 100755..100644 --- a/mert/evaluator.cpp +++ b/mert/evaluator.cpp diff --git a/mert/example/NBEST b/mert/example/NBEST index 65b895772..65b895772 100755..100644 --- a/mert/example/NBEST +++ b/mert/example/NBEST diff --git a/mert/example/README b/mert/example/README index 7ece55a53..7ece55a53 100755..100644 --- a/mert/example/README +++ b/mert/example/README diff --git a/mert/example/README.oldmert b/mert/example/README.oldmert index c5ee329d9..c5ee329d9 100755..100644 --- a/mert/example/README.oldmert +++ b/mert/example/README.oldmert diff --git a/mert/example/REF b/mert/example/REF index e6b2e4f58..e6b2e4f58 100755..100644 --- a/mert/example/REF +++ b/mert/example/REF diff --git a/mert/example/REF.0 b/mert/example/REF.0 index b2d4caf39..b2d4caf39 100755..100644 --- a/mert/example/REF.0 +++ b/mert/example/REF.0 diff --git a/mert/example/REF.1 b/mert/example/REF.1 index e4f2c144a..e4f2c144a 100755..100644 --- a/mert/example/REF.1 +++ b/mert/example/REF.1 diff --git a/mert/example/REF.2 b/mert/example/REF.2 index c18a9b9b7..c18a9b9b7 100755..100644 --- a/mert/example/REF.2 +++ b/mert/example/REF.2 diff --git a/mert/example/init.opt b/mert/example/init.opt index 3fd30cb88..3fd30cb88 100755..100644 --- a/mert/example/init.opt +++ b/mert/example/init.opt diff --git a/mert/extractor.cpp b/mert/extractor.cpp index 990943ba5..990943ba5 100755..100644 --- a/mert/extractor.cpp +++ b/mert/extractor.cpp diff --git a/mert/gzfilebuf.h b/mert/gzfilebuf.h index f9cd8a446..f9cd8a446 100755..100644 --- a/mert/gzfilebuf.h +++ b/mert/gzfilebuf.h diff --git a/mert/init.opt b/mert/init.opt index 32ab00796..32ab00796 100755..100644 --- a/mert/init.opt +++ b/mert/init.opt diff --git a/mert/mert.cpp b/mert/mert.cpp index 30ee2f721..30ee2f721 100755..100644 --- a/mert/mert.cpp +++ b/mert/mert.cpp diff --git a/mert/pro.cpp b/mert/pro.cpp index 9b6812704..9b6812704 100755..100644 --- a/mert/pro.cpp +++ b/mert/pro.cpp diff --git a/mert/test_scorer.cpp b/mert/test_scorer.cpp index c1d52fcbe..c1d52fcbe 100755..100644 --- a/mert/test_scorer.cpp +++ b/mert/test_scorer.cpp diff --git a/mert/test_scorer_data/nbest.out b/mert/test_scorer_data/nbest.out index 36d6cad29..36d6cad29 100755..100644 --- a/mert/test_scorer_data/nbest.out +++ b/mert/test_scorer_data/nbest.out diff --git a/mert/test_scorer_data/reference.txt b/mert/test_scorer_data/reference.txt index e601b43bb..e601b43bb 100755..100644 --- a/mert/test_scorer_data/reference.txt +++ b/mert/test_scorer_data/reference.txt diff --git a/mira/Decoder.cpp b/mira/Decoder.cpp index ad71c9308..05459d30f 100755..100644 --- a/mira/Decoder.cpp +++ b/mira/Decoder.cpp @@ -176,7 +176,8 @@ namespace Mira { cerr << endl; cerr << "Rank " << rank << ", epoch " << epoch << ", \"" << path.GetTargetPhrase() << "\", score: " << scoreWithoutBleu << ", Bleu: " << bleuScore << ", total: " << path.GetTotalScore(); - cerr << " (d-bleu: " << dynBleuScore << ", r-bleu: " << realBleuScore << ") "; + if (m_bleuScoreFeature->Enabled() && realBleu) + cerr << " (d-bleu: " << dynBleuScore << ", r-bleu: " << realBleuScore << ") "; // set bleu score to zero in the feature vector since we do not want to optimise its weight setBleuScore(featureValues.back(), 0); @@ -239,7 +240,8 @@ namespace Mira { cerr << endl; cerr << "Rank " << rank << ", epoch " << epoch << ", \"" << path.GetOutputPhrase() << "\", score: " << scoreWithoutBleu << ", Bleu: " << bleuScore << ", total: " << path.GetTotalScore(); - cerr << " (d-bleu: " << dynBleuScore << ", r-bleu: " << realBleuScore << ") "; + if (m_bleuScoreFeature->Enabled() && realBleu) + cerr << " (d-bleu: " << dynBleuScore << ", r-bleu: " << realBleuScore << ") "; // set bleu score to zero in the feature vector since we do not want to optimise its weight setBleuScore(featureValues.back(), 0); diff --git a/mira/Decoder.h b/mira/Decoder.h index 859f97094..859f97094 100755..100644 --- a/mira/Decoder.h +++ b/mira/Decoder.h diff --git a/mira/Hildreth.cpp b/mira/Hildreth.cpp index 53d1e0881..53d1e0881 100755..100644 --- a/mira/Hildreth.cpp +++ b/mira/Hildreth.cpp diff --git a/mira/Hildreth.h b/mira/Hildreth.h index 699115242..699115242 100755..100644 --- a/mira/Hildreth.h +++ b/mira/Hildreth.h diff --git a/mira/HildrethTest.cpp b/mira/HildrethTest.cpp index a32dcd1d3..a32dcd1d3 100755..100644 --- a/mira/HildrethTest.cpp +++ b/mira/HildrethTest.cpp diff --git a/mira/HypothesisQueue.cpp b/mira/HypothesisQueue.cpp new file mode 100644 index 000000000..67a42dfdd --- /dev/null +++ b/mira/HypothesisQueue.cpp @@ -0,0 +1,57 @@ +/*********************************************************************** + Moses - statistical machine translation system + Copyright (C) 2006-2011 University of Edinburgh + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +***********************************************************************/ + +#include <iostream> +#include "HypothesisQueue.h" + +using namespace std; + +namespace Moses { + +HypothesisQueue::~HypothesisQueue() { + m_queue.clear(); +} + +void HypothesisQueue::Push(BleuIndexPair hypo) { + pair<set<BleuIndexPair>::iterator,bool> ret; + + if (m_capacity == 0 || m_queue.size() < m_capacity) { + ret = m_queue.insert(hypo); + } else if (hypo.first > (*(m_queue.rbegin())).first) { + // Remove the worst-scoring item from the queue and insert hypo (only erase item if new item was successfully added ) + ret = m_queue.insert(hypo); + if ((*(ret.first)).second == 1) { + HypoQueueType::iterator p = m_queue.end(); + --p; + m_queue.erase(p); + } + } else { + // The hypo is unusable: the queue is full and hypo has a worse (or + // equal) score than the worst-scoring item already held. + } +} + +BleuIndexPair HypothesisQueue::Pop() { + HypoQueueType::iterator p = m_queue.begin(); + BleuIndexPair top = *p; + m_queue.erase(p); + return top; +} + +} // namespace Moses diff --git a/mira/HypothesisQueue.h b/mira/HypothesisQueue.h new file mode 100644 index 000000000..89500eaa0 --- /dev/null +++ b/mira/HypothesisQueue.h @@ -0,0 +1,65 @@ +/*********************************************************************** + Moses - statistical machine translation system + Copyright (C) 2006-2011 University of Edinburgh + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA +***********************************************************************/ + +#pragma once + +#include <set> + +namespace Moses { + +// pair of Bleu score and index +typedef std::pair<float, size_t> BleuIndexPair; + +// A bounded priority queue of BleuIndexPairs. The top item is +// the best scoring hypothesis. The queue assumes ownership of pushed items and +// relinquishes ownership when they are popped. Any remaining items at the +// time of the queue's destruction are deleted. +class HypothesisQueue { + + public: + // Create empty queue with fixed capacity of c. Capacity 0 means unbounded. + HypothesisQueue(size_t c) : m_capacity(c) {} + ~HypothesisQueue(); + + bool Empty() { return m_queue.empty(); } + + // Add the hypo to the queue or delete it if the queue is full and the + // score is no better than the queue's worst score. + void Push(BleuIndexPair hypo); + + // Remove the best-scoring detour from the queue and return it. The + // caller is responsible for deleting the object. + BleuIndexPair Pop(); + + private: + struct HypothesisOrderer { + bool operator()(BleuIndexPair a, + BleuIndexPair b) { + return (a.first > b.first); + } + }; + + //typedef std::multiset<BleuIndexPair, HypothesisOrderer> HypoQueueType; + typedef std::set<BleuIndexPair, HypothesisOrderer> HypoQueueType; + + HypoQueueType m_queue; + const size_t m_capacity; +}; + +} // namespace Moses diff --git a/mira/Jamfile b/mira/Jamfile index cede96233..cede96233 100755..100644 --- a/mira/Jamfile +++ b/mira/Jamfile diff --git a/mira/Main.cpp b/mira/Main.cpp index 402ffff3f..b5586fe29 100755..100644 --- a/mira/Main.cpp +++ b/mira/Main.cpp @@ -44,6 +44,7 @@ namespace mpi = boost::mpi; #include "DummyScoreProducers.h" #include "LexicalReordering.h" #include "BleuScorer.h" +#include "HypothesisQueue.h" using namespace Mira; using namespace std; @@ -66,7 +67,7 @@ int main(int argc, char** argv) { string inputFile; vector<string> referenceFiles; vector<string> mosesConfigFilesFolds, inputFilesFolds, referenceFilesFolds; - string coreWeightFile, startWeightFile; + // string coreWeightFile, startWeightFile; size_t epochs; string learner; bool shuffle; @@ -116,7 +117,6 @@ int main(int argc, char** argv) { float scale_lm_factor, scale_wp_factor; bool sample; string moses_src; - bool external_score = false; float sigmoidParam; float bleuWeight, bleuWeight_hope, bleuWeight_fear; bool bleu_weight_lm, bleu_weight_lm_adjust; @@ -126,25 +126,44 @@ int main(int argc, char** argv) { bool l1_regularize, l2_regularize; float l1_lambda, l2_lambda; bool most_violated, all_violated, max_bleu_diff, one_against_all; - bool feature_confidence, signed_counts, averageConfidenceCounts; - float decay, core_r0, sparse_r0; + bool feature_confidence, signed_counts; + float decay_core, decay_sparse, core_r0, sparse_r0; + bool selective, summed, add2hope, skip_hope, skip_model, skip_fear; + float bleu_weight_fear_factor, scaling_constant; + bool hildreth; + float add2lm; bool realBleu, disableBleuFeature; + bool rescaleSlack, rewardHope; + bool makePairs; po::options_description desc("Allowed options"); desc.add_options() + ("make-pairs", po::value<bool>(&makePairs)->default_value(true), "Make pairs of hypotheses for 1slack") + ("reward-hope", po::value<bool>(&rewardHope)->default_value(false), "Reward hope features over fear features") + ("rescale-slack", po::value<bool>(&rescaleSlack)->default_value(false), "Rescale slack in 1-slack formulation") ("disable-bleu-feature", po::value<bool>(&disableBleuFeature)->default_value(false), "Disable the Bleu feature") - ("real-bleu", po::value<bool>(&realBleu)->default_value(false), "Compute real sentence Bleu on complete translations") + ("real-bleu", po::value<bool>(&realBleu)->default_value(false), "Compute real sentence Bleu on complete translations") + ("add2lm", po::value<float>(&add2lm)->default_value(0.0), "Add the specified amount to all LM weights") + ("hildreth", po::value<bool>(&hildreth)->default_value(false), "Prefer Hildreth over analytical update") + ("skip-hope", po::value<bool>(&skip_hope)->default_value(false), "Sample without hope translations") + ("skip-model", po::value<bool>(&skip_model)->default_value(false), "Sample without model translations") + ("skip-fear", po::value<bool>(&skip_fear)->default_value(false), "Sample without fear translations") + ("add2hope", po::value<bool>(&add2hope)->default_value(false), "Add 2 hope translations instead of 1") + ("scaling-constant", po::value<float>(&scaling_constant)->default_value(1.0), "Scale all core values by a constant at beginning of training") + ("selective", po::value<bool>(&selective)->default_value(false), "Build constraints for every feature") + ("summed", po::value<bool>(&summed)->default_value(false), "Sum up all constraints") + ("bleu-weight", po::value<float>(&bleuWeight)->default_value(1.0), "Bleu weight used in decoder objective") ("bw-hope", po::value<float>(&bleuWeight_hope)->default_value(-1.0), "Bleu weight used in decoder objective for hope") ("bw-fear", po::value<float>(&bleuWeight_fear)->default_value(-1.0), "Bleu weight used in decoder objective for fear") ("core-r0", po::value<float>(&core_r0)->default_value(1.0), "Start learning rate for core features") ("sparse-r0", po::value<float>(&sparse_r0)->default_value(1.0), "Start learning rate for sparse features") - ("avg-conf-counts", po::value<bool>(&averageConfidenceCounts)->default_value(true), "Divide confidence counts by number of processors") ("tie-bw-to-lm", po::value<bool>(&bleu_weight_lm)->default_value(false), "Make bleu weight depend on lm weight") ("adjust-bw", po::value<bool>(&bleu_weight_lm_adjust)->default_value(false), "Adjust bleu weight when lm weight changes") ("bw-lm-factor", po::value<float>(&bleu_weight_lm_factor)->default_value(2.0), "Make bleu weight depend on lm weight by this factor") - + ("bw-factor-fear", po::value<float>(&bleu_weight_fear_factor)->default_value(1.0), "Multiply fear weight by this factor") + ("scale-all", po::value<bool>(&scale_all)->default_value(false), "Scale all core features") ("scaling-factor", po::value<float>(&scale_all_factor)->default_value(2), "Scaling factor for all core features") @@ -158,8 +177,9 @@ int main(int argc, char** argv) { ("clear-static", po::value<bool>(&clear_static)->default_value(false), "Clear static data before every translation") ("config,f", po::value<string>(&mosesConfigFile), "Moses ini-file") ("configs-folds", po::value<vector<string> >(&mosesConfigFilesFolds), "Moses ini-files, one for each fold") - ("core-weights", po::value<string>(&coreWeightFile)->default_value(""), "Weight file containing the core weights (already tuned, have to be non-zero)") - ("decay", po::value<float>(&decay)->default_value(0.01), "Decay factor for updating feature learning rates") + //("core-weights", po::value<string>(&coreWeightFile)->default_value(""), "Weight file containing the core weights (already tuned, have to be non-zero)") + ("decay-core", po::value<float>(&decay_core)->default_value(0.001), "Decay factor for updating core feature learning rates") + ("decay-sparse", po::value<float>(&decay_sparse)->default_value(0.001), "Decay factor for updating sparse feature learning rates") ("debug-model", po::value<bool>(&debug_model)->default_value(false), "Get best model translation for debugging purposes") ("decode-hope", po::value<bool>(&decode_hope)->default_value(false), "Decode dev input set according to hope objective") ("decode-fear", po::value<bool>(&decode_fear)->default_value(false), "Decode dev input set according to fear objective") @@ -171,18 +191,18 @@ int main(int argc, char** argv) { ("epochs,e", po::value<size_t>(&epochs)->default_value(10), "Number of epochs") ("feature-confidence", po::value<bool>(&feature_confidence)->default_value(false), "Use feature weight confidence in weight updates") ("feature-cutoff", po::value<int>(&featureCutoff)->default_value(-1), "Feature cutoff as additional regularization for sparse features") - ("fear-n", po::value<int>(&fear_n)->default_value(-1), "Number of fear translations used") + ("fear-n", po::value<int>(&fear_n)->default_value(1), "Number of fear translations used") ("help", po::value(&help)->zero_tokens()->default_value(false), "Print this help message and exit") ("history-bleu", po::value<bool>(&historyBleu)->default_value(false), "Use 1best translations to update the history") ("history-smoothing", po::value<float>(&historySmoothing)->default_value(0.9), "Adjust the factor for history smoothing") ("hope-fear", po::value<bool>(&hope_fear)->default_value(true), "Use only hope and fear translations for optimisation (not model)") ("hope-model", po::value<bool>(&hope_model)->default_value(false), "Use only hope and model translations for optimisation (use --fear-n to set number of model translations)") - ("hope-n", po::value<int>(&hope_n)->default_value(-1), "Number of hope translations used") + ("hope-n", po::value<int>(&hope_n)->default_value(2), "Number of hope translations used") ("input-file,i", po::value<string>(&inputFile), "Input file containing tokenised source") ("input-files-folds", po::value<vector<string> >(&inputFilesFolds), "Input files containing tokenised source, one for each fold") ("learner,l", po::value<string>(&learner)->default_value("mira"), "Learning algorithm") - ("l1-lambda", po::value<float>(&l1_lambda)->default_value(0.001), "Lambda for l1-regularization (w_i +/- lambda)") - ("l2-lambda", po::value<float>(&l2_lambda)->default_value(0.1), "Lambda for l2-regularization (w_i * (1 - lambda))") + ("l1-lambda", po::value<float>(&l1_lambda)->default_value(0.0001), "Lambda for l1-regularization (w_i +/- lambda)") + ("l2-lambda", po::value<float>(&l2_lambda)->default_value(0.01), "Lambda for l2-regularization (w_i * (1 - lambda))") ("l1-reg", po::value<bool>(&l1_regularize)->default_value(false), "L1-regularization") ("l2-reg", po::value<bool>(&l2_regularize)->default_value(false), "L2-regularization") ("min-bleu-ratio", po::value<float>(&minBleuRatio)->default_value(-1), "Set a minimum BLEU ratio between hope and fear") @@ -233,7 +253,7 @@ int main(int argc, char** argv) { ("slack", po::value<float>(&slack)->default_value(0.01), "Use slack in optimiser") ("sparse-average", po::value<bool>(&sparseAverage)->default_value(false), "Average weights by the number of processes") ("sparse-no-average", po::value<bool>(&sparseNoAverage)->default_value(false), "Don't average sparse weights, just sum") - ("start-weights", po::value<string>(&startWeightFile)->default_value(""), "Weight file containing start weights") + //("start-weights", po::value<string>(&startWeightFile)->default_value(""), "Weight file containing start weights") ("stop-weights", po::value<bool>(&weightConvergence)->default_value(true), "Stop when weights converge") ("verbosity,v", po::value<int>(&verbosity)->default_value(0), "Verbosity level") ("weight-dump-frequency", po::value<size_t>(&weightDumpFrequency)->default_value(1), "How often per epoch to dump weights (mpi)") @@ -251,6 +271,10 @@ int main(int argc, char** argv) { std::cout << desc << std::endl; return 0; } + + cerr << "l1-reg: " << l1_regularize << endl; + cerr << "featureCutoff: " << featureCutoff << endl; + cerr << "featureConfidence: " << feature_confidence << endl; const StaticData &staticData = StaticData::Instance(); @@ -261,6 +285,7 @@ int main(int argc, char** argv) { trainWithMultipleFolds = true; } + cerr << "test 1" << endl; if (dumpMixedWeights && (mixingFrequency != weightDumpFrequency)) { cerr << "Set mixing frequency = weight dump frequency for dumping mixed weights!" << endl; exit(1); @@ -271,6 +296,7 @@ int main(int argc, char** argv) { exit(1); } + cerr << "test 2" << endl; if (trainWithMultipleFolds) { if (!mosesConfigFilesFolds.size()) { cerr << "Error: No moses ini files specified for training with folds" << endl; @@ -305,6 +331,7 @@ int main(int argc, char** argv) { } // load input and references + cerr << "test 3" << endl; vector<string> inputSentences; size_t inputSize = trainWithMultipleFolds? inputFilesFolds.size(): 0; size_t refSize = trainWithMultipleFolds? referenceFilesFolds.size(): referenceFiles.size(); @@ -382,6 +409,7 @@ int main(int argc, char** argv) { // add initial Bleu weight and references to initialize Bleu feature boost::trim(decoder_settings); decoder_settings += " -mira -distinct-nbest -weight-bl 1 -references"; + cerr << "test 4" << endl; if (trainWithMultipleFolds) { decoder_settings += " "; decoder_settings += referenceFilesFolds[myFold]; @@ -393,17 +421,22 @@ int main(int argc, char** argv) { } } + cerr << "test 5" << endl; vector<string> decoder_params; boost::split(decoder_params, decoder_settings, boost::is_any_of("\t ")); string configFile = trainWithMultipleFolds? mosesConfigFilesFolds[myFold] : mosesConfigFile; VERBOSE(1, "Rank " << rank << " reading config file from " << configFile << endl); + cerr << "test 6" << endl; MosesDecoder* decoder = new MosesDecoder(configFile, verbosity, decoder_params.size(), decoder_params); + cerr << "test 7" << endl; decoder->setBleuParameters(disableBleuFeature, sentenceBleu, scaleByInputLength, scaleByAvgInputLength, scaleByInverseLength, scaleByAvgInverseLength, scaleByX, historySmoothing, bleu_smoothing_scheme); + cerr << "test 8" << endl; SearchAlgorithm searchAlgorithm = staticData.GetSearchAlgorithm(); bool chartDecoding = (searchAlgorithm == ChartDecoding); + cerr << "test 9" << endl; // Optionally shuffle the sentences vector<size_t> order; @@ -426,6 +459,7 @@ int main(int argc, char** argv) { if (rank == 0) { cerr << "Optimising using Mira" << endl; cerr << "slack: " << slack << ", learning rate: " << mira_learning_rate << endl; + cerr << "selective: " << selective << endl; if (normaliseMargin) cerr << "sigmoid parameter: " << sigmoidParam << endl; } @@ -459,19 +493,19 @@ int main(int argc, char** argv) { } if (hope_n == -1) - hope_n = n; + hope_n = n; if (fear_n == -1) - fear_n = n; + fear_n = n; if (rank_n == -1) - rank_n = n; + rank_n = n; if (sample) - model_hope_fear = true; + model_hope_fear = true; if (model_hope_fear || hope_model || rank_only || megam) - hope_fear = false; // is true by default + hope_fear = false; // is true by default if (learner == "mira" && !(hope_fear || hope_model || model_hope_fear || rank_only || megam)) { - cerr << "Error: Need to select one of parameters --hope-fear/--model-hope-fear for mira update." << endl; - return 1; + cerr << "Error: Need to select one of parameters --hope-fear/--model-hope-fear for mira update." << endl; + return 1; } #ifdef MPI_ENABLE @@ -516,10 +550,10 @@ int main(int argc, char** argv) { staticData.GetTranslationSystem(TranslationSystem::DEFAULT).GetFeatureFunctions(); //const vector<FactorType> &inputFactorOrder = staticData.GetInputFactorOrder(); - ProducerWeightMap coreWeightMap, startWeightMap; + //ProducerWeightMap coreWeightMap, startWeightMap; ScoreComponentCollection initialWeights = decoder->getWeights(); // read start weight file - if (!startWeightFile.empty()) { + /*if (!startWeightFile.empty()) { if (!loadCoreWeights(startWeightFile, startWeightMap, featureFunctions)) { cerr << "Error: Failed to load start weights from " << startWeightFile << endl; return 1; @@ -550,13 +584,27 @@ int main(int argc, char** argv) { for(p = coreWeightMap.begin(); p!=coreWeightMap.end(); ++p) initialWeights.Assign(p->first, p->second); } - } + }*/ cerr << "Rank " << rank << ", initial weights: " << initialWeights << endl; + if (scaling_constant != 1.0) { + initialWeights.MultiplyEquals(scaling_constant); + cerr << "Rank " << rank << ", scaled initial weights: " << initialWeights << endl; + } + + if (add2lm != 0) { + const LMList& lmList_new = staticData.GetLMList(); + for (LMList::const_iterator i = lmList_new.begin(); i != lmList_new.end(); ++i) { + float lmWeight = initialWeights.GetScoreForProducer(*i) + add2lm; + initialWeights.Assign(*i, lmWeight); + cerr << "Rank " << rank << ", add " << add2lm << " to lm weight." << endl; + } + } if (normaliseWeights) { initialWeights.L1Normalise(); cerr << "Rank " << rank << ", normalised initial weights: " << initialWeights << endl; } + decoder->setWeights(initialWeights); if (scale_all) { @@ -583,7 +631,9 @@ int main(int argc, char** argv) { if (bleuWeight_fear == -1) { bleuWeight_fear = bleuWeight; } + bleuWeight_fear *= bleu_weight_fear_factor; cerr << "Bleu weight: " << bleuWeight << endl; + cerr << "Bleu weight fear: " << bleuWeight_fear << endl; if (decode_hope || decode_fear || decode_model) { size_t decode = 1; @@ -614,15 +664,15 @@ int main(int argc, char** argv) { ScoreComponentCollection mixedAverageWeightsBeforePrevious; // log feature counts and/or hope/fear translations with features - string f1 = "decode_hope_epoch0"; + /*string f1 = "decode_hope_epoch0"; string f2 = "decode_fear_epoch0"; - ofstream hopePlusFeatures(f1.c_str()); - ofstream fearPlusFeatures(f2.c_str()); - if (!hopePlusFeatures || !fearPlusFeatures) { - ostringstream msg; - msg << "Unable to open file"; - throw runtime_error(msg.str()); - } + ofstream hopePlusFeatures(f1.c_str()); + ofstream fearPlusFeatures(f2.c_str()); + if (!hopePlusFeatures || !fearPlusFeatures) { + ostringstream msg; + msg << "Unable to open file"; + throw runtime_error(msg.str()); + }*/ bool stop = false; // int sumStillViolatedConstraints; @@ -630,7 +680,7 @@ int main(int argc, char** argv) { // variables for feature confidence ScoreComponentCollection confidenceCounts, mixedConfidenceCounts, featureLearningRates; - featureLearningRates.UpdateLearningRates(decay, confidenceCounts, core_r0, sparse_r0); //initialise core learning rates + featureLearningRates.UpdateLearningRates(decay_core, decay_sparse, confidenceCounts, core_r0, sparse_r0); //initialise core learning rates cerr << "Initial learning rates, core: " << core_r0 << ", sparse: " << sparse_r0 << endl; for (size_t epoch = 0; epoch < epochs && !stop; ++epoch) { @@ -851,6 +901,7 @@ int main(int argc, char** argv) { } // select inference scheme + cerr << "Rank " << rank << ", epoch " << epoch << ", real Bleu? " << realBleu << endl; if (hope_fear || perceptron_update) { if (clear_static) { delete decoder; @@ -876,11 +927,11 @@ int main(int argc, char** argv) { // count sparse features occurring in hope translation featureValuesHope[batchPosition][0].IncrementSparseHopeFeatures(); - if (epoch == 0 && printNbestWithFeatures) { + /*if (epoch == 0 && printNbestWithFeatures) { decoder->outputNBestList(input, *sid, hope_n, 1, bleuWeight_hope, distinctNbest, avgRefLength, "", hopePlusFeatures); decoder->cleanup(chartDecoding); - } + }*/ float precision = bleuScoresHope[batchPosition][0]; @@ -950,11 +1001,11 @@ int main(int argc, char** argv) { // count sparse features occurring in fear translation featureValuesFear[batchPosition][0].IncrementSparseFearFeatures(); - if (epoch == 0 && printNbestWithFeatures) { - decoder->outputNBestList(input, *sid, fear_n, -1, bleuWeight_fear, distinctNbest, - avgRefLength, "", fearPlusFeatures); - decoder->cleanup(chartDecoding); - } + /*if (epoch == 0 && printNbestWithFeatures) { + decoder->outputNBestList(input, *sid, fear_n, -1, bleuWeight_fear, distinctNbest, + avgRefLength, "", fearPlusFeatures); + decoder->cleanup(chartDecoding); + }*/ // Bleu-related example selection bool skip = false; @@ -1068,330 +1119,191 @@ int main(int argc, char** argv) { examples_in_batch++; } - if (model_hope_fear) { - ostringstream hope_nbest_filename, fear_nbest_filename, model_nbest_filename, ref_filename; - if (sample && external_score) { - hope_nbest_filename << "decode_hope_rank" << rank << "." << hope_n << "best"; - fear_nbest_filename << "decode_fear_rank" << rank << "." << fear_n << "best"; - model_nbest_filename << "decode_model_rank" << rank << "." << n << "best"; - - // save reference - ref_filename << "decode_ref_rank" << rank; - referenceFileMegam = ref_filename.str(); - ofstream ref_out(referenceFileMegam.c_str()); - if (!ref_out) { - ostringstream msg; - msg << "Unable to open " << referenceFileMegam; - throw runtime_error(msg.str()); - } - ref_out << referenceSentences[decoder->getShortestReferenceIndex(*sid)][*sid] << "\n"; - ref_out.close(); - } - - // HOPE - if (clear_static) { - delete decoder; - StaticData::ClearDataStatic(); - decoder = new MosesDecoder(configFile, verbosity, decoder_params.size(), decoder_params); - decoder->setBleuParameters(disableBleuFeature, sentenceBleu, scaleByInputLength, scaleByAvgInputLength, scaleByInverseLength, scaleByAvgInverseLength, scaleByX, historySmoothing, bleu_smoothing_scheme); - decoder->setWeights(mosesWeights); - } + if (model_hope_fear) { + // HOPE + if (!skip_hope) { + cerr << "Rank " << rank << ", epoch " << epoch << ", " << n << "best hope translations" << endl; + size_t oraclePos = featureValues[batchPosition].size(); + decoder->getNBest(input, *sid, n, 1.0, bleuWeight_hope, + featureValues[batchPosition], bleuScores[batchPosition], modelScores[batchPosition], + 0, realBleu, distinctNbest, avgRefLength, rank, epoch, ""); + //vector<const Word*> oracle = outputHope[0]; + // needed for history + inputLengths.push_back(current_input_length); + ref_ids.push_back(*sid); + decoder->cleanup(chartDecoding); + //ref_length = decoder->getClosestReferenceLength(*sid, oracle.size()); + //float hope_length_ratio = (float)oracle.size()/ref_length; + cerr << endl; + + oracleFeatureValues.push_back(featureValues[batchPosition][oraclePos]); + oracleBleuScores.push_back(bleuScores[batchPosition][oraclePos]); + oracleModelScores.push_back(modelScores[batchPosition][oraclePos]); + } - cerr << "Rank " << rank << ", epoch " << epoch << ", " << n << "best hope translations" << endl; - size_t oraclePos = featureValues[batchPosition].size(); - decoder->getNBest(input, *sid, n, 1.0, bleuWeight_hope, - featureValues[batchPosition], bleuScores[batchPosition], modelScores[batchPosition], - 0, realBleu, distinctNbest, avgRefLength, rank, epoch, hope_nbest_filename.str()); - // needed for history - inputLengths.push_back(current_input_length); - ref_ids.push_back(*sid); - decoder->cleanup(chartDecoding); - //ref_length = decoder->getClosestReferenceLength(*sid, oracle.size()); - //float hope_length_ratio = (float)oracle.size()/ref_length; - cerr << endl; - - oracleFeatureValues.push_back(featureValues[batchPosition][oraclePos]); - oracleBleuScores.push_back(bleuScores[batchPosition][oraclePos]); - oracleModelScores.push_back(modelScores[batchPosition][oraclePos]); + // MODEL + if (!skip_model) { + cerr << "Rank " << rank << ", epoch " << epoch << ", " << n << "best wrt model score" << endl; + if (historyBleu) { + vector< vector<const Word*> > outputModel = decoder->getNBest(input, *sid, n, 0.0, bleuWeight, + featureValues[batchPosition], bleuScores[batchPosition], modelScores[batchPosition], + 1, realBleu, distinctNbest, avgRefLength, rank, epoch, ""); + vector<const Word*> bestModel = outputModel[0]; + oneBests.push_back(bestModel); + } + else { + decoder->getNBest(input, *sid, n, 0.0, bleuWeight, + featureValues[batchPosition], bleuScores[batchPosition], modelScores[batchPosition], + 0, realBleu, distinctNbest, avgRefLength, rank, epoch, ""); + } + decoder->cleanup(chartDecoding); + //ref_length = decoder->getClosestReferenceLength(*sid, bestModel.size()); + //float model_length_ratio = (float)bestModel.size()/ref_length; + cerr << endl; + } - // MODEL - if (clear_static) { - delete decoder; - StaticData::ClearDataStatic(); - decoder = new MosesDecoder(configFile, verbosity, decoder_params.size(), decoder_params); - decoder->setBleuParameters(disableBleuFeature, sentenceBleu, scaleByInputLength, scaleByAvgInputLength, scaleByInverseLength, scaleByAvgInverseLength, scaleByX, historySmoothing, bleu_smoothing_scheme); - decoder->setWeights(mosesWeights); - } + // FEAR + if (!skip_fear) { + cerr << "Rank " << rank << ", epoch " << epoch << ", " << n << "best fear translations" << endl; + decoder->getNBest(input, *sid, n, -1.0, bleuWeight_fear, + featureValues[batchPosition], bleuScores[batchPosition], modelScores[batchPosition], + 0, realBleu, distinctNbest, avgRefLength, rank, epoch, ""); + decoder->cleanup(chartDecoding); + //ref_length = decoder->getClosestReferenceLength(*sid, fear.size()); + //float fear_length_ratio = (float)fear.size()/ref_length; + } - cerr << "Rank " << rank << ", epoch " << epoch << ", " << n << "best wrt model score" << endl; - if (historyBleu) { - vector< vector<const Word*> > outputModel = decoder->getNBest(input, *sid, n, 0.0, bleuWeight, - featureValues[batchPosition], bleuScores[batchPosition], modelScores[batchPosition], - 1, realBleu, distinctNbest, avgRefLength, rank, epoch, model_nbest_filename.str()); - vector<const Word*> bestModel = outputModel[0]; - oneBests.push_back(bestModel); - } - else { - decoder->getNBest(input, *sid, n, 0.0, bleuWeight, - featureValues[batchPosition], bleuScores[batchPosition], modelScores[batchPosition], - 0, realBleu, distinctNbest, avgRefLength, rank, epoch, model_nbest_filename.str()); + examples_in_batch++; + + if (sample) { + float bleuHope = -1000; + float bleuFear = 1000; + size_t indexHope = -1; + size_t indexFear = -1; + vector<float> bleuHopeList; + vector<float> bleuFearList; + vector<float> indexHopeList; + vector<float> indexFearList; + + HypothesisQueue queueHope(hope_n); + HypothesisQueue queueFear(fear_n); + + cerr << endl; + if (most_violated || all_violated || one_against_all) { + bleuHope = -1000; + bleuFear = 1000; + indexHope = -1; + indexFear = -1; + if (most_violated) + cerr << "Rank " << rank << ", epoch " << epoch << ", pick pair with most violated constraint" << endl; + else if (all_violated) + cerr << "Rank " << rank << ", epoch " << epoch << ", pick all pairs with violated constraints"; + else + cerr << "Rank " << rank << ", epoch " << epoch << ", pick all pairs with hope"; + + // find best hope, then find fear that violates our constraint most + for (size_t i=0; i<bleuScores[batchPosition].size(); ++i) { + if (abs(bleuScores[batchPosition][i] - bleuHope) < epsilon) { // equal bleu scores + if (modelScores[batchPosition][i] > modelScores[batchPosition][indexHope]) { + if (abs(modelScores[batchPosition][i] - modelScores[batchPosition][indexHope]) > epsilon) { + // better model score + bleuHope = bleuScores[batchPosition][i]; + indexHope = i; + } + } } - decoder->cleanup(chartDecoding); - //ref_length = decoder->getClosestReferenceLength(*sid, bestModel.size()); - //float model_length_ratio = (float)bestModel.size()/ref_length; - cerr << endl; - - // FEAR - if (clear_static) { - delete decoder; - StaticData::ClearDataStatic(); - decoder = new MosesDecoder(configFile, verbosity, decoder_params.size(), decoder_params); - decoder->setBleuParameters(disableBleuFeature, sentenceBleu, scaleByInputLength, scaleByAvgInputLength, scaleByInverseLength, scaleByAvgInverseLength, scaleByX, historySmoothing, bleu_smoothing_scheme); - decoder->setWeights(mosesWeights); + else if (bleuScores[batchPosition][i] > bleuHope) { // better than current best + bleuHope = bleuScores[batchPosition][i]; + indexHope = i; } - - cerr << "Rank " << rank << ", epoch " << epoch << ", " << n << "best fear translations" << endl; - decoder->getNBest(input, *sid, n, -1.0, bleuWeight_fear, - featureValues[batchPosition], bleuScores[batchPosition], modelScores[batchPosition], - 0, realBleu, distinctNbest, avgRefLength, rank, epoch, fear_nbest_filename.str()); - decoder->cleanup(chartDecoding); - //ref_length = decoder->getClosestReferenceLength(*sid, fear.size()); - //float fear_length_ratio = (float)fear.size()/ref_length; - - examples_in_batch++; - - if (sample) { - float bleuHope = -1000; - float bleuFear = 1000; - size_t indexHope = -1; - size_t indexFear = -1; - vector<float> bleuHopeList; - vector<float> bleuFearList; - vector<float> indexHopeList; - vector<float> indexFearList; - - if (external_score) { - // concatenate nbest files (use hope, model, fear lists to extract samples from) - stringstream nbestStreamMegam, catCmd, sortCmd, scoreDataFile, featureDataFile; - nbestStreamMegam << "decode_hypos_rank" << rank << "." << (hope_n+n+fear_n) << "best"; - nbestFileMegam = nbestStreamMegam.str(); - catCmd << "cat " << hope_nbest_filename.str() << " " << model_nbest_filename.str() - << " " << fear_nbest_filename.str() << " > " << nbestFileMegam; - system(catCmd.str().c_str()); - - // extract features and scores - scoreDataFile << "decode_hypos_rank" << rank << ".scores.dat"; - featureDataFile << "decode_hypos_rank" << rank << ".features.dat"; - stringstream extractorCmd; - extractorCmd << moses_src << "/dist/bin/extractor" - " --scconfig case:true --scfile " << scoreDataFile.str() << " --ffile " << featureDataFile.str() << " -r " << referenceFileMegam << " -n " << nbestFileMegam; - system(extractorCmd.str().c_str()); + } - // NOTE: here we are just scoring the nbest lists created above. - // We will use the (real, not dynamically computed) sentence bleu scores to select a pair of two - // translations with maximal Bleu difference - vector<float> bleuScoresNbest = BleuScorer::ScoreNbestList(scoreDataFile.str(), featureDataFile.str()); - for (size_t i=0; i < bleuScoresNbest.size(); ++i) { - //cerr << "bleu: " << bleuScoresNbest[i]*current_input_length << endl; - if (abs(bleuScoresNbest[i] - bleuHope) < epsilon) { // equal bleu scores - if (modelScores[batchPosition][i] > modelScores[batchPosition][indexHope]) { - if (abs(modelScores[batchPosition][i] - modelScores[batchPosition][indexHope]) > epsilon) { - bleuHope = bleuScoresNbest[i]; - indexHope = i; - } - } - } - else if (bleuScoresNbest[i] > bleuHope) { // better than current best - bleuHope = bleuScoresNbest[i]; - indexHope = i; - } - - if (abs(bleuScoresNbest[i] - bleuFear) < epsilon) { // equal bleu scores - if (modelScores[batchPosition][i] > modelScores[batchPosition][indexFear]) { - if (abs(modelScores[batchPosition][i] - modelScores[batchPosition][indexFear]) > epsilon) { - bleuFear = bleuScoresNbest[i]; - indexFear = i; - } - } - } - else if (bleuScoresNbest[i] < bleuFear) { // worse than current worst - bleuFear = bleuScoresNbest[i]; - indexFear = i; - } - } + float currentViolation = 0; + float minimum_bleu_diff = 0.01; + for (size_t i=0; i<bleuScores[batchPosition].size(); ++i) { + float bleuDiff = bleuHope - bleuScores[batchPosition][i]; + float modelDiff = modelScores[batchPosition][indexHope] - modelScores[batchPosition][i]; + if (bleuDiff > epsilon) { + if (one_against_all && bleuDiff > minimum_bleu_diff) { + cerr << ".. adding pair"; + bleuHopeList.push_back(bleuHope); + bleuFearList.push_back(bleuScores[batchPosition][i]); + indexHopeList.push_back(indexHope); + indexFearList.push_back(i); } - else { - cerr << endl; - if (most_violated || all_violated || one_against_all) { - bleuHope = -1000; - bleuFear = 1000; - indexHope = -1; - indexFear = -1; - if (most_violated) - cerr << "Rank " << rank << ", epoch " << epoch << ", pick pair with most violated constraint"; - else if (all_violated) - cerr << "Rank " << rank << ", epoch " << epoch << ", pick all pairs with violated constraints"; - else - cerr << "Rank " << rank << ", epoch " << epoch << ", pick all pairs with hope"; - - // find best hope, then find fear that violates our constraint most - for (size_t i=0; i<bleuScores[batchPosition].size(); ++i) { - if (abs(bleuScores[batchPosition][i] - bleuHope) < epsilon) { // equal bleu scores - if (modelScores[batchPosition][i] > modelScores[batchPosition][indexHope]) { - if (abs(modelScores[batchPosition][i] - modelScores[batchPosition][indexHope]) > epsilon) { - // better model score - bleuHope = bleuScores[batchPosition][i]; - indexHope = i; - } - } - } - else if (bleuScores[batchPosition][i] > bleuHope) { // better than current best - bleuHope = bleuScores[batchPosition][i]; - indexHope = i; - } - } - - float currentViolation = 0; - float minimum_bleu_diff = 0.01; - for (size_t i=0; i<bleuScores[batchPosition].size(); ++i) { - float bleuDiff = bleuHope - bleuScores[batchPosition][i]; - float modelDiff = modelScores[batchPosition][indexHope] - modelScores[batchPosition][i]; - if (bleuDiff > epsilon) { - if (one_against_all && bleuDiff > minimum_bleu_diff) { - cerr << ".. adding pair"; - bleuHopeList.push_back(bleuHope); - bleuFearList.push_back(bleuScores[batchPosition][i]); - indexHopeList.push_back(indexHope); - indexFearList.push_back(i); - } - else if (modelDiff < bleuDiff) { - float diff = bleuDiff - modelDiff; - if (diff > epsilon) { - if (all_violated) { - cerr << ".. adding pair"; - bleuHopeList.push_back(bleuHope); - bleuFearList.push_back(bleuScores[batchPosition][i]); - indexHopeList.push_back(indexHope); - indexFearList.push_back(i); - } - else if (most_violated && diff > currentViolation) { - currentViolation = diff; - bleuFear = bleuScores[batchPosition][i]; - indexFear = i; - cerr << "Rank " << rank << ", epoch " << epoch << ", current violation: " << currentViolation << " (" << modelDiff << " >= " << bleuDiff << ")" << endl; - } - } - } - } - } - - if (most_violated) { - if (currentViolation > 0) { - cerr << ".. adding pair with violation " << currentViolation << endl; - bleuHopeList.push_back(bleuHope); - bleuFearList.push_back(bleuFear); - indexHopeList.push_back(indexHope); - indexFearList.push_back(indexFear); - } - else cerr << ".. none" << endl; - } - else cerr << endl; - } - if (max_bleu_diff) { - bleuHope = -1000; - bleuFear = 1000; - indexHope = -1; - indexFear = -1; - cerr << "Rank " << rank << ", epoch " << epoch << ", pick pair with max Bleu diff"; - // use dynamically calculated scores to find best and worst - for (size_t i=0; i<bleuScores[batchPosition].size(); ++i) { - //cerr << "bleu: " << bleuScores[batchPosition][i] << endl; - if (abs(bleuScores[batchPosition][i] - bleuHope) < epsilon) { // equal bleu scores - if (modelScores[batchPosition][i] > modelScores[batchPosition][indexHope]) { - if (abs(modelScores[batchPosition][i] - modelScores[batchPosition][indexHope]) > epsilon) { - bleuHope = bleuScores[batchPosition][i]; - indexHope = i; - } - } - } - else if (bleuScores[batchPosition][i] > bleuHope) { // better than current best - bleuHope = bleuScores[batchPosition][i]; - indexHope = i; - } - - if (abs(bleuScores[batchPosition][i] - bleuFear) < epsilon) { // equal bleu scores - if (modelScores[batchPosition][i] > modelScores[batchPosition][indexFear]) { - if (abs(modelScores[batchPosition][i] - modelScores[batchPosition][indexFear]) > epsilon) { - bleuFear = bleuScores[batchPosition][i]; - indexFear = i; - } - } - } - else if (bleuScores[batchPosition][i] < bleuFear) { // worse than current worst - bleuFear = bleuScores[batchPosition][i]; - indexFear = i; - } - } - - if (bleuHope != -1000 && bleuFear != 1000 && (bleuHope - bleuFear) > epsilon) { - cerr << ".. adding 1 pair" << endl; + else if (modelDiff < bleuDiff) { + float diff = bleuDiff - modelDiff; + if (diff > epsilon) { + if (all_violated) { + cerr << ".. adding pair"; bleuHopeList.push_back(bleuHope); - bleuFearList.push_back(bleuFear); + bleuFearList.push_back(bleuScores[batchPosition][i]); indexHopeList.push_back(indexHope); - indexFearList.push_back(indexFear); + indexFearList.push_back(i); } - else cerr << "none" << endl; - } - } - - if (bleuHopeList.size() == 0 || bleuFearList.size() == 0) { - cerr << "Rank " << rank << ", epoch " << epoch << ", no appropriate hypotheses found.." << endl; - skip_sample = true; - } - else { - if (bleuHope != -1000 && bleuFear != 1000 && bleuHope <= bleuFear) { - if (abs(bleuHope - bleuFear) < epsilon) - cerr << "\nRank " << rank << ", epoch " << epoch << ", WARNING: HOPE and FEAR have equal Bleu." << endl; - else - cerr << "\nRank " << rank << ", epoch " << epoch << ", ERROR: FEAR has better Bleu than HOPE." << endl; + else if (most_violated && diff > currentViolation) { + currentViolation = diff; + bleuFear = bleuScores[batchPosition][i]; + indexFear = i; + cerr << "Rank " << rank << ", epoch " << epoch << ", current violation: " << currentViolation << " (" << modelDiff << " >= " << bleuDiff << ")" << endl; + } } - else { - if (external_score) { - // use actual sentence bleu (not dynamically computed) - bleuScoresHopeSample[batchPosition].push_back(bleuHope*current_input_length); - bleuScoresFearSample[batchPosition].push_back(bleuFear*current_input_length); - featureValuesHopeSample[batchPosition].push_back(featureValues[batchPosition][indexHope]); - featureValuesFearSample[batchPosition].push_back(featureValues[batchPosition][indexFear]); - modelScoresHopeSample[batchPosition].push_back(modelScores[batchPosition][indexHope]); - modelScoresFearSample[batchPosition].push_back(modelScores[batchPosition][indexFear]); - cerr << "Rank " << rank << ", epoch " << epoch << ", Best: " << bleuHope*current_input_length << " (" << indexHope << ")" << endl; - cerr << "Rank " << rank << ", epoch " << epoch << ", Worst: " << bleuFear*current_input_length << " (" << indexFear << ")" << endl; - } - else { - cerr << endl; - for (size_t i=0; i<bleuHopeList.size(); ++i) { - float bHope = bleuHopeList[i]; - float bFear = bleuFearList[i]; - size_t iHope = indexHopeList[i]; - size_t iFear = indexFearList[i]; - cerr << "Rank " << rank << ", epoch " << epoch << ", Hope[" << i << "]: " << bHope << " (" << iHope << ")" << endl; - cerr << "Rank " << rank << ", epoch " << epoch << ", Fear[" << i << "]: " << bFear << " (" << iFear << ")" << endl; - bleuScoresHopeSample[batchPosition].push_back(bHope); - bleuScoresFearSample[batchPosition].push_back(bFear); - featureValuesHopeSample[batchPosition].push_back(featureValues[batchPosition][iHope]); - featureValuesFearSample[batchPosition].push_back(featureValues[batchPosition][iFear]); - modelScoresHopeSample[batchPosition].push_back(modelScores[batchPosition][iHope]); - modelScoresFearSample[batchPosition].push_back(modelScores[batchPosition][iFear]); - - featureValues[batchPosition][iHope].IncrementSparseHopeFeatures(); - featureValues[batchPosition][iFear].IncrementSparseFearFeatures(); - } - } - } } + } + } + + if (most_violated) { + if (currentViolation > 0) { + cerr << "Rank " << rank << ", epoch " << epoch << ", adding pair with violation " << currentViolation << endl; + bleuHopeList.push_back(bleuHope); + bleuFearList.push_back(bleuFear); + indexHopeList.push_back(indexHope); + indexFearList.push_back(indexFear); } + else + cerr << "Rank " << rank << ", epoch " << epoch << ", no violated constraint found." << endl; + } + else cerr << endl; + } + if (max_bleu_diff) { + cerr << "Rank " << rank << ", epoch " << epoch << ", pick pair with max Bleu diff from list: " << bleuScores[batchPosition].size() << endl; + for (size_t i=0; i<bleuScores[batchPosition].size(); ++i) { + BleuIndexPair hope(bleuScores[batchPosition][i], i); + queueHope.Push(hope); + BleuIndexPair fear(-1*(bleuScores[batchPosition][i]), i); + queueFear.Push(fear); + } + } + + cerr << endl; + + vector<BleuIndexPair> hopeList, fearList; + for (size_t i=0; i<hope_n && !queueHope.Empty(); ++i) hopeList.push_back(queueHope.Pop()); + for (size_t i=0; i<fear_n && !queueFear.Empty(); ++i) fearList.push_back(queueFear.Pop()); + + for (size_t i=0; i<hopeList.size(); ++i) { + float hopeBleu = hopeList[i].first; + size_t hopeIndex = hopeList[i].second; + for (size_t j=0; j<fearList.size(); ++j) { + float fearBleu = -1*(fearList[j].first); + size_t fearIndex = fearList[j].second; + cerr << "Rank " << rank << ", epoch " << epoch << ", hope: " << hopeBleu << " (" << hopeIndex << "), fear: " << fearBleu << " (" << fearIndex << ")" << endl; + bleuScoresHopeSample[batchPosition].push_back(hopeBleu); + bleuScoresFearSample[batchPosition].push_back(fearBleu); + featureValuesHopeSample[batchPosition].push_back(featureValues[batchPosition][hopeIndex]); + featureValuesFearSample[batchPosition].push_back(featureValues[batchPosition][fearIndex]); + modelScoresHopeSample[batchPosition].push_back(modelScores[batchPosition][hopeIndex]); + modelScoresFearSample[batchPosition].push_back(modelScores[batchPosition][fearIndex]); + + featureValues[batchPosition][hopeIndex].IncrementSparseHopeFeatures(); + featureValues[batchPosition][fearIndex].IncrementSparseFearFeatures(); + } + } + if (!makePairs) + cerr << "Rank " << rank << ", epoch " << epoch << "summing up hope and fear vectors, no pairs" << endl; + } } - + // next input sentence ++sid; ++actualBatchSize; @@ -1474,11 +1386,11 @@ int main(int argc, char** argv) { } else if (examples_in_batch == 0 || (sample && skip_sample)) { - cerr << "Rank " << rank << ", epoch " << epoch << ", batch is empty." << endl; + cerr << "Rank " << rank << ", epoch " << epoch << ", batch is empty." << endl; } else { vector<vector<float> > losses(actualBatchSize); - if (model_hope_fear) { + if (model_hope_fear && !skip_hope) { // Set loss for each sentence as BLEU(oracle) - BLEU(hypothesis) for (size_t batchPosition = 0; batchPosition < actualBatchSize; ++batchPosition) { for (size_t j = 0; j < bleuScores[batchPosition].size(); ++j) { @@ -1486,7 +1398,7 @@ int main(int argc, char** argv) { } } } - + // set weight for bleu feature to 0 before optimizing vector<const ScoreProducer*>::const_iterator iter; const vector<const ScoreProducer*> featureFunctions2 = staticData.GetTranslationSystem(TranslationSystem::DEFAULT).GetFeatureFunctions(); @@ -1499,13 +1411,9 @@ int main(int argc, char** argv) { // scale LM feature (to avoid rapid changes) if (scale_lm) { + cerr << "scale lm" << endl; const LMList& lmList_new = staticData.GetLMList(); for (LMList::const_iterator iter = lmList_new.begin(); iter != lmList_new.end(); ++iter) { - // scale up weight - float lmWeight = mosesWeights.GetScoreForProducer(*iter); - mosesWeights.Assign(*iter, lmWeight*scale_lm_factor); - cerr << "Rank " << rank << ", epoch " << epoch << ", lm weight scaled from " << lmWeight << " to " << lmWeight*scale_lm_factor << endl; - // scale down score if (sample) { scaleFeatureScore(*iter, scale_lm_factor, featureValuesHopeSample, rank, epoch); @@ -1523,9 +1431,6 @@ int main(int argc, char** argv) { if (scale_wp) { // scale up weight WordPenaltyProducer *wp = staticData.GetFirstWordPenaltyProducer(); - float wpWeight = mosesWeights.GetScoreForProducer(wp); - mosesWeights.Assign(wp, wpWeight*scale_wp_factor); - cerr << "Rank " << rank << ", epoch " << epoch << ", wp weight scaled from " << wpWeight << " to " << wpWeight*scale_wp_factor << endl; // scale down score if (sample) { @@ -1542,10 +1447,7 @@ int main(int argc, char** argv) { if (scale_all) { // scale distortion DistortionScoreProducer *dp = staticData.GetDistortionScoreProducer(); - float dWeight = mosesWeights.GetScoreForProducer(dp); - mosesWeights.Assign(dp, dWeight*scale_all_factor); - cerr << "Rank " << rank << ", epoch " << epoch << ", distortion weight scaled from " << dWeight << " to " << dWeight*scale_all_factor << endl; - + // scale down score if (sample) { scaleFeatureScore(dp, scale_all_factor, featureValuesHopeSample, rank, epoch); @@ -1561,15 +1463,7 @@ int main(int argc, char** argv) { vector<LexicalReordering*> lrVec = staticData.GetLexicalReorderModels(); for (size_t i=0; i<lrVec.size(); ++i) { LexicalReordering* lr = lrVec[i]; - // scale up weight - vector<float> dWeights = mosesWeights.GetScoresForProducer(lr); - for (size_t j=0; j<dWeights.size(); ++j) { - cerr << "Rank " << rank << ", epoch " << epoch << ", d weight scaled from " << dWeights[j]; - dWeights[j] *= scale_all_factor; - cerr << " to " << dWeights[j] << endl; - } - mosesWeights.Assign(lr, dWeights); - + // scale down score if (sample) { scaleFeatureScores(lr, scale_all_factor, featureValuesHopeSample, rank, epoch); @@ -1586,14 +1480,6 @@ int main(int argc, char** argv) { vector<PhraseDictionaryFeature*> pdVec = staticData.GetPhraseDictionaryModels(); for (size_t i=0; i<pdVec.size(); ++i) { PhraseDictionaryFeature* pd = pdVec[i]; - // scale up weight - vector<float> tWeights = mosesWeights.GetScoresForProducer(pd); - for (size_t j=0; j<tWeights.size(); ++j) { - cerr << "Rank " << rank << ", epoch " << epoch << ", t weight scaled from " << tWeights[j]; - tWeights[j] *= scale_all_factor; - cerr << " to " << tWeights[j] << endl; - } - mosesWeights.Assign(pd, tWeights); // scale down score if (sample) { @@ -1607,20 +1493,7 @@ int main(int argc, char** argv) { } } } - - // set core features to 0 to avoid updating the feature weights - if (coreWeightMap.size() > 0) { - if (sample) { - ignoreCoreFeatures(featureValuesHopeSample, coreWeightMap); - ignoreCoreFeatures(featureValuesFearSample, coreWeightMap); - } - else { - ignoreCoreFeatures(featureValues, coreWeightMap); - ignoreCoreFeatures(featureValuesHope, coreWeightMap); - ignoreCoreFeatures(featureValuesFear, coreWeightMap); - } - } - + // print out the feature values if (print_feature_values) { cerr << "\nRank " << rank << ", epoch " << epoch << ", feature values: " << endl; @@ -1641,9 +1514,7 @@ int main(int argc, char** argv) { // apply learning rates to feature vectors before optimization if (feature_confidence) { - cerr << "Rank " << rank << ", epoch " << epoch << ", apply feature learning rates with decay " << decay << ": " << featureLearningRates << endl; - //weightUpdate.MultiplyEqualsBackoff(featureLearningRates, sparse_r0); - //cerr << "Rank " << rank << ", epoch " << epoch << ", scaled update: " << weightUpdate << endl; + cerr << "Rank " << rank << ", epoch " << epoch << ", apply feature learning rates with decays " << decay_core << "/" << decay_sparse << ": " << featureLearningRates << endl; if (sample) { cerr << "Rank " << rank << ", epoch " << epoch << ", feature values before: " << featureValuesHopeSample[0][0] << endl; applyPerFeatureLearningRates(featureValuesHopeSample, featureLearningRates, sparse_r0); @@ -1674,120 +1545,122 @@ int main(int argc, char** argv) { } } + // if we scaled up the weights, scale down model scores now + if (scaling_constant != 1.0) { + if (hope_fear || hope_model || perceptron_update) { + for (size_t i = 0; i < modelScoresHope.size(); ++i) + for (size_t j = 0; j < modelScoresHope[i].size(); ++j) { + modelScoresHope[i][j] /= scaling_constant; + modelScoresFear[i][j] /= scaling_constant; + } + } + else if (model_hope_fear || rank_only) { + if (sample) { + cerr << "Rank " << rank << ", epoch " << epoch << ", scale down model scores for sampling.. " << endl; + for (size_t i = 0; i < modelScoresHopeSample.size(); ++i) + for (size_t j = 0; j < modelScoresHopeSample[i].size(); ++j) { + modelScoresHopeSample[i][j] /= scaling_constant; + modelScoresFearSample[i][j] /= scaling_constant; + } + } + else { + for (size_t i = 0; i < modelScores.size(); ++i) + for (size_t j = 0; j < modelScores[i].size(); ++j) + modelScores[i][j] /= scaling_constant; + } + } + } + // Run optimiser on batch: VERBOSE(1, "\nRank " << rank << ", epoch " << epoch << ", run optimiser:" << endl); size_t update_status = 1; ScoreComponentCollection weightUpdate; if (perceptron_update) { vector<vector<float> > dummy1; - update_status = optimiser->updateWeightsHopeFear(mosesWeights, weightUpdate, + update_status = optimiser->updateWeightsHopeFear( weightUpdate, featureValuesHope, featureValuesFear, dummy1, dummy1, dummy1, dummy1, learning_rate, rank, epoch); } else if (hope_fear || hope_model) { if (bleuScoresHope[0][0] >= min_oracle_bleu) { - if (hope_n == 1 && fear_n ==1 && batchSize == 1) { - update_status = ((MiraOptimiser*) optimiser)->updateWeightsAnalytically(mosesWeights, weightUpdate, + if (hope_n == 1 && fear_n ==1 && batchSize == 1 && !hildreth) { + update_status = ((MiraOptimiser*) optimiser)->updateWeightsAnalytically(weightUpdate, featureValuesHope[0][0], featureValuesFear[0][0], bleuScoresHope[0][0], bleuScoresFear[0][0], modelScoresHope[0][0], modelScoresFear[0][0], learning_rate, rank, epoch); } - else { - update_status = optimiser->updateWeightsHopeFear(mosesWeights, weightUpdate, + else + update_status = optimiser->updateWeightsHopeFear(weightUpdate, featureValuesHope, featureValuesFear, bleuScoresHope, bleuScoresFear, - modelScoresHope, modelScoresFear, learning_rate, rank, epoch); - } + modelScoresHope, modelScoresFear, learning_rate, rank, epoch); } else update_status = 1; } else if (rank_only) { - // learning ranking of model translations - update_status = ((MiraOptimiser*) optimiser)->updateWeightsRankModel(mosesWeights, weightUpdate, + // learning ranking of model translations + if (summed) + update_status = ((MiraOptimiser*) optimiser)->updateWeightsRankModelSummed(weightUpdate, + featureValues, bleuScores, modelScores, learning_rate, rank, epoch); + else + update_status = ((MiraOptimiser*) optimiser)->updateWeightsRankModel(weightUpdate, featureValues, bleuScores, modelScores, learning_rate, rank, epoch); } else { // model_hope_fear if (sample) { - update_status = optimiser->updateWeightsHopeFear(mosesWeights, weightUpdate, - featureValuesHopeSample, featureValuesFearSample, bleuScoresHopeSample, bleuScoresFearSample, + if (selective) + update_status = ((MiraOptimiser*)optimiser)->updateWeightsHopeFearSelective(weightUpdate, + featureValuesHopeSample, featureValuesFearSample, + bleuScoresHopeSample, bleuScoresFearSample, modelScoresHopeSample, + modelScoresFearSample, learning_rate, rank, epoch); + else if (summed) + update_status = ((MiraOptimiser*)optimiser)->updateWeightsHopeFearSummed(weightUpdate, + featureValuesHopeSample, featureValuesFearSample, + bleuScoresHopeSample, bleuScoresFearSample, modelScoresHopeSample, + modelScoresFearSample, learning_rate, rank, epoch, rescaleSlack, rewardHope, makePairs); + else { + if (batchSize == 1 && featureValuesHopeSample[0].size() == 1 && !hildreth) { + cerr << "Rank " << rank << ", epoch " << epoch << ", model score hope: " << modelScoresHopeSample[0][0] << endl; + cerr << "Rank " << rank << ", epoch " << epoch << ", model score fear: " << modelScoresFearSample[0][0] << endl; + update_status = ((MiraOptimiser*) optimiser)->updateWeightsAnalytically(weightUpdate, + featureValuesHopeSample[0][0], featureValuesFearSample[0][0], + bleuScoresHopeSample[0][0], bleuScoresFearSample[0][0], + modelScoresHopeSample[0][0], modelScoresFearSample[0][0], + learning_rate, rank, epoch); + } + else { + cerr << "Rank " << rank << ", epoch " << epoch << ", model score hope: " << modelScoresHopeSample[0][0] << endl; + cerr << "Rank " << rank << ", epoch " << epoch << ", model score fear: " << modelScoresFearSample[0][0] << endl; + update_status = optimiser->updateWeightsHopeFear(weightUpdate, + featureValuesHopeSample, featureValuesFearSample, + bleuScoresHopeSample, bleuScoresFearSample, modelScoresHopeSample, modelScoresFearSample, learning_rate, rank, epoch); + } + } } else { - update_status = ((MiraOptimiser*) optimiser)->updateWeights(mosesWeights, weightUpdate, - featureValues, losses, bleuScores, modelScores, oracleFeatureValues, oracleBleuScores, oracleModelScores, learning_rate, rank, epoch); + if (summed) { + // don't differentiate between hope and model/fear, treat all the same and sum constraints + update_status = ((MiraOptimiser*) optimiser)->updateWeightsRankModelSummed(weightUpdate, + featureValues, bleuScores, modelScores, learning_rate, rank, epoch); + } + else + update_status = ((MiraOptimiser*) optimiser)->updateWeights(weightUpdate, + featureValues, losses, bleuScores, modelScores, oracleFeatureValues, oracleBleuScores, oracleModelScores, learning_rate, rank, epoch); } } // sumStillViolatedConstraints += update_status; - // rescale LM feature - if (scale_lm) { - const LMList& lmList_new = staticData.GetLMList(); - for (LMList::const_iterator iter = lmList_new.begin(); iter != lmList_new.end(); ++iter) { - // scale weight back down - float lmWeight = mosesWeights.GetScoreForProducer(*iter); - mosesWeights.Assign(*iter, lmWeight/scale_lm_factor); - cerr << "Rank " << rank << ", epoch " << epoch << ", lm weight rescaled from " << lmWeight << " to " << lmWeight/scale_lm_factor << endl; - } - } - - // rescale WP feature - if (scale_wp) { - // scale weight back down - WordPenaltyProducer *wp = staticData.GetFirstWordPenaltyProducer(); - float wpWeight = mosesWeights.GetScoreForProducer(wp); - mosesWeights.Assign(wp, wpWeight/scale_wp_factor); - cerr << "Rank " << rank << ", epoch " << epoch << ", wp weight rescaled from " << wpWeight << " to " << wpWeight/scale_wp_factor << endl; - } - - if (scale_all) { - // rescale distortion - DistortionScoreProducer *dp = staticData.GetDistortionScoreProducer(); - float dWeight = mosesWeights.GetScoreForProducer(dp); - mosesWeights.Assign(dp, dWeight/scale_all_factor); - cerr << "Rank " << rank << ", epoch " << epoch << ", distortion weight rescaled from " << dWeight << " to " << dWeight/scale_all_factor << endl; - - // rescale lexical reordering - vector<LexicalReordering*> lr = staticData.GetLexicalReorderModels(); - for (size_t i=0; i<lr.size(); ++i) { - vector<float> dWeights = mosesWeights.GetScoresForProducer(lr[i]); - for (size_t j=0; j<dWeights.size(); ++j) { - cerr << "Rank " << rank << ", epoch " << epoch << ", d weight rescaled from " << dWeights[j]; - dWeights[j] /=scale_all_factor; - cerr << " to " << dWeights[j] << endl; - } - mosesWeights.Assign(lr[i], dWeights); - } - - // rescale phrase models - vector<PhraseDictionaryFeature*> pd = staticData.GetPhraseDictionaryModels(); - for (size_t i=0; i<pd.size(); ++i) { - vector<float> tWeights = mosesWeights.GetScoresForProducer(pd[i]); - for (size_t j=0; j<tWeights.size(); ++j) { - cerr << "Rank " << rank << ", epoch " << epoch << ", t weight rescaled from " << tWeights[j]; - tWeights[j] /=scale_all_factor; - cerr << " to " << tWeights[j] << endl; - } - mosesWeights.Assign(pd[i], tWeights); - } - } - if (update_status == 0) { // if weights were updated // apply weight update cerr << "Rank " << rank << ", epoch " << epoch << ", update: " << weightUpdate << endl; - if (l2_regularize) { - weightUpdate.L2Regularize(l2_lambda); - cerr << "Rank " << rank << ", epoch " << epoch << ", " - << "l2-reg. on mosesWeights with lambda=" << l2_lambda << endl; - cerr << "Rank " << rank << ", epoch " << epoch << ", regularized update: " << weightUpdate << endl; - } - if (feature_confidence) { // update confidence counts based on weight update confidenceCounts.UpdateConfidenceCounts(weightUpdate, signed_counts); // update feature learning rates - featureLearningRates.UpdateLearningRates(decay, confidenceCounts, core_r0, sparse_r0); + featureLearningRates.UpdateLearningRates(decay_core, decay_sparse, confidenceCounts, core_r0, sparse_r0); } mosesWeights.PlusEquals(weightUpdate); @@ -1817,6 +1690,7 @@ int main(int argc, char** argv) { // set new Moses weights decoder->setWeights(mosesWeights); + cerr << "Rank " << rank << ", epoch " << epoch << ", new weights: " << mosesWeights << endl; // adjust bleu weight if (bleu_weight_lm_adjust) { @@ -1852,11 +1726,12 @@ int main(int argc, char** argv) { // mix weights? if (mix) { #ifdef MPI_ENABLE + cerr << "Rank " << rank << ", epoch " << epoch << ", mixing weights.. " << endl; // collect all weights in mixedWeights and divide by number of processes mpi::reduce(world, mosesWeights, mixedWeights, SCCPlus(), 0); // mix confidence counts - mpi::reduce(world, confidenceCounts, mixedConfidenceCounts, SCCPlus(), 0); + //mpi::reduce(world, confidenceCounts, mixedConfidenceCounts, SCCPlus(), 0); ScoreComponentCollection totalBinary; if (sparseAverage) { ScoreComponentCollection binary; @@ -1873,11 +1748,8 @@ int main(int argc, char** argv) { mixedWeights.DivideEquals(size); // divide confidence counts - if (averageConfidenceCounts) { - mixedConfidenceCounts.DivideEquals(size); - cerr << "Rank " << rank << ", epoch " << epoch << ", average confidence counts." << endl; - } - + //mixedConfidenceCounts.DivideEquals(size); + // normalise weights after averaging if (normaliseWeights) { mixedWeights.L1Normalise(); @@ -1905,15 +1777,17 @@ int main(int argc, char** argv) { << pruned << " features pruned from cumulativeWeights." << endl; } - if (l1_regularize && weightMixingThisEpoch == mixingFrequency) { - mixedWeights.L1Regularize(l1_lambda); - cerr << "Rank " << rank << ", epoch " << epoch << ", " - << "l1-reg. on mixedWeights with lambda=" << l1_lambda << endl; - - // subtract lambda from every weight in the sum --> multiply by number of updates - cumulativeWeights.L1Regularize(l1_lambda*numberOfUpdatesThisEpoch); - cerr << "Rank " << rank << ", epoch " << epoch << ", " - << "l1-reg. on cumulativeWeights with lambda=" << l1_lambda*numberOfUpdatesThisEpoch << endl; + if (weightMixingThisEpoch == mixingFrequency) { + if (l1_regularize) { + size_t pruned = mixedWeights.SparseL1Regularize(l1_lambda); + cerr << "Rank " << rank << ", epoch " << epoch << ", " + << "l1-reg. on mixedWeights with lambda=" << l1_lambda << ", pruned: " << pruned << endl; + } + if (l2_regularize) { + mixedWeights.SparseL2Regularize(l2_lambda); + cerr << "Rank " << rank << ", epoch " << epoch << ", " + << "l2-reg. on mixedWeights with lambda=" << l2_lambda << endl; + } } } @@ -1923,8 +1797,8 @@ int main(int argc, char** argv) { mosesWeights = mixedWeights; // broadcast summed confidence counts - mpi::broadcast(world, mixedConfidenceCounts, 0); - confidenceCounts = mixedConfidenceCounts; + //mpi::broadcast(world, mixedConfidenceCounts, 0); + //confidenceCounts = mixedConfidenceCounts; #endif #ifndef MPI_ENABLE @@ -2021,6 +1895,25 @@ int main(int argc, char** argv) { cerr << "Dumping mixed average weights during epoch " << epoch << " to " << filename.str() << endl << endl; mixedAverageWeights.Save(filename.str()); ++weightEpochDump; + + if (weightEpochDump == weightDumpFrequency) { + if (l1_regularize) { + size_t pruned = mixedAverageWeights.SparseL1Regularize(l1_lambda); + cerr << "Rank " << rank << ", epoch " << epoch << ", " + << "l1-reg. on mixedAverageWeights with lambda=" << l1_lambda << ", pruned: " << pruned << endl; + } + if (l2_regularize) { + mixedAverageWeights.SparseL2Regularize(l2_lambda); + cerr << "Rank " << rank << ", epoch " << epoch << ", " + << "l2-reg. on mixedAverageWeights with lambda=" << l2_lambda << endl; + } + + if (l1_regularize || l2_regularize) { + filename << "_reg"; + cerr << "Dumping regularized mixed average weights during epoch " << epoch << " to " << filename.str() << endl << endl; + mixedAverageWeights.Save(filename.str()); + } + } if (weightEpochDump == weightDumpFrequency && printFeatureCounts) { // print out all features with counts @@ -2042,11 +1935,11 @@ int main(int argc, char** argv) { } // end of shard loop, end of this epoch - if (printNbestWithFeatures && rank == 0 && epoch == 0) { - cerr << "Writing out hope/fear nbest list with features: " << f1 << ", " << f2 << endl; - hopePlusFeatures.close(); - fearPlusFeatures.close(); - } + /*if (printNbestWithFeatures && rank == 0 && epoch == 0) { + cerr << "Writing out hope/fear nbest list with features: " << f1 << ", " << f2 << endl; + hopePlusFeatures.close(); + fearPlusFeatures.close(); + }*/ if (historyBleu) { cerr << "Bleu feature history after epoch " << epoch << endl; @@ -2133,6 +2026,13 @@ int main(int argc, char** argv) { time(&now); cerr << "Rank " << rank << ", " << ctime(&now); + if (rank == 0) { + ScoreComponentCollection dummy; + ostringstream endfilename; + endfilename << "finished"; + dummy.Save(endfilename.str()); + } + delete decoder; exit(0); } @@ -2147,7 +2047,7 @@ bool loadSentences(const string& filename, vector<string>& sentences) { return true; } -bool loadCoreWeights(const string& filename, ProducerWeightMap& coreWeightMap, const vector<const ScoreProducer*> &featureFunctions) { +/*bool loadCoreWeights(const string& filename, ProducerWeightMap& coreWeightMap, const vector<const ScoreProducer*> &featureFunctions) { ifstream in(filename.c_str()); if (!in) return false; @@ -2180,10 +2080,10 @@ bool loadCoreWeights(const string& filename, ProducerWeightMap& coreWeightMap, c store_weights.push_back(weight); if (store_weights.size() == featureFunctions[i]->GetNumScoreComponents()) { coreWeightMap.insert(ProducerWeightPair(featureFunctions[i], store_weights)); - /*cerr << "insert " << store_weights.size() << " weights for " << featureFunctions[i]->GetScoreProducerDescription() << " ("; + cerr << "insert " << store_weights.size() << " weights for " << featureFunctions[i]->GetScoreProducerDescription() << " ("; for (size_t j=0; j < store_weights.size(); ++j) cerr << store_weights[j] << " "; - cerr << ")" << endl;*/ + cerr << ")" << endl; store_weights.clear(); } } @@ -2191,7 +2091,7 @@ bool loadCoreWeights(const string& filename, ProducerWeightMap& coreWeightMap, c } } return true; -} +}*/ bool evaluateModulo(size_t shard_position, size_t mix_or_dump_base, size_t actual_batch_size) { if (mix_or_dump_base == 0) return 0; @@ -2369,7 +2269,7 @@ void scaleFeatureScore(ScoreProducer *sp, float scaling_factor, vector<vector<Sc for (size_t i=0; i<featureValues.size(); ++i) { // each item in batch for (size_t j=0; j<featureValues[i].size(); ++j) { // each item in nbest featureScore = featureValues[i][j].GetScoreForProducer(sp); - featureValues[i][j].Assign(sp, featureScore/scaling_factor); + featureValues[i][j].Assign(sp, featureScore*scaling_factor); //cerr << "Rank " << rank << ", epoch " << epoch << ", " << name << " score scaled from " << featureScore << " to " << featureScore/scaling_factor << endl; } } @@ -2383,7 +2283,7 @@ void scaleFeatureScores(ScoreProducer *sp, float scaling_factor, vector<vector<S for (size_t j=0; j<featureValues[i].size(); ++j) { // each item in nbest vector<float> featureScores = featureValues[i][j].GetScoresForProducer(sp); for (size_t k=0; k<featureScores.size(); ++k) - featureScores[k] /= scaling_factor; + featureScores[k] *= scaling_factor; featureValues[i][j].Assign(sp, featureScores); //cerr << "Rank " << rank << ", epoch " << epoch << ", " << name << " score scaled from " << featureScore << " to " << featureScore/scaling_factor << endl; } diff --git a/mira/Main.h b/mira/Main.h index 690a475d6..ff6e18d7b 100755..100644 --- a/mira/Main.h +++ b/mira/Main.h @@ -44,7 +44,7 @@ struct RandomIndex { //void OutputNBestList(const MosesChart::TrellisPathList &nBestList, const TranslationSystem* system, long translationId); bool loadSentences(const std::string& filename, std::vector<std::string>& sentences); -bool loadCoreWeights(const std::string& filename, ProducerWeightMap& coreWeightMap, const std::vector<const Moses::ScoreProducer*> &featureFunctions); +//bool loadCoreWeights(const std::string& filename, ProducerWeightMap& coreWeightMap, const std::vector<const Moses::ScoreProducer*> &featureFunctions); bool evaluateModulo(size_t shard_position, size_t mix_or_dump_base, size_t actual_batch_size); void printFeatureValues(std::vector<std::vector<Moses::ScoreComponentCollection> > &featureValues); void ignoreCoreFeatures(std::vector<std::vector<Moses::ScoreComponentCollection> > &featureValues, ProducerWeightMap &coreWeightMap); diff --git a/mira/Makefile.am b/mira/Makefile.am index cd490c853..cd490c853 100755..100644 --- a/mira/Makefile.am +++ b/mira/Makefile.am diff --git a/mira/MiraOptimiser.cpp b/mira/MiraOptimiser.cpp index c3ccfb011..a0fb07238 100755..100644 --- a/mira/MiraOptimiser.cpp +++ b/mira/MiraOptimiser.cpp @@ -8,7 +8,6 @@ using namespace std; namespace Mira { size_t MiraOptimiser::updateWeights( - ScoreComponentCollection& currWeights, ScoreComponentCollection& weightUpdate, const vector<vector<ScoreComponentCollection> >& featureValues, const vector<vector<float> >& losses, @@ -152,7 +151,6 @@ size_t MiraOptimiser::updateWeights( } size_t MiraOptimiser::updateWeightsHopeFear( - Moses::ScoreComponentCollection& currWeights, Moses::ScoreComponentCollection& weightUpdate, const std::vector< std::vector<Moses::ScoreComponentCollection> >& featureValuesHope, const std::vector< std::vector<Moses::ScoreComponentCollection> >& featureValuesFear, @@ -315,7 +313,6 @@ size_t MiraOptimiser::updateWeightsHopeFear( } size_t MiraOptimiser::updateWeightsAnalytically( - ScoreComponentCollection& currWeights, ScoreComponentCollection& weightUpdate, ScoreComponentCollection& featureValuesHope, ScoreComponentCollection& featureValuesFear, @@ -457,7 +454,6 @@ size_t MiraOptimiser::updateWeightsAnalytically( } size_t MiraOptimiser::updateWeightsRankModel( - Moses::ScoreComponentCollection& currWeights, Moses::ScoreComponentCollection& weightUpdate, const std::vector< std::vector<Moses::ScoreComponentCollection> >& featureValues, const std::vector<std::vector<float> >& bleuScores, @@ -478,11 +474,12 @@ size_t MiraOptimiser::updateWeightsRankModel( float oldDistanceFromOptimum = 0; // iterate over input sentences (1 (online) or more (batch)) - float minBleuDifference = 1.0; + float minBleuDifference = 0.005; for (size_t i = 0; i < featureValues.size(); ++i) { // Build all pairs where the first has higher Bleu than the second for (size_t j = 0; j < featureValues[i].size(); ++j) { for (size_t k = 0; k < featureValues[i].size(); ++k) { + if (j == k) continue; if (bleuScores[i][j] - minBleuDifference < bleuScores[i][k]) // need at least a positive Bleu difference of specified amount continue; @@ -598,5 +595,419 @@ size_t MiraOptimiser::updateWeightsRankModel( return 0; } +size_t MiraOptimiser::updateWeightsHopeFearSelective( + Moses::ScoreComponentCollection& weightUpdate, + const std::vector< std::vector<Moses::ScoreComponentCollection> >& featureValuesHope, + const std::vector< std::vector<Moses::ScoreComponentCollection> >& featureValuesFear, + const std::vector<std::vector<float> >& bleuScoresHope, + const std::vector<std::vector<float> >& bleuScoresFear, + const std::vector<std::vector<float> >& modelScoresHope, + const std::vector<std::vector<float> >& modelScoresFear, + float learning_rate, + size_t rank, + size_t epoch, + int updatePosition) { + + // vector of feature values differences for all created constraints + vector<ScoreComponentCollection> nonZeroFeatures; + vector<float> lossMinusModelScoreDiffs; + + // Make constraints for new hypothesis translations + float epsilon = 0.0001; + int violatedConstraintsBefore = 0; + + // iterate over input sentences (1 (online) or more (batch)) + for (size_t i = 0; i < featureValuesHope.size(); ++i) { + if (updatePosition != -1) { + if (i < updatePosition) + continue; + else if (i > updatePosition) + break; + } + + // Pick all pairs[j,j] of hope and fear translations for one input sentence + for (size_t j = 0; j < featureValuesHope[i].size(); ++j) { + ScoreComponentCollection featureValueDiff = featureValuesHope[i][j]; + featureValueDiff.MinusEquals(featureValuesFear[i][j]); + if (featureValueDiff.GetL1Norm() == 0) { + cerr << "Rank " << rank << ", epoch " << epoch << ", features equal --> skip" << endl; + continue; + } + + // check if constraint is violated + float loss = bleuScoresHope[i][j] - bleuScoresFear[i][j]; + float modelScoreDiff = modelScoresHope[i][j] - modelScoresFear[i][j]; + float diff = 0; + if (loss > modelScoreDiff) + diff = loss - modelScoreDiff; + if (diff > epsilon) + ++violatedConstraintsBefore; + cerr << "Rank " << rank << ", epoch " << epoch << ", constraint: " << modelScoreDiff << " >= " << loss << " (current violation: " << diff << ")" << endl; + + // iterate over difference vector and add a constraint for every non-zero feature + FVector features = featureValueDiff.GetScoresVector(); + size_t n_core = 0, n_sparse = 0, n_sparse_hope = 0, n_sparse_fear = 0; + for (size_t i=0; i<features.coreSize(); ++i) { + if (features[i] != 0.0) { + ++n_core; + ScoreComponentCollection f; + f.Assign(i, features[i]); + nonZeroFeatures.push_back(f); + } + } + // 1 + 2 + /*for (FVector::iterator i = features.begin(); i != features.end(); ++i) { + if (i->second != 0.0) { + ++n_sparse; + ScoreComponentCollection f; + f.Assign((i->first).name(), i->second); + nonZeroFeatures.push_back(f); + cerr << "Rank " << rank << ", epoch " << epoch << ", f: " << f << endl; + } + } + cerr << "Rank " << rank << ", epoch " << epoch << ", non-zero features: " << nonZeroFeatures.size() << endl;*/ + + // 3 + vector<ScoreComponentCollection> nonZeroFeaturesHope; + vector<ScoreComponentCollection> nonZeroFeaturesFear; + for (FVector::iterator i = features.begin(); i != features.end(); ++i) { + if (i->second != 0.0) { + ScoreComponentCollection f; + f.Assign((i->first).name(), i->second); + cerr << "Rank " << rank << ", epoch " << epoch << ", f: " << f << endl; + + if (i->second > 0.0) { + ++n_sparse_hope; + nonZeroFeaturesHope.push_back(f); + } + else { + ++n_sparse_fear; + nonZeroFeaturesFear.push_back(f); + } + } + } + + //1 + /*float n = n_core + n_sparse; + for (size_t i=0; i<n; ++i) + lossMinusModelScoreDiffs.push_back(diff/n); + + //2 + float diff_10 = diff * 0.1; + float diff_90 = diff * 0.9; + cerr << "Rank " << rank << ", epoch " << epoch << ", core diff: " << diff_10/n_core << endl; + cerr << "Rank " << rank << ", epoch " << epoch << ", sparse diff: " << diff_90/n_sparse << endl; + for (size_t i=0; i<n_core; ++i) + lossMinusModelScoreDiffs.push_back(diff_10/n_core); + for (size_t i=0; i<n_sparse; ++i) + lossMinusModelScoreDiffs.push_back(diff_90/n_sparse);*/ + + // 3 + float n = n_core + n_sparse_hope + n_sparse_fear; + for (size_t i=0; i<n_core; ++i) + lossMinusModelScoreDiffs.push_back(diff/n); + for (size_t i=0; i<n_sparse_hope; ++i) { + nonZeroFeatures.push_back(nonZeroFeaturesHope[i]); + lossMinusModelScoreDiffs.push_back((diff/n)*1.1); + } + for (size_t i=0; i<n_sparse_fear; ++i) { + nonZeroFeatures.push_back(nonZeroFeaturesFear[i]); + lossMinusModelScoreDiffs.push_back(diff/n); + } + cerr << "Rank " << rank << ", epoch " << epoch << ", core diff: " << diff/n << endl; + cerr << "Rank " << rank << ", epoch " << epoch << ", hope diff: " << ((diff/n)*1.1) << endl; + cerr << "Rank " << rank << ", epoch " << epoch << ", fear diff: " << diff/n << endl; + } + } + + assert(nonZeroFeatures.size() == lossMinusModelScoreDiffs.size()); + + // run optimisation: compute alphas for all given constraints + vector<float> alphas; + ScoreComponentCollection summedUpdate; + if (violatedConstraintsBefore > 0) { + cerr << "Rank " << rank << ", epoch " << epoch << ", number of constraints passed to optimizer: " << nonZeroFeatures.size() << endl; + alphas = Hildreth::optimise(nonZeroFeatures, lossMinusModelScoreDiffs, m_slack); + + // Update the weight vector according to the alphas and the feature value differences + // * w' = w' + SUM alpha_i * (h_i(oracle) - h_i(hypothesis)) + for (size_t k = 0; k < nonZeroFeatures.size(); ++k) { + float alpha = alphas[k]; + cerr << "Rank " << rank << ", epoch " << epoch << ", alpha: " << alpha << endl; + if (alpha != 0) { + ScoreComponentCollection update(nonZeroFeatures[k]); + update.MultiplyEquals(alpha); + + // sum updates + summedUpdate.PlusEquals(update); + } + } + } + else { + cerr << "Rank " << rank << ", epoch " << epoch << ", no constraint violated for this batch" << endl; + // return 0; + return 1; + } + + // apply learning rate + if (learning_rate != 1) { + cerr << "Rank " << rank << ", epoch " << epoch << ", apply learning rate " << learning_rate << " to update." << endl; + summedUpdate.MultiplyEquals(learning_rate); + } + + // scale update by BLEU of oracle (for batch size 1 only) + if (featureValuesHope.size() == 1) { + if (m_scale_update) { + cerr << "Rank " << rank << ", epoch " << epoch << ", scaling summed update with oracle bleu score " << bleuScoresHope[0][0] << endl; + summedUpdate.MultiplyEquals(bleuScoresHope[0][0]); + } + } + + //cerr << "Rank " << rank << ", epoch " << epoch << ", update: " << summedUpdate << endl; + weightUpdate.PlusEquals(summedUpdate); + return 0; +} + +size_t MiraOptimiser::updateWeightsHopeFearSummed( + Moses::ScoreComponentCollection& weightUpdate, + const std::vector< std::vector<Moses::ScoreComponentCollection> >& featureValuesHope, + const std::vector< std::vector<Moses::ScoreComponentCollection> >& featureValuesFear, + const std::vector<std::vector<float> >& bleuScoresHope, + const std::vector<std::vector<float> >& bleuScoresFear, + const std::vector<std::vector<float> >& modelScoresHope, + const std::vector<std::vector<float> >& modelScoresFear, + float learning_rate, + size_t rank, + size_t epoch, + bool rescaleSlack, + bool rewardHope, + bool makePairs) { + + // vector of feature values differences for all created constraints + ScoreComponentCollection averagedFeatureDiffs; + float averagedViolations = 0; + + // Make constraints for new hypothesis translations + float epsilon = 0.0001; + int violatedConstraintsBefore = 0; + + if (!makePairs) { + ScoreComponentCollection featureValueDiff; + float lossHope = 0, lossFear = 0, modelScoreHope = 0, modelScoreFear = 0, hopeCount = 0, fearCount = 0; + // add all hope vectors + for (size_t i = 0; i < featureValuesHope.size(); ++i) { + for (size_t j = 0; j < featureValuesHope[i].size(); ++j) { + featureValueDiff.PlusEquals(featureValuesHope[i][j]); + lossHope += bleuScoresHope[i][j]; + modelScoreHope += modelScoresHope[i][j]; + ++hopeCount; + } + } + lossHope /= hopeCount; + modelScoreHope /= hopeCount; + + // subtract all fear vectors + for (size_t i = 0; i < featureValuesFear.size(); ++i) { + for (size_t j = 0; j < featureValuesFear[i].size(); ++j) { + featureValueDiff.MinusEquals(featureValuesFear[i][j]); + lossFear += bleuScoresFear[i][j]; + modelScoreFear += modelScoresFear[i][j]; + ++fearCount; + } + } + lossFear /= fearCount; + modelScoreFear /= fearCount; + + if (featureValueDiff.GetL1Norm() == 0) { + cerr << "Rank " << rank << ", epoch " << epoch << ", features equal --> skip" << endl; + cerr << "Rank " << rank << ", epoch " << epoch << ", no constraint violated for this batch" << endl; + return 1; + } + + // check if constraint is violated + float lossDiff = lossHope - lossFear; + float modelScoreDiff = modelScoreHope - modelScoreFear; + float diff = 0; + if (lossDiff > modelScoreDiff) + diff = lossDiff - modelScoreDiff; + if (diff > epsilon) + ++violatedConstraintsBefore; + cerr << "Rank " << rank << ", epoch " << epoch << ", constraint: " << modelScoreDiff << " >= " << lossDiff << " (current violation: " <<\ + diff << ")" << endl; + + // add constraint + averagedFeatureDiffs = featureValueDiff; + averagedViolations = diff; + } + else { + // iterate over input sentences (1 (online) or more (batch)) + for (size_t i = 0; i < featureValuesHope.size(); ++i) { + // Pick all pairs[j,j] of hope and fear translations for one input sentence and add them up + for (size_t j = 0; j < featureValuesHope[i].size(); ++j) { + ScoreComponentCollection featureValueDiff = featureValuesHope[i][j]; + featureValueDiff.MinusEquals(featureValuesFear[i][j]); + if (featureValueDiff.GetL1Norm() == 0) { + cerr << "Rank " << rank << ", epoch " << epoch << ", features equal --> skip" << endl; + continue; + } + + // check if constraint is violated + float lossDiff = bleuScoresHope[i][j] - bleuScoresFear[i][j]; + float modelScoreDiff = modelScoresHope[i][j] - modelScoresFear[i][j]; + if (rescaleSlack) { + cerr << "Rank " << rank << ", epoch " << epoch << ", modelScoreDiff scaled by lossDiff: " << modelScoreDiff << " --> " << modelScoreDiff*lossDiff << endl; + modelScoreDiff *= lossDiff; + } + float diff = 0; + if (lossDiff > modelScoreDiff) + diff = lossDiff - modelScoreDiff; + if (diff > epsilon) + ++violatedConstraintsBefore; + cerr << "Rank " << rank << ", epoch " << epoch << ", constraint: " << modelScoreDiff << " >= " << lossDiff << " (current violation: " << diff << ")" << endl; + + // add constraint + if (rescaleSlack) { + averagedFeatureDiffs.MultiplyEquals(lossDiff); + cerr << "Rank " << rank << ", epoch " << epoch << ", featureValueDiff scaled by lossDiff." << endl; + } + averagedFeatureDiffs.PlusEquals(featureValueDiff); + averagedViolations += diff; + } + } + } + + // divide by number of constraints (1/n) + if (!makePairs) { + averagedFeatureDiffs.DivideEquals(featureValuesHope[0].size()); + } + else { + averagedFeatureDiffs.DivideEquals(featureValuesHope[0].size()); + averagedViolations /= featureValuesHope[0].size(); + } + cerr << "Rank " << rank << ", epoch " << epoch << ", averaged feature diffs: " << averagedFeatureDiffs << endl; + cerr << "Rank " << rank << ", epoch " << epoch << ", averaged violations: " << averagedViolations << endl; + + if (violatedConstraintsBefore > 0) { + if (rewardHope) { + averagedFeatureDiffs.RedistributeMass(0.1); + cerr << "Rank " << rank << ", epoch " << epoch << ", redistributed feature diffs: " << averagedFeatureDiffs << endl; + } + + // compute alpha for given constraint: (loss diff - model score diff) / || feature value diff ||^2 + // featureValueDiff.GetL2Norm() * featureValueDiff.GetL2Norm() == featureValueDiff.InnerProduct(featureValueDiff) + // from Crammer&Singer 2006: alpha = min {C , l_t/ ||x||^2} + // adjusted for 1 slack according to Joachims 2009, OP4 (margin rescaling), OP5 (slack rescaling) + float squaredNorm = averagedFeatureDiffs.GetL2Norm() * averagedFeatureDiffs.GetL2Norm(); + float alpha = averagedViolations / squaredNorm; + cerr << "Rank " << rank << ", epoch " << epoch << ", unclipped alpha: " << alpha << endl; + if (m_slack > 0 ) { + if (alpha > m_slack) { + alpha = m_slack; + } + else if (alpha < m_slack*(-1)) { + alpha = m_slack*(-1); + } + } + cerr << "Rank " << rank << ", epoch " << epoch << ", clipped alpha: " << alpha << endl; + + // compute update + averagedFeatureDiffs.MultiplyEquals(alpha); + weightUpdate.PlusEquals(averagedFeatureDiffs); + return 0; + } + else { + cerr << "Rank " << rank << ", epoch " << epoch << ", no constraint violated for this batch" << endl; + return 1; + } +} + +size_t MiraOptimiser::updateWeightsRankModelSummed( + Moses::ScoreComponentCollection& weightUpdate, + const std::vector< std::vector<Moses::ScoreComponentCollection> >& featureValues, + const std::vector<std::vector<float> >& bleuScores, + const std::vector<std::vector<float> >& modelScores, + float learning_rate, + size_t rank, + size_t epoch) { + // vector of feature values differences for all created constraints + ScoreComponentCollection averagedFeatureDiffs; + float averagedViolations = 0; + + // Make constraints for new hypothesis translations + float epsilon = 0.0001; + int violatedConstraintsBefore = 0; + float oldDistanceFromOptimum = 0; + + // iterate over input sentences (1 (online) or more (batch)) + float minBleuDifference = 0.005; + size_t numConstraints = 0; + for (size_t i = 0; i < featureValues.size(); ++i) { + // Build all pairs where the first has higher Bleu than the second + for (size_t j = 0; j < featureValues[i].size(); ++j) { + for (size_t k = 0; k < featureValues[i].size(); ++k) { + if (j == k) continue; + if (bleuScores[i][j] - minBleuDifference < bleuScores[i][k]) // need at least a positive Bleu difference of specified amount + continue; + + ScoreComponentCollection featureValueDiff = featureValues[i][j]; + featureValueDiff.MinusEquals(featureValues[i][k]); + if (featureValueDiff.GetL1Norm() == 0) { + cerr << "Rank " << rank << ", epoch " << epoch << ", features equal --> skip" << endl; + continue; + } + + // check if constraint is violated + float loss = bleuScores[i][j] - bleuScores[i][k]; + float modelScoreDiff = modelScores[i][j] - modelScores[i][k]; + float diff = 0; + if (loss > modelScoreDiff) + diff = loss - modelScoreDiff; + if (diff > epsilon) + ++violatedConstraintsBefore; + cerr << "Rank " << rank << ", epoch " << epoch << ", constraint: " << modelScoreDiff << " >= " << loss << " (current violation: " << diff << ")" << endl; + + // add constraint + averagedFeatureDiffs.PlusEquals(featureValueDiff); + averagedViolations += diff; + ++numConstraints; + } + } + } + + // divide by number of constraints + averagedFeatureDiffs.DivideEquals(numConstraints); + averagedViolations /= numConstraints; + + cerr << "Rank " << rank << ", epoch " << epoch << ", averaged feature diffs: " << averagedFeatureDiffs << endl; + cerr << "Rank " << rank << ", epoch " << epoch << ", averaged violations: " << averagedViolations << endl; + + if (violatedConstraintsBefore > 0) { + // compute alpha for given constraint: (loss - model score diff) / || feature value diff ||^2 + // featureValueDiff.GetL2Norm() * featureValueDiff.GetL2Norm() == featureValueDiff.InnerProduct(featureValueDiff) + // from Crammer&Singer 2006: alpha = min {C , l_t/ ||x||^2} + float squaredNorm = averagedFeatureDiffs.GetL2Norm() * averagedFeatureDiffs.GetL2Norm(); + float alpha = averagedViolations / squaredNorm; + cerr << "Rank " << rank << ", epoch " << epoch << ", unclipped alpha: " << alpha << endl; + if (m_slack > 0 ) { + if (alpha > m_slack) { + alpha = m_slack; + } + else if (alpha < m_slack*(-1)) { + alpha = m_slack*(-1); + } + } + cerr << "Rank " << rank << ", epoch " << epoch << ", clipped alpha: " << alpha << endl; + + // compute update + averagedFeatureDiffs.MultiplyEquals(alpha); + weightUpdate.PlusEquals(averagedFeatureDiffs); + return 0; + } + else { + cerr << "Rank " << rank << ", epoch " << epoch << ", no constraint violated for this batch" << endl; + return 1; + } +} + } diff --git a/mira/MiraTest.cpp b/mira/MiraTest.cpp index 774b324f8..774b324f8 100755..100644 --- a/mira/MiraTest.cpp +++ b/mira/MiraTest.cpp diff --git a/mira/Optimiser.h b/mira/Optimiser.h index 8ad38bd5a..b91ad2c4f 100755..100644 --- a/mira/Optimiser.h +++ b/mira/Optimiser.h @@ -31,7 +31,6 @@ namespace Mira { Optimiser() {} virtual size_t updateWeightsHopeFear( - Moses::ScoreComponentCollection& currWeights, Moses::ScoreComponentCollection& weightUpdate, const std::vector<std::vector<Moses::ScoreComponentCollection> >& featureValuesHope, const std::vector<std::vector<Moses::ScoreComponentCollection> >& featureValuesFear, @@ -48,7 +47,6 @@ namespace Mira { class Perceptron : public Optimiser { public: virtual size_t updateWeightsHopeFear( - Moses::ScoreComponentCollection& currWeights, Moses::ScoreComponentCollection& weightUpdate, const std::vector<std::vector<Moses::ScoreComponentCollection> >& featureValuesHope, const std::vector<std::vector<Moses::ScoreComponentCollection> >& featureValuesFear, @@ -80,8 +78,7 @@ namespace Mira { m_normaliseMargin(normaliseMargin), m_sigmoidParam(sigmoidParam) { } - size_t updateWeights(Moses::ScoreComponentCollection& currWeights, - Moses::ScoreComponentCollection& weightUpdate, + size_t updateWeights(Moses::ScoreComponentCollection& weightUpdate, const std::vector<std::vector<Moses::ScoreComponentCollection> >& featureValues, const std::vector<std::vector<float> >& losses, const std::vector<std::vector<float> >& bleuScores, @@ -92,8 +89,7 @@ namespace Mira { float learning_rate, size_t rank, size_t epoch); - virtual size_t updateWeightsHopeFear(Moses::ScoreComponentCollection& currWeights, - Moses::ScoreComponentCollection& weightUpdate, + virtual size_t updateWeightsHopeFear(Moses::ScoreComponentCollection& weightUpdate, const std::vector<std::vector<Moses::ScoreComponentCollection> >& featureValuesHope, const std::vector<std::vector<Moses::ScoreComponentCollection> >& featureValuesFear, const std::vector<std::vector<float> >& bleuScoresHope, @@ -104,8 +100,31 @@ namespace Mira { size_t rank, size_t epoch, int updatePosition = -1); - size_t updateWeightsAnalytically(Moses::ScoreComponentCollection& currWeights, - Moses::ScoreComponentCollection& weightUpdate, + size_t updateWeightsHopeFearSelective(Moses::ScoreComponentCollection& weightUpdate, + const std::vector<std::vector<Moses::ScoreComponentCollection> >& featureValuesHope, + const std::vector<std::vector<Moses::ScoreComponentCollection> >& featureValuesFear, + const std::vector<std::vector<float> >& bleuScoresHope, + const std::vector<std::vector<float> >& bleuScoresFear, + const std::vector<std::vector<float> >& modelScoresHope, + const std::vector<std::vector<float> >& modelScoresFear, + float learning_rate, + size_t rank, + size_t epoch, + int updatePosition = -1); + size_t updateWeightsHopeFearSummed(Moses::ScoreComponentCollection& weightUpdate, + const std::vector<std::vector<Moses::ScoreComponentCollection> >& featureValuesHope, + const std::vector<std::vector<Moses::ScoreComponentCollection> >& featureValuesFear, + const std::vector<std::vector<float> >& bleuScoresHope, + const std::vector<std::vector<float> >& bleuScoresFear, + const std::vector<std::vector<float> >& modelScoresHope, + const std::vector<std::vector<float> >& modelScoresFear, + float learning_rate, + size_t rank, + size_t epoch, + bool rescaleSlack, + bool rewardHope, + bool makePairs); + size_t updateWeightsAnalytically(Moses::ScoreComponentCollection& weightUpdate, Moses::ScoreComponentCollection& featureValuesHope, Moses::ScoreComponentCollection& featureValuesFear, float bleuScoreHope, @@ -115,15 +134,21 @@ namespace Mira { float learning_rate, size_t rank, size_t epoch); - size_t updateWeightsRankModel(Moses::ScoreComponentCollection& currWeights, - Moses::ScoreComponentCollection& weightUpdate, + size_t updateWeightsRankModel(Moses::ScoreComponentCollection& weightUpdate, const std::vector<std::vector<Moses::ScoreComponentCollection> >& featureValues, const std::vector<std::vector<float> >& bleuScores, const std::vector<std::vector<float> >& modelScores, float learning_rate, size_t rank, size_t epoch); - + size_t updateWeightsRankModelSummed(Moses::ScoreComponentCollection& weightUpdate, + const std::vector<std::vector<Moses::ScoreComponentCollection> >& featureValues, + const std::vector<std::vector<float> >& bleuScores, + const std::vector<std::vector<float> >& modelScores, + float learning_rate, + size_t rank, + size_t epoch); + void setSlack(float slack) { m_slack = slack; } diff --git a/mira/Perceptron.cpp b/mira/Perceptron.cpp index 409d2ba34..569a83216 100755..100644 --- a/mira/Perceptron.cpp +++ b/mira/Perceptron.cpp @@ -25,7 +25,6 @@ using namespace std; namespace Mira { size_t Perceptron::updateWeightsHopeFear( - ScoreComponentCollection& currWeights, ScoreComponentCollection& weightUpdate, const vector< vector<ScoreComponentCollection> >& featureValuesHope, const vector< vector<ScoreComponentCollection> >& featureValuesFear, diff --git a/mira/expt.cfg b/mira/expt.cfg index 416eb1d3f..416eb1d3f 100755..100644 --- a/mira/expt.cfg +++ b/mira/expt.cfg diff --git a/mira/mira.xcodeproj/project.pbxproj b/mira/mira.xcodeproj/project.pbxproj index 67662f4e0..67662f4e0 100755..100644 --- a/mira/mira.xcodeproj/project.pbxproj +++ b/mira/mira.xcodeproj/project.pbxproj diff --git a/mira/training-expt.perl b/mira/training-expt.perl index 03d780ea7..948a12fca 100755 --- a/mira/training-expt.perl +++ b/mira/training-expt.perl @@ -177,7 +177,7 @@ else { $mixing_frequency = 1; } - print "Warning: mixing frequency must not be larger than shard size, setting mixing frequency to $mixing_frequency\n"; + print STDERR "Warning: mixing frequency must not be larger than shard size, setting mixing frequency to $mixing_frequency\n"; } } @@ -188,7 +188,7 @@ else { $weight_dump_frequency = 1; } - print "Warning: weight dump frequency must not be larger than shard size, setting weight dump frequency to $weight_dump_frequency\n"; + print STDERR "Warning: weight dump frequency must not be larger than shard size, setting weight dump frequency to $weight_dump_frequency\n"; } } @@ -199,7 +199,7 @@ else { $mixing_frequency = 1; } - print "Warning: mixing frequency must not be larger than (shard size/batch size), setting mixing frequency to $mixing_frequency\n"; + print STDERR "Warning: mixing frequency must not be larger than (shard size/batch size), setting mixing frequency to $mixing_frequency\n"; } } @@ -210,7 +210,7 @@ else { $weight_dump_frequency = 1; } - print "Warning: weight dump frequency must not be larger than (shard size/batch size), setting weight dump frequency to $weight_dump_frequency\n"; + print STDERR "Warning: weight dump frequency must not be larger than (shard size/batch size), setting weight dump frequency to $weight_dump_frequency\n"; } } } @@ -315,7 +315,7 @@ else { close TRAIN; if (! $execute) { - print "Written train file: $train_script_file\n"; + print STDERR "Written train file: $train_script_file\n"; exit 0; } @@ -336,7 +336,7 @@ my $train_iteration = -1; # optionally continue from a later epoch (if $continue_from_epoch > 0) if ($continue_from_epoch > 0) { $train_iteration = $continue_from_epoch - 1; - print "Continuing training from epoch $continue_from_epoch, with weights from ini file $moses_ini_file.\n"; + print STDERR "Continuing training from epoch $continue_from_epoch, with weights from ini file $moses_ini_file.\n"; } while(1) { @@ -344,7 +344,7 @@ while(1) { $train_iteration += 1; # starts at 0 my $new_weight_file = "$working_dir/$weight_file_stem" . "_"; if ($weight_dump_frequency == 0) { - print "No weights, no testing..\n"; + print STDERR "No weights, no testing..\n"; exit(0); } @@ -369,34 +369,48 @@ while(1) { my $expected_num_files = $epochs*$weight_dump_frequency; if ($wait_for_bleu) { - print "Expected number of BLEU files: $expected_num_files \n"; + print STDERR "Expected number of BLEU files: $expected_num_files \n"; } if (-e "$working_dir/stopping") { wait_for_bleu($expected_num_files) if ($wait_for_bleu); - print "Training finished at " . scalar(localtime()) . " because stopping criterion was reached.\n"; + print STDERR "Training finished at " . scalar(localtime()) . " because stopping criterion was reached.\n"; exit 0; } else { - print "Waiting for $new_weight_file\n"; + print STDERR "Waiting for $new_weight_file\n"; if (!$skipTrain) { while ((! -e $new_weight_file) && &check_running($train_job_id)) { sleep 10; } } if (! -e $new_weight_file ) { - wait_for_bleu($expected_num_files) if ($wait_for_bleu); - - print "Training finished at " . scalar(localtime()) . "\n"; - exit 0; + if (-e "$working_dir/stopping" or -e "$working_dir/finished") { + wait_for_bleu($expected_num_files) if ($wait_for_bleu); + + print STDERR "Training finished at " . scalar(localtime()) . "\n"; + exit 0; + } + else { + # training finished with error + print STDERR "Error: training was aborted at " . scalar(localtime()) . "\n"; + exit 1; + } } } #new weight file written. create test script and submit my $suffix = ""; - print "weight file exists? ".(-e $new_weight_file)."\n"; + print STDERR "weight file exists? ".(-e $new_weight_file)."\n"; if (!$skip_devtest) { createTestScriptAndSubmit($epoch, $epoch_slice, $new_weight_file, $suffix, "devtest", $devtest_ini_file, $devtest_input_file, $devtest_reference_files, $skip_submit_test); + + my $regularized_weight_file = $new_weight_file."_reg"; + if (-e $regularized_weight_file) { + print STDERR "Submitting test script for regularized weights. \n"; + $epoch_slice .= "_reg"; + createTestScriptAndSubmit($epoch, $epoch_slice, $regularized_weight_file, $suffix, "devtest", $devtest_ini_file, $devtest_input_file, $devtest_reference_files, $skip_submit_test); + } } if (!$skip_dev) { createTestScriptAndSubmit($epoch, $epoch_slice, $new_weight_file, $suffix, "dev", $moses_ini_file, $input_file, $reference_files, $skip_submit_test); @@ -405,13 +419,14 @@ while(1) { sub wait_for_bleu() { my $expected_num_files = $_[0]; - print "Waiting for $expected_num_files bleu files..\n"; + print STDERR "Waiting for $expected_num_files bleu files..\n"; my @bleu_files = glob("*.bleu"); while (scalar(@bleu_files) < $expected_num_files) { - sleep 10; + sleep 30; @bleu_files = glob("*.bleu"); + #print STDERR "currently have ".(scalar(@bleu_files))."\n"; } - print "$expected_num_files BLEU files completed, continue.\n"; + print STDERR "$expected_num_files BLEU files completed, continue.\n"; } sub createTestScriptAndSubmit { @@ -525,8 +540,8 @@ sub createTestScriptAndSubmit { } close WEIGHTS; - print "Number of core weights read: ".$readCoreWeights."\n"; - print "Number of extra weights read: ".$readExtraWeights."\n"; + print STDERR "Number of core weights read: ".$readCoreWeights."\n"; + print STDERR "Number of extra weights read: ".$readExtraWeights."\n"; # If there is a core weight file, we have to load the core weights from that file (NOTE: this is not necessary if the core weights are also printed to the weights file) # if (defined $core_weight_file) { @@ -696,7 +711,7 @@ sub createTestScriptAndSubmit { if(!$skip_submit) { if ($have_sge) { if ($extra_memory_devtest) { - print "Extra memory for test job: $extra_memory_devtest \n"; + print STDERR "Extra memory for test job: $extra_memory_devtest \n"; &submit_job_sge_extra_memory($test_script_file,$extra_memory_devtest); } else { @@ -768,13 +783,13 @@ sub check_exists_noThrow { sub submit_job_sge { my($script_file) = @_; my $qsub_result = `qsub -P $queue $script_file`; - print "SUBMIT CMD: qsub -P $queue $script_file\n"; + print STDERR "SUBMIT CMD: qsub -P $queue $script_file\n"; if ($qsub_result !~ /Your job (\d+)/) { - print "Failed to qsub job: $qsub_result\n"; + print STDERR "Failed to qsub job: $qsub_result\n"; return 0; } my $job_name = basename($script_file); - print "Submitted job: $job_name id: $1 " . + print STDERR "Submitted job: $job_name id: $1 " . scalar(localtime()) . "\n"; return $1; } @@ -782,13 +797,13 @@ sub submit_job_sge { sub submit_job_sge_extra_memory { my($script_file,$extra_memory) = @_; my $qsub_result = `qsub -pe $extra_memory -P $queue $script_file`; - print "SUBMIT CMD: qsub -pe $extra_memory -P $queue $script_file \n"; + print STDERR "SUBMIT CMD: qsub -pe $extra_memory -P $queue $script_file \n"; if ($qsub_result !~ /Your job (\d+)/) { - print "Failed to qsub job: $qsub_result\n"; + print STDERR "Failed to qsub job: $qsub_result\n"; return 0; } my $job_name = basename($script_file); - print "Submitted job: $job_name id: $1 " . + print STDERR "Submitted job: $job_name id: $1 " . scalar(localtime()) . "\n"; return $1; } @@ -802,10 +817,10 @@ sub submit_job_no_sge { my $pid = undef; if ($pid = fork) { my $job_name = basename($script_file); - print "Launched : $job_name pid: $pid " . scalar(localtime()) . "\n"; + print STDERR "Launched : $job_name pid: $pid " . scalar(localtime()) . "\n"; return $pid; } elsif (defined $pid) { - print "Executing script $script_file, writing to $out and $err.\n"; + print STDERR "Executing script $script_file, writing to $out and $err.\n"; `cd $working_dir; sh $script_file 1>$out 2> $err`; exit; } else { diff --git a/misc/GenerateTuples.cpp b/misc/GenerateTuples.cpp index 58e9697fd..58e9697fd 100755..100644 --- a/misc/GenerateTuples.cpp +++ b/misc/GenerateTuples.cpp diff --git a/misc/GenerateTuples.h b/misc/GenerateTuples.h index 728f28823..728f28823 100755..100644 --- a/misc/GenerateTuples.h +++ b/misc/GenerateTuples.h diff --git a/misc/Jamfile b/misc/Jamfile index e8a133367..e8a133367 100755..100644 --- a/misc/Jamfile +++ b/misc/Jamfile diff --git a/misc/misc.xcodeproj/project.pbxproj b/misc/misc.xcodeproj/project.pbxproj index 0b52b8170..0b52b8170 100755..100644 --- a/misc/misc.xcodeproj/project.pbxproj +++ b/misc/misc.xcodeproj/project.pbxproj diff --git a/misc/pmoses/AUTHORS b/misc/pmoses/AUTHORS index b2ffbdd30..b2ffbdd30 100755..100644 --- a/misc/pmoses/AUTHORS +++ b/misc/pmoses/AUTHORS diff --git a/misc/pmoses/ChangeLog b/misc/pmoses/ChangeLog index e69de29bb..e69de29bb 100755..100644 --- a/misc/pmoses/ChangeLog +++ b/misc/pmoses/ChangeLog diff --git a/misc/pmoses/Makefile.am b/misc/pmoses/Makefile.am index 2d9810f28..2d9810f28 100755..100644 --- a/misc/pmoses/Makefile.am +++ b/misc/pmoses/Makefile.am diff --git a/misc/pmoses/NEWS b/misc/pmoses/NEWS index e69de29bb..e69de29bb 100755..100644 --- a/misc/pmoses/NEWS +++ b/misc/pmoses/NEWS diff --git a/misc/pmoses/README b/misc/pmoses/README index 31a2e6e4f..31a2e6e4f 100755..100644 --- a/misc/pmoses/README +++ b/misc/pmoses/README diff --git a/misc/pmoses/configure b/misc/pmoses/configure index 188414c59..188414c59 100755..100644 --- a/misc/pmoses/configure +++ b/misc/pmoses/configure diff --git a/misc/pmoses/configure.ac b/misc/pmoses/configure.ac index 63b465a8b..63b465a8b 100755..100644 --- a/misc/pmoses/configure.ac +++ b/misc/pmoses/configure.ac diff --git a/misc/pmoses/pmoses.cc b/misc/pmoses/pmoses.cc index 8b8134adc..8b8134adc 100755..100644 --- a/misc/pmoses/pmoses.cc +++ b/misc/pmoses/pmoses.cc diff --git a/misc/processLexicalTable.cpp b/misc/processLexicalTable.cpp index a81c65965..a81c65965 100755..100644 --- a/misc/processLexicalTable.cpp +++ b/misc/processLexicalTable.cpp diff --git a/misc/processLexicalTable.vcxproj b/misc/processLexicalTable.vcxproj index cb32fb1c4..cb32fb1c4 100755..100644 --- a/misc/processLexicalTable.vcxproj +++ b/misc/processLexicalTable.vcxproj diff --git a/misc/processPhraseTable.cpp b/misc/processPhraseTable.cpp index 7eca79349..7eca79349 100755..100644 --- a/misc/processPhraseTable.cpp +++ b/misc/processPhraseTable.cpp diff --git a/misc/processPhraseTable.vcxproj b/misc/processPhraseTable.vcxproj index 692eff058..692eff058 100755..100644 --- a/misc/processPhraseTable.vcxproj +++ b/misc/processPhraseTable.vcxproj diff --git a/misc/queryLexicalTable.cpp b/misc/queryLexicalTable.cpp index 166549267..166549267 100755..100644 --- a/misc/queryLexicalTable.cpp +++ b/misc/queryLexicalTable.cpp diff --git a/misc/queryPhraseTable.cpp b/misc/queryPhraseTable.cpp index 109c7e69e..109c7e69e 100755..100644 --- a/misc/queryPhraseTable.cpp +++ b/misc/queryPhraseTable.cpp diff --git a/moses-chart-cmd/src/IOWrapper.cpp b/moses-chart-cmd/src/IOWrapper.cpp index fcdd82bdc..fcdd82bdc 100755..100644 --- a/moses-chart-cmd/src/IOWrapper.cpp +++ b/moses-chart-cmd/src/IOWrapper.cpp diff --git a/moses-chart-cmd/src/IOWrapper.h b/moses-chart-cmd/src/IOWrapper.h index 058ee0712..058ee0712 100755..100644 --- a/moses-chart-cmd/src/IOWrapper.h +++ b/moses-chart-cmd/src/IOWrapper.h diff --git a/moses-chart-cmd/src/Jamfile b/moses-chart-cmd/src/Jamfile index 583b4664e..583b4664e 100755..100644 --- a/moses-chart-cmd/src/Jamfile +++ b/moses-chart-cmd/src/Jamfile diff --git a/moses-chart-cmd/src/Main.cpp b/moses-chart-cmd/src/Main.cpp index d6d603c1b..d6d603c1b 100755..100644 --- a/moses-chart-cmd/src/Main.cpp +++ b/moses-chart-cmd/src/Main.cpp diff --git a/moses-chart-cmd/src/Main.h b/moses-chart-cmd/src/Main.h index b9d9a32d6..b9d9a32d6 100755..100644 --- a/moses-chart-cmd/src/Main.h +++ b/moses-chart-cmd/src/Main.h diff --git a/moses-chart-cmd/src/TranslationAnalysis.cpp b/moses-chart-cmd/src/TranslationAnalysis.cpp index 1ba6052ed..1ba6052ed 100755..100644 --- a/moses-chart-cmd/src/TranslationAnalysis.cpp +++ b/moses-chart-cmd/src/TranslationAnalysis.cpp diff --git a/moses-chart-cmd/src/TranslationAnalysis.h b/moses-chart-cmd/src/TranslationAnalysis.h index 1291548f8..1291548f8 100755..100644 --- a/moses-chart-cmd/src/TranslationAnalysis.h +++ b/moses-chart-cmd/src/TranslationAnalysis.h diff --git a/moses-chart-cmd/src/mbr.cpp b/moses-chart-cmd/src/mbr.cpp index 633a518b8..633a518b8 100755..100644 --- a/moses-chart-cmd/src/mbr.cpp +++ b/moses-chart-cmd/src/mbr.cpp diff --git a/moses-chart-cmd/src/mbr.h b/moses-chart-cmd/src/mbr.h index c94a058fb..c94a058fb 100755..100644 --- a/moses-chart-cmd/src/mbr.h +++ b/moses-chart-cmd/src/mbr.h diff --git a/moses-cmd/src/IOWrapper.cpp b/moses-cmd/src/IOWrapper.cpp index a122b83b4..a122b83b4 100755..100644 --- a/moses-cmd/src/IOWrapper.cpp +++ b/moses-cmd/src/IOWrapper.cpp diff --git a/moses-cmd/src/IOWrapper.h b/moses-cmd/src/IOWrapper.h index be792e276..be792e276 100755..100644 --- a/moses-cmd/src/IOWrapper.h +++ b/moses-cmd/src/IOWrapper.h diff --git a/moses-cmd/src/Jamfile b/moses-cmd/src/Jamfile index 61af12a50..61af12a50 100755..100644 --- a/moses-cmd/src/Jamfile +++ b/moses-cmd/src/Jamfile diff --git a/moses-cmd/src/LatticeMBR.cpp b/moses-cmd/src/LatticeMBR.cpp index cf172d737..cf172d737 100755..100644 --- a/moses-cmd/src/LatticeMBR.cpp +++ b/moses-cmd/src/LatticeMBR.cpp diff --git a/moses-cmd/src/LatticeMBR.h b/moses-cmd/src/LatticeMBR.h index 8b54e6c51..8b54e6c51 100755..100644 --- a/moses-cmd/src/LatticeMBR.h +++ b/moses-cmd/src/LatticeMBR.h diff --git a/moses-cmd/src/LatticeMBRGrid.cpp b/moses-cmd/src/LatticeMBRGrid.cpp index 8bd52b7d7..8bd52b7d7 100755..100644 --- a/moses-cmd/src/LatticeMBRGrid.cpp +++ b/moses-cmd/src/LatticeMBRGrid.cpp diff --git a/moses-cmd/src/Main.cpp b/moses-cmd/src/Main.cpp index 44eca6535..44eca6535 100755..100644 --- a/moses-cmd/src/Main.cpp +++ b/moses-cmd/src/Main.cpp diff --git a/moses-cmd/src/Main.h b/moses-cmd/src/Main.h index d02ea816f..d02ea816f 100755..100644 --- a/moses-cmd/src/Main.h +++ b/moses-cmd/src/Main.h diff --git a/moses-cmd/src/TranslationAnalysis.cpp b/moses-cmd/src/TranslationAnalysis.cpp index a7795a27b..a7795a27b 100755..100644 --- a/moses-cmd/src/TranslationAnalysis.cpp +++ b/moses-cmd/src/TranslationAnalysis.cpp diff --git a/moses-cmd/src/TranslationAnalysis.h b/moses-cmd/src/TranslationAnalysis.h index 1eb7a04fd..1eb7a04fd 100755..100644 --- a/moses-cmd/src/TranslationAnalysis.h +++ b/moses-cmd/src/TranslationAnalysis.h diff --git a/moses-cmd/src/mbr.cpp b/moses-cmd/src/mbr.cpp index 7462d3fc6..7462d3fc6 100755..100644 --- a/moses-cmd/src/mbr.cpp +++ b/moses-cmd/src/mbr.cpp diff --git a/moses-cmd/src/mbr.h b/moses-cmd/src/mbr.h index d08b11a98..d08b11a98 100755..100644 --- a/moses-cmd/src/mbr.h +++ b/moses-cmd/src/mbr.h diff --git a/moses/src/AlignmentInfo.cpp b/moses/src/AlignmentInfo.cpp index 959e7591f..959e7591f 100755..100644 --- a/moses/src/AlignmentInfo.cpp +++ b/moses/src/AlignmentInfo.cpp diff --git a/moses/src/AlignmentInfo.h b/moses/src/AlignmentInfo.h index 12c5ee2e9..12c5ee2e9 100755..100644 --- a/moses/src/AlignmentInfo.h +++ b/moses/src/AlignmentInfo.h diff --git a/moses/src/AlignmentInfoCollection.cpp b/moses/src/AlignmentInfoCollection.cpp index aa411fc63..aa411fc63 100755..100644 --- a/moses/src/AlignmentInfoCollection.cpp +++ b/moses/src/AlignmentInfoCollection.cpp diff --git a/moses/src/AlignmentInfoCollection.h b/moses/src/AlignmentInfoCollection.h index a6c90f135..a6c90f135 100755..100644 --- a/moses/src/AlignmentInfoCollection.h +++ b/moses/src/AlignmentInfoCollection.h diff --git a/moses/src/BilingualDynSuffixArray.cpp b/moses/src/BilingualDynSuffixArray.cpp index a2d5e3e90..a2d5e3e90 100755..100644 --- a/moses/src/BilingualDynSuffixArray.cpp +++ b/moses/src/BilingualDynSuffixArray.cpp diff --git a/moses/src/BilingualDynSuffixArray.h b/moses/src/BilingualDynSuffixArray.h index 1543c3709..1543c3709 100755..100644 --- a/moses/src/BilingualDynSuffixArray.h +++ b/moses/src/BilingualDynSuffixArray.h diff --git a/moses/src/BitmapContainer.cpp b/moses/src/BitmapContainer.cpp index c80f3b542..c80f3b542 100755..100644 --- a/moses/src/BitmapContainer.cpp +++ b/moses/src/BitmapContainer.cpp diff --git a/moses/src/BitmapContainer.h b/moses/src/BitmapContainer.h index 987440750..987440750 100755..100644 --- a/moses/src/BitmapContainer.h +++ b/moses/src/BitmapContainer.h diff --git a/moses/src/BleuScoreFeature.cpp b/moses/src/BleuScoreFeature.cpp index a0f4df200..8ba979742 100755..100644 --- a/moses/src/BleuScoreFeature.cpp +++ b/moses/src/BleuScoreFeature.cpp @@ -22,11 +22,28 @@ int BleuScoreState::Compare(const FFState& o) const if (&o == this) return 0; + const StaticData &staticData = StaticData::Instance(); + SearchAlgorithm searchAlgorithm = staticData.GetSearchAlgorithm(); + bool chartDecoding = (searchAlgorithm == ChartDecoding); + if (chartDecoding) + return 0; + const BleuScoreState& other = dynamic_cast<const BleuScoreState&>(o); int c = m_words.Compare(other.m_words); if (c != 0) return c; + /*for(size_t i = 0; i < m_ngram_counts.size(); i++) { + if (m_ngram_counts[i] < other.m_ngram_counts[i]) + return -1; + if (m_ngram_counts[i] > other.m_ngram_counts[i]) + return 1; + if (m_ngram_matches[i] < other.m_ngram_matches[i]) + return -1; + if (m_ngram_matches[i] > other.m_ngram_matches[i]) + return 1; + }*/ + return 0; } std::ostream& operator<<(std::ostream& out, const BleuScoreState& state) { diff --git a/moses/src/BleuScoreFeature.h b/moses/src/BleuScoreFeature.h index fc7aa2e39..5bae3a1fb 100755..100644 --- a/moses/src/BleuScoreFeature.h +++ b/moses/src/BleuScoreFeature.h @@ -123,7 +123,7 @@ public: FFState* EvaluateChart(const ChartHypothesis& cur_hypo, int featureID, ScoreComponentCollection* accumulator) const; - + bool Enabled() const { return m_enabled; } float CalculateBleu(BleuScoreState*) const; float CalculateBleu(Phrase translation) const; const FFState* EmptyHypothesisState(const InputType&) const; diff --git a/moses/src/CellCollection.h b/moses/src/CellCollection.h index 5b99fe0fe..5b99fe0fe 100755..100644 --- a/moses/src/CellCollection.h +++ b/moses/src/CellCollection.h diff --git a/moses/src/ChartCell.cpp b/moses/src/ChartCell.cpp index 21c5dd68a..21c5dd68a 100755..100644 --- a/moses/src/ChartCell.cpp +++ b/moses/src/ChartCell.cpp diff --git a/moses/src/ChartCell.h b/moses/src/ChartCell.h index ab9e5b1ea..ab9e5b1ea 100755..100644 --- a/moses/src/ChartCell.h +++ b/moses/src/ChartCell.h diff --git a/moses/src/ChartCellCollection.cpp b/moses/src/ChartCellCollection.cpp index 894bb352c..894bb352c 100755..100644 --- a/moses/src/ChartCellCollection.cpp +++ b/moses/src/ChartCellCollection.cpp diff --git a/moses/src/ChartCellCollection.h b/moses/src/ChartCellCollection.h index 6627b6b67..6627b6b67 100755..100644 --- a/moses/src/ChartCellCollection.h +++ b/moses/src/ChartCellCollection.h diff --git a/moses/src/ChartCellLabel.h b/moses/src/ChartCellLabel.h index 4feeac322..4feeac322 100755..100644 --- a/moses/src/ChartCellLabel.h +++ b/moses/src/ChartCellLabel.h diff --git a/moses/src/ChartCellLabelSet.h b/moses/src/ChartCellLabelSet.h index 2a359758d..2a359758d 100755..100644 --- a/moses/src/ChartCellLabelSet.h +++ b/moses/src/ChartCellLabelSet.h diff --git a/moses/src/ChartHypothesis.cpp b/moses/src/ChartHypothesis.cpp index 88b930243..88b930243 100755..100644 --- a/moses/src/ChartHypothesis.cpp +++ b/moses/src/ChartHypothesis.cpp diff --git a/moses/src/ChartHypothesis.h b/moses/src/ChartHypothesis.h index aa663a140..aa663a140 100755..100644 --- a/moses/src/ChartHypothesis.h +++ b/moses/src/ChartHypothesis.h diff --git a/moses/src/ChartHypothesisCollection.cpp b/moses/src/ChartHypothesisCollection.cpp index 48a108aab..48a108aab 100755..100644 --- a/moses/src/ChartHypothesisCollection.cpp +++ b/moses/src/ChartHypothesisCollection.cpp diff --git a/moses/src/ChartHypothesisCollection.h b/moses/src/ChartHypothesisCollection.h index ebf1c6002..ebf1c6002 100755..100644 --- a/moses/src/ChartHypothesisCollection.h +++ b/moses/src/ChartHypothesisCollection.h diff --git a/moses/src/ChartManager.cpp b/moses/src/ChartManager.cpp index ad8f0dc84..77b703007 100755..100644 --- a/moses/src/ChartManager.cpp +++ b/moses/src/ChartManager.cpp @@ -185,7 +185,8 @@ void ChartManager::CalcNBest(size_t count, ChartTrellisPathList &ret, bool onlyD // Get all complete translations Word *w = new Word(); - w->CreateFromString(Output, staticData.GetOutputFactorOrder(), "TOP", true); + //w->CreateFromString(Output, staticData.GetOutputFactorOrder(), "TOP", true); + w->CreateFromString(Output, staticData.GetOutputFactorOrder(), "S", true); const HypoList topHypos = lastCell.GetSortedHypotheses(*w); // Create a ChartTrellisDetour for each complete translation and add it to the queue diff --git a/moses/src/ChartManager.h b/moses/src/ChartManager.h index dbcd42b6c..dbcd42b6c 100755..100644 --- a/moses/src/ChartManager.h +++ b/moses/src/ChartManager.h diff --git a/moses/src/ChartRuleLookupManager.cpp b/moses/src/ChartRuleLookupManager.cpp index 63e941429..63e941429 100755..100644 --- a/moses/src/ChartRuleLookupManager.cpp +++ b/moses/src/ChartRuleLookupManager.cpp diff --git a/moses/src/ChartRuleLookupManager.h b/moses/src/ChartRuleLookupManager.h index 2166f28f5..2166f28f5 100755..100644 --- a/moses/src/ChartRuleLookupManager.h +++ b/moses/src/ChartRuleLookupManager.h diff --git a/moses/src/ChartRuleLookupManagerMemory.cpp b/moses/src/ChartRuleLookupManagerMemory.cpp index aab3dfcce..aab3dfcce 100755..100644 --- a/moses/src/ChartRuleLookupManagerMemory.cpp +++ b/moses/src/ChartRuleLookupManagerMemory.cpp diff --git a/moses/src/ChartRuleLookupManagerMemory.h b/moses/src/ChartRuleLookupManagerMemory.h index a9273499c..a9273499c 100755..100644 --- a/moses/src/ChartRuleLookupManagerMemory.h +++ b/moses/src/ChartRuleLookupManagerMemory.h diff --git a/moses/src/ChartRuleLookupManagerOnDisk.cpp b/moses/src/ChartRuleLookupManagerOnDisk.cpp index 17e57f73c..010973900 100755..100644 --- a/moses/src/ChartRuleLookupManagerOnDisk.cpp +++ b/moses/src/ChartRuleLookupManagerOnDisk.cpp @@ -41,7 +41,6 @@ ChartRuleLookupManagerOnDisk::ChartRuleLookupManagerOnDisk( const WordPenaltyProducer *wpProducer, const std::vector<FactorType> &inputFactorsVec, const std::vector<FactorType> &outputFactorsVec, - const std::vector<float> &weight, const std::string &filePath) : ChartRuleLookupManager(sentence, cellColl) , m_dictionary(dictionary) @@ -50,7 +49,6 @@ ChartRuleLookupManagerOnDisk::ChartRuleLookupManagerOnDisk( , m_wpProducer(wpProducer) , m_inputFactorsVec(inputFactorsVec) , m_outputFactorsVec(outputFactorsVec) - , m_weight(weight) , m_filePath(filePath) { CHECK(m_expandableDottedRuleListVec.size() == 0); @@ -241,12 +239,11 @@ void ChartRuleLookupManagerOnDisk::GetChartRuleCollection( const OnDiskPt::TargetPhraseCollection *tpcollBerkeleyDb = node->GetTargetPhraseCollection(m_dictionary.GetTableLimit(), m_dbWrapper); - std::vector<float> weightT = staticData.GetTranslationSystem(TranslationSystem::DEFAULT).GetTranslationWeights(); + std::vector<float> weightT = staticData.GetTranslationSystem(TranslationSystem::DEFAULT).GetTranslationWeights(m_dictionary.GetDictIndex()); targetPhraseCollection = tpcollBerkeleyDb->ConvertToMoses(m_inputFactorsVec ,m_outputFactorsVec ,m_dictionary - //, m_weight ,weightT ,m_wpProducer ,*m_languageModels diff --git a/moses/src/ChartRuleLookupManagerOnDisk.h b/moses/src/ChartRuleLookupManagerOnDisk.h index ba87dbbf8..31f44bdfe 100755..100644 --- a/moses/src/ChartRuleLookupManagerOnDisk.h +++ b/moses/src/ChartRuleLookupManagerOnDisk.h @@ -44,7 +44,6 @@ public: const WordPenaltyProducer *wpProducer, const std::vector<FactorType> &inputFactorsVec, const std::vector<FactorType> &outputFactorsVec, - const std::vector<float> &weight, const std::string &filePath); ~ChartRuleLookupManagerOnDisk(); @@ -60,7 +59,6 @@ private: const WordPenaltyProducer *m_wpProducer; const std::vector<FactorType> &m_inputFactorsVec; const std::vector<FactorType> &m_outputFactorsVec; - const std::vector<float> &m_weight; const std::string &m_filePath; std::vector<DottedRuleStackOnDisk*> m_expandableDottedRuleListVec; std::map<UINT64, const TargetPhraseCollection*> m_cache; diff --git a/moses/src/ChartTranslationOption.cpp b/moses/src/ChartTranslationOption.cpp index 6aa04d189..6aa04d189 100755..100644 --- a/moses/src/ChartTranslationOption.cpp +++ b/moses/src/ChartTranslationOption.cpp diff --git a/moses/src/ChartTranslationOption.h b/moses/src/ChartTranslationOption.h index 116eff037..116eff037 100755..100644 --- a/moses/src/ChartTranslationOption.h +++ b/moses/src/ChartTranslationOption.h diff --git a/moses/src/ChartTranslationOptionCollection.cpp b/moses/src/ChartTranslationOptionCollection.cpp index 8f06656b2..8f06656b2 100755..100644 --- a/moses/src/ChartTranslationOptionCollection.cpp +++ b/moses/src/ChartTranslationOptionCollection.cpp diff --git a/moses/src/ChartTranslationOptionCollection.h b/moses/src/ChartTranslationOptionCollection.h index e1f3490a9..e1f3490a9 100755..100644 --- a/moses/src/ChartTranslationOptionCollection.h +++ b/moses/src/ChartTranslationOptionCollection.h diff --git a/moses/src/ChartTranslationOptionList.cpp b/moses/src/ChartTranslationOptionList.cpp index cb1b8e256..cb1b8e256 100755..100644 --- a/moses/src/ChartTranslationOptionList.cpp +++ b/moses/src/ChartTranslationOptionList.cpp diff --git a/moses/src/ChartTranslationOptionList.h b/moses/src/ChartTranslationOptionList.h index 7272a01cf..7272a01cf 100755..100644 --- a/moses/src/ChartTranslationOptionList.h +++ b/moses/src/ChartTranslationOptionList.h diff --git a/moses/src/ChartTrellisDetour.cpp b/moses/src/ChartTrellisDetour.cpp index 550a44a2c..550a44a2c 100755..100644 --- a/moses/src/ChartTrellisDetour.cpp +++ b/moses/src/ChartTrellisDetour.cpp diff --git a/moses/src/ChartTrellisDetour.h b/moses/src/ChartTrellisDetour.h index a3b07ad00..a3b07ad00 100755..100644 --- a/moses/src/ChartTrellisDetour.h +++ b/moses/src/ChartTrellisDetour.h diff --git a/moses/src/ChartTrellisDetourQueue.cpp b/moses/src/ChartTrellisDetourQueue.cpp index 9b359ca43..9b359ca43 100755..100644 --- a/moses/src/ChartTrellisDetourQueue.cpp +++ b/moses/src/ChartTrellisDetourQueue.cpp diff --git a/moses/src/ChartTrellisDetourQueue.h b/moses/src/ChartTrellisDetourQueue.h index f679708e4..f679708e4 100755..100644 --- a/moses/src/ChartTrellisDetourQueue.h +++ b/moses/src/ChartTrellisDetourQueue.h diff --git a/moses/src/ChartTrellisNode.cpp b/moses/src/ChartTrellisNode.cpp index ce3c9eaf7..ce3c9eaf7 100755..100644 --- a/moses/src/ChartTrellisNode.cpp +++ b/moses/src/ChartTrellisNode.cpp diff --git a/moses/src/ChartTrellisNode.h b/moses/src/ChartTrellisNode.h index 7b81ff4b2..7b81ff4b2 100755..100644 --- a/moses/src/ChartTrellisNode.h +++ b/moses/src/ChartTrellisNode.h diff --git a/moses/src/ChartTrellisPath.cpp b/moses/src/ChartTrellisPath.cpp index 231d4237a..231d4237a 100755..100644 --- a/moses/src/ChartTrellisPath.cpp +++ b/moses/src/ChartTrellisPath.cpp diff --git a/moses/src/ChartTrellisPath.h b/moses/src/ChartTrellisPath.h index 4dee018c3..4dee018c3 100755..100644 --- a/moses/src/ChartTrellisPath.h +++ b/moses/src/ChartTrellisPath.h diff --git a/moses/src/ChartTrellisPathList.h b/moses/src/ChartTrellisPathList.h index 5b811d621..5b811d621 100755..100644 --- a/moses/src/ChartTrellisPathList.h +++ b/moses/src/ChartTrellisPathList.h diff --git a/moses/src/ConfusionNet.cpp b/moses/src/ConfusionNet.cpp index 8ff119497..8ff119497 100755..100644 --- a/moses/src/ConfusionNet.cpp +++ b/moses/src/ConfusionNet.cpp diff --git a/moses/src/ConfusionNet.h b/moses/src/ConfusionNet.h index 25b5a021d..25b5a021d 100755..100644 --- a/moses/src/ConfusionNet.h +++ b/moses/src/ConfusionNet.h diff --git a/moses/src/DecodeFeature.cpp b/moses/src/DecodeFeature.cpp index 67999384a..67999384a 100755..100644 --- a/moses/src/DecodeFeature.cpp +++ b/moses/src/DecodeFeature.cpp diff --git a/moses/src/DecodeFeature.h b/moses/src/DecodeFeature.h index afa1771ba..afa1771ba 100755..100644 --- a/moses/src/DecodeFeature.h +++ b/moses/src/DecodeFeature.h diff --git a/moses/src/DecodeGraph.cpp b/moses/src/DecodeGraph.cpp index 107258d56..107258d56 100755..100644 --- a/moses/src/DecodeGraph.cpp +++ b/moses/src/DecodeGraph.cpp diff --git a/moses/src/DecodeGraph.h b/moses/src/DecodeGraph.h index 770cb9958..770cb9958 100755..100644 --- a/moses/src/DecodeGraph.h +++ b/moses/src/DecodeGraph.h diff --git a/moses/src/DecodeStep.cpp b/moses/src/DecodeStep.cpp index 3345f95d0..3345f95d0 100755..100644 --- a/moses/src/DecodeStep.cpp +++ b/moses/src/DecodeStep.cpp diff --git a/moses/src/DecodeStep.h b/moses/src/DecodeStep.h index 4d2f2280b..4d2f2280b 100755..100644 --- a/moses/src/DecodeStep.h +++ b/moses/src/DecodeStep.h diff --git a/moses/src/DecodeStepGeneration.cpp b/moses/src/DecodeStepGeneration.cpp index 0f0c5c2dc..0f0c5c2dc 100755..100644 --- a/moses/src/DecodeStepGeneration.cpp +++ b/moses/src/DecodeStepGeneration.cpp diff --git a/moses/src/DecodeStepGeneration.h b/moses/src/DecodeStepGeneration.h index d22534ccc..d22534ccc 100755..100644 --- a/moses/src/DecodeStepGeneration.h +++ b/moses/src/DecodeStepGeneration.h diff --git a/moses/src/DecodeStepTranslation.cpp b/moses/src/DecodeStepTranslation.cpp index 03713b50c..03713b50c 100755..100644 --- a/moses/src/DecodeStepTranslation.cpp +++ b/moses/src/DecodeStepTranslation.cpp diff --git a/moses/src/DecodeStepTranslation.h b/moses/src/DecodeStepTranslation.h index 651754b1c..651754b1c 100755..100644 --- a/moses/src/DecodeStepTranslation.h +++ b/moses/src/DecodeStepTranslation.h diff --git a/moses/src/Dictionary.cpp b/moses/src/Dictionary.cpp index 05b4f6bb4..05b4f6bb4 100755..100644 --- a/moses/src/Dictionary.cpp +++ b/moses/src/Dictionary.cpp diff --git a/moses/src/Dictionary.h b/moses/src/Dictionary.h index 7bb4d09b1..7bb4d09b1 100755..100644 --- a/moses/src/Dictionary.h +++ b/moses/src/Dictionary.h diff --git a/moses/src/DotChart.cpp b/moses/src/DotChart.cpp index c7ba3f43e..c7ba3f43e 100755..100644 --- a/moses/src/DotChart.cpp +++ b/moses/src/DotChart.cpp diff --git a/moses/src/DotChart.h b/moses/src/DotChart.h index b9da12afd..b9da12afd 100755..100644 --- a/moses/src/DotChart.h +++ b/moses/src/DotChart.h diff --git a/moses/src/DotChartInMemory.cpp b/moses/src/DotChartInMemory.cpp index 095e3418f..095e3418f 100755..100644 --- a/moses/src/DotChartInMemory.cpp +++ b/moses/src/DotChartInMemory.cpp diff --git a/moses/src/DotChartInMemory.h b/moses/src/DotChartInMemory.h index fe7ab64c5..fe7ab64c5 100755..100644 --- a/moses/src/DotChartInMemory.h +++ b/moses/src/DotChartInMemory.h diff --git a/moses/src/DotChartOnDisk.cpp b/moses/src/DotChartOnDisk.cpp index 1674f0e21..1674f0e21 100755..100644 --- a/moses/src/DotChartOnDisk.cpp +++ b/moses/src/DotChartOnDisk.cpp diff --git a/moses/src/DotChartOnDisk.h b/moses/src/DotChartOnDisk.h index 4473b7685..4473b7685 100755..100644 --- a/moses/src/DotChartOnDisk.h +++ b/moses/src/DotChartOnDisk.h diff --git a/moses/src/DummyScoreProducers.cpp b/moses/src/DummyScoreProducers.cpp index 03c635b03..03c635b03 100755..100644 --- a/moses/src/DummyScoreProducers.cpp +++ b/moses/src/DummyScoreProducers.cpp diff --git a/moses/src/DummyScoreProducers.h b/moses/src/DummyScoreProducers.h index d8d9393d2..d8d9393d2 100755..100644 --- a/moses/src/DummyScoreProducers.h +++ b/moses/src/DummyScoreProducers.h diff --git a/moses/src/DynSAInclude/RandLMCache.h b/moses/src/DynSAInclude/RandLMCache.h index 3f38cae02..3f38cae02 100755..100644 --- a/moses/src/DynSAInclude/RandLMCache.h +++ b/moses/src/DynSAInclude/RandLMCache.h diff --git a/moses/src/DynSAInclude/RandLMFilter.h b/moses/src/DynSAInclude/RandLMFilter.h index 556bbe44a..556bbe44a 100755..100644 --- a/moses/src/DynSAInclude/RandLMFilter.h +++ b/moses/src/DynSAInclude/RandLMFilter.h diff --git a/moses/src/DynSAInclude/fdstream.h b/moses/src/DynSAInclude/fdstream.h index 4c95d032c..4c95d032c 100755..100644 --- a/moses/src/DynSAInclude/fdstream.h +++ b/moses/src/DynSAInclude/fdstream.h diff --git a/moses/src/DynSAInclude/file.cpp b/moses/src/DynSAInclude/file.cpp index d2901c1ae..d2901c1ae 100755..100644 --- a/moses/src/DynSAInclude/file.cpp +++ b/moses/src/DynSAInclude/file.cpp diff --git a/moses/src/DynSAInclude/file.h b/moses/src/DynSAInclude/file.h index 3157f918b..3157f918b 100755..100644 --- a/moses/src/DynSAInclude/file.h +++ b/moses/src/DynSAInclude/file.h diff --git a/moses/src/DynSAInclude/hash.h b/moses/src/DynSAInclude/hash.h index 233d0be5d..233d0be5d 100755..100644 --- a/moses/src/DynSAInclude/hash.h +++ b/moses/src/DynSAInclude/hash.h diff --git a/moses/src/DynSAInclude/onlineRLM.h b/moses/src/DynSAInclude/onlineRLM.h index adc7934fc..adc7934fc 100755..100644 --- a/moses/src/DynSAInclude/onlineRLM.h +++ b/moses/src/DynSAInclude/onlineRLM.h diff --git a/moses/src/DynSAInclude/params.cpp b/moses/src/DynSAInclude/params.cpp index 4be3a1676..4be3a1676 100755..100644 --- a/moses/src/DynSAInclude/params.cpp +++ b/moses/src/DynSAInclude/params.cpp diff --git a/moses/src/DynSAInclude/params.h b/moses/src/DynSAInclude/params.h index e0aab6135..e0aab6135 100755..100644 --- a/moses/src/DynSAInclude/params.h +++ b/moses/src/DynSAInclude/params.h diff --git a/moses/src/DynSAInclude/perfectHash.h b/moses/src/DynSAInclude/perfectHash.h index 2e3bfbc8f..2e3bfbc8f 100755..100644 --- a/moses/src/DynSAInclude/perfectHash.h +++ b/moses/src/DynSAInclude/perfectHash.h diff --git a/moses/src/DynSAInclude/quantizer.h b/moses/src/DynSAInclude/quantizer.h index c12189615..c12189615 100755..100644 --- a/moses/src/DynSAInclude/quantizer.h +++ b/moses/src/DynSAInclude/quantizer.h diff --git a/moses/src/DynSAInclude/types.h b/moses/src/DynSAInclude/types.h index 444010889..444010889 100755..100644 --- a/moses/src/DynSAInclude/types.h +++ b/moses/src/DynSAInclude/types.h diff --git a/moses/src/DynSAInclude/utils.h b/moses/src/DynSAInclude/utils.h index 74703863d..74703863d 100755..100644 --- a/moses/src/DynSAInclude/utils.h +++ b/moses/src/DynSAInclude/utils.h diff --git a/moses/src/DynSAInclude/vocab.cpp b/moses/src/DynSAInclude/vocab.cpp index 27e052260..27e052260 100755..100644 --- a/moses/src/DynSAInclude/vocab.cpp +++ b/moses/src/DynSAInclude/vocab.cpp diff --git a/moses/src/DynSAInclude/vocab.h b/moses/src/DynSAInclude/vocab.h index 467d16fdb..467d16fdb 100755..100644 --- a/moses/src/DynSAInclude/vocab.h +++ b/moses/src/DynSAInclude/vocab.h diff --git a/moses/src/DynSuffixArray.cpp b/moses/src/DynSuffixArray.cpp index f043f5c9b..f043f5c9b 100755..100644 --- a/moses/src/DynSuffixArray.cpp +++ b/moses/src/DynSuffixArray.cpp diff --git a/moses/src/DynSuffixArray.h b/moses/src/DynSuffixArray.h index 05ea0596a..05ea0596a 100755..100644 --- a/moses/src/DynSuffixArray.h +++ b/moses/src/DynSuffixArray.h diff --git a/moses/src/FFState.cpp b/moses/src/FFState.cpp index 5bf0992a9..5bf0992a9 100755..100644 --- a/moses/src/FFState.cpp +++ b/moses/src/FFState.cpp diff --git a/moses/src/FFState.h b/moses/src/FFState.h index 49b0e55a8..49b0e55a8 100755..100644 --- a/moses/src/FFState.h +++ b/moses/src/FFState.h diff --git a/moses/src/Factor.cpp b/moses/src/Factor.cpp index 60a93fdc3..60a93fdc3 100755..100644 --- a/moses/src/Factor.cpp +++ b/moses/src/Factor.cpp diff --git a/moses/src/Factor.h b/moses/src/Factor.h index 4ea44f4e1..4ea44f4e1 100755..100644 --- a/moses/src/Factor.h +++ b/moses/src/Factor.h diff --git a/moses/src/FactorCollection.cpp b/moses/src/FactorCollection.cpp index 2ef55b6d1..2ef55b6d1 100755..100644 --- a/moses/src/FactorCollection.cpp +++ b/moses/src/FactorCollection.cpp diff --git a/moses/src/FactorCollection.h b/moses/src/FactorCollection.h index d55be1b17..d55be1b17 100755..100644 --- a/moses/src/FactorCollection.h +++ b/moses/src/FactorCollection.h diff --git a/moses/src/FactorTypeSet.cpp b/moses/src/FactorTypeSet.cpp index de2166ba2..de2166ba2 100755..100644 --- a/moses/src/FactorTypeSet.cpp +++ b/moses/src/FactorTypeSet.cpp diff --git a/moses/src/FactorTypeSet.h b/moses/src/FactorTypeSet.h index b0db0502c..b0db0502c 100755..100644 --- a/moses/src/FactorTypeSet.h +++ b/moses/src/FactorTypeSet.h diff --git a/moses/src/FeatureFunction.cpp b/moses/src/FeatureFunction.cpp index d435df5af..d435df5af 100755..100644 --- a/moses/src/FeatureFunction.cpp +++ b/moses/src/FeatureFunction.cpp diff --git a/moses/src/FeatureFunction.h b/moses/src/FeatureFunction.h index 4ef85ecd9..4ef85ecd9 100755..100644 --- a/moses/src/FeatureFunction.h +++ b/moses/src/FeatureFunction.h diff --git a/moses/src/FeatureVector.cpp b/moses/src/FeatureVector.cpp index 911c29600..ac3deb876 100755..100644 --- a/moses/src/FeatureVector.cpp +++ b/moses/src/FeatureVector.cpp @@ -156,29 +156,29 @@ namespace Moses { } } - void FVector::clear() { - m_coreFeatures.resize(0); - m_features.clear(); - } + void FVector::clear() { + m_coreFeatures.resize(0); + m_features.clear(); + } - bool FVector::load(const std::string& filename) { + bool FVector::load(const std::string& filename) { clear(); - ifstream in (filename.c_str()); - if (!in) { + ifstream in (filename.c_str()); + if (!in) { return false; - } - string line; - while(getline(in,line)) { - if (line[0] == '#') continue; - istringstream linestream(line); - string namestring; - FValue value; - linestream >> namestring; - linestream >> value; - FName fname(namestring); - cerr << "Setting sparse weight " << fname << " to value " << value << "." << endl; - set(fname,value); - } + } + string line; + while(getline(in,line)) { + if (line[0] == '#') continue; + istringstream linestream(line); + string namestring; + FValue value; + linestream >> namestring; + linestream >> value; + FName fname(namestring); + //cerr << "Setting sparse weight " << fname << " to value " << value << "." << endl; + set(fname,value); + } return true; } @@ -416,34 +416,38 @@ namespace Moses { void FVector::updateConfidenceCounts(const FVector& weightUpdate, bool signedCounts) { for (size_t i = 0; i < weightUpdate.m_coreFeatures.size(); ++i) { if (signedCounts) { - int sign = weightUpdate.m_coreFeatures[i] >= 0 ? 1 : -1; - m_coreFeatures[i] += (weightUpdate.m_coreFeatures[i] * weightUpdate.m_coreFeatures[i]) * sign; + //int sign = weightUpdate.m_coreFeatures[i] >= 0 ? 1 : -1; + //m_coreFeatures[i] += (weightUpdate.m_coreFeatures[i] * weightUpdate.m_coreFeatures[i]) * sign; + m_coreFeatures[i] += weightUpdate.m_coreFeatures[i]; } else - m_coreFeatures[i] += (weightUpdate.m_coreFeatures[i] * weightUpdate.m_coreFeatures[i]); + //m_coreFeatures[i] += (weightUpdate.m_coreFeatures[i] * weightUpdate.m_coreFeatures[i]); + m_coreFeatures[i] += abs(weightUpdate.m_coreFeatures[i]); } for (const_iterator i = weightUpdate.cbegin(); i != weightUpdate.cend(); ++i) { if (weightUpdate[i->first] == 0) continue; - float value = get(i->first); + float value = get(i->first); if (signedCounts) { - int sign = weightUpdate[i->first] >= 0 ? 1 : -1; - value += (weightUpdate[i->first] * weightUpdate[i->first]) * sign; + //int sign = weightUpdate[i->first] >= 0 ? 1 : -1; + //value += (weightUpdate[i->first] * weightUpdate[i->first]) * sign; + value += weightUpdate[i->first]; } else - value += (weightUpdate[i->first] * weightUpdate[i->first]); + //value += (weightUpdate[i->first] * weightUpdate[i->first]); + value += abs(weightUpdate[i->first]); set(i->first, value); } } - void FVector::updateLearningRates(float decay, const FVector &confidenceCounts, float core_r0, float sparse_r0) { + void FVector::updateLearningRates(float decay_core, float decay_sparse, const FVector &confidenceCounts, float core_r0, float sparse_r0) { for (size_t i = 0; i < confidenceCounts.m_coreFeatures.size(); ++i) { - m_coreFeatures[i] = 1.0/(1.0/core_r0 + decay * abs(confidenceCounts.m_coreFeatures[i])); + m_coreFeatures[i] = 1.0/(1.0/core_r0 + decay_core * abs(confidenceCounts.m_coreFeatures[i])); } for (const_iterator i = confidenceCounts.cbegin(); i != confidenceCounts.cend(); ++i) { - float value = 1.0/(1.0/sparse_r0 + decay * abs(i->second)); + float value = 1.0/(1.0/sparse_r0 + decay_sparse * abs(i->second)); set(i->first, value); } } @@ -612,8 +616,8 @@ namespace Moses { return norm; } - void FVector::l1regularize(float lambda) { - for (size_t i = 0; i < m_coreFeatures.size(); ++i) { + size_t FVector::sparseL1regularize(float lambda) { + /*for (size_t i = 0; i < m_coreFeatures.size(); ++i) { float value = m_coreFeatures[i]; if (value > 0) { m_coreFeatures[i] = max(0.0f, value - lambda); @@ -621,23 +625,39 @@ namespace Moses { else { m_coreFeatures[i] = min(0.0f, value + lambda); } - } + }*/ + size_t numberPruned = size(); + vector<FName> toErase; for (iterator i = begin(); i != end(); ++i) { float value = i->second; - if (value > 0) { - i->second = max(0.0f, value - lambda); - } - else { - i->second = min(0.0f, value + lambda); + if (value != 0.0f) { + if (value > 0) + value = max(0.0f, value - lambda); + else + value = min(0.0f, value + lambda); + + if (value != 0.0f) + i->second = value; + else { + toErase.push_back(i->first); + const std::string& fname = (i->first).name(); + FName::eraseId(FName::getId(fname)); + } } } + + // erase features that have become zero + for (size_t i = 0; i < toErase.size(); ++i) + m_features.erase(toErase[i]); + numberPruned -= size(); + return numberPruned; } - void FVector::l2regularize(float lambda) { - for (size_t i = 0; i < m_coreFeatures.size(); ++i) { + void FVector::sparseL2regularize(float lambda) { + /*for (size_t i = 0; i < m_coreFeatures.size(); ++i) { m_coreFeatures[i] *= (1 - lambda); - } + }*/ for (iterator i = begin(); i != end(); ++i) { i->second *= (1 - lambda); diff --git a/moses/src/FeatureVector.h b/moses/src/FeatureVector.h index a86b30001..5dbfa01fe 100755..100644 --- a/moses/src/FeatureVector.h +++ b/moses/src/FeatureVector.h @@ -192,8 +192,8 @@ namespace Moses { FValue l1norm_coreFeatures() const; FValue l2norm() const; FValue linfnorm() const; - void l1regularize(float lambda); - void l2regularize(float lambda); + size_t sparseL1regularize(float lambda); + void sparseL2regularize(float lambda); FValue sum() const; /** pretty printing */ @@ -218,7 +218,7 @@ namespace Moses { size_t pruneSparseFeatures(size_t threshold); size_t pruneZeroWeightFeatures(); void updateConfidenceCounts(const FVector& weightUpdate, bool signedCounts); - void updateLearningRates(float decay, const FVector& confidence_counts, float core_r0, float sparse_r0); + void updateLearningRates(float decay_core, float decay_sparse, const FVector& confidence_counts, float core_r0, float sparse_r0); // vector which, for each element of the original vector, reflects whether an element is zero or non-zero void setToBinaryOf(const FVector& rhs); diff --git a/moses/src/FeatureVectorTest.cpp b/moses/src/FeatureVectorTest.cpp index af1829e62..af1829e62 100755..100644 --- a/moses/src/FeatureVectorTest.cpp +++ b/moses/src/FeatureVectorTest.cpp diff --git a/moses/src/File.cpp b/moses/src/File.cpp index 3d15b071c..3d15b071c 100755..100644 --- a/moses/src/File.cpp +++ b/moses/src/File.cpp diff --git a/moses/src/File.h b/moses/src/File.h index 09d9ddc92..09d9ddc92 100755..100644 --- a/moses/src/File.h +++ b/moses/src/File.h diff --git a/moses/src/FilePtr.h b/moses/src/FilePtr.h index 1613b2f2f..1613b2f2f 100755..100644 --- a/moses/src/FilePtr.h +++ b/moses/src/FilePtr.h diff --git a/moses/src/FloydWarshall.cpp b/moses/src/FloydWarshall.cpp index e63de819b..e63de819b 100755..100644 --- a/moses/src/FloydWarshall.cpp +++ b/moses/src/FloydWarshall.cpp diff --git a/moses/src/FloydWarshall.h b/moses/src/FloydWarshall.h index 96845caf6..96845caf6 100755..100644 --- a/moses/src/FloydWarshall.h +++ b/moses/src/FloydWarshall.h diff --git a/moses/src/GenerationDictionary.cpp b/moses/src/GenerationDictionary.cpp index f7b35fb63..f7b35fb63 100755..100644 --- a/moses/src/GenerationDictionary.cpp +++ b/moses/src/GenerationDictionary.cpp diff --git a/moses/src/GenerationDictionary.h b/moses/src/GenerationDictionary.h index 1c3f75f75..1c3f75f75 100755..100644 --- a/moses/src/GenerationDictionary.h +++ b/moses/src/GenerationDictionary.h diff --git a/moses/src/GlobalLexicalModel.cpp b/moses/src/GlobalLexicalModel.cpp index 65d3afaa1..65d3afaa1 100755..100644 --- a/moses/src/GlobalLexicalModel.cpp +++ b/moses/src/GlobalLexicalModel.cpp diff --git a/moses/src/GlobalLexicalModel.h b/moses/src/GlobalLexicalModel.h index 3105cb466..3105cb466 100755..100644 --- a/moses/src/GlobalLexicalModel.h +++ b/moses/src/GlobalLexicalModel.h diff --git a/moses/src/GlobalLexicalModelUnlimited.cpp b/moses/src/GlobalLexicalModelUnlimited.cpp index f1de65bd0..f1de65bd0 100755..100644 --- a/moses/src/GlobalLexicalModelUnlimited.cpp +++ b/moses/src/GlobalLexicalModelUnlimited.cpp diff --git a/moses/src/GlobalLexicalModelUnlimited.h b/moses/src/GlobalLexicalModelUnlimited.h index c05c11be8..c05c11be8 100755..100644 --- a/moses/src/GlobalLexicalModelUnlimited.h +++ b/moses/src/GlobalLexicalModelUnlimited.h diff --git a/moses/src/Hypothesis.cpp b/moses/src/Hypothesis.cpp index 72105ec7b..72105ec7b 100755..100644 --- a/moses/src/Hypothesis.cpp +++ b/moses/src/Hypothesis.cpp diff --git a/moses/src/Hypothesis.h b/moses/src/Hypothesis.h index 23980326e..23980326e 100755..100644 --- a/moses/src/Hypothesis.h +++ b/moses/src/Hypothesis.h diff --git a/moses/src/HypothesisStack.cpp b/moses/src/HypothesisStack.cpp index dfa03108e..dfa03108e 100755..100644 --- a/moses/src/HypothesisStack.cpp +++ b/moses/src/HypothesisStack.cpp diff --git a/moses/src/HypothesisStack.h b/moses/src/HypothesisStack.h index 784cd7a39..784cd7a39 100755..100644 --- a/moses/src/HypothesisStack.h +++ b/moses/src/HypothesisStack.h diff --git a/moses/src/HypothesisStackCubePruning.cpp b/moses/src/HypothesisStackCubePruning.cpp index ca54bf944..ca54bf944 100755..100644 --- a/moses/src/HypothesisStackCubePruning.cpp +++ b/moses/src/HypothesisStackCubePruning.cpp diff --git a/moses/src/HypothesisStackCubePruning.h b/moses/src/HypothesisStackCubePruning.h index 53cad04a1..53cad04a1 100755..100644 --- a/moses/src/HypothesisStackCubePruning.h +++ b/moses/src/HypothesisStackCubePruning.h diff --git a/moses/src/HypothesisStackNormal.cpp b/moses/src/HypothesisStackNormal.cpp index 7d72f76aa..7d72f76aa 100755..100644 --- a/moses/src/HypothesisStackNormal.cpp +++ b/moses/src/HypothesisStackNormal.cpp diff --git a/moses/src/HypothesisStackNormal.h b/moses/src/HypothesisStackNormal.h index 6996f4003..6996f4003 100755..100644 --- a/moses/src/HypothesisStackNormal.h +++ b/moses/src/HypothesisStackNormal.h diff --git a/moses/src/InputFileStream.cpp b/moses/src/InputFileStream.cpp index d2d774bf1..d2d774bf1 100755..100644 --- a/moses/src/InputFileStream.cpp +++ b/moses/src/InputFileStream.cpp diff --git a/moses/src/InputFileStream.h b/moses/src/InputFileStream.h index d53abfc23..d53abfc23 100755..100644 --- a/moses/src/InputFileStream.h +++ b/moses/src/InputFileStream.h diff --git a/moses/src/InputType.cpp b/moses/src/InputType.cpp index 77857bdaf..77857bdaf 100755..100644 --- a/moses/src/InputType.cpp +++ b/moses/src/InputType.cpp diff --git a/moses/src/InputType.h b/moses/src/InputType.h index ca710c408..ca710c408 100755..100644 --- a/moses/src/InputType.h +++ b/moses/src/InputType.h diff --git a/moses/src/Jamfile b/moses/src/Jamfile index b6e379070..b6e379070 100755..100644 --- a/moses/src/Jamfile +++ b/moses/src/Jamfile diff --git a/moses/src/LM/Base.cpp b/moses/src/LM/Base.cpp index 45edf973e..45edf973e 100755..100644 --- a/moses/src/LM/Base.cpp +++ b/moses/src/LM/Base.cpp diff --git a/moses/src/LM/Base.h b/moses/src/LM/Base.h index 621ab0dc3..621ab0dc3 100755..100644 --- a/moses/src/LM/Base.h +++ b/moses/src/LM/Base.h diff --git a/moses/src/LM/DMap.cpp b/moses/src/LM/DMap.cpp index 3bef47083..3bef47083 100755..100644 --- a/moses/src/LM/DMap.cpp +++ b/moses/src/LM/DMap.cpp diff --git a/moses/src/LM/DMap.h b/moses/src/LM/DMap.h index f9fbf56c2..f9fbf56c2 100755..100644 --- a/moses/src/LM/DMap.h +++ b/moses/src/LM/DMap.h diff --git a/moses/src/LM/Factory.cpp b/moses/src/LM/Factory.cpp index 5d877e9d6..5d877e9d6 100755..100644 --- a/moses/src/LM/Factory.cpp +++ b/moses/src/LM/Factory.cpp diff --git a/moses/src/LM/Factory.h b/moses/src/LM/Factory.h index 1a140846a..1a140846a 100755..100644 --- a/moses/src/LM/Factory.h +++ b/moses/src/LM/Factory.h diff --git a/moses/src/LM/IRST.cpp b/moses/src/LM/IRST.cpp index 692385b4d..692385b4d 100755..100644 --- a/moses/src/LM/IRST.cpp +++ b/moses/src/LM/IRST.cpp diff --git a/moses/src/LM/IRST.h b/moses/src/LM/IRST.h index 2ffe67f98..2ffe67f98 100755..100644 --- a/moses/src/LM/IRST.h +++ b/moses/src/LM/IRST.h diff --git a/moses/src/LM/Implementation.cpp b/moses/src/LM/Implementation.cpp index 589ed375a..589ed375a 100755..100644 --- a/moses/src/LM/Implementation.cpp +++ b/moses/src/LM/Implementation.cpp diff --git a/moses/src/LM/Implementation.h b/moses/src/LM/Implementation.h index a7c637ef8..a7c637ef8 100755..100644 --- a/moses/src/LM/Implementation.h +++ b/moses/src/LM/Implementation.h diff --git a/moses/src/LM/Jamfile b/moses/src/LM/Jamfile index 2f3cde8ef..2f3cde8ef 100755..100644 --- a/moses/src/LM/Jamfile +++ b/moses/src/LM/Jamfile diff --git a/moses/src/LM/Joint.cpp b/moses/src/LM/Joint.cpp index 266f08029..266f08029 100755..100644 --- a/moses/src/LM/Joint.cpp +++ b/moses/src/LM/Joint.cpp diff --git a/moses/src/LM/Joint.h b/moses/src/LM/Joint.h index e000409be..e000409be 100755..100644 --- a/moses/src/LM/Joint.h +++ b/moses/src/LM/Joint.h diff --git a/moses/src/LM/Ken.cpp b/moses/src/LM/Ken.cpp index c5307ffc0..c5307ffc0 100755..100644 --- a/moses/src/LM/Ken.cpp +++ b/moses/src/LM/Ken.cpp diff --git a/moses/src/LM/Ken.h b/moses/src/LM/Ken.h index f55679395..f55679395 100755..100644 --- a/moses/src/LM/Ken.h +++ b/moses/src/LM/Ken.h diff --git a/moses/src/LM/MultiFactor.cpp b/moses/src/LM/MultiFactor.cpp index d141b88b3..d141b88b3 100755..100644 --- a/moses/src/LM/MultiFactor.cpp +++ b/moses/src/LM/MultiFactor.cpp diff --git a/moses/src/LM/MultiFactor.h b/moses/src/LM/MultiFactor.h index 32cef51d9..32cef51d9 100755..100644 --- a/moses/src/LM/MultiFactor.h +++ b/moses/src/LM/MultiFactor.h diff --git a/moses/src/LM/ORLM.cpp b/moses/src/LM/ORLM.cpp index 30f3ada55..30f3ada55 100755..100644 --- a/moses/src/LM/ORLM.cpp +++ b/moses/src/LM/ORLM.cpp diff --git a/moses/src/LM/ORLM.h b/moses/src/LM/ORLM.h index c1ccb4387..c1ccb4387 100755..100644 --- a/moses/src/LM/ORLM.h +++ b/moses/src/LM/ORLM.h diff --git a/moses/src/LM/ParallelBackoff.cpp b/moses/src/LM/ParallelBackoff.cpp index ec2fb2f78..ec2fb2f78 100755..100644 --- a/moses/src/LM/ParallelBackoff.cpp +++ b/moses/src/LM/ParallelBackoff.cpp diff --git a/moses/src/LM/ParallelBackoff.h b/moses/src/LM/ParallelBackoff.h index 8e4241395..8e4241395 100755..100644 --- a/moses/src/LM/ParallelBackoff.h +++ b/moses/src/LM/ParallelBackoff.h diff --git a/moses/src/LM/Rand.cpp b/moses/src/LM/Rand.cpp index 93411b8d3..93411b8d3 100755..100644 --- a/moses/src/LM/Rand.cpp +++ b/moses/src/LM/Rand.cpp diff --git a/moses/src/LM/Rand.h b/moses/src/LM/Rand.h index c4ef99947..c4ef99947 100755..100644 --- a/moses/src/LM/Rand.h +++ b/moses/src/LM/Rand.h diff --git a/moses/src/LM/Remote.cpp b/moses/src/LM/Remote.cpp index 78380c75e..78380c75e 100755..100644 --- a/moses/src/LM/Remote.cpp +++ b/moses/src/LM/Remote.cpp diff --git a/moses/src/LM/Remote.h b/moses/src/LM/Remote.h index 9a70d64c0..9a70d64c0 100755..100644 --- a/moses/src/LM/Remote.h +++ b/moses/src/LM/Remote.h diff --git a/moses/src/LM/SRI.cpp b/moses/src/LM/SRI.cpp index 9c5a9c3d4..9c5a9c3d4 100755..100644 --- a/moses/src/LM/SRI.cpp +++ b/moses/src/LM/SRI.cpp diff --git a/moses/src/LM/SRI.h b/moses/src/LM/SRI.h index 69d55f117..69d55f117 100755..100644 --- a/moses/src/LM/SRI.h +++ b/moses/src/LM/SRI.h diff --git a/moses/src/LM/SingleFactor.cpp b/moses/src/LM/SingleFactor.cpp index 73c9e6e83..73c9e6e83 100755..100644 --- a/moses/src/LM/SingleFactor.cpp +++ b/moses/src/LM/SingleFactor.cpp diff --git a/moses/src/LM/SingleFactor.h b/moses/src/LM/SingleFactor.h index 44fdf9b16..44fdf9b16 100755..100644 --- a/moses/src/LM/SingleFactor.h +++ b/moses/src/LM/SingleFactor.h diff --git a/moses/src/LMList.cpp b/moses/src/LMList.cpp index cac1199e0..cac1199e0 100755..100644 --- a/moses/src/LMList.cpp +++ b/moses/src/LMList.cpp diff --git a/moses/src/LMList.h b/moses/src/LMList.h index a803e16df..a803e16df 100755..100644 --- a/moses/src/LMList.h +++ b/moses/src/LMList.h diff --git a/moses/src/LVoc.cpp b/moses/src/LVoc.cpp index d1ee92237..d1ee92237 100755..100644 --- a/moses/src/LVoc.cpp +++ b/moses/src/LVoc.cpp diff --git a/moses/src/LVoc.h b/moses/src/LVoc.h index ec20fe3cd..ec20fe3cd 100755..100644 --- a/moses/src/LVoc.h +++ b/moses/src/LVoc.h diff --git a/moses/src/LexicalReordering.cpp b/moses/src/LexicalReordering.cpp index b32b96b0d..b32b96b0d 100755..100644 --- a/moses/src/LexicalReordering.cpp +++ b/moses/src/LexicalReordering.cpp diff --git a/moses/src/LexicalReordering.h b/moses/src/LexicalReordering.h index e979b5bf5..e979b5bf5 100755..100644 --- a/moses/src/LexicalReordering.h +++ b/moses/src/LexicalReordering.h diff --git a/moses/src/LexicalReorderingState.cpp b/moses/src/LexicalReorderingState.cpp index 346ac745b..346ac745b 100755..100644 --- a/moses/src/LexicalReorderingState.cpp +++ b/moses/src/LexicalReorderingState.cpp diff --git a/moses/src/LexicalReorderingState.h b/moses/src/LexicalReorderingState.h index 802f1fcb0..802f1fcb0 100755..100644 --- a/moses/src/LexicalReorderingState.h +++ b/moses/src/LexicalReorderingState.h diff --git a/moses/src/LexicalReorderingTable.cpp b/moses/src/LexicalReorderingTable.cpp index 00be0a495..00be0a495 100755..100644 --- a/moses/src/LexicalReorderingTable.cpp +++ b/moses/src/LexicalReorderingTable.cpp diff --git a/moses/src/LexicalReorderingTable.h b/moses/src/LexicalReorderingTable.h index ae10ae386..ae10ae386 100755..100644 --- a/moses/src/LexicalReorderingTable.h +++ b/moses/src/LexicalReorderingTable.h diff --git a/moses/src/Makefile.am b/moses/src/Makefile.am index b43191773..b43191773 100755..100644 --- a/moses/src/Makefile.am +++ b/moses/src/Makefile.am diff --git a/moses/src/Manager.cpp b/moses/src/Manager.cpp index c27d88fee..c27d88fee 100755..100644 --- a/moses/src/Manager.cpp +++ b/moses/src/Manager.cpp diff --git a/moses/src/Manager.h b/moses/src/Manager.h index 4b45414ee..4b45414ee 100755..100644 --- a/moses/src/Manager.h +++ b/moses/src/Manager.h diff --git a/moses/src/MockHypothesis.cpp b/moses/src/MockHypothesis.cpp index 0afd3b071..0afd3b071 100755..100644 --- a/moses/src/MockHypothesis.cpp +++ b/moses/src/MockHypothesis.cpp diff --git a/moses/src/MockHypothesis.h b/moses/src/MockHypothesis.h index 41f118f40..41f118f40 100755..100644 --- a/moses/src/MockHypothesis.h +++ b/moses/src/MockHypothesis.h diff --git a/moses/src/MosesTest.cpp b/moses/src/MosesTest.cpp index 45f5bdba4..45f5bdba4 100755..100644 --- a/moses/src/MosesTest.cpp +++ b/moses/src/MosesTest.cpp diff --git a/moses/src/NonTerminal.cpp b/moses/src/NonTerminal.cpp index 37ebc9b68..37ebc9b68 100755..100644 --- a/moses/src/NonTerminal.cpp +++ b/moses/src/NonTerminal.cpp diff --git a/moses/src/NonTerminal.h b/moses/src/NonTerminal.h index 3fa2ede92..3fa2ede92 100755..100644 --- a/moses/src/NonTerminal.h +++ b/moses/src/NonTerminal.h diff --git a/moses/src/ObjectPool.h b/moses/src/ObjectPool.h index 05c849f79..05c849f79 100755..100644 --- a/moses/src/ObjectPool.h +++ b/moses/src/ObjectPool.h diff --git a/moses/src/OnlineCommand.cpp b/moses/src/OnlineCommand.cpp index 93024b92c..93024b92c 100755..100644 --- a/moses/src/OnlineCommand.cpp +++ b/moses/src/OnlineCommand.cpp diff --git a/moses/src/OnlineCommand.h b/moses/src/OnlineCommand.h index 90f778ea4..90f778ea4 100755..100644 --- a/moses/src/OnlineCommand.h +++ b/moses/src/OnlineCommand.h diff --git a/moses/src/OutputCollector.h b/moses/src/OutputCollector.h index 0b56c6d80..0b56c6d80 100755..100644 --- a/moses/src/OutputCollector.h +++ b/moses/src/OutputCollector.h diff --git a/moses/src/PCNTools.cpp b/moses/src/PCNTools.cpp index fac386444..fac386444 100755..100644 --- a/moses/src/PCNTools.cpp +++ b/moses/src/PCNTools.cpp diff --git a/moses/src/PCNTools.h b/moses/src/PCNTools.h index 1147b73bb..1147b73bb 100755..100644 --- a/moses/src/PCNTools.h +++ b/moses/src/PCNTools.h diff --git a/moses/src/PDTAimp.h b/moses/src/PDTAimp.h index 7bff39c07..0c2a984b0 100755..100644 --- a/moses/src/PDTAimp.h +++ b/moses/src/PDTAimp.h @@ -33,13 +33,11 @@ class PDTAimp protected: PDTAimp(PhraseDictionaryTreeAdaptor *p,unsigned nis) - : m_languageModels(0),m_weightWP(0.0),m_dict(0), + : m_languageModels(0),m_dict(0), m_obj(p),useCache(1),m_numInputScores(nis),totalE(0),distinctE(0) {} -public: - std::vector<float> m_weights; + public: LMList const* m_languageModels; - float m_weightWP; std::vector<FactorType> m_input,m_output; PhraseDictionaryTree *m_dict; typedef std::vector<TargetPhraseCollection const*> vTPC; @@ -139,6 +137,10 @@ public: return 0; } + const TranslationSystem& system = StaticData::Instance().GetTranslationSystem(TranslationSystem::DEFAULT); + std::vector<float> weights = system.GetTranslationWeights(m_obj->GetDictIndex()); + float weightWP = system.GetWeightWordPenalty(); + std::vector<TargetPhrase> tCands; tCands.reserve(cands.size()); std::vector<std::pair<float,size_t> > costs; @@ -165,7 +167,7 @@ public: *(cands[i].fnames[j]), cands[i].fvalues[j]); } } - CreateTargetPhrase(targetPhrase,factorStrings,scoreVector, sparseFeatures, wacands[i],&src); + CreateTargetPhrase(targetPhrase,factorStrings,scoreVector, sparseFeatures, wacands[i], weights, weightWP, &src); costs.push_back(std::make_pair(-targetPhrase.GetFutureScore(),tCands.size())); tCands.push_back(targetPhrase); } @@ -188,9 +190,8 @@ public: void Create(const std::vector<FactorType> &input , const std::vector<FactorType> &output , const std::string &filePath - , const std::vector<float> &weight + , const std::vector<float> &weight , const LMList &languageModels - , float weightWP ) { // set my members @@ -198,8 +199,6 @@ public: m_input=input; m_output=output; m_languageModels=&languageModels; - m_weightWP=weightWP; - m_weights=weight; const StaticData &staticData = StaticData::Instance(); m_dict->UseWordAlignment(staticData.UseAlignmentInfo()); @@ -262,8 +261,10 @@ public: Scores const& scoreVector, const ScoreComponentCollection& sparseFeatures, const std::string& alignmentString, + std::vector<float> &weights, + float weightWP, Phrase const* srcPtr=0) const { - CreateTargetPhrase(targetPhrase, factorStrings, scoreVector, sparseFeatures, srcPtr); + CreateTargetPhrase(targetPhrase, factorStrings, scoreVector, sparseFeatures, weights, weightWP, srcPtr); targetPhrase.SetAlignmentInfo(alignmentString); } @@ -272,6 +273,8 @@ public: StringTgtCand::Tokens const& factorStrings, Scores const& scoreVector, const ScoreComponentCollection& sparseFeatures, + std::vector<float> &weights, + float weightWP, Phrase const* srcPtr=0) const { FactorCollection &factorCollection = FactorCollection::Instance(); @@ -284,7 +287,7 @@ public: } } - targetPhrase.SetScore(m_obj->GetFeature(), scoreVector, sparseFeatures, m_weights, m_weightWP, *m_languageModels); + targetPhrase.SetScore(m_obj->GetFeature(), scoreVector, sparseFeatures, weights, weightWP, *m_languageModels); targetPhrase.SetSourcePhrase(*srcPtr); } @@ -366,6 +369,10 @@ public: for(Position i=0 ; i < srcSize ; ++i) stack.push_back(State(i, i, m_dict->GetRoot(), std::vector<float>(m_numInputScores,0.0))); + const TranslationSystem& system = StaticData::Instance().GetTranslationSystem(TranslationSystem::DEFAULT); + std::vector<float> weightT = system.GetTranslationWeights(m_obj->GetDictIndex()); + float weightWP = system.GetWeightWordPenalty(); + while(!stack.empty()) { State curr(stack.back()); stack.pop_back(); @@ -440,19 +447,13 @@ public: //put in phrase table scores, logging as we insert std::transform(tcands[i].scores.begin(),tcands[i].scores.end(),nscores.begin() + m_numInputScores,TransformScore); - - CHECK(nscores.size()==m_weights.size()); - - const TranslationSystem& system = StaticData::Instance().GetTranslationSystem(TranslationSystem::DEFAULT); + CHECK(nscores.size()==weightT.size()); + //tally up - std::vector<float> weightT = system.GetTranslationWeights(); - //float score=std::inner_product(nscores.begin(), nscores.end(), m_weights.begin(), 0.0f); float score=std::inner_product(nscores.begin(), nscores.end(), weightT.begin(), 0.0f); //count word penalty - float weightWP = system.GetWeightWordPenalty(); - //score-=tcands[i].tokens.size() * m_weightWP; score-=tcands[i].tokens.size() * weightWP; std::pair<E2Costs::iterator,bool> p=e2costs.insert(std::make_pair(tcands[i].tokens,TScores())); @@ -501,7 +502,7 @@ public: for(E2Costs::const_iterator j=i->second.begin(); j!=i->second.end(); ++j) { TScores const & scores=j->second; TargetPhrase targetPhrase(Output); - CreateTargetPhrase(targetPhrase,j->first,scores.trans,ScoreComponentCollection(),scores.src); + CreateTargetPhrase(targetPhrase,j->first,scores.trans,ScoreComponentCollection(),weightT,weightWP,scores.src); costs.push_back(std::make_pair(-targetPhrase.GetFutureScore(),tCands.size())); tCands.push_back(targetPhrase); //std::cerr << i->first.first << "-" << i->first.second << ": " << targetPhrase << std::endl; diff --git a/moses/src/Parameter.cpp b/moses/src/Parameter.cpp index a24c6033c..a24c6033c 100755..100644 --- a/moses/src/Parameter.cpp +++ b/moses/src/Parameter.cpp diff --git a/moses/src/Parameter.h b/moses/src/Parameter.h index de0d3f7e7..de0d3f7e7 100755..100644 --- a/moses/src/Parameter.h +++ b/moses/src/Parameter.h diff --git a/moses/src/PartialTranslOptColl.cpp b/moses/src/PartialTranslOptColl.cpp index 91ad65415..91ad65415 100755..100644 --- a/moses/src/PartialTranslOptColl.cpp +++ b/moses/src/PartialTranslOptColl.cpp diff --git a/moses/src/PartialTranslOptColl.h b/moses/src/PartialTranslOptColl.h index b8b16b901..b8b16b901 100755..100644 --- a/moses/src/PartialTranslOptColl.h +++ b/moses/src/PartialTranslOptColl.h diff --git a/moses/src/Phrase.cpp b/moses/src/Phrase.cpp index db808390c..db808390c 100755..100644 --- a/moses/src/Phrase.cpp +++ b/moses/src/Phrase.cpp diff --git a/moses/src/Phrase.h b/moses/src/Phrase.h index b64a84a25..b64a84a25 100755..100644 --- a/moses/src/Phrase.h +++ b/moses/src/Phrase.h diff --git a/moses/src/PhraseBoundaryFeature.cpp b/moses/src/PhraseBoundaryFeature.cpp index 461fcbe57..461fcbe57 100755..100644 --- a/moses/src/PhraseBoundaryFeature.cpp +++ b/moses/src/PhraseBoundaryFeature.cpp diff --git a/moses/src/PhraseBoundaryFeature.h b/moses/src/PhraseBoundaryFeature.h index 4167ab9b2..4167ab9b2 100755..100644 --- a/moses/src/PhraseBoundaryFeature.h +++ b/moses/src/PhraseBoundaryFeature.h diff --git a/moses/src/PhraseDictionary.cpp b/moses/src/PhraseDictionary.cpp index 0fc39a286..49615456c 100755..100644 --- a/moses/src/PhraseDictionary.cpp +++ b/moses/src/PhraseDictionary.cpp @@ -46,6 +46,11 @@ GetTargetPhraseCollection(InputType const& src,WordsRange const& range) const return GetTargetPhraseCollection(src.GetSubString(range)); } +size_t PhraseDictionary::GetDictIndex() const +{ + return m_feature->GetDictIndex(); +} + PhraseDictionaryFeature::PhraseDictionaryFeature (PhraseTableImplementation implementation , SparsePhraseDictionaryFeature* spdf @@ -55,13 +60,14 @@ PhraseDictionaryFeature::PhraseDictionaryFeature , const std::vector<FactorType> &output , const std::string &filePath , const std::vector<float> &weight + , size_t dictIndex , size_t tableLimit , const std::string &targetFile // default param , const std::string &alignmentsFile) // default param :DecodeFeature("PhraseModel",numScoreComponent,input,output), m_numInputScores(numInputScores), m_filePath(filePath), - m_weight(weight), + m_dictIndex(dictIndex), m_tableLimit(tableLimit), m_implementation(implementation), m_targetFile(targetFile), @@ -70,6 +76,10 @@ PhraseDictionaryFeature::PhraseDictionaryFeature { if (implementation == Memory || implementation == SCFG || implementation == SuffixArray) { m_useThreadSafePhraseDictionary = true; + if (implementation == SuffixArray) { + cerr << "Warning: implementation holds chached weights!" << endl; + exit(1); + } } else { m_useThreadSafePhraseDictionary = false; } @@ -78,7 +88,7 @@ PhraseDictionaryFeature::PhraseDictionaryFeature PhraseDictionary* PhraseDictionaryFeature::LoadPhraseTable(const TranslationSystem* system) { const StaticData& staticData = StaticData::Instance(); - std::vector<float> weightT = system->GetTranslationWeights(); + std::vector<float> weightT = system->GetTranslationWeights(m_dictIndex); if (m_implementation == Memory) { // memory phrase table @@ -95,7 +105,6 @@ PhraseDictionary* PhraseDictionaryFeature::LoadPhraseTable(const TranslationSyst PhraseDictionaryMemory* pdm = new PhraseDictionaryMemory(GetNumScoreComponents(),this); bool ret = pdm->Load(GetInput(), GetOutput() , m_filePath - //, m_weight , weightT , m_tableLimit , system->GetLanguageModels() @@ -107,7 +116,6 @@ PhraseDictionary* PhraseDictionaryFeature::LoadPhraseTable(const TranslationSyst bool ret = pdta->Load( GetInput() , GetOutput() , m_filePath - //, m_weight , weightT , m_tableLimit , system->GetLanguageModels() @@ -126,8 +134,7 @@ PhraseDictionary* PhraseDictionaryFeature::LoadPhraseTable(const TranslationSyst bool ret = pdm->Load(GetInput() , GetOutput() , m_filePath - // m_weight - , weightT + , weightT , m_tableLimit , system->GetLanguageModels() , system->GetWordPenaltyProducer()); @@ -145,7 +152,6 @@ PhraseDictionary* PhraseDictionaryFeature::LoadPhraseTable(const TranslationSyst bool ret = pdm->Load(GetInput() , GetOutput() , m_filePath - //, m_weight , weightT , m_tableLimit , system->GetLanguageModels() @@ -154,6 +160,8 @@ PhraseDictionary* PhraseDictionaryFeature::LoadPhraseTable(const TranslationSyst return pdm; } else if (m_implementation == ALSuffixArray) { // memory phrase table + cerr << "Warning: Implementation holds cached weights!" << endl; + exit(1); VERBOSE(2,"using Hiero format phrase tables" << std::endl); if (!FileExists(m_filePath) && FileExists(m_filePath + ".gz")) { m_filePath += ".gz"; @@ -164,9 +172,8 @@ PhraseDictionary* PhraseDictionaryFeature::LoadPhraseTable(const TranslationSyst bool ret = pdm->Load(GetInput() , GetOutput() , m_filePath - //, m_weight - , weightT - , m_tableLimit + , weightT + , m_tableLimit , system->GetLanguageModels() , system->GetWordPenaltyProducer()); CHECK(ret); @@ -177,14 +184,15 @@ PhraseDictionary* PhraseDictionaryFeature::LoadPhraseTable(const TranslationSyst bool ret = pdta->Load(GetInput() , GetOutput() , m_filePath - //, m_weight - , weightT - , m_tableLimit + , weightT + , m_tableLimit , system->GetLanguageModels() , system->GetWordPenaltyProducer()); CHECK(ret); return pdta; } else if (m_implementation == SuffixArray) { + cerr << "Warning: Implementation holds cached weights!" << endl; + exit(1); #ifndef WIN32 PhraseDictionaryDynSuffixArray *pd = new PhraseDictionaryDynSuffixArray(GetNumScoreComponents(), this); if(!(pd->Load( @@ -192,11 +200,10 @@ PhraseDictionary* PhraseDictionaryFeature::LoadPhraseTable(const TranslationSyst ,GetOutput() ,m_filePath ,m_targetFile - , m_alignmentsFile - //, m_weight, m_tableLimit - , weightT, m_tableLimit - , system->GetLanguageModels() - , system->GetWeightWordPenalty()))) { + ,m_alignmentsFile + ,weightT, m_tableLimit + ,system->GetLanguageModels() + ,system->GetWeightWordPenalty()))) { std::cerr << "FAILED TO LOAD\n" << endl; delete pd; pd = NULL; @@ -297,5 +304,10 @@ const PhraseDictionaryFeature* PhraseDictionary::GetFeature() const return m_feature; } +size_t PhraseDictionaryFeature::GetDictIndex() const +{ + return m_dictIndex; +} + } diff --git a/moses/src/PhraseDictionary.h b/moses/src/PhraseDictionary.h index e8f478079..18b48436e 100755..100644 --- a/moses/src/PhraseDictionary.h +++ b/moses/src/PhraseDictionary.h @@ -69,7 +69,7 @@ public: return Translate; } const PhraseDictionaryFeature* GetFeature() const; - + size_t GetDictIndex() const; //! find list of translations that can translates src. Only for phrase input virtual const TargetPhraseCollection *GetTargetPhraseCollection(const Phrase& src) const=0; @@ -105,6 +105,7 @@ public: , const std::vector<FactorType> &output , const std::string &filePath , const std::vector<float> &weight + , size_t dictIndex , size_t tableLimit , const std::string &targetFile , const std::string &alignmentsFile); @@ -131,6 +132,10 @@ public: //Get the dictionary. Be sure to initialise it first. const PhraseDictionary* GetDictionary() const; PhraseDictionary* GetDictionary(); + size_t GetDictIndex() const; + +protected: + size_t m_dictIndex; private: /** Load the appropriate phrase table */ @@ -138,7 +143,6 @@ private: unsigned m_numInputScores; std::string m_filePath; - std::vector<float> m_weight; size_t m_tableLimit; //We instantiate either the the thread-safe or non-thread-safe dictionary, //but not both. The thread-safe one can be instantiated in the constructor and shared diff --git a/moses/src/PhraseDictionaryALSuffixArray.cpp b/moses/src/PhraseDictionaryALSuffixArray.cpp index 71b810a91..99fe968f7 100755..100644 --- a/moses/src/PhraseDictionaryALSuffixArray.cpp +++ b/moses/src/PhraseDictionaryALSuffixArray.cpp @@ -56,8 +56,7 @@ void PhraseDictionaryALSuffixArray::InitializeForInput(InputType const& source) std::auto_ptr<RuleTableLoader> loader = RuleTableLoaderFactory::Create(grammarFile); - std::vector<float> weightT = StaticData::Instance().GetTranslationSystem(TranslationSystem::DEFAULT).GetTranslationWeights(); - //bool ret = loader->Load(*m_input, *m_output, inFile, *m_weight, m_tableLimit, + std::vector<float> weightT = StaticData::Instance().GetTranslationSystem(TranslationSystem::DEFAULT).GetTranslationWeights(GetDictIndex()); bool ret = loader->Load(*m_input, *m_output, inFile, weightT, m_tableLimit, *m_languageModels, m_wpProducer, *this); diff --git a/moses/src/PhraseDictionaryALSuffixArray.h b/moses/src/PhraseDictionaryALSuffixArray.h index 79c928c69..79c928c69 100755..100644 --- a/moses/src/PhraseDictionaryALSuffixArray.h +++ b/moses/src/PhraseDictionaryALSuffixArray.h diff --git a/moses/src/PhraseDictionaryDynSuffixArray.cpp b/moses/src/PhraseDictionaryDynSuffixArray.cpp index d4f0161db..d4f0161db 100755..100644 --- a/moses/src/PhraseDictionaryDynSuffixArray.cpp +++ b/moses/src/PhraseDictionaryDynSuffixArray.cpp diff --git a/moses/src/PhraseDictionaryDynSuffixArray.h b/moses/src/PhraseDictionaryDynSuffixArray.h index 0d6be08dd..0d6be08dd 100755..100644 --- a/moses/src/PhraseDictionaryDynSuffixArray.h +++ b/moses/src/PhraseDictionaryDynSuffixArray.h diff --git a/moses/src/PhraseDictionaryHiero.cpp b/moses/src/PhraseDictionaryHiero.cpp index 5899ec8b1..5899ec8b1 100755..100644 --- a/moses/src/PhraseDictionaryHiero.cpp +++ b/moses/src/PhraseDictionaryHiero.cpp diff --git a/moses/src/PhraseDictionaryHiero.h b/moses/src/PhraseDictionaryHiero.h index f845c4e15..f845c4e15 100755..100644 --- a/moses/src/PhraseDictionaryHiero.h +++ b/moses/src/PhraseDictionaryHiero.h diff --git a/moses/src/PhraseDictionaryMemory.cpp b/moses/src/PhraseDictionaryMemory.cpp index 1ee449172..1ee449172 100755..100644 --- a/moses/src/PhraseDictionaryMemory.cpp +++ b/moses/src/PhraseDictionaryMemory.cpp diff --git a/moses/src/PhraseDictionaryMemory.h b/moses/src/PhraseDictionaryMemory.h index dad7f4a9b..dad7f4a9b 100755..100644 --- a/moses/src/PhraseDictionaryMemory.h +++ b/moses/src/PhraseDictionaryMemory.h diff --git a/moses/src/PhraseDictionaryNode.cpp b/moses/src/PhraseDictionaryNode.cpp index 5b552bd53..5b552bd53 100755..100644 --- a/moses/src/PhraseDictionaryNode.cpp +++ b/moses/src/PhraseDictionaryNode.cpp diff --git a/moses/src/PhraseDictionaryNode.h b/moses/src/PhraseDictionaryNode.h index 95ae48b0e..95ae48b0e 100755..100644 --- a/moses/src/PhraseDictionaryNode.h +++ b/moses/src/PhraseDictionaryNode.h diff --git a/moses/src/PhraseDictionaryNodeSCFG.cpp b/moses/src/PhraseDictionaryNodeSCFG.cpp index 91f5f7acd..91f5f7acd 100755..100644 --- a/moses/src/PhraseDictionaryNodeSCFG.cpp +++ b/moses/src/PhraseDictionaryNodeSCFG.cpp diff --git a/moses/src/PhraseDictionaryNodeSCFG.h b/moses/src/PhraseDictionaryNodeSCFG.h index 80e3722b5..80e3722b5 100755..100644 --- a/moses/src/PhraseDictionaryNodeSCFG.h +++ b/moses/src/PhraseDictionaryNodeSCFG.h diff --git a/moses/src/PhraseDictionaryOnDisk.cpp b/moses/src/PhraseDictionaryOnDisk.cpp index 3c89408f5..5bada2aea 100755..100644 --- a/moses/src/PhraseDictionaryOnDisk.cpp +++ b/moses/src/PhraseDictionaryOnDisk.cpp @@ -39,7 +39,7 @@ PhraseDictionaryOnDisk::~PhraseDictionaryOnDisk() bool PhraseDictionaryOnDisk::Load(const std::vector<FactorType> &input , const std::vector<FactorType> &output , const std::string &filePath - , const std::vector<float> &weight + , const std::vector<float> &weight , size_t tableLimit , const LMList& languageModels , const WordPenaltyProducer* wpProducer) @@ -51,8 +51,6 @@ bool PhraseDictionaryOnDisk::Load(const std::vector<FactorType> &input m_inputFactorsVec = input; m_outputFactorsVec = output; - m_weight = weight; - LoadTargetLookup(); if (!m_dbWrapper.BeginLoad(filePath)) @@ -94,13 +92,11 @@ ChartRuleLookupManager *PhraseDictionaryOnDisk::CreateRuleLookupManager( const InputType &sentence, const ChartCellCollection &cellCollection) { - std::vector<float> weightT = StaticData::Instance().GetTranslationSystem(TranslationSystem::DEFAULT).GetTranslationWeights(); + std::vector<float> weightT = StaticData::Instance().GetTranslationSystem(TranslationSystem::DEFAULT).GetTranslationWeights(GetDictIndex()); return new ChartRuleLookupManagerOnDisk(sentence, cellCollection, *this, m_dbWrapper, m_languageModels, m_wpProducer, m_inputFactorsVec, - //m_outputFactorsVec, m_weight, - m_outputFactorsVec, weightT, - m_filePath); + m_outputFactorsVec, m_filePath); } } diff --git a/moses/src/PhraseDictionaryOnDisk.h b/moses/src/PhraseDictionaryOnDisk.h index 0a8dfc808..64c77cbd7 100755..100644 --- a/moses/src/PhraseDictionaryOnDisk.h +++ b/moses/src/PhraseDictionaryOnDisk.h @@ -45,7 +45,6 @@ protected: const LMList* m_languageModels; const WordPenaltyProducer* m_wpProducer; std::vector<FactorType> m_inputFactorsVec, m_outputFactorsVec; - std::vector<float> m_weight; std::string m_filePath; void LoadTargetLookup(); @@ -63,7 +62,7 @@ public: bool Load(const std::vector<FactorType> &input , const std::vector<FactorType> &output , const std::string &filePath - , const std::vector<float> &weight + , const std::vector<float> &weight , size_t tableLimit, const LMList& languageModels, const WordPenaltyProducer* wpProducer); diff --git a/moses/src/PhraseDictionarySCFG.cpp b/moses/src/PhraseDictionarySCFG.cpp index c3a243990..c3a243990 100755..100644 --- a/moses/src/PhraseDictionarySCFG.cpp +++ b/moses/src/PhraseDictionarySCFG.cpp diff --git a/moses/src/PhraseDictionarySCFG.h b/moses/src/PhraseDictionarySCFG.h index e338dac50..e338dac50 100755..100644 --- a/moses/src/PhraseDictionarySCFG.h +++ b/moses/src/PhraseDictionarySCFG.h diff --git a/moses/src/PhraseDictionaryTree.cpp b/moses/src/PhraseDictionaryTree.cpp index 13b404724..13b404724 100755..100644 --- a/moses/src/PhraseDictionaryTree.cpp +++ b/moses/src/PhraseDictionaryTree.cpp diff --git a/moses/src/PhraseDictionaryTree.h b/moses/src/PhraseDictionaryTree.h index ebe43a618..ebe43a618 100755..100644 --- a/moses/src/PhraseDictionaryTree.h +++ b/moses/src/PhraseDictionaryTree.h diff --git a/moses/src/PhraseDictionaryTreeAdaptor.cpp b/moses/src/PhraseDictionaryTreeAdaptor.cpp index cce4a2ee4..154572bce 100755..100644 --- a/moses/src/PhraseDictionaryTreeAdaptor.cpp +++ b/moses/src/PhraseDictionaryTreeAdaptor.cpp @@ -55,8 +55,7 @@ bool PhraseDictionaryTreeAdaptor::Load(const std::vector<FactorType> &input // set PhraseDictionary members m_tableLimit=tableLimit; - imp->Create(input,output,filePath, - weight,languageModels,weightWP); + imp->Create(input,output,filePath,weight,languageModels); return true; } diff --git a/moses/src/PhraseDictionaryTreeAdaptor.h b/moses/src/PhraseDictionaryTreeAdaptor.h index c38e234fb..c38e234fb 100755..100644 --- a/moses/src/PhraseDictionaryTreeAdaptor.h +++ b/moses/src/PhraseDictionaryTreeAdaptor.h diff --git a/moses/src/PhraseLengthFeature.cpp b/moses/src/PhraseLengthFeature.cpp index ece3b0923..ece3b0923 100755..100644 --- a/moses/src/PhraseLengthFeature.cpp +++ b/moses/src/PhraseLengthFeature.cpp diff --git a/moses/src/PhraseLengthFeature.h b/moses/src/PhraseLengthFeature.h index f25142230..f25142230 100755..100644 --- a/moses/src/PhraseLengthFeature.h +++ b/moses/src/PhraseLengthFeature.h diff --git a/moses/src/PhrasePairFeature.cpp b/moses/src/PhrasePairFeature.cpp index c44807205..c44807205 100755..100644 --- a/moses/src/PhrasePairFeature.cpp +++ b/moses/src/PhrasePairFeature.cpp diff --git a/moses/src/PhrasePairFeature.h b/moses/src/PhrasePairFeature.h index 6dab1a998..6dab1a998 100755..100644 --- a/moses/src/PhrasePairFeature.h +++ b/moses/src/PhrasePairFeature.h diff --git a/moses/src/PrefixTree.h b/moses/src/PrefixTree.h index 3215fb834..3215fb834 100755..100644 --- a/moses/src/PrefixTree.h +++ b/moses/src/PrefixTree.h diff --git a/moses/src/PrefixTreeMap.cpp b/moses/src/PrefixTreeMap.cpp index 7e5512a05..7e5512a05 100755..100644 --- a/moses/src/PrefixTreeMap.cpp +++ b/moses/src/PrefixTreeMap.cpp diff --git a/moses/src/PrefixTreeMap.h b/moses/src/PrefixTreeMap.h index 6bb6b769f..6bb6b769f 100755..100644 --- a/moses/src/PrefixTreeMap.h +++ b/moses/src/PrefixTreeMap.h diff --git a/moses/src/ReorderingConstraint.cpp b/moses/src/ReorderingConstraint.cpp index ea0c1b807..ea0c1b807 100755..100644 --- a/moses/src/ReorderingConstraint.cpp +++ b/moses/src/ReorderingConstraint.cpp diff --git a/moses/src/ReorderingConstraint.h b/moses/src/ReorderingConstraint.h index 742b2228b..742b2228b 100755..100644 --- a/moses/src/ReorderingConstraint.h +++ b/moses/src/ReorderingConstraint.h diff --git a/moses/src/ReorderingStack.cpp b/moses/src/ReorderingStack.cpp index 49a723a36..49a723a36 100755..100644 --- a/moses/src/ReorderingStack.cpp +++ b/moses/src/ReorderingStack.cpp diff --git a/moses/src/ReorderingStack.h b/moses/src/ReorderingStack.h index 9a710b348..9a710b348 100755..100644 --- a/moses/src/ReorderingStack.h +++ b/moses/src/ReorderingStack.h diff --git a/moses/src/RuleCube.cpp b/moses/src/RuleCube.cpp index b028abe3e..b028abe3e 100755..100644 --- a/moses/src/RuleCube.cpp +++ b/moses/src/RuleCube.cpp diff --git a/moses/src/RuleCube.h b/moses/src/RuleCube.h index 5d6aabe46..5d6aabe46 100755..100644 --- a/moses/src/RuleCube.h +++ b/moses/src/RuleCube.h diff --git a/moses/src/RuleCubeItem.cpp b/moses/src/RuleCubeItem.cpp index fa4b4c51e..fa4b4c51e 100755..100644 --- a/moses/src/RuleCubeItem.cpp +++ b/moses/src/RuleCubeItem.cpp diff --git a/moses/src/RuleCubeItem.h b/moses/src/RuleCubeItem.h index 1b953b1b4..1b953b1b4 100755..100644 --- a/moses/src/RuleCubeItem.h +++ b/moses/src/RuleCubeItem.h diff --git a/moses/src/RuleCubeQueue.cpp b/moses/src/RuleCubeQueue.cpp index 89020a4e5..89020a4e5 100755..100644 --- a/moses/src/RuleCubeQueue.cpp +++ b/moses/src/RuleCubeQueue.cpp diff --git a/moses/src/RuleCubeQueue.h b/moses/src/RuleCubeQueue.h index 5ef3b3af2..5ef3b3af2 100755..100644 --- a/moses/src/RuleCubeQueue.h +++ b/moses/src/RuleCubeQueue.h diff --git a/moses/src/RuleTableLoader.h b/moses/src/RuleTableLoader.h index b5d4d8e24..b5d4d8e24 100755..100644 --- a/moses/src/RuleTableLoader.h +++ b/moses/src/RuleTableLoader.h diff --git a/moses/src/RuleTableLoaderCompact.cpp b/moses/src/RuleTableLoaderCompact.cpp index 64297948f..64297948f 100755..100644 --- a/moses/src/RuleTableLoaderCompact.cpp +++ b/moses/src/RuleTableLoaderCompact.cpp diff --git a/moses/src/RuleTableLoaderCompact.h b/moses/src/RuleTableLoaderCompact.h index 56918782b..56918782b 100755..100644 --- a/moses/src/RuleTableLoaderCompact.h +++ b/moses/src/RuleTableLoaderCompact.h diff --git a/moses/src/RuleTableLoaderFactory.cpp b/moses/src/RuleTableLoaderFactory.cpp index 7ac97bde2..7ac97bde2 100755..100644 --- a/moses/src/RuleTableLoaderFactory.cpp +++ b/moses/src/RuleTableLoaderFactory.cpp diff --git a/moses/src/RuleTableLoaderFactory.h b/moses/src/RuleTableLoaderFactory.h index c9c4daf1d..c9c4daf1d 100755..100644 --- a/moses/src/RuleTableLoaderFactory.h +++ b/moses/src/RuleTableLoaderFactory.h diff --git a/moses/src/RuleTableLoaderHiero.cpp b/moses/src/RuleTableLoaderHiero.cpp index 6899cfa61..6899cfa61 100755..100644 --- a/moses/src/RuleTableLoaderHiero.cpp +++ b/moses/src/RuleTableLoaderHiero.cpp diff --git a/moses/src/RuleTableLoaderHiero.h b/moses/src/RuleTableLoaderHiero.h index a1f8a9205..a1f8a9205 100755..100644 --- a/moses/src/RuleTableLoaderHiero.h +++ b/moses/src/RuleTableLoaderHiero.h diff --git a/moses/src/RuleTableLoaderStandard.cpp b/moses/src/RuleTableLoaderStandard.cpp index 122e75c8c..122e75c8c 100755..100644 --- a/moses/src/RuleTableLoaderStandard.cpp +++ b/moses/src/RuleTableLoaderStandard.cpp diff --git a/moses/src/RuleTableLoaderStandard.h b/moses/src/RuleTableLoaderStandard.h index 9477db962..9477db962 100755..100644 --- a/moses/src/RuleTableLoaderStandard.h +++ b/moses/src/RuleTableLoaderStandard.h diff --git a/moses/src/ScoreComponentCollection.cpp b/moses/src/ScoreComponentCollection.cpp index d9638f21c..e393c3a74 100755..100644 --- a/moses/src/ScoreComponentCollection.cpp +++ b/moses/src/ScoreComponentCollection.cpp @@ -137,12 +137,12 @@ float ScoreComponentCollection::GetLInfNorm() const { return m_scores.linfnorm(); } -void ScoreComponentCollection::L1Regularize(float lambda) { - m_scores.l1regularize(lambda); +size_t ScoreComponentCollection::SparseL1Regularize(float lambda) { + return m_scores.sparseL1regularize(lambda); } -void ScoreComponentCollection::L2Regularize(float lambda) { - m_scores.l2regularize(lambda); +void ScoreComponentCollection::SparseL2Regularize(float lambda) { + m_scores.sparseL2regularize(lambda); } void ScoreComponentCollection::Save(ostream& out) const { diff --git a/moses/src/ScoreComponentCollection.h b/moses/src/ScoreComponentCollection.h index f80055613..e170d0cd9 100755..100644 --- a/moses/src/ScoreComponentCollection.h +++ b/moses/src/ScoreComponentCollection.h @@ -234,25 +234,29 @@ public: m_scores[fname] += score; } - void Assign(const ScoreProducer* sp, const std::vector<float>& scores) - { + void Assign(const ScoreProducer* sp, const std::vector<float>& scores) + { IndexPair indexes = GetIndexes(sp); CHECK(scores.size() == indexes.second - indexes.first); for (size_t i = 0; i < scores.size(); ++i) { m_scores[i + indexes.first] = scores[i]; } - } - - //! Special version Assign(ScoreProducer, vector<float>) - //! to add the score from a single ScoreProducer that produces - //! a single value - void Assign(const ScoreProducer* sp, float score) - { + } + + //! Special version Assign(ScoreProducer, vector<float>) + //! to add the score from a single ScoreProducer that produces + //! a single value + void Assign(const ScoreProducer* sp, float score) + { IndexPair indexes = GetIndexes(sp); CHECK(1 == indexes.second - indexes.first); m_scores[indexes.first] = score; - } - + } + + // Assign core weight by index + void Assign(size_t index, float score) { + m_scores[index] = score; + } //For features which have an unbounded number of components void Assign(const ScoreProducer*sp, const std::string name, float score) @@ -367,8 +371,8 @@ public: float GetL1Norm() const; float GetL2Norm() const; float GetLInfNorm() const; - void L1Regularize(float lambda); - void L2Regularize(float lambda); + size_t SparseL1Regularize(float lambda); + void SparseL2Regularize(float lambda); void Save(const std::string& filename) const; void Save(std::ostream&) const; @@ -381,7 +385,7 @@ public: size_t PruneSparseFeatures(size_t threshold) { return m_scores.pruneSparseFeatures(threshold); } size_t PruneZeroWeightFeatures() { return m_scores.pruneZeroWeightFeatures(); } void UpdateConfidenceCounts(ScoreComponentCollection &weightUpdate, bool signedCounts) { m_scores.updateConfidenceCounts(weightUpdate.m_scores, signedCounts); } - void UpdateLearningRates(float decay, ScoreComponentCollection &confidenceCounts, float core_r0, float sparse_r0) { m_scores.updateLearningRates(decay, confidenceCounts.m_scores, core_r0, sparse_r0); } + void UpdateLearningRates(float decay_core, float decay_sparse, ScoreComponentCollection &confidenceCounts, float core_r0, float sparse_r0) { m_scores.updateLearningRates(decay_core, decay_sparse, confidenceCounts.m_scores, core_r0, sparse_r0); } #ifdef MPI_ENABLE public: diff --git a/moses/src/ScoreComponentCollectionTest.cpp b/moses/src/ScoreComponentCollectionTest.cpp index 10e96a017..10e96a017 100755..100644 --- a/moses/src/ScoreComponentCollectionTest.cpp +++ b/moses/src/ScoreComponentCollectionTest.cpp diff --git a/moses/src/ScoreProducer.cpp b/moses/src/ScoreProducer.cpp index 07823125c..07823125c 100755..100644 --- a/moses/src/ScoreProducer.cpp +++ b/moses/src/ScoreProducer.cpp diff --git a/moses/src/ScoreProducer.h b/moses/src/ScoreProducer.h index c88e5efca..c88e5efca 100755..100644 --- a/moses/src/ScoreProducer.h +++ b/moses/src/ScoreProducer.h diff --git a/moses/src/Search.cpp b/moses/src/Search.cpp index aa3bfe59f..aa3bfe59f 100755..100644 --- a/moses/src/Search.cpp +++ b/moses/src/Search.cpp diff --git a/moses/src/Search.h b/moses/src/Search.h index 67a6c69ea..67a6c69ea 100755..100644 --- a/moses/src/Search.h +++ b/moses/src/Search.h diff --git a/moses/src/SearchCubePruning.cpp b/moses/src/SearchCubePruning.cpp index 9fe6aec24..9fe6aec24 100755..100644 --- a/moses/src/SearchCubePruning.cpp +++ b/moses/src/SearchCubePruning.cpp diff --git a/moses/src/SearchCubePruning.h b/moses/src/SearchCubePruning.h index 9f8f73ef5..9f8f73ef5 100755..100644 --- a/moses/src/SearchCubePruning.h +++ b/moses/src/SearchCubePruning.h diff --git a/moses/src/SearchNormal.cpp b/moses/src/SearchNormal.cpp index 9f26270e9..9f26270e9 100755..100644 --- a/moses/src/SearchNormal.cpp +++ b/moses/src/SearchNormal.cpp diff --git a/moses/src/SearchNormal.h b/moses/src/SearchNormal.h index 8b4f904d9..8b4f904d9 100755..100644 --- a/moses/src/SearchNormal.h +++ b/moses/src/SearchNormal.h diff --git a/moses/src/Sentence.cpp b/moses/src/Sentence.cpp index 210e5ccb5..210e5ccb5 100755..100644 --- a/moses/src/Sentence.cpp +++ b/moses/src/Sentence.cpp diff --git a/moses/src/Sentence.h b/moses/src/Sentence.h index b1c25f9dd..b1c25f9dd 100755..100644 --- a/moses/src/Sentence.h +++ b/moses/src/Sentence.h diff --git a/moses/src/SentenceStats.cpp b/moses/src/SentenceStats.cpp index 218fe2187..218fe2187 100755..100644 --- a/moses/src/SentenceStats.cpp +++ b/moses/src/SentenceStats.cpp diff --git a/moses/src/SentenceStats.h b/moses/src/SentenceStats.h index 6a72008ba..6a72008ba 100755..100644 --- a/moses/src/SentenceStats.h +++ b/moses/src/SentenceStats.h diff --git a/moses/src/SourceWordDeletionFeature.cpp b/moses/src/SourceWordDeletionFeature.cpp index 4f247c7e7..4f247c7e7 100755..100644 --- a/moses/src/SourceWordDeletionFeature.cpp +++ b/moses/src/SourceWordDeletionFeature.cpp diff --git a/moses/src/SourceWordDeletionFeature.h b/moses/src/SourceWordDeletionFeature.h index 6d8d21a42..6d8d21a42 100755..100644 --- a/moses/src/SourceWordDeletionFeature.h +++ b/moses/src/SourceWordDeletionFeature.h diff --git a/moses/src/SparsePhraseDictionaryFeature.cpp b/moses/src/SparsePhraseDictionaryFeature.cpp index 8b1a35ee3..8b1a35ee3 100755..100644 --- a/moses/src/SparsePhraseDictionaryFeature.cpp +++ b/moses/src/SparsePhraseDictionaryFeature.cpp diff --git a/moses/src/SparsePhraseDictionaryFeature.h b/moses/src/SparsePhraseDictionaryFeature.h index ad38e7078..ad38e7078 100755..100644 --- a/moses/src/SparsePhraseDictionaryFeature.h +++ b/moses/src/SparsePhraseDictionaryFeature.h diff --git a/moses/src/SquareMatrix.cpp b/moses/src/SquareMatrix.cpp index 276d10053..276d10053 100755..100644 --- a/moses/src/SquareMatrix.cpp +++ b/moses/src/SquareMatrix.cpp diff --git a/moses/src/SquareMatrix.h b/moses/src/SquareMatrix.h index 3d36962d4..3d36962d4 100755..100644 --- a/moses/src/SquareMatrix.h +++ b/moses/src/SquareMatrix.h diff --git a/moses/src/StaticData.cpp b/moses/src/StaticData.cpp index 218be7f2b..6ccb8fb34 100755..100644 --- a/moses/src/StaticData.cpp +++ b/moses/src/StaticData.cpp @@ -1397,6 +1397,7 @@ bool StaticData::LoadPhraseTables() , output , filePath , weight + , currDict , maxTargetPhrase[index] , targetPath, alignmentsFile); @@ -1551,6 +1552,7 @@ bool StaticData::LoadDecodeGraphs() DecodeGraph *decodeGraph; if (m_searchAlgorithm == ChartDecoding) { size_t maxChartSpan = (decodeGraphInd < maxChartSpans.size()) ? maxChartSpans[decodeGraphInd] : DEFAULT_MAX_CHART_SPAN; + cerr << "max-chart-span: " << maxChartSpans[decodeGraphInd] << endl; decodeGraph = new DecodeGraph(m_decodeGraphs.size(), maxChartSpan); } else { decodeGraph = new DecodeGraph(m_decodeGraphs.size()); diff --git a/moses/src/StaticData.h b/moses/src/StaticData.h index 1b8075e25..1b8075e25 100755..100644 --- a/moses/src/StaticData.h +++ b/moses/src/StaticData.h diff --git a/moses/src/SyntacticLanguageModel.cpp b/moses/src/SyntacticLanguageModel.cpp index c9b3f1e22..c9b3f1e22 100755..100644 --- a/moses/src/SyntacticLanguageModel.cpp +++ b/moses/src/SyntacticLanguageModel.cpp diff --git a/moses/src/SyntacticLanguageModel.h b/moses/src/SyntacticLanguageModel.h index 3497d3dc4..3497d3dc4 100755..100644 --- a/moses/src/SyntacticLanguageModel.h +++ b/moses/src/SyntacticLanguageModel.h diff --git a/moses/src/SyntacticLanguageModelFiles.h b/moses/src/SyntacticLanguageModelFiles.h index c6533c424..c6533c424 100755..100644 --- a/moses/src/SyntacticLanguageModelFiles.h +++ b/moses/src/SyntacticLanguageModelFiles.h diff --git a/moses/src/SyntacticLanguageModelState.h b/moses/src/SyntacticLanguageModelState.h index 0877a59b3..0877a59b3 100755..100644 --- a/moses/src/SyntacticLanguageModelState.h +++ b/moses/src/SyntacticLanguageModelState.h diff --git a/moses/src/TargetBigramFeature.cpp b/moses/src/TargetBigramFeature.cpp index a9ad2216b..a9ad2216b 100755..100644 --- a/moses/src/TargetBigramFeature.cpp +++ b/moses/src/TargetBigramFeature.cpp diff --git a/moses/src/TargetBigramFeature.h b/moses/src/TargetBigramFeature.h index 76b4f6ef7..76b4f6ef7 100755..100644 --- a/moses/src/TargetBigramFeature.h +++ b/moses/src/TargetBigramFeature.h diff --git a/moses/src/TargetBigramFeatureTest.cpp b/moses/src/TargetBigramFeatureTest.cpp index 2ee7243bb..2ee7243bb 100755..100644 --- a/moses/src/TargetBigramFeatureTest.cpp +++ b/moses/src/TargetBigramFeatureTest.cpp diff --git a/moses/src/TargetNgramFeature.cpp b/moses/src/TargetNgramFeature.cpp index 3fefdfba2..3fefdfba2 100755..100644 --- a/moses/src/TargetNgramFeature.cpp +++ b/moses/src/TargetNgramFeature.cpp diff --git a/moses/src/TargetNgramFeature.h b/moses/src/TargetNgramFeature.h index 681e7d6aa..681e7d6aa 100755..100644 --- a/moses/src/TargetNgramFeature.h +++ b/moses/src/TargetNgramFeature.h diff --git a/moses/src/TargetPhrase.cpp b/moses/src/TargetPhrase.cpp index c79b844f8..2783a7604 100755..100644 --- a/moses/src/TargetPhrase.cpp +++ b/moses/src/TargetPhrase.cpp @@ -142,12 +142,7 @@ void TargetPhrase::SetScore(const ScoreProducer* translationScoreProducer, CHECK(weightT.size() == scoreVector.size()); // calc average score if non-best - const TranslationSystem& system = StaticData::Instance().GetTranslationSystem(TranslationSystem::DEFAULT); - std::vector<float> weightsT = system.GetTranslationWeights(); - weightWP = system.GetWeightWordPenalty(); - - //m_transScore = std::inner_product(scoreVector.begin(), scoreVector.end(), weightT.begin(), 0.0f); - m_transScore = std::inner_product(scoreVector.begin(), scoreVector.end(), weightsT.begin(), 0.0f); + m_transScore = std::inner_product(scoreVector.begin(), scoreVector.end(), weightT.begin(), 0.0f); m_scoreBreakdown.PlusEquals(translationScoreProducer, scoreVector); m_scoreBreakdown.PlusEquals(sparseScoreVector); @@ -197,15 +192,10 @@ void TargetPhrase::SetScoreChart(const ScoreProducer* translationScoreProducer, ,const LMList &languageModels ,const WordPenaltyProducer* wpProducer) { - CHECK(weightT.size() == scoreVector.size()); - - const TranslationSystem& system = StaticData::Instance().GetTranslationSystem(TranslationSystem::DEFAULT); - std::vector<float> weightsT = system.GetTranslationWeights(); // calc average score if non-best - //m_transScore = std::inner_product(scoreVector.begin(), scoreVector.end(), weightT.begin(), 0.0f); - m_transScore = std::inner_product(scoreVector.begin(), scoreVector.end(), weightsT.begin(), 0.0f); + m_transScore = std::inner_product(scoreVector.begin(), scoreVector.end(), weightT.begin(), 0.0f); m_scoreBreakdown.PlusEquals(translationScoreProducer, scoreVector); // Replicated from TranslationOptions.cpp @@ -269,11 +259,7 @@ void TargetPhrase::SetWeights(const ScoreProducer* translationScoreProducer, con addition to the usual phrase translation scaling factors) the input weight factor as last element */ - - const TranslationSystem& system = StaticData::Instance().GetTranslationSystem(TranslationSystem::DEFAULT); - std::vector<float> weightsT = system.GetTranslationWeights(); - //m_transScore = m_scoreBreakdown.PartialInnerProduct(translationScoreProducer, weightT); - m_transScore = m_scoreBreakdown.PartialInnerProduct(translationScoreProducer, weightsT); + m_transScore = m_scoreBreakdown.PartialInnerProduct(translationScoreProducer, weightT); } void TargetPhrase::ResetScore() diff --git a/moses/src/TargetPhrase.h b/moses/src/TargetPhrase.h index 377985c5e..377985c5e 100755..100644 --- a/moses/src/TargetPhrase.h +++ b/moses/src/TargetPhrase.h diff --git a/moses/src/TargetPhraseCollection.cpp b/moses/src/TargetPhraseCollection.cpp index 38570f8d5..38570f8d5 100755..100644 --- a/moses/src/TargetPhraseCollection.cpp +++ b/moses/src/TargetPhraseCollection.cpp diff --git a/moses/src/TargetPhraseCollection.h b/moses/src/TargetPhraseCollection.h index f4124f458..f4124f458 100755..100644 --- a/moses/src/TargetPhraseCollection.h +++ b/moses/src/TargetPhraseCollection.h diff --git a/moses/src/TargetWordInsertionFeature.cpp b/moses/src/TargetWordInsertionFeature.cpp index f7d5a5c7e..f7d5a5c7e 100755..100644 --- a/moses/src/TargetWordInsertionFeature.cpp +++ b/moses/src/TargetWordInsertionFeature.cpp diff --git a/moses/src/TargetWordInsertionFeature.h b/moses/src/TargetWordInsertionFeature.h index 0d53582d5..0d53582d5 100755..100644 --- a/moses/src/TargetWordInsertionFeature.h +++ b/moses/src/TargetWordInsertionFeature.h diff --git a/moses/src/ThreadPool.cpp b/moses/src/ThreadPool.cpp index ca9bd2f60..ca9bd2f60 100755..100644 --- a/moses/src/ThreadPool.cpp +++ b/moses/src/ThreadPool.cpp diff --git a/moses/src/ThreadPool.h b/moses/src/ThreadPool.h index a76872027..a76872027 100755..100644 --- a/moses/src/ThreadPool.h +++ b/moses/src/ThreadPool.h diff --git a/moses/src/Timer.cpp b/moses/src/Timer.cpp index bbe1bcabd..bbe1bcabd 100755..100644 --- a/moses/src/Timer.cpp +++ b/moses/src/Timer.cpp diff --git a/moses/src/Timer.h b/moses/src/Timer.h index 1d7c4aacc..1d7c4aacc 100755..100644 --- a/moses/src/Timer.h +++ b/moses/src/Timer.h diff --git a/moses/src/TranslationOption.cpp b/moses/src/TranslationOption.cpp index c823dadb8..c823dadb8 100755..100644 --- a/moses/src/TranslationOption.cpp +++ b/moses/src/TranslationOption.cpp diff --git a/moses/src/TranslationOption.h b/moses/src/TranslationOption.h index fa4065b80..fa4065b80 100755..100644 --- a/moses/src/TranslationOption.h +++ b/moses/src/TranslationOption.h diff --git a/moses/src/TranslationOptionCollection.cpp b/moses/src/TranslationOptionCollection.cpp index d9eefc9d6..d9eefc9d6 100755..100644 --- a/moses/src/TranslationOptionCollection.cpp +++ b/moses/src/TranslationOptionCollection.cpp diff --git a/moses/src/TranslationOptionCollection.h b/moses/src/TranslationOptionCollection.h index e1fa26a15..e1fa26a15 100755..100644 --- a/moses/src/TranslationOptionCollection.h +++ b/moses/src/TranslationOptionCollection.h diff --git a/moses/src/TranslationOptionCollectionConfusionNet.cpp b/moses/src/TranslationOptionCollectionConfusionNet.cpp index c2713fb3a..c2713fb3a 100755..100644 --- a/moses/src/TranslationOptionCollectionConfusionNet.cpp +++ b/moses/src/TranslationOptionCollectionConfusionNet.cpp diff --git a/moses/src/TranslationOptionCollectionConfusionNet.h b/moses/src/TranslationOptionCollectionConfusionNet.h index 66ef953a8..66ef953a8 100755..100644 --- a/moses/src/TranslationOptionCollectionConfusionNet.h +++ b/moses/src/TranslationOptionCollectionConfusionNet.h diff --git a/moses/src/TranslationOptionCollectionText.cpp b/moses/src/TranslationOptionCollectionText.cpp index c3676eaef..c3676eaef 100755..100644 --- a/moses/src/TranslationOptionCollectionText.cpp +++ b/moses/src/TranslationOptionCollectionText.cpp diff --git a/moses/src/TranslationOptionCollectionText.h b/moses/src/TranslationOptionCollectionText.h index bb819441e..bb819441e 100755..100644 --- a/moses/src/TranslationOptionCollectionText.h +++ b/moses/src/TranslationOptionCollectionText.h diff --git a/moses/src/TranslationOptionList.cpp b/moses/src/TranslationOptionList.cpp index 1d99729fe..1d99729fe 100755..100644 --- a/moses/src/TranslationOptionList.cpp +++ b/moses/src/TranslationOptionList.cpp diff --git a/moses/src/TranslationOptionList.h b/moses/src/TranslationOptionList.h index d56578029..d56578029 100755..100644 --- a/moses/src/TranslationOptionList.h +++ b/moses/src/TranslationOptionList.h diff --git a/moses/src/TranslationSystem.cpp b/moses/src/TranslationSystem.cpp index 722ea864e..e017ba241 100755..100644 --- a/moses/src/TranslationSystem.cpp +++ b/moses/src/TranslationSystem.cpp @@ -175,8 +175,8 @@ namespace Moses { return StaticData::Instance().GetWeight(m_distortionScoreProducer); } - std::vector<float> TranslationSystem::GetTranslationWeights() const { - std::vector<float> weights = StaticData::Instance().GetWeights(GetTranslationScoreProducer()); + std::vector<float> TranslationSystem::GetTranslationWeights(size_t index) const { + std::vector<float> weights = StaticData::Instance().GetWeights(GetTranslationScoreProducer(index)); //VERBOSE(1, "Read weightT from translation sytem.. "); for (size_t i = 0; i < weights.size(); ++i) //VERBOSE(1, weights[i] << " "); diff --git a/moses/src/TranslationSystem.h b/moses/src/TranslationSystem.h index 615fc7d8a..6f66fd25a 100755..100644 --- a/moses/src/TranslationSystem.h +++ b/moses/src/TranslationSystem.h @@ -83,12 +83,12 @@ class TranslationSystem { const UnknownWordPenaltyProducer *GetUnknownWordPenaltyProducer() const { return m_unknownWpProducer; } const DistortionScoreProducer* GetDistortionProducer() const {return m_distortionScoreProducer;} - const PhraseDictionaryFeature *GetTranslationScoreProducer() const { return GetPhraseDictionaries()[0]; } + const PhraseDictionaryFeature *GetTranslationScoreProducer(size_t index) const { return GetPhraseDictionaries()[index]; } float GetWeightWordPenalty() const; float GetWeightUnknownWordPenalty() const; float GetWeightDistortion() const; - std::vector<float> GetTranslationWeights() const; + std::vector<float> GetTranslationWeights(size_t index) const; //sentence (and thread) specific initialisationn and cleanup void InitializeBeforeSentenceProcessing(const InputType& source) const; diff --git a/moses/src/TreeInput.cpp b/moses/src/TreeInput.cpp index d6e0f1e78..d6e0f1e78 100755..100644 --- a/moses/src/TreeInput.cpp +++ b/moses/src/TreeInput.cpp diff --git a/moses/src/TreeInput.h b/moses/src/TreeInput.h index a6242d97e..a6242d97e 100755..100644 --- a/moses/src/TreeInput.h +++ b/moses/src/TreeInput.h diff --git a/moses/src/TrellisPath.cpp b/moses/src/TrellisPath.cpp index c73575b2c..c73575b2c 100755..100644 --- a/moses/src/TrellisPath.cpp +++ b/moses/src/TrellisPath.cpp diff --git a/moses/src/TrellisPath.h b/moses/src/TrellisPath.h index c1b347de9..c1b347de9 100755..100644 --- a/moses/src/TrellisPath.h +++ b/moses/src/TrellisPath.h diff --git a/moses/src/TrellisPathCollection.cpp b/moses/src/TrellisPathCollection.cpp index 89d429f4b..89d429f4b 100755..100644 --- a/moses/src/TrellisPathCollection.cpp +++ b/moses/src/TrellisPathCollection.cpp diff --git a/moses/src/TrellisPathCollection.h b/moses/src/TrellisPathCollection.h index 82e771d78..82e771d78 100755..100644 --- a/moses/src/TrellisPathCollection.h +++ b/moses/src/TrellisPathCollection.h diff --git a/moses/src/TrellisPathList.h b/moses/src/TrellisPathList.h index 073efb9b8..073efb9b8 100755..100644 --- a/moses/src/TrellisPathList.h +++ b/moses/src/TrellisPathList.h diff --git a/moses/src/TypeDef.h b/moses/src/TypeDef.h index bb439f5c9..bb439f5c9 100755..100644 --- a/moses/src/TypeDef.h +++ b/moses/src/TypeDef.h diff --git a/moses/src/UniqueObject.h b/moses/src/UniqueObject.h index 789c5e1b3..789c5e1b3 100755..100644 --- a/moses/src/UniqueObject.h +++ b/moses/src/UniqueObject.h diff --git a/moses/src/UserMessage.cpp b/moses/src/UserMessage.cpp index ad89d80a7..ad89d80a7 100755..100644 --- a/moses/src/UserMessage.cpp +++ b/moses/src/UserMessage.cpp diff --git a/moses/src/UserMessage.h b/moses/src/UserMessage.h index aac38cae4..aac38cae4 100755..100644 --- a/moses/src/UserMessage.h +++ b/moses/src/UserMessage.h diff --git a/moses/src/Util.cpp b/moses/src/Util.cpp index be02fb27b..be02fb27b 100755..100644 --- a/moses/src/Util.cpp +++ b/moses/src/Util.cpp diff --git a/moses/src/Util.h b/moses/src/Util.h index 1b0638ec2..1b0638ec2 100755..100644 --- a/moses/src/Util.h +++ b/moses/src/Util.h diff --git a/moses/src/Word.cpp b/moses/src/Word.cpp index 1ff5df496..1ff5df496 100755..100644 --- a/moses/src/Word.cpp +++ b/moses/src/Word.cpp diff --git a/moses/src/Word.h b/moses/src/Word.h index 7dd395030..7dd395030 100755..100644 --- a/moses/src/Word.h +++ b/moses/src/Word.h diff --git a/moses/src/WordLattice.cpp b/moses/src/WordLattice.cpp index f3344dc67..f3344dc67 100755..100644 --- a/moses/src/WordLattice.cpp +++ b/moses/src/WordLattice.cpp diff --git a/moses/src/WordLattice.h b/moses/src/WordLattice.h index 21df48054..21df48054 100755..100644 --- a/moses/src/WordLattice.h +++ b/moses/src/WordLattice.h diff --git a/moses/src/WordTranslationFeature.cpp b/moses/src/WordTranslationFeature.cpp index c0b3e0025..c0b3e0025 100755..100644 --- a/moses/src/WordTranslationFeature.cpp +++ b/moses/src/WordTranslationFeature.cpp diff --git a/moses/src/WordTranslationFeature.h b/moses/src/WordTranslationFeature.h index 39be24d41..39be24d41 100755..100644 --- a/moses/src/WordTranslationFeature.h +++ b/moses/src/WordTranslationFeature.h diff --git a/moses/src/WordsBitmap.cpp b/moses/src/WordsBitmap.cpp index b3203145f..b3203145f 100755..100644 --- a/moses/src/WordsBitmap.cpp +++ b/moses/src/WordsBitmap.cpp diff --git a/moses/src/WordsBitmap.h b/moses/src/WordsBitmap.h index 370120571..370120571 100755..100644 --- a/moses/src/WordsBitmap.h +++ b/moses/src/WordsBitmap.h diff --git a/moses/src/WordsRange.cpp b/moses/src/WordsRange.cpp index f37a738c0..f37a738c0 100755..100644 --- a/moses/src/WordsRange.cpp +++ b/moses/src/WordsRange.cpp diff --git a/moses/src/WordsRange.h b/moses/src/WordsRange.h index 7191d259e..7191d259e 100755..100644 --- a/moses/src/WordsRange.h +++ b/moses/src/WordsRange.h diff --git a/moses/src/XmlOption.cpp b/moses/src/XmlOption.cpp index f5eee83f9..f5eee83f9 100755..100644 --- a/moses/src/XmlOption.cpp +++ b/moses/src/XmlOption.cpp diff --git a/moses/src/XmlOption.h b/moses/src/XmlOption.h index 45989c841..45989c841 100755..100644 --- a/moses/src/XmlOption.h +++ b/moses/src/XmlOption.h diff --git a/moses/src/gzfilebuf.h b/moses/src/gzfilebuf.h index d59d3e1b7..d59d3e1b7 100755..100644 --- a/moses/src/gzfilebuf.h +++ b/moses/src/gzfilebuf.h diff --git a/moses/src/hash.cpp b/moses/src/hash.cpp index 9afac463d..9afac463d 100755..100644 --- a/moses/src/hash.cpp +++ b/moses/src/hash.cpp diff --git a/moses/src/hash.h b/moses/src/hash.h index 227f3b90a..227f3b90a 100755..100644 --- a/moses/src/hash.h +++ b/moses/src/hash.h diff --git a/moses/src/hypergraph.proto b/moses/src/hypergraph.proto index e292eacca..e292eacca 100755..100644 --- a/moses/src/hypergraph.proto +++ b/moses/src/hypergraph.proto diff --git a/moses/src/rule.proto b/moses/src/rule.proto index 5f8084636..5f8084636 100755..100644 --- a/moses/src/rule.proto +++ b/moses/src/rule.proto diff --git a/regression-testing/Jamfile b/regression-testing/Jamfile index 0c00b516e..0c00b516e 100755..100644 --- a/regression-testing/Jamfile +++ b/regression-testing/Jamfile diff --git a/regression-testing/MosesRegressionTesting.pm b/regression-testing/MosesRegressionTesting.pm index 9eb94a838..9eb94a838 100755..100644 --- a/regression-testing/MosesRegressionTesting.pm +++ b/regression-testing/MosesRegressionTesting.pm diff --git a/regression-testing/tests/chart.hierarchical-withkenlm/moses.ini b/regression-testing/tests/chart.hierarchical-withkenlm/moses.ini index d8c7694fb..d8c7694fb 100755..100644 --- a/regression-testing/tests/chart.hierarchical-withkenlm/moses.ini +++ b/regression-testing/tests/chart.hierarchical-withkenlm/moses.ini diff --git a/regression-testing/tests/chart.hierarchical-withkenlm/to-translate.txt b/regression-testing/tests/chart.hierarchical-withkenlm/to-translate.txt index 142ac43e0..142ac43e0 100755..100644 --- a/regression-testing/tests/chart.hierarchical-withkenlm/to-translate.txt +++ b/regression-testing/tests/chart.hierarchical-withkenlm/to-translate.txt diff --git a/regression-testing/tests/chart.hierarchical-withkenlm/truth/results.txt b/regression-testing/tests/chart.hierarchical-withkenlm/truth/results.txt index c77f070ce..c77f070ce 100755..100644 --- a/regression-testing/tests/chart.hierarchical-withkenlm/truth/results.txt +++ b/regression-testing/tests/chart.hierarchical-withkenlm/truth/results.txt diff --git a/regression-testing/tests/chart.hierarchical-withsrilm/moses.ini b/regression-testing/tests/chart.hierarchical-withsrilm/moses.ini index 0bad920af..0bad920af 100755..100644 --- a/regression-testing/tests/chart.hierarchical-withsrilm/moses.ini +++ b/regression-testing/tests/chart.hierarchical-withsrilm/moses.ini diff --git a/regression-testing/tests/chart.hierarchical-withsrilm/to-translate.txt b/regression-testing/tests/chart.hierarchical-withsrilm/to-translate.txt index 142ac43e0..142ac43e0 100755..100644 --- a/regression-testing/tests/chart.hierarchical-withsrilm/to-translate.txt +++ b/regression-testing/tests/chart.hierarchical-withsrilm/to-translate.txt diff --git a/regression-testing/tests/chart.hierarchical-withsrilm/truth/results.txt b/regression-testing/tests/chart.hierarchical-withsrilm/truth/results.txt index 5945e4daa..5945e4daa 100755..100644 --- a/regression-testing/tests/chart.hierarchical-withsrilm/truth/results.txt +++ b/regression-testing/tests/chart.hierarchical-withsrilm/truth/results.txt diff --git a/regression-testing/tests/chart.hierarchical.ondisk/moses.ini b/regression-testing/tests/chart.hierarchical.ondisk/moses.ini index 1fdbf786d..1fdbf786d 100755..100644 --- a/regression-testing/tests/chart.hierarchical.ondisk/moses.ini +++ b/regression-testing/tests/chart.hierarchical.ondisk/moses.ini diff --git a/regression-testing/tests/chart.hierarchical.ondisk/to-translate.txt b/regression-testing/tests/chart.hierarchical.ondisk/to-translate.txt index 142ac43e0..142ac43e0 100755..100644 --- a/regression-testing/tests/chart.hierarchical.ondisk/to-translate.txt +++ b/regression-testing/tests/chart.hierarchical.ondisk/to-translate.txt diff --git a/regression-testing/tests/chart.hierarchical.ondisk/truth/results.txt b/regression-testing/tests/chart.hierarchical.ondisk/truth/results.txt index c48776609..c48776609 100755..100644 --- a/regression-testing/tests/chart.hierarchical.ondisk/truth/results.txt +++ b/regression-testing/tests/chart.hierarchical.ondisk/truth/results.txt diff --git a/regression-testing/tests/chart.hierarchical/moses.ini b/regression-testing/tests/chart.hierarchical/moses.ini index 9d6edec94..9d6edec94 100755..100644 --- a/regression-testing/tests/chart.hierarchical/moses.ini +++ b/regression-testing/tests/chart.hierarchical/moses.ini diff --git a/regression-testing/tests/chart.hierarchical/to-translate.txt b/regression-testing/tests/chart.hierarchical/to-translate.txt index 142ac43e0..142ac43e0 100755..100644 --- a/regression-testing/tests/chart.hierarchical/to-translate.txt +++ b/regression-testing/tests/chart.hierarchical/to-translate.txt diff --git a/regression-testing/tests/chart.hierarchical/truth/results.txt b/regression-testing/tests/chart.hierarchical/truth/results.txt index a3491649b..a3491649b 100755..100644 --- a/regression-testing/tests/chart.hierarchical/truth/results.txt +++ b/regression-testing/tests/chart.hierarchical/truth/results.txt diff --git a/regression-testing/tests/chart.show-weights.target-syntax/moses.ini b/regression-testing/tests/chart.show-weights.target-syntax/moses.ini index 3ae39c73c..3ae39c73c 100755..100644 --- a/regression-testing/tests/chart.show-weights.target-syntax/moses.ini +++ b/regression-testing/tests/chart.show-weights.target-syntax/moses.ini diff --git a/regression-testing/tests/chart.show-weights.target-syntax/to-translate.txt b/regression-testing/tests/chart.show-weights.target-syntax/to-translate.txt index e69de29bb..e69de29bb 100755..100644 --- a/regression-testing/tests/chart.show-weights.target-syntax/to-translate.txt +++ b/regression-testing/tests/chart.show-weights.target-syntax/to-translate.txt diff --git a/regression-testing/tests/chart.show-weights.target-syntax/truth/results.txt b/regression-testing/tests/chart.show-weights.target-syntax/truth/results.txt index b036514e1..b036514e1 100755..100644 --- a/regression-testing/tests/chart.show-weights.target-syntax/truth/results.txt +++ b/regression-testing/tests/chart.show-weights.target-syntax/truth/results.txt diff --git a/regression-testing/tests/chart.target-syntax.ondisk/moses.ini b/regression-testing/tests/chart.target-syntax.ondisk/moses.ini index 0e40974f0..0e40974f0 100755..100644 --- a/regression-testing/tests/chart.target-syntax.ondisk/moses.ini +++ b/regression-testing/tests/chart.target-syntax.ondisk/moses.ini diff --git a/regression-testing/tests/chart.target-syntax.ondisk/to-translate.txt b/regression-testing/tests/chart.target-syntax.ondisk/to-translate.txt index 142ac43e0..142ac43e0 100755..100644 --- a/regression-testing/tests/chart.target-syntax.ondisk/to-translate.txt +++ b/regression-testing/tests/chart.target-syntax.ondisk/to-translate.txt diff --git a/regression-testing/tests/chart.target-syntax.ondisk/truth/results.txt b/regression-testing/tests/chart.target-syntax.ondisk/truth/results.txt index ac9629ca9..ac9629ca9 100755..100644 --- a/regression-testing/tests/chart.target-syntax.ondisk/truth/results.txt +++ b/regression-testing/tests/chart.target-syntax.ondisk/truth/results.txt diff --git a/regression-testing/tests/chart.target-syntax/moses.ini b/regression-testing/tests/chart.target-syntax/moses.ini index 81f4e3961..81f4e3961 100755..100644 --- a/regression-testing/tests/chart.target-syntax/moses.ini +++ b/regression-testing/tests/chart.target-syntax/moses.ini diff --git a/regression-testing/tests/chart.target-syntax/to-translate.txt b/regression-testing/tests/chart.target-syntax/to-translate.txt index 142ac43e0..142ac43e0 100755..100644 --- a/regression-testing/tests/chart.target-syntax/to-translate.txt +++ b/regression-testing/tests/chart.target-syntax/to-translate.txt diff --git a/regression-testing/tests/chart.target-syntax/truth/results.txt b/regression-testing/tests/chart.target-syntax/truth/results.txt index ac9629ca9..ac9629ca9 100755..100644 --- a/regression-testing/tests/chart.target-syntax/truth/results.txt +++ b/regression-testing/tests/chart.target-syntax/truth/results.txt diff --git a/regression-testing/tests/mert.basic/command b/regression-testing/tests/mert.basic/command index f54cbb085..f54cbb085 100755..100644 --- a/regression-testing/tests/mert.basic/command +++ b/regression-testing/tests/mert.basic/command diff --git a/regression-testing/tests/mert.basic/data/FEATSTAT.bin b/regression-testing/tests/mert.basic/data/FEATSTAT.bin Binary files differindex 1770bd0f6..1770bd0f6 100755..100644 --- a/regression-testing/tests/mert.basic/data/FEATSTAT.bin +++ b/regression-testing/tests/mert.basic/data/FEATSTAT.bin diff --git a/regression-testing/tests/mert.basic/data/FEATSTAT.txt b/regression-testing/tests/mert.basic/data/FEATSTAT.txt index 9ec6f58ce..9ec6f58ce 100755..100644 --- a/regression-testing/tests/mert.basic/data/FEATSTAT.txt +++ b/regression-testing/tests/mert.basic/data/FEATSTAT.txt diff --git a/regression-testing/tests/mert.basic/data/INIT b/regression-testing/tests/mert.basic/data/INIT index e1122383a..e1122383a 100755..100644 --- a/regression-testing/tests/mert.basic/data/INIT +++ b/regression-testing/tests/mert.basic/data/INIT diff --git a/regression-testing/tests/mert.basic/data/SCORESTAT.bin b/regression-testing/tests/mert.basic/data/SCORESTAT.bin Binary files differindex 18c81b2b2..18c81b2b2 100755..100644 --- a/regression-testing/tests/mert.basic/data/SCORESTAT.bin +++ b/regression-testing/tests/mert.basic/data/SCORESTAT.bin diff --git a/regression-testing/tests/mert.basic/data/SCORESTAT.txt b/regression-testing/tests/mert.basic/data/SCORESTAT.txt index a7cf9f28e..a7cf9f28e 100755..100644 --- a/regression-testing/tests/mert.basic/data/SCORESTAT.txt +++ b/regression-testing/tests/mert.basic/data/SCORESTAT.txt diff --git a/regression-testing/tests/mert.basic/filter-stderr b/regression-testing/tests/mert.basic/filter-stderr index dcd74ad6c..dcd74ad6c 100755..100644 --- a/regression-testing/tests/mert.basic/filter-stderr +++ b/regression-testing/tests/mert.basic/filter-stderr diff --git a/regression-testing/tests/mert.basic/filter-stdout b/regression-testing/tests/mert.basic/filter-stdout index 1212cc873..1212cc873 100755..100644 --- a/regression-testing/tests/mert.basic/filter-stdout +++ b/regression-testing/tests/mert.basic/filter-stdout diff --git a/regression-testing/tests/mert.basic/truth/results.txt b/regression-testing/tests/mert.basic/truth/results.txt index e3f76c8d0..e3f76c8d0 100755..100644 --- a/regression-testing/tests/mert.basic/truth/results.txt +++ b/regression-testing/tests/mert.basic/truth/results.txt diff --git a/regression-testing/tests/mert.extractor-bin/command b/regression-testing/tests/mert.extractor-bin/command index 82e6e62fe..82e6e62fe 100755..100644 --- a/regression-testing/tests/mert.extractor-bin/command +++ b/regression-testing/tests/mert.extractor-bin/command diff --git a/regression-testing/tests/mert.extractor-bin/data/nbest.1.gz b/regression-testing/tests/mert.extractor-bin/data/nbest.1.gz Binary files differindex 4e105c27d..4e105c27d 100755..100644 --- a/regression-testing/tests/mert.extractor-bin/data/nbest.1.gz +++ b/regression-testing/tests/mert.extractor-bin/data/nbest.1.gz diff --git a/regression-testing/tests/mert.extractor-bin/data/nbest.2.gz b/regression-testing/tests/mert.extractor-bin/data/nbest.2.gz Binary files differindex f1939f66f..f1939f66f 100755..100644 --- a/regression-testing/tests/mert.extractor-bin/data/nbest.2.gz +++ b/regression-testing/tests/mert.extractor-bin/data/nbest.2.gz diff --git a/regression-testing/tests/mert.extractor-bin/data/nbest.3.gz b/regression-testing/tests/mert.extractor-bin/data/nbest.3.gz Binary files differindex a0c155ca1..a0c155ca1 100755..100644 --- a/regression-testing/tests/mert.extractor-bin/data/nbest.3.gz +++ b/regression-testing/tests/mert.extractor-bin/data/nbest.3.gz diff --git a/regression-testing/tests/mert.extractor-bin/data/nbest.4.gz b/regression-testing/tests/mert.extractor-bin/data/nbest.4.gz Binary files differindex 6998ad89f..6998ad89f 100755..100644 --- a/regression-testing/tests/mert.extractor-bin/data/nbest.4.gz +++ b/regression-testing/tests/mert.extractor-bin/data/nbest.4.gz diff --git a/regression-testing/tests/mert.extractor-bin/data/nbest.5.gz b/regression-testing/tests/mert.extractor-bin/data/nbest.5.gz Binary files differindex 1c21e3d68..1c21e3d68 100755..100644 --- a/regression-testing/tests/mert.extractor-bin/data/nbest.5.gz +++ b/regression-testing/tests/mert.extractor-bin/data/nbest.5.gz diff --git a/regression-testing/tests/mert.extractor-bin/data/reference b/regression-testing/tests/mert.extractor-bin/data/reference index f54eb4f6d..f54eb4f6d 100755..100644 --- a/regression-testing/tests/mert.extractor-bin/data/reference +++ b/regression-testing/tests/mert.extractor-bin/data/reference diff --git a/regression-testing/tests/mert.extractor-bin/filter-stderr b/regression-testing/tests/mert.extractor-bin/filter-stderr index d838a0b68..d838a0b68 100755..100644 --- a/regression-testing/tests/mert.extractor-bin/filter-stderr +++ b/regression-testing/tests/mert.extractor-bin/filter-stderr diff --git a/regression-testing/tests/mert.extractor-bin/filter-stdout b/regression-testing/tests/mert.extractor-bin/filter-stdout index 1212cc873..1212cc873 100755..100644 --- a/regression-testing/tests/mert.extractor-bin/filter-stdout +++ b/regression-testing/tests/mert.extractor-bin/filter-stdout diff --git a/regression-testing/tests/mert.extractor-bin/truth/results.txt b/regression-testing/tests/mert.extractor-bin/truth/results.txt index 20b521ad4..20b521ad4 100755..100644 --- a/regression-testing/tests/mert.extractor-bin/truth/results.txt +++ b/regression-testing/tests/mert.extractor-bin/truth/results.txt diff --git a/regression-testing/tests/mert.extractor-txt/command b/regression-testing/tests/mert.extractor-txt/command index a0cac62e0..a0cac62e0 100755..100644 --- a/regression-testing/tests/mert.extractor-txt/command +++ b/regression-testing/tests/mert.extractor-txt/command diff --git a/regression-testing/tests/mert.extractor-txt/data/nbest.1.gz b/regression-testing/tests/mert.extractor-txt/data/nbest.1.gz Binary files differindex 4e105c27d..4e105c27d 100755..100644 --- a/regression-testing/tests/mert.extractor-txt/data/nbest.1.gz +++ b/regression-testing/tests/mert.extractor-txt/data/nbest.1.gz diff --git a/regression-testing/tests/mert.extractor-txt/data/nbest.2.gz b/regression-testing/tests/mert.extractor-txt/data/nbest.2.gz Binary files differindex f1939f66f..f1939f66f 100755..100644 --- a/regression-testing/tests/mert.extractor-txt/data/nbest.2.gz +++ b/regression-testing/tests/mert.extractor-txt/data/nbest.2.gz diff --git a/regression-testing/tests/mert.extractor-txt/data/nbest.3.gz b/regression-testing/tests/mert.extractor-txt/data/nbest.3.gz Binary files differindex a0c155ca1..a0c155ca1 100755..100644 --- a/regression-testing/tests/mert.extractor-txt/data/nbest.3.gz +++ b/regression-testing/tests/mert.extractor-txt/data/nbest.3.gz diff --git a/regression-testing/tests/mert.extractor-txt/data/nbest.4.gz b/regression-testing/tests/mert.extractor-txt/data/nbest.4.gz Binary files differindex 6998ad89f..6998ad89f 100755..100644 --- a/regression-testing/tests/mert.extractor-txt/data/nbest.4.gz +++ b/regression-testing/tests/mert.extractor-txt/data/nbest.4.gz diff --git a/regression-testing/tests/mert.extractor-txt/data/nbest.5.gz b/regression-testing/tests/mert.extractor-txt/data/nbest.5.gz Binary files differindex 1c21e3d68..1c21e3d68 100755..100644 --- a/regression-testing/tests/mert.extractor-txt/data/nbest.5.gz +++ b/regression-testing/tests/mert.extractor-txt/data/nbest.5.gz diff --git a/regression-testing/tests/mert.extractor-txt/data/reference b/regression-testing/tests/mert.extractor-txt/data/reference index f54eb4f6d..f54eb4f6d 100755..100644 --- a/regression-testing/tests/mert.extractor-txt/data/reference +++ b/regression-testing/tests/mert.extractor-txt/data/reference diff --git a/regression-testing/tests/mert.extractor-txt/filter-stderr b/regression-testing/tests/mert.extractor-txt/filter-stderr index d838a0b68..d838a0b68 100755..100644 --- a/regression-testing/tests/mert.extractor-txt/filter-stderr +++ b/regression-testing/tests/mert.extractor-txt/filter-stderr diff --git a/regression-testing/tests/mert.extractor-txt/filter-stdout b/regression-testing/tests/mert.extractor-txt/filter-stdout index 1212cc873..1212cc873 100755..100644 --- a/regression-testing/tests/mert.extractor-txt/filter-stdout +++ b/regression-testing/tests/mert.extractor-txt/filter-stdout diff --git a/regression-testing/tests/mert.extractor-txt/truth/results.txt b/regression-testing/tests/mert.extractor-txt/truth/results.txt index 0528e9df9..0528e9df9 100755..100644 --- a/regression-testing/tests/mert.extractor-txt/truth/results.txt +++ b/regression-testing/tests/mert.extractor-txt/truth/results.txt diff --git a/regression-testing/tests/mert.pro/command b/regression-testing/tests/mert.pro/command index 94c989cd0..94c989cd0 100755..100644 --- a/regression-testing/tests/mert.pro/command +++ b/regression-testing/tests/mert.pro/command diff --git a/regression-testing/tests/mert.pro/data/FEATSTAT.bin b/regression-testing/tests/mert.pro/data/FEATSTAT.bin Binary files differindex 1770bd0f6..1770bd0f6 100755..100644 --- a/regression-testing/tests/mert.pro/data/FEATSTAT.bin +++ b/regression-testing/tests/mert.pro/data/FEATSTAT.bin diff --git a/regression-testing/tests/mert.pro/data/FEATSTAT.txt b/regression-testing/tests/mert.pro/data/FEATSTAT.txt index 9ec6f58ce..9ec6f58ce 100755..100644 --- a/regression-testing/tests/mert.pro/data/FEATSTAT.txt +++ b/regression-testing/tests/mert.pro/data/FEATSTAT.txt diff --git a/regression-testing/tests/mert.pro/data/INIT b/regression-testing/tests/mert.pro/data/INIT index e1122383a..e1122383a 100755..100644 --- a/regression-testing/tests/mert.pro/data/INIT +++ b/regression-testing/tests/mert.pro/data/INIT diff --git a/regression-testing/tests/mert.pro/data/SCORESTAT.bin b/regression-testing/tests/mert.pro/data/SCORESTAT.bin Binary files differindex 18c81b2b2..18c81b2b2 100755..100644 --- a/regression-testing/tests/mert.pro/data/SCORESTAT.bin +++ b/regression-testing/tests/mert.pro/data/SCORESTAT.bin diff --git a/regression-testing/tests/mert.pro/data/SCORESTAT.txt b/regression-testing/tests/mert.pro/data/SCORESTAT.txt index a7cf9f28e..a7cf9f28e 100755..100644 --- a/regression-testing/tests/mert.pro/data/SCORESTAT.txt +++ b/regression-testing/tests/mert.pro/data/SCORESTAT.txt diff --git a/regression-testing/tests/mert.pro/filter-stderr b/regression-testing/tests/mert.pro/filter-stderr index dcd74ad6c..dcd74ad6c 100755..100644 --- a/regression-testing/tests/mert.pro/filter-stderr +++ b/regression-testing/tests/mert.pro/filter-stderr diff --git a/regression-testing/tests/mert.pro/filter-stdout b/regression-testing/tests/mert.pro/filter-stdout index 1212cc873..1212cc873 100755..100644 --- a/regression-testing/tests/mert.pro/filter-stdout +++ b/regression-testing/tests/mert.pro/filter-stdout diff --git a/regression-testing/tests/mert.pro/stdout b/regression-testing/tests/mert.pro/stdout index c71cf6fa5..c71cf6fa5 100755..100644 --- a/regression-testing/tests/mert.pro/stdout +++ b/regression-testing/tests/mert.pro/stdout diff --git a/regression-testing/tests/mert.pro/truth/results.txt b/regression-testing/tests/mert.pro/truth/results.txt index 794709528..794709528 100755..100644 --- a/regression-testing/tests/mert.pro/truth/results.txt +++ b/regression-testing/tests/mert.pro/truth/results.txt diff --git a/regression-testing/tests/mert.pro/weights.txt b/regression-testing/tests/mert.pro/weights.txt index 0a8fcca97..0a8fcca97 100755..100644 --- a/regression-testing/tests/mert.pro/weights.txt +++ b/regression-testing/tests/mert.pro/weights.txt diff --git a/regression-testing/tests/perllib/RegTestUtils.pm b/regression-testing/tests/perllib/RegTestUtils.pm index 25e7f5e53..25e7f5e53 100755..100644 --- a/regression-testing/tests/perllib/RegTestUtils.pm +++ b/regression-testing/tests/perllib/RegTestUtils.pm diff --git a/regression-testing/tests/phrase.basic-lm-oov-withkenlm/moses.ini b/regression-testing/tests/phrase.basic-lm-oov-withkenlm/moses.ini index 3c2558505..3c2558505 100755..100644 --- a/regression-testing/tests/phrase.basic-lm-oov-withkenlm/moses.ini +++ b/regression-testing/tests/phrase.basic-lm-oov-withkenlm/moses.ini diff --git a/regression-testing/tests/phrase.basic-lm-oov-withkenlm/to-translate.txt b/regression-testing/tests/phrase.basic-lm-oov-withkenlm/to-translate.txt index a505702d1..a505702d1 100755..100644 --- a/regression-testing/tests/phrase.basic-lm-oov-withkenlm/to-translate.txt +++ b/regression-testing/tests/phrase.basic-lm-oov-withkenlm/to-translate.txt diff --git a/regression-testing/tests/phrase.basic-lm-oov-withkenlm/truth/results.txt b/regression-testing/tests/phrase.basic-lm-oov-withkenlm/truth/results.txt index 974429d61..974429d61 100755..100644 --- a/regression-testing/tests/phrase.basic-lm-oov-withkenlm/truth/results.txt +++ b/regression-testing/tests/phrase.basic-lm-oov-withkenlm/truth/results.txt diff --git a/regression-testing/tests/phrase.basic-lm-oov/moses.ini b/regression-testing/tests/phrase.basic-lm-oov/moses.ini index 88bbc1ee6..88bbc1ee6 100755..100644 --- a/regression-testing/tests/phrase.basic-lm-oov/moses.ini +++ b/regression-testing/tests/phrase.basic-lm-oov/moses.ini diff --git a/regression-testing/tests/phrase.basic-lm-oov/to-translate.txt b/regression-testing/tests/phrase.basic-lm-oov/to-translate.txt index a505702d1..a505702d1 100755..100644 --- a/regression-testing/tests/phrase.basic-lm-oov/to-translate.txt +++ b/regression-testing/tests/phrase.basic-lm-oov/to-translate.txt diff --git a/regression-testing/tests/phrase.basic-lm-oov/truth/results.txt b/regression-testing/tests/phrase.basic-lm-oov/truth/results.txt index faca9f17b..faca9f17b 100755..100644 --- a/regression-testing/tests/phrase.basic-lm-oov/truth/results.txt +++ b/regression-testing/tests/phrase.basic-lm-oov/truth/results.txt diff --git a/regression-testing/tests/phrase.basic-surface-binptable/moses.ini b/regression-testing/tests/phrase.basic-surface-binptable/moses.ini index a1352e17c..a1352e17c 100755..100644 --- a/regression-testing/tests/phrase.basic-surface-binptable/moses.ini +++ b/regression-testing/tests/phrase.basic-surface-binptable/moses.ini diff --git a/regression-testing/tests/phrase.basic-surface-binptable/to-translate.txt b/regression-testing/tests/phrase.basic-surface-binptable/to-translate.txt index a505702d1..a505702d1 100755..100644 --- a/regression-testing/tests/phrase.basic-surface-binptable/to-translate.txt +++ b/regression-testing/tests/phrase.basic-surface-binptable/to-translate.txt diff --git a/regression-testing/tests/phrase.basic-surface-binptable/truth/results.txt b/regression-testing/tests/phrase.basic-surface-binptable/truth/results.txt index 78091602c..78091602c 100755..100644 --- a/regression-testing/tests/phrase.basic-surface-binptable/truth/results.txt +++ b/regression-testing/tests/phrase.basic-surface-binptable/truth/results.txt diff --git a/regression-testing/tests/phrase.basic-surface-only-withirstlm-binlm/moses.ini b/regression-testing/tests/phrase.basic-surface-only-withirstlm-binlm/moses.ini index 271b8b34a..271b8b34a 100755..100644 --- a/regression-testing/tests/phrase.basic-surface-only-withirstlm-binlm/moses.ini +++ b/regression-testing/tests/phrase.basic-surface-only-withirstlm-binlm/moses.ini diff --git a/regression-testing/tests/phrase.basic-surface-only-withirstlm-binlm/to-translate.txt b/regression-testing/tests/phrase.basic-surface-only-withirstlm-binlm/to-translate.txt index a505702d1..a505702d1 100755..100644 --- a/regression-testing/tests/phrase.basic-surface-only-withirstlm-binlm/to-translate.txt +++ b/regression-testing/tests/phrase.basic-surface-only-withirstlm-binlm/to-translate.txt diff --git a/regression-testing/tests/phrase.basic-surface-only-withirstlm-binlm/truth/results.txt b/regression-testing/tests/phrase.basic-surface-only-withirstlm-binlm/truth/results.txt index 2e8e3cab8..2e8e3cab8 100755..100644 --- a/regression-testing/tests/phrase.basic-surface-only-withirstlm-binlm/truth/results.txt +++ b/regression-testing/tests/phrase.basic-surface-only-withirstlm-binlm/truth/results.txt diff --git a/regression-testing/tests/phrase.basic-surface-only-withirstlm/moses.ini b/regression-testing/tests/phrase.basic-surface-only-withirstlm/moses.ini index f4c6fee97..f4c6fee97 100755..100644 --- a/regression-testing/tests/phrase.basic-surface-only-withirstlm/moses.ini +++ b/regression-testing/tests/phrase.basic-surface-only-withirstlm/moses.ini diff --git a/regression-testing/tests/phrase.basic-surface-only-withirstlm/to-translate.txt b/regression-testing/tests/phrase.basic-surface-only-withirstlm/to-translate.txt index a505702d1..a505702d1 100755..100644 --- a/regression-testing/tests/phrase.basic-surface-only-withirstlm/to-translate.txt +++ b/regression-testing/tests/phrase.basic-surface-only-withirstlm/to-translate.txt diff --git a/regression-testing/tests/phrase.basic-surface-only-withirstlm/truth/results.txt b/regression-testing/tests/phrase.basic-surface-only-withirstlm/truth/results.txt index bf57182f6..bf57182f6 100755..100644 --- a/regression-testing/tests/phrase.basic-surface-only-withirstlm/truth/results.txt +++ b/regression-testing/tests/phrase.basic-surface-only-withirstlm/truth/results.txt diff --git a/regression-testing/tests/phrase.basic-surface-only-withkenlm.bin/moses.ini b/regression-testing/tests/phrase.basic-surface-only-withkenlm.bin/moses.ini index 25bd27173..25bd27173 100755..100644 --- a/regression-testing/tests/phrase.basic-surface-only-withkenlm.bin/moses.ini +++ b/regression-testing/tests/phrase.basic-surface-only-withkenlm.bin/moses.ini diff --git a/regression-testing/tests/phrase.basic-surface-only-withkenlm.bin/to-translate.txt b/regression-testing/tests/phrase.basic-surface-only-withkenlm.bin/to-translate.txt index a505702d1..a505702d1 100755..100644 --- a/regression-testing/tests/phrase.basic-surface-only-withkenlm.bin/to-translate.txt +++ b/regression-testing/tests/phrase.basic-surface-only-withkenlm.bin/to-translate.txt diff --git a/regression-testing/tests/phrase.basic-surface-only-withkenlm.bin/truth/results.txt b/regression-testing/tests/phrase.basic-surface-only-withkenlm.bin/truth/results.txt index 44a0502c8..44a0502c8 100755..100644 --- a/regression-testing/tests/phrase.basic-surface-only-withkenlm.bin/truth/results.txt +++ b/regression-testing/tests/phrase.basic-surface-only-withkenlm.bin/truth/results.txt diff --git a/regression-testing/tests/phrase.basic-surface-only-withkenlm/moses.ini b/regression-testing/tests/phrase.basic-surface-only-withkenlm/moses.ini index 25bd27173..25bd27173 100755..100644 --- a/regression-testing/tests/phrase.basic-surface-only-withkenlm/moses.ini +++ b/regression-testing/tests/phrase.basic-surface-only-withkenlm/moses.ini diff --git a/regression-testing/tests/phrase.basic-surface-only-withkenlm/to-translate.txt b/regression-testing/tests/phrase.basic-surface-only-withkenlm/to-translate.txt index a505702d1..a505702d1 100755..100644 --- a/regression-testing/tests/phrase.basic-surface-only-withkenlm/to-translate.txt +++ b/regression-testing/tests/phrase.basic-surface-only-withkenlm/to-translate.txt diff --git a/regression-testing/tests/phrase.basic-surface-only-withkenlm/truth/results.txt b/regression-testing/tests/phrase.basic-surface-only-withkenlm/truth/results.txt index 44a0502c8..44a0502c8 100755..100644 --- a/regression-testing/tests/phrase.basic-surface-only-withkenlm/truth/results.txt +++ b/regression-testing/tests/phrase.basic-surface-only-withkenlm/truth/results.txt diff --git a/regression-testing/tests/phrase.basic-surface-only/moses.ini b/regression-testing/tests/phrase.basic-surface-only/moses.ini index 336b5c7b1..336b5c7b1 100755..100644 --- a/regression-testing/tests/phrase.basic-surface-only/moses.ini +++ b/regression-testing/tests/phrase.basic-surface-only/moses.ini diff --git a/regression-testing/tests/phrase.basic-surface-only/to-translate.txt b/regression-testing/tests/phrase.basic-surface-only/to-translate.txt index a505702d1..a505702d1 100755..100644 --- a/regression-testing/tests/phrase.basic-surface-only/to-translate.txt +++ b/regression-testing/tests/phrase.basic-surface-only/to-translate.txt diff --git a/regression-testing/tests/phrase.basic-surface-only/truth/results.txt b/regression-testing/tests/phrase.basic-surface-only/truth/results.txt index e17063443..e17063443 100755..100644 --- a/regression-testing/tests/phrase.basic-surface-only/truth/results.txt +++ b/regression-testing/tests/phrase.basic-surface-only/truth/results.txt diff --git a/regression-testing/tests/phrase.confusionNet-multi-factor/moses.ini b/regression-testing/tests/phrase.confusionNet-multi-factor/moses.ini index ee6c05de4..ee6c05de4 100755..100644 --- a/regression-testing/tests/phrase.confusionNet-multi-factor/moses.ini +++ b/regression-testing/tests/phrase.confusionNet-multi-factor/moses.ini diff --git a/regression-testing/tests/phrase.confusionNet-multi-factor/to-translate.txt b/regression-testing/tests/phrase.confusionNet-multi-factor/to-translate.txt index d08755644..d08755644 100755..100644 --- a/regression-testing/tests/phrase.confusionNet-multi-factor/to-translate.txt +++ b/regression-testing/tests/phrase.confusionNet-multi-factor/to-translate.txt diff --git a/regression-testing/tests/phrase.confusionNet-multi-factor/truth/results.txt b/regression-testing/tests/phrase.confusionNet-multi-factor/truth/results.txt index 49cbe55be..49cbe55be 100755..100644 --- a/regression-testing/tests/phrase.confusionNet-multi-factor/truth/results.txt +++ b/regression-testing/tests/phrase.confusionNet-multi-factor/truth/results.txt diff --git a/regression-testing/tests/phrase.confusionNet-surface-only/moses.ini b/regression-testing/tests/phrase.confusionNet-surface-only/moses.ini index a18cb5934..a18cb5934 100755..100644 --- a/regression-testing/tests/phrase.confusionNet-surface-only/moses.ini +++ b/regression-testing/tests/phrase.confusionNet-surface-only/moses.ini diff --git a/regression-testing/tests/phrase.confusionNet-surface-only/to-translate.txt b/regression-testing/tests/phrase.confusionNet-surface-only/to-translate.txt index d08755644..d08755644 100755..100644 --- a/regression-testing/tests/phrase.confusionNet-surface-only/to-translate.txt +++ b/regression-testing/tests/phrase.confusionNet-surface-only/to-translate.txt diff --git a/regression-testing/tests/phrase.confusionNet-surface-only/truth/results.txt b/regression-testing/tests/phrase.confusionNet-surface-only/truth/results.txt index 1e89b205e..1e89b205e 100755..100644 --- a/regression-testing/tests/phrase.confusionNet-surface-only/truth/results.txt +++ b/regression-testing/tests/phrase.confusionNet-surface-only/truth/results.txt diff --git a/regression-testing/tests/phrase.consensus-decoding-surface/moses.ini b/regression-testing/tests/phrase.consensus-decoding-surface/moses.ini index 550bc2e8f..550bc2e8f 100755..100644 --- a/regression-testing/tests/phrase.consensus-decoding-surface/moses.ini +++ b/regression-testing/tests/phrase.consensus-decoding-surface/moses.ini diff --git a/regression-testing/tests/phrase.consensus-decoding-surface/to-translate.txt b/regression-testing/tests/phrase.consensus-decoding-surface/to-translate.txt index a505702d1..a505702d1 100755..100644 --- a/regression-testing/tests/phrase.consensus-decoding-surface/to-translate.txt +++ b/regression-testing/tests/phrase.consensus-decoding-surface/to-translate.txt diff --git a/regression-testing/tests/phrase.consensus-decoding-surface/truth/results.txt b/regression-testing/tests/phrase.consensus-decoding-surface/truth/results.txt index 9710951dd..9710951dd 100755..100644 --- a/regression-testing/tests/phrase.consensus-decoding-surface/truth/results.txt +++ b/regression-testing/tests/phrase.consensus-decoding-surface/truth/results.txt diff --git a/regression-testing/tests/phrase.continue-partial-translation/moses.ini b/regression-testing/tests/phrase.continue-partial-translation/moses.ini index 2d1468e8f..2d1468e8f 100755..100644 --- a/regression-testing/tests/phrase.continue-partial-translation/moses.ini +++ b/regression-testing/tests/phrase.continue-partial-translation/moses.ini diff --git a/regression-testing/tests/phrase.continue-partial-translation/to-translate.txt b/regression-testing/tests/phrase.continue-partial-translation/to-translate.txt index 9283512d3..9283512d3 100755..100644 --- a/regression-testing/tests/phrase.continue-partial-translation/to-translate.txt +++ b/regression-testing/tests/phrase.continue-partial-translation/to-translate.txt diff --git a/regression-testing/tests/phrase.continue-partial-translation/truth/results.txt b/regression-testing/tests/phrase.continue-partial-translation/truth/results.txt index 8dd76dbb1..8dd76dbb1 100755..100644 --- a/regression-testing/tests/phrase.continue-partial-translation/truth/results.txt +++ b/regression-testing/tests/phrase.continue-partial-translation/truth/results.txt diff --git a/regression-testing/tests/phrase.lattice-distortion/CMD b/regression-testing/tests/phrase.lattice-distortion/CMD index 7dcf26c8c..7dcf26c8c 100755..100644 --- a/regression-testing/tests/phrase.lattice-distortion/CMD +++ b/regression-testing/tests/phrase.lattice-distortion/CMD diff --git a/regression-testing/tests/phrase.lattice-distortion/moses.ini b/regression-testing/tests/phrase.lattice-distortion/moses.ini index 80d4c4695..80d4c4695 100755..100644 --- a/regression-testing/tests/phrase.lattice-distortion/moses.ini +++ b/regression-testing/tests/phrase.lattice-distortion/moses.ini diff --git a/regression-testing/tests/phrase.lattice-distortion/phrase-table b/regression-testing/tests/phrase.lattice-distortion/phrase-table index 48f6a1551..48f6a1551 100755..100644 --- a/regression-testing/tests/phrase.lattice-distortion/phrase-table +++ b/regression-testing/tests/phrase.lattice-distortion/phrase-table diff --git a/regression-testing/tests/phrase.lattice-distortion/phrase-table.binphr.idx b/regression-testing/tests/phrase.lattice-distortion/phrase-table.binphr.idx Binary files differindex 7eded7e5d..7eded7e5d 100755..100644 --- a/regression-testing/tests/phrase.lattice-distortion/phrase-table.binphr.idx +++ b/regression-testing/tests/phrase.lattice-distortion/phrase-table.binphr.idx diff --git a/regression-testing/tests/phrase.lattice-distortion/phrase-table.binphr.srctree b/regression-testing/tests/phrase.lattice-distortion/phrase-table.binphr.srctree Binary files differindex 93de16d2b..93de16d2b 100755..100644 --- a/regression-testing/tests/phrase.lattice-distortion/phrase-table.binphr.srctree +++ b/regression-testing/tests/phrase.lattice-distortion/phrase-table.binphr.srctree diff --git a/regression-testing/tests/phrase.lattice-distortion/phrase-table.binphr.srcvoc b/regression-testing/tests/phrase.lattice-distortion/phrase-table.binphr.srcvoc index d096e7f09..d096e7f09 100755..100644 --- a/regression-testing/tests/phrase.lattice-distortion/phrase-table.binphr.srcvoc +++ b/regression-testing/tests/phrase.lattice-distortion/phrase-table.binphr.srcvoc diff --git a/regression-testing/tests/phrase.lattice-distortion/phrase-table.binphr.tgtdata b/regression-testing/tests/phrase.lattice-distortion/phrase-table.binphr.tgtdata Binary files differindex 0306f7108..0306f7108 100755..100644 --- a/regression-testing/tests/phrase.lattice-distortion/phrase-table.binphr.tgtdata +++ b/regression-testing/tests/phrase.lattice-distortion/phrase-table.binphr.tgtdata diff --git a/regression-testing/tests/phrase.lattice-distortion/phrase-table.binphr.tgtvoc b/regression-testing/tests/phrase.lattice-distortion/phrase-table.binphr.tgtvoc index 71dec3430..71dec3430 100755..100644 --- a/regression-testing/tests/phrase.lattice-distortion/phrase-table.binphr.tgtvoc +++ b/regression-testing/tests/phrase.lattice-distortion/phrase-table.binphr.tgtvoc diff --git a/regression-testing/tests/phrase.lattice-distortion/small.lm b/regression-testing/tests/phrase.lattice-distortion/small.lm index 2206a7d57..2206a7d57 100755..100644 --- a/regression-testing/tests/phrase.lattice-distortion/small.lm +++ b/regression-testing/tests/phrase.lattice-distortion/small.lm diff --git a/regression-testing/tests/phrase.lattice-distortion/to-translate.txt b/regression-testing/tests/phrase.lattice-distortion/to-translate.txt index ed1c0d1bb..ed1c0d1bb 100755..100644 --- a/regression-testing/tests/phrase.lattice-distortion/to-translate.txt +++ b/regression-testing/tests/phrase.lattice-distortion/to-translate.txt diff --git a/regression-testing/tests/phrase.lattice-distortion/truth/results.txt b/regression-testing/tests/phrase.lattice-distortion/truth/results.txt index c3d031cd8..c3d031cd8 100755..100644 --- a/regression-testing/tests/phrase.lattice-distortion/truth/results.txt +++ b/regression-testing/tests/phrase.lattice-distortion/truth/results.txt diff --git a/regression-testing/tests/phrase.lattice-surface/moses.ini b/regression-testing/tests/phrase.lattice-surface/moses.ini index 013d447cd..013d447cd 100755..100644 --- a/regression-testing/tests/phrase.lattice-surface/moses.ini +++ b/regression-testing/tests/phrase.lattice-surface/moses.ini diff --git a/regression-testing/tests/phrase.lattice-surface/to-translate.txt b/regression-testing/tests/phrase.lattice-surface/to-translate.txt index fd475df5e..fd475df5e 100755..100644 --- a/regression-testing/tests/phrase.lattice-surface/to-translate.txt +++ b/regression-testing/tests/phrase.lattice-surface/to-translate.txt diff --git a/regression-testing/tests/phrase.lattice-surface/truth/results.txt b/regression-testing/tests/phrase.lattice-surface/truth/results.txt index 7a7dd5304..7a7dd5304 100755..100644 --- a/regression-testing/tests/phrase.lattice-surface/truth/results.txt +++ b/regression-testing/tests/phrase.lattice-surface/truth/results.txt diff --git a/regression-testing/tests/phrase.lexicalized-reordering-bin/moses.ini b/regression-testing/tests/phrase.lexicalized-reordering-bin/moses.ini index fb536f9a9..fb536f9a9 100755..100644 --- a/regression-testing/tests/phrase.lexicalized-reordering-bin/moses.ini +++ b/regression-testing/tests/phrase.lexicalized-reordering-bin/moses.ini diff --git a/regression-testing/tests/phrase.lexicalized-reordering-bin/to-translate.txt b/regression-testing/tests/phrase.lexicalized-reordering-bin/to-translate.txt index d336d82f3..d336d82f3 100755..100644 --- a/regression-testing/tests/phrase.lexicalized-reordering-bin/to-translate.txt +++ b/regression-testing/tests/phrase.lexicalized-reordering-bin/to-translate.txt diff --git a/regression-testing/tests/phrase.lexicalized-reordering-bin/truth/results.txt b/regression-testing/tests/phrase.lexicalized-reordering-bin/truth/results.txt index 198db29bc..198db29bc 100755..100644 --- a/regression-testing/tests/phrase.lexicalized-reordering-bin/truth/results.txt +++ b/regression-testing/tests/phrase.lexicalized-reordering-bin/truth/results.txt diff --git a/regression-testing/tests/phrase.lexicalized-reordering-cn/moses.ini b/regression-testing/tests/phrase.lexicalized-reordering-cn/moses.ini index afddd854d..afddd854d 100755..100644 --- a/regression-testing/tests/phrase.lexicalized-reordering-cn/moses.ini +++ b/regression-testing/tests/phrase.lexicalized-reordering-cn/moses.ini diff --git a/regression-testing/tests/phrase.lexicalized-reordering-cn/to-translate.txt b/regression-testing/tests/phrase.lexicalized-reordering-cn/to-translate.txt index 3e712ee1b..3e712ee1b 100755..100644 --- a/regression-testing/tests/phrase.lexicalized-reordering-cn/to-translate.txt +++ b/regression-testing/tests/phrase.lexicalized-reordering-cn/to-translate.txt diff --git a/regression-testing/tests/phrase.lexicalized-reordering-cn/truth/results.txt b/regression-testing/tests/phrase.lexicalized-reordering-cn/truth/results.txt index 02dd60ec5..02dd60ec5 100755..100644 --- a/regression-testing/tests/phrase.lexicalized-reordering-cn/truth/results.txt +++ b/regression-testing/tests/phrase.lexicalized-reordering-cn/truth/results.txt diff --git a/regression-testing/tests/phrase.lexicalized-reordering/moses.ini b/regression-testing/tests/phrase.lexicalized-reordering/moses.ini index 83b3927cb..83b3927cb 100755..100644 --- a/regression-testing/tests/phrase.lexicalized-reordering/moses.ini +++ b/regression-testing/tests/phrase.lexicalized-reordering/moses.ini diff --git a/regression-testing/tests/phrase.lexicalized-reordering/to-translate.txt b/regression-testing/tests/phrase.lexicalized-reordering/to-translate.txt index d336d82f3..d336d82f3 100755..100644 --- a/regression-testing/tests/phrase.lexicalized-reordering/to-translate.txt +++ b/regression-testing/tests/phrase.lexicalized-reordering/to-translate.txt diff --git a/regression-testing/tests/phrase.lexicalized-reordering/truth/results.txt b/regression-testing/tests/phrase.lexicalized-reordering/truth/results.txt index 198db29bc..198db29bc 100755..100644 --- a/regression-testing/tests/phrase.lexicalized-reordering/truth/results.txt +++ b/regression-testing/tests/phrase.lexicalized-reordering/truth/results.txt diff --git a/regression-testing/tests/phrase.multi-factor-binptable/moses.ini b/regression-testing/tests/phrase.multi-factor-binptable/moses.ini index a49100a6c..a49100a6c 100755..100644 --- a/regression-testing/tests/phrase.multi-factor-binptable/moses.ini +++ b/regression-testing/tests/phrase.multi-factor-binptable/moses.ini diff --git a/regression-testing/tests/phrase.multi-factor-binptable/to-translate.txt b/regression-testing/tests/phrase.multi-factor-binptable/to-translate.txt index b3283a754..b3283a754 100755..100644 --- a/regression-testing/tests/phrase.multi-factor-binptable/to-translate.txt +++ b/regression-testing/tests/phrase.multi-factor-binptable/to-translate.txt diff --git a/regression-testing/tests/phrase.multi-factor-binptable/truth/results.txt b/regression-testing/tests/phrase.multi-factor-binptable/truth/results.txt index 4b74da7f7..4b74da7f7 100755..100644 --- a/regression-testing/tests/phrase.multi-factor-binptable/truth/results.txt +++ b/regression-testing/tests/phrase.multi-factor-binptable/truth/results.txt diff --git a/regression-testing/tests/phrase.multi-factor-drop/moses.ini b/regression-testing/tests/phrase.multi-factor-drop/moses.ini index 1409fc723..1409fc723 100755..100644 --- a/regression-testing/tests/phrase.multi-factor-drop/moses.ini +++ b/regression-testing/tests/phrase.multi-factor-drop/moses.ini diff --git a/regression-testing/tests/phrase.multi-factor-drop/to-translate.txt b/regression-testing/tests/phrase.multi-factor-drop/to-translate.txt index b3283a754..b3283a754 100755..100644 --- a/regression-testing/tests/phrase.multi-factor-drop/to-translate.txt +++ b/regression-testing/tests/phrase.multi-factor-drop/to-translate.txt diff --git a/regression-testing/tests/phrase.multi-factor-drop/truth/results.txt b/regression-testing/tests/phrase.multi-factor-drop/truth/results.txt index 8cb75ab2d..8cb75ab2d 100755..100644 --- a/regression-testing/tests/phrase.multi-factor-drop/truth/results.txt +++ b/regression-testing/tests/phrase.multi-factor-drop/truth/results.txt diff --git a/regression-testing/tests/phrase.multi-factor/moses.ini b/regression-testing/tests/phrase.multi-factor/moses.ini index 13be27263..13be27263 100755..100644 --- a/regression-testing/tests/phrase.multi-factor/moses.ini +++ b/regression-testing/tests/phrase.multi-factor/moses.ini diff --git a/regression-testing/tests/phrase.multi-factor/to-translate.txt b/regression-testing/tests/phrase.multi-factor/to-translate.txt index 58686860c..58686860c 100755..100644 --- a/regression-testing/tests/phrase.multi-factor/to-translate.txt +++ b/regression-testing/tests/phrase.multi-factor/to-translate.txt diff --git a/regression-testing/tests/phrase.multi-factor/truth/results.txt b/regression-testing/tests/phrase.multi-factor/truth/results.txt index f1fd7dab3..f1fd7dab3 100755..100644 --- a/regression-testing/tests/phrase.multi-factor/truth/results.txt +++ b/regression-testing/tests/phrase.multi-factor/truth/results.txt diff --git a/regression-testing/tests/phrase.multiple-translation-system-lr/moses.ini b/regression-testing/tests/phrase.multiple-translation-system-lr/moses.ini index 8687b0db9..8687b0db9 100755..100644 --- a/regression-testing/tests/phrase.multiple-translation-system-lr/moses.ini +++ b/regression-testing/tests/phrase.multiple-translation-system-lr/moses.ini diff --git a/regression-testing/tests/phrase.multiple-translation-system-lr/to-translate.txt b/regression-testing/tests/phrase.multiple-translation-system-lr/to-translate.txt index d336d82f3..d336d82f3 100755..100644 --- a/regression-testing/tests/phrase.multiple-translation-system-lr/to-translate.txt +++ b/regression-testing/tests/phrase.multiple-translation-system-lr/to-translate.txt diff --git a/regression-testing/tests/phrase.multiple-translation-system-lr/truth/results.txt b/regression-testing/tests/phrase.multiple-translation-system-lr/truth/results.txt index 198db29bc..198db29bc 100755..100644 --- a/regression-testing/tests/phrase.multiple-translation-system-lr/truth/results.txt +++ b/regression-testing/tests/phrase.multiple-translation-system-lr/truth/results.txt diff --git a/regression-testing/tests/phrase.multiple-translation-system/moses.ini b/regression-testing/tests/phrase.multiple-translation-system/moses.ini index 7d9f23d39..7d9f23d39 100755..100644 --- a/regression-testing/tests/phrase.multiple-translation-system/moses.ini +++ b/regression-testing/tests/phrase.multiple-translation-system/moses.ini diff --git a/regression-testing/tests/phrase.multiple-translation-system/to-translate.txt b/regression-testing/tests/phrase.multiple-translation-system/to-translate.txt index a505702d1..a505702d1 100755..100644 --- a/regression-testing/tests/phrase.multiple-translation-system/to-translate.txt +++ b/regression-testing/tests/phrase.multiple-translation-system/to-translate.txt diff --git a/regression-testing/tests/phrase.multiple-translation-system/truth/results.txt b/regression-testing/tests/phrase.multiple-translation-system/truth/results.txt index e17063443..e17063443 100755..100644 --- a/regression-testing/tests/phrase.multiple-translation-system/truth/results.txt +++ b/regression-testing/tests/phrase.multiple-translation-system/truth/results.txt diff --git a/regression-testing/tests/phrase.nbest-multi-factor/moses.ini b/regression-testing/tests/phrase.nbest-multi-factor/moses.ini index cdc6e2359..cdc6e2359 100755..100644 --- a/regression-testing/tests/phrase.nbest-multi-factor/moses.ini +++ b/regression-testing/tests/phrase.nbest-multi-factor/moses.ini diff --git a/regression-testing/tests/phrase.nbest-multi-factor/to-translate.txt b/regression-testing/tests/phrase.nbest-multi-factor/to-translate.txt index 58686860c..58686860c 100755..100644 --- a/regression-testing/tests/phrase.nbest-multi-factor/to-translate.txt +++ b/regression-testing/tests/phrase.nbest-multi-factor/to-translate.txt diff --git a/regression-testing/tests/phrase.nbest-multi-factor/truth/results.txt b/regression-testing/tests/phrase.nbest-multi-factor/truth/results.txt index a595f78e1..a595f78e1 100755..100644 --- a/regression-testing/tests/phrase.nbest-multi-factor/truth/results.txt +++ b/regression-testing/tests/phrase.nbest-multi-factor/truth/results.txt diff --git a/regression-testing/tests/phrase.ptable-filtering/moses.ini b/regression-testing/tests/phrase.ptable-filtering/moses.ini index 0838ad6b7..0838ad6b7 100755..100644 --- a/regression-testing/tests/phrase.ptable-filtering/moses.ini +++ b/regression-testing/tests/phrase.ptable-filtering/moses.ini diff --git a/regression-testing/tests/phrase.ptable-filtering/to-translate.txt b/regression-testing/tests/phrase.ptable-filtering/to-translate.txt index 3ece67fa6..3ece67fa6 100755..100644 --- a/regression-testing/tests/phrase.ptable-filtering/to-translate.txt +++ b/regression-testing/tests/phrase.ptable-filtering/to-translate.txt diff --git a/regression-testing/tests/phrase.ptable-filtering/truth/results.txt b/regression-testing/tests/phrase.ptable-filtering/truth/results.txt index 8be8a2fde..8be8a2fde 100755..100644 --- a/regression-testing/tests/phrase.ptable-filtering/truth/results.txt +++ b/regression-testing/tests/phrase.ptable-filtering/truth/results.txt diff --git a/regression-testing/tests/phrase.show-weights.lex-reorder/moses.ini b/regression-testing/tests/phrase.show-weights.lex-reorder/moses.ini index 0806f3cc8..0806f3cc8 100755..100644 --- a/regression-testing/tests/phrase.show-weights.lex-reorder/moses.ini +++ b/regression-testing/tests/phrase.show-weights.lex-reorder/moses.ini diff --git a/regression-testing/tests/phrase.show-weights.lex-reorder/to-translate.txt b/regression-testing/tests/phrase.show-weights.lex-reorder/to-translate.txt index e69de29bb..e69de29bb 100755..100644 --- a/regression-testing/tests/phrase.show-weights.lex-reorder/to-translate.txt +++ b/regression-testing/tests/phrase.show-weights.lex-reorder/to-translate.txt diff --git a/regression-testing/tests/phrase.show-weights.lex-reorder/truth/results.txt b/regression-testing/tests/phrase.show-weights.lex-reorder/truth/results.txt index d49a872ca..d49a872ca 100755..100644 --- a/regression-testing/tests/phrase.show-weights.lex-reorder/truth/results.txt +++ b/regression-testing/tests/phrase.show-weights.lex-reorder/truth/results.txt diff --git a/regression-testing/tests/phrase.show-weights/moses.ini b/regression-testing/tests/phrase.show-weights/moses.ini index e99ea9b1f..e99ea9b1f 100755..100644 --- a/regression-testing/tests/phrase.show-weights/moses.ini +++ b/regression-testing/tests/phrase.show-weights/moses.ini diff --git a/regression-testing/tests/phrase.show-weights/to-translate.txt b/regression-testing/tests/phrase.show-weights/to-translate.txt index e69de29bb..e69de29bb 100755..100644 --- a/regression-testing/tests/phrase.show-weights/to-translate.txt +++ b/regression-testing/tests/phrase.show-weights/to-translate.txt diff --git a/regression-testing/tests/phrase.show-weights/truth/results.txt b/regression-testing/tests/phrase.show-weights/truth/results.txt index 5c7be0978..5c7be0978 100755..100644 --- a/regression-testing/tests/phrase.show-weights/truth/results.txt +++ b/regression-testing/tests/phrase.show-weights/truth/results.txt diff --git a/regression-testing/tests/phrase.xml-markup/moses.ini b/regression-testing/tests/phrase.xml-markup/moses.ini index 1fedb28a5..1fedb28a5 100755..100644 --- a/regression-testing/tests/phrase.xml-markup/moses.ini +++ b/regression-testing/tests/phrase.xml-markup/moses.ini diff --git a/regression-testing/tests/phrase.xml-markup/phrase-table b/regression-testing/tests/phrase.xml-markup/phrase-table index fc67473c7..fc67473c7 100755..100644 --- a/regression-testing/tests/phrase.xml-markup/phrase-table +++ b/regression-testing/tests/phrase.xml-markup/phrase-table diff --git a/regression-testing/tests/phrase.xml-markup/phrase-table.binphr.idx b/regression-testing/tests/phrase.xml-markup/phrase-table.binphr.idx Binary files differindex a18ceafd3..a18ceafd3 100755..100644 --- a/regression-testing/tests/phrase.xml-markup/phrase-table.binphr.idx +++ b/regression-testing/tests/phrase.xml-markup/phrase-table.binphr.idx diff --git a/regression-testing/tests/phrase.xml-markup/phrase-table.binphr.srctree b/regression-testing/tests/phrase.xml-markup/phrase-table.binphr.srctree Binary files differindex 9335395bf..9335395bf 100755..100644 --- a/regression-testing/tests/phrase.xml-markup/phrase-table.binphr.srctree +++ b/regression-testing/tests/phrase.xml-markup/phrase-table.binphr.srctree diff --git a/regression-testing/tests/phrase.xml-markup/phrase-table.binphr.srcvoc b/regression-testing/tests/phrase.xml-markup/phrase-table.binphr.srcvoc index cc94a13dc..cc94a13dc 100755..100644 --- a/regression-testing/tests/phrase.xml-markup/phrase-table.binphr.srcvoc +++ b/regression-testing/tests/phrase.xml-markup/phrase-table.binphr.srcvoc diff --git a/regression-testing/tests/phrase.xml-markup/phrase-table.binphr.tgtdata b/regression-testing/tests/phrase.xml-markup/phrase-table.binphr.tgtdata Binary files differindex 1af05d728..1af05d728 100755..100644 --- a/regression-testing/tests/phrase.xml-markup/phrase-table.binphr.tgtdata +++ b/regression-testing/tests/phrase.xml-markup/phrase-table.binphr.tgtdata diff --git a/regression-testing/tests/phrase.xml-markup/phrase-table.binphr.tgtvoc b/regression-testing/tests/phrase.xml-markup/phrase-table.binphr.tgtvoc index a00b16fb1..a00b16fb1 100755..100644 --- a/regression-testing/tests/phrase.xml-markup/phrase-table.binphr.tgtvoc +++ b/regression-testing/tests/phrase.xml-markup/phrase-table.binphr.tgtvoc diff --git a/regression-testing/tests/phrase.xml-markup/to-translate.txt b/regression-testing/tests/phrase.xml-markup/to-translate.txt index 3e0d71f97..3e0d71f97 100755..100644 --- a/regression-testing/tests/phrase.xml-markup/to-translate.txt +++ b/regression-testing/tests/phrase.xml-markup/to-translate.txt diff --git a/regression-testing/tests/phrase.xml-markup/truth/results.txt b/regression-testing/tests/phrase.xml-markup/truth/results.txt index 3aa22c188..3aa22c188 100755..100644 --- a/regression-testing/tests/phrase.xml-markup/truth/results.txt +++ b/regression-testing/tests/phrase.xml-markup/truth/results.txt diff --git a/regression-testing/tests/score.hierarchical-inv/args.txt b/regression-testing/tests/score.hierarchical-inv/args.txt index 9de2f235f..9de2f235f 100755..100644 --- a/regression-testing/tests/score.hierarchical-inv/args.txt +++ b/regression-testing/tests/score.hierarchical-inv/args.txt diff --git a/regression-testing/tests/score.hierarchical-inv/truth/results.txt b/regression-testing/tests/score.hierarchical-inv/truth/results.txt index 1515e02ad..1515e02ad 100755..100644 --- a/regression-testing/tests/score.hierarchical-inv/truth/results.txt +++ b/regression-testing/tests/score.hierarchical-inv/truth/results.txt diff --git a/regression-testing/tests/score.hierarchical/args.txt b/regression-testing/tests/score.hierarchical/args.txt index 744443c1f..744443c1f 100755..100644 --- a/regression-testing/tests/score.hierarchical/args.txt +++ b/regression-testing/tests/score.hierarchical/args.txt diff --git a/regression-testing/tests/score.hierarchical/truth/results.txt b/regression-testing/tests/score.hierarchical/truth/results.txt index 763376734..763376734 100755..100644 --- a/regression-testing/tests/score.hierarchical/truth/results.txt +++ b/regression-testing/tests/score.hierarchical/truth/results.txt diff --git a/regression-testing/tests/score.phrase-based-inv/args.txt b/regression-testing/tests/score.phrase-based-inv/args.txt index 2bac52b87..2bac52b87 100755..100644 --- a/regression-testing/tests/score.phrase-based-inv/args.txt +++ b/regression-testing/tests/score.phrase-based-inv/args.txt diff --git a/regression-testing/tests/score.phrase-based-inv/truth/results.txt b/regression-testing/tests/score.phrase-based-inv/truth/results.txt index 216d9cdea..216d9cdea 100755..100644 --- a/regression-testing/tests/score.phrase-based-inv/truth/results.txt +++ b/regression-testing/tests/score.phrase-based-inv/truth/results.txt diff --git a/regression-testing/tests/score.phrase-based-with-alignment-inv/args.txt b/regression-testing/tests/score.phrase-based-with-alignment-inv/args.txt index c60d1e3ce..c60d1e3ce 100755..100644 --- a/regression-testing/tests/score.phrase-based-with-alignment-inv/args.txt +++ b/regression-testing/tests/score.phrase-based-with-alignment-inv/args.txt diff --git a/regression-testing/tests/score.phrase-based-with-alignment-inv/truth/results.txt b/regression-testing/tests/score.phrase-based-with-alignment-inv/truth/results.txt index 216d9cdea..216d9cdea 100755..100644 --- a/regression-testing/tests/score.phrase-based-with-alignment-inv/truth/results.txt +++ b/regression-testing/tests/score.phrase-based-with-alignment-inv/truth/results.txt diff --git a/regression-testing/tests/score.phrase-based-with-alignment/args.txt b/regression-testing/tests/score.phrase-based-with-alignment/args.txt index 1dd5b5d3e..1dd5b5d3e 100755..100644 --- a/regression-testing/tests/score.phrase-based-with-alignment/args.txt +++ b/regression-testing/tests/score.phrase-based-with-alignment/args.txt diff --git a/regression-testing/tests/score.phrase-based-with-alignment/truth/results.txt b/regression-testing/tests/score.phrase-based-with-alignment/truth/results.txt index 45b247702..45b247702 100755..100644 --- a/regression-testing/tests/score.phrase-based-with-alignment/truth/results.txt +++ b/regression-testing/tests/score.phrase-based-with-alignment/truth/results.txt diff --git a/regression-testing/tests/score.phrase-based/args.txt b/regression-testing/tests/score.phrase-based/args.txt index ff2f97026..ff2f97026 100755..100644 --- a/regression-testing/tests/score.phrase-based/args.txt +++ b/regression-testing/tests/score.phrase-based/args.txt diff --git a/regression-testing/tests/score.phrase-based/truth/results.txt b/regression-testing/tests/score.phrase-based/truth/results.txt index d8b64963d..d8b64963d 100755..100644 --- a/regression-testing/tests/score.phrase-based/truth/results.txt +++ b/regression-testing/tests/score.phrase-based/truth/results.txt diff --git a/scripts/Jamfile b/scripts/Jamfile index e33544d17..e33544d17 100755..100644 --- a/scripts/Jamfile +++ b/scripts/Jamfile diff --git a/scripts/README b/scripts/README index 35dac9dd0..35dac9dd0 100755..100644 --- a/scripts/README +++ b/scripts/README diff --git a/scripts/analysis/README b/scripts/analysis/README index 137b5af87..137b5af87 100755..100644 --- a/scripts/analysis/README +++ b/scripts/analysis/README diff --git a/scripts/analysis/perllib/Error.pm b/scripts/analysis/perllib/Error.pm index cc9edbb69..cc9edbb69 100755..100644 --- a/scripts/analysis/perllib/Error.pm +++ b/scripts/analysis/perllib/Error.pm diff --git a/scripts/analysis/smtgui/Corpus.pm b/scripts/analysis/smtgui/Corpus.pm index 2a7493b39..2a7493b39 100755..100644 --- a/scripts/analysis/smtgui/Corpus.pm +++ b/scripts/analysis/smtgui/Corpus.pm diff --git a/scripts/analysis/smtgui/README b/scripts/analysis/smtgui/README index e6bcabb2e..e6bcabb2e 100755..100644 --- a/scripts/analysis/smtgui/README +++ b/scripts/analysis/smtgui/README diff --git a/scripts/analysis/smtgui/file-descriptions b/scripts/analysis/smtgui/file-descriptions index 5c1f9153f..5c1f9153f 100755..100644 --- a/scripts/analysis/smtgui/file-descriptions +++ b/scripts/analysis/smtgui/file-descriptions diff --git a/scripts/analysis/smtgui/file-factors b/scripts/analysis/smtgui/file-factors index 86789d967..86789d967 100755..100644 --- a/scripts/analysis/smtgui/file-factors +++ b/scripts/analysis/smtgui/file-factors diff --git a/scripts/analysis/smtgui/newsmtgui.cgi b/scripts/analysis/smtgui/newsmtgui.cgi index 552f89924..552f89924 100755..100644 --- a/scripts/analysis/smtgui/newsmtgui.cgi +++ b/scripts/analysis/smtgui/newsmtgui.cgi diff --git a/scripts/ems/biconcor/Alignment.cpp b/scripts/ems/biconcor/Alignment.cpp index 979037ee6..979037ee6 100755..100644 --- a/scripts/ems/biconcor/Alignment.cpp +++ b/scripts/ems/biconcor/Alignment.cpp diff --git a/scripts/ems/biconcor/Alignment.h b/scripts/ems/biconcor/Alignment.h index 38e4dab17..38e4dab17 100755..100644 --- a/scripts/ems/biconcor/Alignment.h +++ b/scripts/ems/biconcor/Alignment.h diff --git a/scripts/ems/biconcor/Jamfile b/scripts/ems/biconcor/Jamfile index 003193067..003193067 100755..100644 --- a/scripts/ems/biconcor/Jamfile +++ b/scripts/ems/biconcor/Jamfile diff --git a/scripts/ems/biconcor/Mismatch.cpp b/scripts/ems/biconcor/Mismatch.cpp index 43e83e921..43e83e921 100755..100644 --- a/scripts/ems/biconcor/Mismatch.cpp +++ b/scripts/ems/biconcor/Mismatch.cpp diff --git a/scripts/ems/biconcor/Mismatch.h b/scripts/ems/biconcor/Mismatch.h index bfcbf4fd8..bfcbf4fd8 100755..100644 --- a/scripts/ems/biconcor/Mismatch.h +++ b/scripts/ems/biconcor/Mismatch.h diff --git a/scripts/ems/biconcor/PhrasePair.cpp b/scripts/ems/biconcor/PhrasePair.cpp index b5330a5fb..b5330a5fb 100755..100644 --- a/scripts/ems/biconcor/PhrasePair.cpp +++ b/scripts/ems/biconcor/PhrasePair.cpp diff --git a/scripts/ems/biconcor/PhrasePair.h b/scripts/ems/biconcor/PhrasePair.h index 079588277..079588277 100755..100644 --- a/scripts/ems/biconcor/PhrasePair.h +++ b/scripts/ems/biconcor/PhrasePair.h diff --git a/scripts/ems/biconcor/PhrasePairCollection.cpp b/scripts/ems/biconcor/PhrasePairCollection.cpp index 10d4e37c4..10d4e37c4 100755..100644 --- a/scripts/ems/biconcor/PhrasePairCollection.cpp +++ b/scripts/ems/biconcor/PhrasePairCollection.cpp diff --git a/scripts/ems/biconcor/PhrasePairCollection.h b/scripts/ems/biconcor/PhrasePairCollection.h index b2473515e..b2473515e 100755..100644 --- a/scripts/ems/biconcor/PhrasePairCollection.h +++ b/scripts/ems/biconcor/PhrasePairCollection.h diff --git a/scripts/ems/biconcor/SuffixArray.cpp b/scripts/ems/biconcor/SuffixArray.cpp index e7214bf43..e7214bf43 100755..100644 --- a/scripts/ems/biconcor/SuffixArray.cpp +++ b/scripts/ems/biconcor/SuffixArray.cpp diff --git a/scripts/ems/biconcor/SuffixArray.h b/scripts/ems/biconcor/SuffixArray.h index fc5ad7c1c..fc5ad7c1c 100755..100644 --- a/scripts/ems/biconcor/SuffixArray.h +++ b/scripts/ems/biconcor/SuffixArray.h diff --git a/scripts/ems/biconcor/TargetCorpus.cpp b/scripts/ems/biconcor/TargetCorpus.cpp index 78c67987f..78c67987f 100755..100644 --- a/scripts/ems/biconcor/TargetCorpus.cpp +++ b/scripts/ems/biconcor/TargetCorpus.cpp diff --git a/scripts/ems/biconcor/TargetCorpus.h b/scripts/ems/biconcor/TargetCorpus.h index 557b1fc4e..557b1fc4e 100755..100644 --- a/scripts/ems/biconcor/TargetCorpus.h +++ b/scripts/ems/biconcor/TargetCorpus.h diff --git a/scripts/ems/biconcor/Vocabulary.cpp b/scripts/ems/biconcor/Vocabulary.cpp index 6a9bea7e3..6a9bea7e3 100755..100644 --- a/scripts/ems/biconcor/Vocabulary.cpp +++ b/scripts/ems/biconcor/Vocabulary.cpp diff --git a/scripts/ems/biconcor/Vocabulary.h b/scripts/ems/biconcor/Vocabulary.h index dc0175387..dc0175387 100755..100644 --- a/scripts/ems/biconcor/Vocabulary.h +++ b/scripts/ems/biconcor/Vocabulary.h diff --git a/scripts/ems/biconcor/base64.cpp b/scripts/ems/biconcor/base64.cpp index 2a863d161..2a863d161 100755..100644 --- a/scripts/ems/biconcor/base64.cpp +++ b/scripts/ems/biconcor/base64.cpp diff --git a/scripts/ems/biconcor/base64.h b/scripts/ems/biconcor/base64.h index 65d5db8b2..65d5db8b2 100755..100644 --- a/scripts/ems/biconcor/base64.h +++ b/scripts/ems/biconcor/base64.h diff --git a/scripts/ems/biconcor/biconcor.cpp b/scripts/ems/biconcor/biconcor.cpp index 0b6218623..0b6218623 100755..100644 --- a/scripts/ems/biconcor/biconcor.cpp +++ b/scripts/ems/biconcor/biconcor.cpp diff --git a/scripts/ems/example/config.basic b/scripts/ems/example/config.basic index fb8d62c74..fb8d62c74 100755..100644 --- a/scripts/ems/example/config.basic +++ b/scripts/ems/example/config.basic diff --git a/scripts/ems/example/config.factored b/scripts/ems/example/config.factored index 0fb072c66..0fb072c66 100755..100644 --- a/scripts/ems/example/config.factored +++ b/scripts/ems/example/config.factored diff --git a/scripts/ems/example/config.hierarchical b/scripts/ems/example/config.hierarchical index 9284726c7..9284726c7 100755..100644 --- a/scripts/ems/example/config.hierarchical +++ b/scripts/ems/example/config.hierarchical diff --git a/scripts/ems/example/config.syntax b/scripts/ems/example/config.syntax index 085e210a5..085e210a5 100755..100644 --- a/scripts/ems/example/config.syntax +++ b/scripts/ems/example/config.syntax diff --git a/scripts/ems/example/config.toy b/scripts/ems/example/config.toy index 59753a50e..59753a50e 100755..100644 --- a/scripts/ems/example/config.toy +++ b/scripts/ems/example/config.toy diff --git a/scripts/ems/example/data/nc-5k.en b/scripts/ems/example/data/nc-5k.en index ea40d25fd..ea40d25fd 100755..100644 --- a/scripts/ems/example/data/nc-5k.en +++ b/scripts/ems/example/data/nc-5k.en diff --git a/scripts/ems/example/data/nc-5k.fr b/scripts/ems/example/data/nc-5k.fr index e8ac93b5d..e8ac93b5d 100755..100644 --- a/scripts/ems/example/data/nc-5k.fr +++ b/scripts/ems/example/data/nc-5k.fr diff --git a/scripts/ems/example/data/test-ref.en.sgm b/scripts/ems/example/data/test-ref.en.sgm index 8aa97ae5b..8aa97ae5b 100755..100644 --- a/scripts/ems/example/data/test-ref.en.sgm +++ b/scripts/ems/example/data/test-ref.en.sgm diff --git a/scripts/ems/example/data/test-src.fr.sgm b/scripts/ems/example/data/test-src.fr.sgm index ed5856a74..ed5856a74 100755..100644 --- a/scripts/ems/example/data/test-src.fr.sgm +++ b/scripts/ems/example/data/test-src.fr.sgm diff --git a/scripts/ems/example/data/weight.ini b/scripts/ems/example/data/weight.ini index 731de5535..731de5535 100755..100644 --- a/scripts/ems/example/data/weight.ini +++ b/scripts/ems/example/data/weight.ini diff --git a/scripts/ems/experiment.machines b/scripts/ems/experiment.machines index 9e0294d60..9e0294d60 100755..100644 --- a/scripts/ems/experiment.machines +++ b/scripts/ems/experiment.machines diff --git a/scripts/ems/experiment.meta b/scripts/ems/experiment.meta index 941d42fa7..941d42fa7 100755..100644 --- a/scripts/ems/experiment.meta +++ b/scripts/ems/experiment.meta diff --git a/scripts/ems/experiment.perl b/scripts/ems/experiment.perl index 60b6142b0..8530904c1 100755 --- a/scripts/ems/experiment.perl +++ b/scripts/ems/experiment.perl @@ -1552,7 +1552,7 @@ sub define_tuning_tune { # the last 3 variables are only used for mira tuning my ($tuned_config,$config,$input,$reference,$config_devtest,$input_devtest,$reference_devtest) = &get_output_and_input($step_id); - + my $use_mira = &backoff_and_get("TUNING:use-mira"); my $cmd = ""; if ($use_mira && $use_mira eq "true") { @@ -1564,7 +1564,9 @@ sub define_tuning_tune { $mira_config .= "cfg"; write_mira_config($mira_config,$experiment_dir,$config,$input,$reference,$config_devtest,$input_devtest,$reference_devtest); - $cmd = "$tuning_script -config $mira_config -exec >& $mira_config_log"; + #$cmd = "$tuning_script -config $mira_config -exec >& $mira_config_log"; + # we want error messages in top-level log file + $cmd = "$tuning_script -config $mira_config -exec "; # write script to select the best set of weights after training for the specified number of epochs --> # cp to tuning/tmp.?/moses.ini @@ -1611,70 +1613,21 @@ sub define_tuning_tune { } sub write_mira_config { - my ($config_filename,$expt_dir,$tune_filtered_ini,$input,$reference,$devtest_filtered_ini,$input_devtest,$reference_devtest) = @_; - + my ($config_filename,$expt_dir,$tune_filtered_ini,$input,$reference,$devtest_filtered_ini,$input_devtest,$reference_devtest) = @_; my $moses_src_dir = &check_and_get("GENERAL:moses-src-dir"); my $tuning_decoder_settings = &check_and_get("TUNING:decoder-settings"); - my $core_weights = &backoff_and_get("TUNING:core-weight-config"); my $start_weights = &backoff_and_get("TUNING:start-weight-config"); my $tuning_settings = &check_and_get("TUNING:tuning-settings"); my @settings = split(/ /, $tuning_settings); my $mira_tuning_settings = &check_and_get("TUNING:mira-tuning-settings"); - # convert core weights into format expected by mira - my $core_file = "$expt_dir/core_weights"; - my $start_file = "$expt_dir/start_weights"; - if ($core_weights or $start_weights) { - open INI, $core_weights if $core_weights; - open INI, $start_weights if $start_weights; - #print STDERR "Reading core weights from file $core_weights \n"; - open CORE_OR_START, ">$core_file" if $core_weights; - open CORE_OR_START, ">$start_file" if $start_weights; - while(<INI>) { - if (/weight-l/) { - my @lm_weights; - while (<INI>) { - last if $_ eq "\n"; - push(@lm_weights, $_); - } - - print CORE_OR_START "LM ".$lm_weights[0]; - for my $i (1 .. $#lm_weights) { - print CORE_OR_START "LM:".($i+1)." ".$lm_weights[$i]; - } - - } elsif (/weight-t/) { - my @pm_weights; - while (<INI>) { - last if $_ eq "\n"; - push(@pm_weights, $_); - } - for my $i (0 .. $#pm_weights) { - print CORE_OR_START "PhraseModel_".($i+1)." ".$pm_weights[$i]; - } - } elsif (/weight-d/) { - my @d_weights; - while (<INI>) { - last if $_ eq "\n"; - push(@d_weights, $_); - } - for my $i (0 .. $#d_weights) { - if ($i == 0) { - print CORE_OR_START "Distortion ".$d_weights[0]; - } - else { - print CORE_OR_START "LexicalReordering_wbe-msd-bidirectional-fe-allff_".($i+1)." ".$d_weights[$i]; - } - } - - } elsif (/weight-w/) { - my $w = <INI>; - print CORE_OR_START "WordPenalty ".$w; - } - } - close INI; - close CORE_OR_START; - } + $tune_filtered_ini =~ /.*\/([A-Za-z0-9\.\-\_]*)$/; + my $tune_filtered_ini_start = $1; + $tune_filtered_ini_start = $expt_dir."/".$tune_filtered_ini_start.".start"; + if ($start_weights) { + # apply start weights to filtered ini file, and pass the new ini to mira + system("$Bin/support/reuse-weights.perl $start_weights < $tune_filtered_ini > $tune_filtered_ini_start"); + } # mira config file open(CFG, ">$config_filename"); @@ -1686,27 +1639,21 @@ sub write_mira_config { print CFG "working-dir=".$expt_dir."\n"; print CFG "wait-for-bleu=1 \n"; print CFG "decoder-settings=".$tuning_decoder_settings."\n\n"; - - if ($core_weights) { - print CFG "[core] \n"; - print CFG "weightfile=".$core_file."\n\n"; - } - if ($start_weights) { - print CFG "[start] \n"; - print CFG "weightfile=".$start_file."\n\n"; - } - print CFG "[train] \n"; print CFG "trainer=\${moses-home}/dist/bin/mira \n"; print CFG "input-file=".$input."\n"; print CFG "reference-files=".$reference."\n"; - print CFG "moses-ini-file=".$tune_filtered_ini."\n"; + if ($start_weights) { + print CFG "moses-ini-file=".$tune_filtered_ini_start."\n"; + } + else { + print CFG "moses-ini-file=".$tune_filtered_ini."\n"; + } print CFG "hours=48 \n"; foreach my $setting (@settings) { print CFG $setting."\n"; } - print CFG "extra-args=".$mira_tuning_settings."\n\n"; - + print CFG "extra-args=".$mira_tuning_settings."\n\n"; print CFG "[devtest] \n"; if (&get("TRAINING:hierarchical-rule-set")) { print CFG "moses=\${moses-home}/dist/bin/moses_chart \n"; diff --git a/scripts/ems/web/analysis.php b/scripts/ems/web/analysis.php index 489bdc50d..489bdc50d 100755..100644 --- a/scripts/ems/web/analysis.php +++ b/scripts/ems/web/analysis.php diff --git a/scripts/ems/web/analysis_diff.php b/scripts/ems/web/analysis_diff.php index 9cb853030..9cb853030 100755..100644 --- a/scripts/ems/web/analysis_diff.php +++ b/scripts/ems/web/analysis_diff.php diff --git a/scripts/ems/web/bilingual-concordance.css b/scripts/ems/web/bilingual-concordance.css index e232337d2..e232337d2 100755..100644 --- a/scripts/ems/web/bilingual-concordance.css +++ b/scripts/ems/web/bilingual-concordance.css diff --git a/scripts/ems/web/close.gif b/scripts/ems/web/close.gif Binary files differindex d45791ccd..d45791ccd 100755..100644 --- a/scripts/ems/web/close.gif +++ b/scripts/ems/web/close.gif diff --git a/scripts/ems/web/comment.php b/scripts/ems/web/comment.php index 04628ea4f..04628ea4f 100755..100644 --- a/scripts/ems/web/comment.php +++ b/scripts/ems/web/comment.php diff --git a/scripts/ems/web/diff.php b/scripts/ems/web/diff.php index 71e732af1..71e732af1 100755..100644 --- a/scripts/ems/web/diff.php +++ b/scripts/ems/web/diff.php diff --git a/scripts/ems/web/general.css b/scripts/ems/web/general.css index 5eb8e3eb8..5eb8e3eb8 100755..100644 --- a/scripts/ems/web/general.css +++ b/scripts/ems/web/general.css diff --git a/scripts/ems/web/hierarchical-segmentation.css b/scripts/ems/web/hierarchical-segmentation.css index 47f2c2693..47f2c2693 100755..100644 --- a/scripts/ems/web/hierarchical-segmentation.css +++ b/scripts/ems/web/hierarchical-segmentation.css diff --git a/scripts/ems/web/hierarchical-segmentation.js b/scripts/ems/web/hierarchical-segmentation.js index b4eb206ce..b4eb206ce 100755..100644 --- a/scripts/ems/web/hierarchical-segmentation.js +++ b/scripts/ems/web/hierarchical-segmentation.js diff --git a/scripts/ems/web/index.php b/scripts/ems/web/index.php index 466af9013..466af9013 100755..100644 --- a/scripts/ems/web/index.php +++ b/scripts/ems/web/index.php diff --git a/scripts/ems/web/javascripts/builder.js b/scripts/ems/web/javascripts/builder.js index f1f42b9ac..f1f42b9ac 100755..100644 --- a/scripts/ems/web/javascripts/builder.js +++ b/scripts/ems/web/javascripts/builder.js diff --git a/scripts/ems/web/javascripts/controls.js b/scripts/ems/web/javascripts/controls.js index 7392fb664..7392fb664 100755..100644 --- a/scripts/ems/web/javascripts/controls.js +++ b/scripts/ems/web/javascripts/controls.js diff --git a/scripts/ems/web/javascripts/dragdrop.js b/scripts/ems/web/javascripts/dragdrop.js index 15c6dbca6..15c6dbca6 100755..100644 --- a/scripts/ems/web/javascripts/dragdrop.js +++ b/scripts/ems/web/javascripts/dragdrop.js diff --git a/scripts/ems/web/javascripts/effects.js b/scripts/ems/web/javascripts/effects.js index 066ee5909..066ee5909 100755..100644 --- a/scripts/ems/web/javascripts/effects.js +++ b/scripts/ems/web/javascripts/effects.js diff --git a/scripts/ems/web/javascripts/prototype.js b/scripts/ems/web/javascripts/prototype.js index 845ab7fb4..845ab7fb4 100755..100644 --- a/scripts/ems/web/javascripts/prototype.js +++ b/scripts/ems/web/javascripts/prototype.js diff --git a/scripts/ems/web/javascripts/scriptaculous.js b/scripts/ems/web/javascripts/scriptaculous.js index 6bf437acc..6bf437acc 100755..100644 --- a/scripts/ems/web/javascripts/scriptaculous.js +++ b/scripts/ems/web/javascripts/scriptaculous.js diff --git a/scripts/ems/web/javascripts/slider.js b/scripts/ems/web/javascripts/slider.js index eb8305582..eb8305582 100755..100644 --- a/scripts/ems/web/javascripts/slider.js +++ b/scripts/ems/web/javascripts/slider.js diff --git a/scripts/ems/web/javascripts/sound.js b/scripts/ems/web/javascripts/sound.js index a286eb98e..a286eb98e 100755..100644 --- a/scripts/ems/web/javascripts/sound.js +++ b/scripts/ems/web/javascripts/sound.js diff --git a/scripts/ems/web/javascripts/unittest.js b/scripts/ems/web/javascripts/unittest.js index 33a0c7157..33a0c7157 100755..100644 --- a/scripts/ems/web/javascripts/unittest.js +++ b/scripts/ems/web/javascripts/unittest.js diff --git a/scripts/ems/web/lib.php b/scripts/ems/web/lib.php index 440940d9c..440940d9c 100755..100644 --- a/scripts/ems/web/lib.php +++ b/scripts/ems/web/lib.php diff --git a/scripts/ems/web/overview.php b/scripts/ems/web/overview.php index 7280bc35b..7280bc35b 100755..100644 --- a/scripts/ems/web/overview.php +++ b/scripts/ems/web/overview.php diff --git a/scripts/ems/web/setup b/scripts/ems/web/setup index ffab41501..ffab41501 100755..100644 --- a/scripts/ems/web/setup +++ b/scripts/ems/web/setup diff --git a/scripts/ems/web/spinner.gif b/scripts/ems/web/spinner.gif Binary files differindex c196a8289..c196a8289 100755..100644 --- a/scripts/ems/web/spinner.gif +++ b/scripts/ems/web/spinner.gif diff --git a/scripts/generic/fsa-sample.fsa b/scripts/generic/fsa-sample.fsa index 9d2e0a6ab..9d2e0a6ab 100755..100644 --- a/scripts/generic/fsa-sample.fsa +++ b/scripts/generic/fsa-sample.fsa diff --git a/scripts/regression-testing/MosesScriptsRegressionTesting.pm b/scripts/regression-testing/MosesScriptsRegressionTesting.pm index 6f78961e5..6f78961e5 100755..100644 --- a/scripts/regression-testing/MosesScriptsRegressionTesting.pm +++ b/scripts/regression-testing/MosesScriptsRegressionTesting.pm diff --git a/scripts/regression-testing/moses-scripts-reg-test-data-1.0/lm/train.en.w5.msb.nops.blm b/scripts/regression-testing/moses-scripts-reg-test-data-1.0/lm/train.en.w5.msb.nops.blm index 6145017fc..6145017fc 100755..100644 --- a/scripts/regression-testing/moses-scripts-reg-test-data-1.0/lm/train.en.w5.msb.nops.blm +++ b/scripts/regression-testing/moses-scripts-reg-test-data-1.0/lm/train.en.w5.msb.nops.blm diff --git a/scripts/regression-testing/moses-scripts-reg-test-data-1.0/models/phrase-table.0-0.gz b/scripts/regression-testing/moses-scripts-reg-test-data-1.0/models/phrase-table.0-0.gz Binary files differindex c480eaff6..c480eaff6 100755..100644 --- a/scripts/regression-testing/moses-scripts-reg-test-data-1.0/models/phrase-table.0-0.gz +++ b/scripts/regression-testing/moses-scripts-reg-test-data-1.0/models/phrase-table.0-0.gz diff --git a/scripts/regression-testing/moses-scripts-reg-test-data-1.0/models/reordering-table.msd-bidirectional-fe.0.5.0-0.gz b/scripts/regression-testing/moses-scripts-reg-test-data-1.0/models/reordering-table.msd-bidirectional-fe.0.5.0-0.gz Binary files differindex 4cf7f46fa..4cf7f46fa 100755..100644 --- a/scripts/regression-testing/moses-scripts-reg-test-data-1.0/models/reordering-table.msd-bidirectional-fe.0.5.0-0.gz +++ b/scripts/regression-testing/moses-scripts-reg-test-data-1.0/models/reordering-table.msd-bidirectional-fe.0.5.0-0.gz diff --git a/scripts/regression-testing/moses-virtual b/scripts/regression-testing/moses-virtual index 8a92051ee..8a92051ee 100755..100644 --- a/scripts/regression-testing/moses-virtual +++ b/scripts/regression-testing/moses-virtual diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/command b/scripts/regression-testing/tests/mert-moses-new-aggregate/command index e1b34986a..e1b34986a 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/command +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/command diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/archive.list b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/archive.list index 4ec64e892..4ec64e892 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/archive.list +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/archive.list diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run1.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run1.NBEST.out.gz Binary files differindex 420808c7a..420808c7a 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run1.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run1.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run1.TRANS.out b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run1.TRANS.out index af177cfa3..af177cfa3 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run1.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run1.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run10.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run10.NBEST.out.gz Binary files differindex 380c1ccd3..380c1ccd3 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run10.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run10.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run10.TRANS.out b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run10.TRANS.out index c66cf69b1..c66cf69b1 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run10.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run10.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run11.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run11.NBEST.out.gz Binary files differindex 14b8ace88..14b8ace88 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run11.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run11.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run11.TRANS.out b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run11.TRANS.out index 27158913f..27158913f 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run11.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run11.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run12.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run12.NBEST.out.gz Binary files differindex 84a42982d..84a42982d 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run12.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run12.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run12.TRANS.out b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run12.TRANS.out index f1b6190b1..f1b6190b1 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run12.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run12.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run13.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run13.NBEST.out.gz Binary files differindex 829feb61f..829feb61f 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run13.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run13.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run13.TRANS.out b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run13.TRANS.out index 1c2081efc..1c2081efc 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run13.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run13.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run14.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run14.NBEST.out.gz Binary files differindex e74a5a7f2..e74a5a7f2 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run14.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run14.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run14.TRANS.out b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run14.TRANS.out index eb53a8ea6..eb53a8ea6 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run14.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run14.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run2.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run2.NBEST.out.gz Binary files differindex 785ade3fb..785ade3fb 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run2.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run2.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run2.TRANS.out b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run2.TRANS.out index c2f020112..c2f020112 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run2.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run2.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run3.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run3.NBEST.out.gz Binary files differindex bd0518097..bd0518097 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run3.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run3.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run3.TRANS.out b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run3.TRANS.out index 14dec6ead..14dec6ead 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run3.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run3.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run4.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run4.NBEST.out.gz Binary files differindex 22db7934e..22db7934e 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run4.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run4.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run4.TRANS.out b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run4.TRANS.out index 9d9766717..9d9766717 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run4.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run4.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run5.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run5.NBEST.out.gz Binary files differindex 23fdc56ef..23fdc56ef 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run5.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run5.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run5.TRANS.out b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run5.TRANS.out index c6c2fafe8..c6c2fafe8 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run5.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run5.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run6.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run6.NBEST.out.gz Binary files differindex 1d9d8e5df..1d9d8e5df 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run6.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run6.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run6.TRANS.out b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run6.TRANS.out index d898f5ecd..d898f5ecd 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run6.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run6.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run7.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run7.NBEST.out.gz Binary files differindex d45e3a67b..d45e3a67b 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run7.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run7.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run7.TRANS.out b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run7.TRANS.out index a99b4790e..a99b4790e 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run7.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run7.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run8.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run8.NBEST.out.gz Binary files differindex 0000ce3fc..0000ce3fc 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run8.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run8.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run8.TRANS.out b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run8.TRANS.out index d081991a3..d081991a3 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run8.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run8.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run9.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run9.NBEST.out.gz Binary files differindex 7f669a816..7f669a816 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run9.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run9.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run9.TRANS.out b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run9.TRANS.out index 7dad21c19..7dad21c19 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run9.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/run9.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/filter-stderr b/scripts/regression-testing/tests/mert-moses-new-aggregate/filter-stderr index dc1853ca0..dc1853ca0 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/filter-stderr +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/filter-stderr diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/filter-stdout b/scripts/regression-testing/tests/mert-moses-new-aggregate/filter-stdout index 1212cc873..1212cc873 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/filter-stdout +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/filter-stdout diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/input b/scripts/regression-testing/tests/mert-moses-new-aggregate/input index 30358cea1..30358cea1 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/input +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/input diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/moses.ini b/scripts/regression-testing/tests/mert-moses-new-aggregate/moses.ini index f3ffaead1..f3ffaead1 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/moses.ini +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/moses.ini diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/reference.0 b/scripts/regression-testing/tests/mert-moses-new-aggregate/reference.0 index b507beeab..b507beeab 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/reference.0 +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/reference.0 diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/reference.1 b/scripts/regression-testing/tests/mert-moses-new-aggregate/reference.1 index 735b2be95..735b2be95 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/reference.1 +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/reference.1 diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/reference.2 b/scripts/regression-testing/tests/mert-moses-new-aggregate/reference.2 index 4c51a8a16..4c51a8a16 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/reference.2 +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/reference.2 diff --git a/scripts/regression-testing/tests/mert-moses-new-aggregate/truth/results.dat b/scripts/regression-testing/tests/mert-moses-new-aggregate/truth/results.dat index ace8586c7..ace8586c7 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-aggregate/truth/results.dat +++ b/scripts/regression-testing/tests/mert-moses-new-aggregate/truth/results.dat diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/command b/scripts/regression-testing/tests/mert-moses-new-continue/command index 3f346febd..3f346febd 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/command +++ b/scripts/regression-testing/tests/mert-moses-new-continue/command diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/data/actual.index b/scripts/regression-testing/tests/mert-moses-new-continue/data/actual.index index 7ed6ff82d..7ed6ff82d 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/data/actual.index +++ b/scripts/regression-testing/tests/mert-moses-new-continue/data/actual.index diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/data/archive.list b/scripts/regression-testing/tests/mert-moses-new-continue/data/archive.list index 7208e537c..7208e537c 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/data/archive.list +++ b/scripts/regression-testing/tests/mert-moses-new-continue/data/archive.list diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/data/finished_step.txt b/scripts/regression-testing/tests/mert-moses-new-continue/data/finished_step.txt index 7ed6ff82d..7ed6ff82d 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/data/finished_step.txt +++ b/scripts/regression-testing/tests/mert-moses-new-continue/data/finished_step.txt diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/data/run1.features.dat b/scripts/regression-testing/tests/mert-moses-new-continue/data/run1.features.dat Binary files differindex ab05a427a..ab05a427a 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/data/run1.features.dat +++ b/scripts/regression-testing/tests/mert-moses-new-continue/data/run1.features.dat diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/data/run1.scores.dat b/scripts/regression-testing/tests/mert-moses-new-continue/data/run1.scores.dat Binary files differindex 9dfc634cd..9dfc634cd 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/data/run1.scores.dat +++ b/scripts/regression-testing/tests/mert-moses-new-continue/data/run1.scores.dat diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/data/run2.features.dat b/scripts/regression-testing/tests/mert-moses-new-continue/data/run2.features.dat Binary files differindex 25092c573..25092c573 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/data/run2.features.dat +++ b/scripts/regression-testing/tests/mert-moses-new-continue/data/run2.features.dat diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/data/run2.scores.dat b/scripts/regression-testing/tests/mert-moses-new-continue/data/run2.scores.dat Binary files differindex c388c8565..c388c8565 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/data/run2.scores.dat +++ b/scripts/regression-testing/tests/mert-moses-new-continue/data/run2.scores.dat diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/data/run3.features.dat b/scripts/regression-testing/tests/mert-moses-new-continue/data/run3.features.dat Binary files differindex 0dda3e348..0dda3e348 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/data/run3.features.dat +++ b/scripts/regression-testing/tests/mert-moses-new-continue/data/run3.features.dat diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/data/run3.scores.dat b/scripts/regression-testing/tests/mert-moses-new-continue/data/run3.scores.dat Binary files differindex 0579b9001..0579b9001 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/data/run3.scores.dat +++ b/scripts/regression-testing/tests/mert-moses-new-continue/data/run3.scores.dat diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/data/run4.features.dat b/scripts/regression-testing/tests/mert-moses-new-continue/data/run4.features.dat Binary files differindex 3d459a768..3d459a768 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/data/run4.features.dat +++ b/scripts/regression-testing/tests/mert-moses-new-continue/data/run4.features.dat diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/data/run4.scores.dat b/scripts/regression-testing/tests/mert-moses-new-continue/data/run4.scores.dat Binary files differindex 4668c17f2..4668c17f2 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/data/run4.scores.dat +++ b/scripts/regression-testing/tests/mert-moses-new-continue/data/run4.scores.dat diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/data/run5.features.dat b/scripts/regression-testing/tests/mert-moses-new-continue/data/run5.features.dat Binary files differindex 39f9d0690..39f9d0690 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/data/run5.features.dat +++ b/scripts/regression-testing/tests/mert-moses-new-continue/data/run5.features.dat diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/data/run5.mert.log b/scripts/regression-testing/tests/mert-moses-new-continue/data/run5.mert.log index eed0d9cef..eed0d9cef 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/data/run5.mert.log +++ b/scripts/regression-testing/tests/mert-moses-new-continue/data/run5.mert.log diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/data/run5.names.txt b/scripts/regression-testing/tests/mert-moses-new-continue/data/run5.names.txt index 2ec663caa..2ec663caa 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/data/run5.names.txt +++ b/scripts/regression-testing/tests/mert-moses-new-continue/data/run5.names.txt diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/data/run5.scores.dat b/scripts/regression-testing/tests/mert-moses-new-continue/data/run5.scores.dat Binary files differindex ae142e6e7..ae142e6e7 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/data/run5.scores.dat +++ b/scripts/regression-testing/tests/mert-moses-new-continue/data/run5.scores.dat diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/data/run5.weights.txt b/scripts/regression-testing/tests/mert-moses-new-continue/data/run5.weights.txt index 8805e3728..8805e3728 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/data/run5.weights.txt +++ b/scripts/regression-testing/tests/mert-moses-new-continue/data/run5.weights.txt diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/data/run6.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new-continue/data/run6.NBEST.out.gz Binary files differindex 02dbcbc2b..02dbcbc2b 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/data/run6.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new-continue/data/run6.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/data/run6.TRANS.out b/scripts/regression-testing/tests/mert-moses-new-continue/data/run6.TRANS.out index e3e8e6490..e3e8e6490 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/data/run6.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new-continue/data/run6.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/data/run7.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new-continue/data/run7.NBEST.out.gz Binary files differindex 7858a6d9e..7858a6d9e 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/data/run7.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new-continue/data/run7.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/data/run7.TRANS.out b/scripts/regression-testing/tests/mert-moses-new-continue/data/run7.TRANS.out index 18568ca0f..18568ca0f 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/data/run7.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new-continue/data/run7.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/filter-stderr b/scripts/regression-testing/tests/mert-moses-new-continue/filter-stderr index dc1853ca0..dc1853ca0 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/filter-stderr +++ b/scripts/regression-testing/tests/mert-moses-new-continue/filter-stderr diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/filter-stdout b/scripts/regression-testing/tests/mert-moses-new-continue/filter-stdout index 1212cc873..1212cc873 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/filter-stdout +++ b/scripts/regression-testing/tests/mert-moses-new-continue/filter-stdout diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/input b/scripts/regression-testing/tests/mert-moses-new-continue/input index 30358cea1..30358cea1 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/input +++ b/scripts/regression-testing/tests/mert-moses-new-continue/input diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/moses.ini b/scripts/regression-testing/tests/mert-moses-new-continue/moses.ini index f3ffaead1..f3ffaead1 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/moses.ini +++ b/scripts/regression-testing/tests/mert-moses-new-continue/moses.ini diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/reference.0 b/scripts/regression-testing/tests/mert-moses-new-continue/reference.0 index b507beeab..b507beeab 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/reference.0 +++ b/scripts/regression-testing/tests/mert-moses-new-continue/reference.0 diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/reference.1 b/scripts/regression-testing/tests/mert-moses-new-continue/reference.1 index 735b2be95..735b2be95 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/reference.1 +++ b/scripts/regression-testing/tests/mert-moses-new-continue/reference.1 diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/reference.2 b/scripts/regression-testing/tests/mert-moses-new-continue/reference.2 index 4c51a8a16..4c51a8a16 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/reference.2 +++ b/scripts/regression-testing/tests/mert-moses-new-continue/reference.2 diff --git a/scripts/regression-testing/tests/mert-moses-new-continue/truth/results.dat b/scripts/regression-testing/tests/mert-moses-new-continue/truth/results.dat index 3bede3d2c..3bede3d2c 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-continue/truth/results.dat +++ b/scripts/regression-testing/tests/mert-moses-new-continue/truth/results.dat diff --git a/scripts/regression-testing/tests/mert-moses-new-nocase/command b/scripts/regression-testing/tests/mert-moses-new-nocase/command index ed47d0aa1..ed47d0aa1 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-nocase/command +++ b/scripts/regression-testing/tests/mert-moses-new-nocase/command diff --git a/scripts/regression-testing/tests/mert-moses-new-nocase/data/archive.list b/scripts/regression-testing/tests/mert-moses-new-nocase/data/archive.list index 34e331a91..34e331a91 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-nocase/data/archive.list +++ b/scripts/regression-testing/tests/mert-moses-new-nocase/data/archive.list diff --git a/scripts/regression-testing/tests/mert-moses-new-nocase/data/run1.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new-nocase/data/run1.NBEST.out.gz Binary files differindex 9e038f757..9e038f757 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-nocase/data/run1.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new-nocase/data/run1.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new-nocase/data/run1.TRANS.out b/scripts/regression-testing/tests/mert-moses-new-nocase/data/run1.TRANS.out index af177cfa3..af177cfa3 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-nocase/data/run1.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new-nocase/data/run1.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new-nocase/data/run2.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new-nocase/data/run2.NBEST.out.gz Binary files differindex d8c364cf0..d8c364cf0 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-nocase/data/run2.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new-nocase/data/run2.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new-nocase/data/run2.TRANS.out b/scripts/regression-testing/tests/mert-moses-new-nocase/data/run2.TRANS.out index 3993bd0a9..3993bd0a9 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-nocase/data/run2.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new-nocase/data/run2.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new-nocase/data/run3.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new-nocase/data/run3.NBEST.out.gz Binary files differindex 973bcac01..973bcac01 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-nocase/data/run3.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new-nocase/data/run3.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new-nocase/data/run3.TRANS.out b/scripts/regression-testing/tests/mert-moses-new-nocase/data/run3.TRANS.out index 4aaa2a258..4aaa2a258 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-nocase/data/run3.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new-nocase/data/run3.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new-nocase/data/run4.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new-nocase/data/run4.NBEST.out.gz Binary files differindex 97102c7ba..97102c7ba 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-nocase/data/run4.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new-nocase/data/run4.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new-nocase/data/run4.TRANS.out b/scripts/regression-testing/tests/mert-moses-new-nocase/data/run4.TRANS.out index e7a29d309..e7a29d309 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-nocase/data/run4.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new-nocase/data/run4.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new-nocase/data/run5.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new-nocase/data/run5.NBEST.out.gz Binary files differindex 959288144..959288144 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-nocase/data/run5.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new-nocase/data/run5.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new-nocase/data/run5.TRANS.out b/scripts/regression-testing/tests/mert-moses-new-nocase/data/run5.TRANS.out index 490732261..490732261 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-nocase/data/run5.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new-nocase/data/run5.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new-nocase/filter-stderr b/scripts/regression-testing/tests/mert-moses-new-nocase/filter-stderr index dc1853ca0..dc1853ca0 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-nocase/filter-stderr +++ b/scripts/regression-testing/tests/mert-moses-new-nocase/filter-stderr diff --git a/scripts/regression-testing/tests/mert-moses-new-nocase/filter-stdout b/scripts/regression-testing/tests/mert-moses-new-nocase/filter-stdout index 1212cc873..1212cc873 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-nocase/filter-stdout +++ b/scripts/regression-testing/tests/mert-moses-new-nocase/filter-stdout diff --git a/scripts/regression-testing/tests/mert-moses-new-nocase/input b/scripts/regression-testing/tests/mert-moses-new-nocase/input index 30358cea1..30358cea1 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-nocase/input +++ b/scripts/regression-testing/tests/mert-moses-new-nocase/input diff --git a/scripts/regression-testing/tests/mert-moses-new-nocase/moses.ini b/scripts/regression-testing/tests/mert-moses-new-nocase/moses.ini index f3ffaead1..f3ffaead1 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-nocase/moses.ini +++ b/scripts/regression-testing/tests/mert-moses-new-nocase/moses.ini diff --git a/scripts/regression-testing/tests/mert-moses-new-nocase/reference.0 b/scripts/regression-testing/tests/mert-moses-new-nocase/reference.0 index b507beeab..b507beeab 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-nocase/reference.0 +++ b/scripts/regression-testing/tests/mert-moses-new-nocase/reference.0 diff --git a/scripts/regression-testing/tests/mert-moses-new-nocase/reference.1 b/scripts/regression-testing/tests/mert-moses-new-nocase/reference.1 index 735b2be95..735b2be95 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-nocase/reference.1 +++ b/scripts/regression-testing/tests/mert-moses-new-nocase/reference.1 diff --git a/scripts/regression-testing/tests/mert-moses-new-nocase/reference.2 b/scripts/regression-testing/tests/mert-moses-new-nocase/reference.2 index 4c51a8a16..4c51a8a16 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-nocase/reference.2 +++ b/scripts/regression-testing/tests/mert-moses-new-nocase/reference.2 diff --git a/scripts/regression-testing/tests/mert-moses-new-nocase/truth/results.dat b/scripts/regression-testing/tests/mert-moses-new-nocase/truth/results.dat index 3a6a69527..3a6a69527 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new-nocase/truth/results.dat +++ b/scripts/regression-testing/tests/mert-moses-new-nocase/truth/results.dat diff --git a/scripts/regression-testing/tests/mert-moses-new/command b/scripts/regression-testing/tests/mert-moses-new/command index a1e0ec1bf..a1e0ec1bf 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new/command +++ b/scripts/regression-testing/tests/mert-moses-new/command diff --git a/scripts/regression-testing/tests/mert-moses-new/data/archive.list b/scripts/regression-testing/tests/mert-moses-new/data/archive.list index 7208e537c..7208e537c 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new/data/archive.list +++ b/scripts/regression-testing/tests/mert-moses-new/data/archive.list diff --git a/scripts/regression-testing/tests/mert-moses-new/data/run1.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new/data/run1.NBEST.out.gz Binary files differindex 4bcc85998..4bcc85998 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new/data/run1.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new/data/run1.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new/data/run1.TRANS.out b/scripts/regression-testing/tests/mert-moses-new/data/run1.TRANS.out index af177cfa3..af177cfa3 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new/data/run1.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new/data/run1.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new/data/run2.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new/data/run2.NBEST.out.gz Binary files differindex 7e078aa90..7e078aa90 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new/data/run2.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new/data/run2.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new/data/run2.TRANS.out b/scripts/regression-testing/tests/mert-moses-new/data/run2.TRANS.out index d5c0ad2a7..d5c0ad2a7 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new/data/run2.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new/data/run2.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new/data/run3.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new/data/run3.NBEST.out.gz Binary files differindex 1f34e174b..1f34e174b 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new/data/run3.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new/data/run3.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new/data/run3.TRANS.out b/scripts/regression-testing/tests/mert-moses-new/data/run3.TRANS.out index 766178e7a..766178e7a 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new/data/run3.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new/data/run3.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new/data/run4.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new/data/run4.NBEST.out.gz Binary files differindex ea43e94bb..ea43e94bb 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new/data/run4.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new/data/run4.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new/data/run4.TRANS.out b/scripts/regression-testing/tests/mert-moses-new/data/run4.TRANS.out index 658210dab..658210dab 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new/data/run4.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new/data/run4.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new/data/run5.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new/data/run5.NBEST.out.gz Binary files differindex b889b9eb4..b889b9eb4 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new/data/run5.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new/data/run5.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new/data/run5.TRANS.out b/scripts/regression-testing/tests/mert-moses-new/data/run5.TRANS.out index ea6251ab3..ea6251ab3 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new/data/run5.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new/data/run5.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new/data/run6.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new/data/run6.NBEST.out.gz Binary files differindex 1e4dafb62..1e4dafb62 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new/data/run6.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new/data/run6.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new/data/run6.TRANS.out b/scripts/regression-testing/tests/mert-moses-new/data/run6.TRANS.out index e3e8e6490..e3e8e6490 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new/data/run6.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new/data/run6.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new/data/run7.NBEST.out.gz b/scripts/regression-testing/tests/mert-moses-new/data/run7.NBEST.out.gz Binary files differindex 7ec2fa0c0..7ec2fa0c0 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new/data/run7.NBEST.out.gz +++ b/scripts/regression-testing/tests/mert-moses-new/data/run7.NBEST.out.gz diff --git a/scripts/regression-testing/tests/mert-moses-new/data/run7.TRANS.out b/scripts/regression-testing/tests/mert-moses-new/data/run7.TRANS.out index 18568ca0f..18568ca0f 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new/data/run7.TRANS.out +++ b/scripts/regression-testing/tests/mert-moses-new/data/run7.TRANS.out diff --git a/scripts/regression-testing/tests/mert-moses-new/filter-stderr b/scripts/regression-testing/tests/mert-moses-new/filter-stderr index dc1853ca0..dc1853ca0 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new/filter-stderr +++ b/scripts/regression-testing/tests/mert-moses-new/filter-stderr diff --git a/scripts/regression-testing/tests/mert-moses-new/filter-stdout b/scripts/regression-testing/tests/mert-moses-new/filter-stdout index 1212cc873..1212cc873 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new/filter-stdout +++ b/scripts/regression-testing/tests/mert-moses-new/filter-stdout diff --git a/scripts/regression-testing/tests/mert-moses-new/input b/scripts/regression-testing/tests/mert-moses-new/input index 30358cea1..30358cea1 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new/input +++ b/scripts/regression-testing/tests/mert-moses-new/input diff --git a/scripts/regression-testing/tests/mert-moses-new/moses.ini b/scripts/regression-testing/tests/mert-moses-new/moses.ini index f3ffaead1..f3ffaead1 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new/moses.ini +++ b/scripts/regression-testing/tests/mert-moses-new/moses.ini diff --git a/scripts/regression-testing/tests/mert-moses-new/reference.0 b/scripts/regression-testing/tests/mert-moses-new/reference.0 index b507beeab..b507beeab 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new/reference.0 +++ b/scripts/regression-testing/tests/mert-moses-new/reference.0 diff --git a/scripts/regression-testing/tests/mert-moses-new/reference.1 b/scripts/regression-testing/tests/mert-moses-new/reference.1 index 735b2be95..735b2be95 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new/reference.1 +++ b/scripts/regression-testing/tests/mert-moses-new/reference.1 diff --git a/scripts/regression-testing/tests/mert-moses-new/reference.2 b/scripts/regression-testing/tests/mert-moses-new/reference.2 index 4c51a8a16..4c51a8a16 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new/reference.2 +++ b/scripts/regression-testing/tests/mert-moses-new/reference.2 diff --git a/scripts/regression-testing/tests/mert-moses-new/truth/results.dat b/scripts/regression-testing/tests/mert-moses-new/truth/results.dat index 655513f9c..655513f9c 100755..100644 --- a/scripts/regression-testing/tests/mert-moses-new/truth/results.dat +++ b/scripts/regression-testing/tests/mert-moses-new/truth/results.dat diff --git a/scripts/tests/README b/scripts/tests/README index 2d1db6908..2d1db6908 100755..100644 --- a/scripts/tests/README +++ b/scripts/tests/README diff --git a/scripts/tests/cs-en-sample/lm.en.gz b/scripts/tests/cs-en-sample/lm.en.gz Binary files differindex c64cf8d52..c64cf8d52 100755..100644 --- a/scripts/tests/cs-en-sample/lm.en.gz +++ b/scripts/tests/cs-en-sample/lm.en.gz diff --git a/scripts/tests/cs-en-sample/test.ref b/scripts/tests/cs-en-sample/test.ref index 6fadee5a9..6fadee5a9 100755..100644 --- a/scripts/tests/cs-en-sample/test.ref +++ b/scripts/tests/cs-en-sample/test.ref diff --git a/scripts/tests/cs-en-sample/test.src b/scripts/tests/cs-en-sample/test.src index 99323d490..99323d490 100755..100644 --- a/scripts/tests/cs-en-sample/test.src +++ b/scripts/tests/cs-en-sample/test.src diff --git a/scripts/tests/cs-en-sample/train.cs b/scripts/tests/cs-en-sample/train.cs index 999aab1e1..999aab1e1 100755..100644 --- a/scripts/tests/cs-en-sample/train.cs +++ b/scripts/tests/cs-en-sample/train.cs diff --git a/scripts/tests/cs-en-sample/train.en b/scripts/tests/cs-en-sample/train.en index e7ec5add2..e7ec5add2 100755..100644 --- a/scripts/tests/cs-en-sample/train.en +++ b/scripts/tests/cs-en-sample/train.en diff --git a/scripts/tests/full-train-mert-decode.test b/scripts/tests/full-train-mert-decode.test index 359732656..359732656 100755..100644 --- a/scripts/tests/full-train-mert-decode.test +++ b/scripts/tests/full-train-mert-decode.test diff --git a/scripts/tests/train-factored-test-step9.test b/scripts/tests/train-factored-test-step9.test index 96e9ba504..96e9ba504 100755..100644 --- a/scripts/tests/train-factored-test-step9.test +++ b/scripts/tests/train-factored-test-step9.test diff --git a/scripts/tokenizer/nonbreaking_prefixes/README.txt b/scripts/tokenizer/nonbreaking_prefixes/README.txt index 02cdfccb9..02cdfccb9 100755..100644 --- a/scripts/tokenizer/nonbreaking_prefixes/README.txt +++ b/scripts/tokenizer/nonbreaking_prefixes/README.txt diff --git a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.ca b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.ca index 2f4fdfc67..2f4fdfc67 100755..100644 --- a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.ca +++ b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.ca diff --git a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.de b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.de index 35fdf5eee..35fdf5eee 100755..100644 --- a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.de +++ b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.de diff --git a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.el b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.el index 0470f9192..0470f9192 100755..100644 --- a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.el +++ b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.el diff --git a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.en b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.en index e1a3733b5..e1a3733b5 100755..100644 --- a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.en +++ b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.en diff --git a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.es b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.es index d8b275518..d8b275518 100755..100644 --- a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.es +++ b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.es diff --git a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.fr b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.fr index 28126fa57..28126fa57 100755..100644 --- a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.fr +++ b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.fr diff --git a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.is b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.is index 5b8a71086..5b8a71086 100755..100644 --- a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.is +++ b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.is diff --git a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.it b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.it index 992b9ecd4..992b9ecd4 100755..100644 --- a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.it +++ b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.it diff --git a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.nl b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.nl index c80c41772..c80c41772 100755..100644 --- a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.nl +++ b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.nl diff --git a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.pt b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.pt index 5d65bf25a..5d65bf25a 100755..100644 --- a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.pt +++ b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.pt diff --git a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.ro b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.ro index d489f4654..d489f4654 100755..100644 --- a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.ro +++ b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.ro diff --git a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.ru b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.ru index 444465b35..444465b35 100755..100644 --- a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.ru +++ b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.ru diff --git a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.sk b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.sk index 1198d4829..1198d4829 100755..100644 --- a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.sk +++ b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.sk diff --git a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.sl b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.sl index 230062c69..230062c69 100755..100644 --- a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.sl +++ b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.sl diff --git a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.sv b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.sv index df5ef2959..df5ef2959 100755..100644 --- a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.sv +++ b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.sv diff --git a/scripts/training/Jamfile b/scripts/training/Jamfile index 8ca408d07..8ca408d07 100755..100644 --- a/scripts/training/Jamfile +++ b/scripts/training/Jamfile diff --git a/scripts/training/compact-rule-table/Compactify.cpp b/scripts/training/compact-rule-table/Compactify.cpp index ceb7eb090..ceb7eb090 100755..100644 --- a/scripts/training/compact-rule-table/Compactify.cpp +++ b/scripts/training/compact-rule-table/Compactify.cpp diff --git a/scripts/training/compact-rule-table/Compactify.h b/scripts/training/compact-rule-table/Compactify.h index eb9febbba..eb9febbba 100755..100644 --- a/scripts/training/compact-rule-table/Compactify.h +++ b/scripts/training/compact-rule-table/Compactify.h diff --git a/scripts/training/compact-rule-table/Compactify_Main.cpp b/scripts/training/compact-rule-table/Compactify_Main.cpp index 5ae8833c1..5ae8833c1 100755..100644 --- a/scripts/training/compact-rule-table/Compactify_Main.cpp +++ b/scripts/training/compact-rule-table/Compactify_Main.cpp diff --git a/scripts/training/compact-rule-table/Exception.h b/scripts/training/compact-rule-table/Exception.h index 3868fcec5..3868fcec5 100755..100644 --- a/scripts/training/compact-rule-table/Exception.h +++ b/scripts/training/compact-rule-table/Exception.h diff --git a/scripts/training/compact-rule-table/Jamfile b/scripts/training/compact-rule-table/Jamfile index 09f45d454..09f45d454 100755..100644 --- a/scripts/training/compact-rule-table/Jamfile +++ b/scripts/training/compact-rule-table/Jamfile diff --git a/scripts/training/compact-rule-table/NumberedSet.h b/scripts/training/compact-rule-table/NumberedSet.h index 72c01cb30..72c01cb30 100755..100644 --- a/scripts/training/compact-rule-table/NumberedSet.h +++ b/scripts/training/compact-rule-table/NumberedSet.h diff --git a/scripts/training/compact-rule-table/Options.h b/scripts/training/compact-rule-table/Options.h index f3fdb9139..f3fdb9139 100755..100644 --- a/scripts/training/compact-rule-table/Options.h +++ b/scripts/training/compact-rule-table/Options.h diff --git a/scripts/training/compact-rule-table/RuleTableParser.cpp b/scripts/training/compact-rule-table/RuleTableParser.cpp index 6272079fd..6272079fd 100755..100644 --- a/scripts/training/compact-rule-table/RuleTableParser.cpp +++ b/scripts/training/compact-rule-table/RuleTableParser.cpp diff --git a/scripts/training/compact-rule-table/RuleTableParser.h b/scripts/training/compact-rule-table/RuleTableParser.h index 5599e63de..5599e63de 100755..100644 --- a/scripts/training/compact-rule-table/RuleTableParser.h +++ b/scripts/training/compact-rule-table/RuleTableParser.h diff --git a/scripts/training/compact-rule-table/Tool.h b/scripts/training/compact-rule-table/Tool.h index 4a7e1e0e1..4a7e1e0e1 100755..100644 --- a/scripts/training/compact-rule-table/Tool.h +++ b/scripts/training/compact-rule-table/Tool.h diff --git a/scripts/training/lexical-reordering/Jamfile b/scripts/training/lexical-reordering/Jamfile index 322f4202a..322f4202a 100755..100644 --- a/scripts/training/lexical-reordering/Jamfile +++ b/scripts/training/lexical-reordering/Jamfile diff --git a/scripts/training/lexical-reordering/reordering_classes.cpp b/scripts/training/lexical-reordering/reordering_classes.cpp index 99043063a..99043063a 100755..100644 --- a/scripts/training/lexical-reordering/reordering_classes.cpp +++ b/scripts/training/lexical-reordering/reordering_classes.cpp diff --git a/scripts/training/lexical-reordering/reordering_classes.h b/scripts/training/lexical-reordering/reordering_classes.h index 40fa366dc..40fa366dc 100755..100644 --- a/scripts/training/lexical-reordering/reordering_classes.h +++ b/scripts/training/lexical-reordering/reordering_classes.h diff --git a/scripts/training/lexical-reordering/score.cpp b/scripts/training/lexical-reordering/score.cpp index 3677ba572..3677ba572 100755..100644 --- a/scripts/training/lexical-reordering/score.cpp +++ b/scripts/training/lexical-reordering/score.cpp diff --git a/scripts/training/phrase-extract/AlignmentPhrase.cpp b/scripts/training/phrase-extract/AlignmentPhrase.cpp index 2d4439567..2d4439567 100755..100644 --- a/scripts/training/phrase-extract/AlignmentPhrase.cpp +++ b/scripts/training/phrase-extract/AlignmentPhrase.cpp diff --git a/scripts/training/phrase-extract/AlignmentPhrase.h b/scripts/training/phrase-extract/AlignmentPhrase.h index f77b44f36..f77b44f36 100755..100644 --- a/scripts/training/phrase-extract/AlignmentPhrase.h +++ b/scripts/training/phrase-extract/AlignmentPhrase.h diff --git a/scripts/training/phrase-extract/ExtractedRule.cpp b/scripts/training/phrase-extract/ExtractedRule.cpp index 3b90b6287..3b90b6287 100755..100644 --- a/scripts/training/phrase-extract/ExtractedRule.cpp +++ b/scripts/training/phrase-extract/ExtractedRule.cpp diff --git a/scripts/training/phrase-extract/ExtractedRule.h b/scripts/training/phrase-extract/ExtractedRule.h index e577cf813..e577cf813 100755..100644 --- a/scripts/training/phrase-extract/ExtractedRule.h +++ b/scripts/training/phrase-extract/ExtractedRule.h diff --git a/scripts/training/phrase-extract/Hole.h b/scripts/training/phrase-extract/Hole.h index 31e928f6e..31e928f6e 100755..100644 --- a/scripts/training/phrase-extract/Hole.h +++ b/scripts/training/phrase-extract/Hole.h diff --git a/scripts/training/phrase-extract/HoleCollection.cpp b/scripts/training/phrase-extract/HoleCollection.cpp index 4cffab7fd..4cffab7fd 100755..100644 --- a/scripts/training/phrase-extract/HoleCollection.cpp +++ b/scripts/training/phrase-extract/HoleCollection.cpp diff --git a/scripts/training/phrase-extract/HoleCollection.h b/scripts/training/phrase-extract/HoleCollection.h index 355e825fb..355e825fb 100755..100644 --- a/scripts/training/phrase-extract/HoleCollection.h +++ b/scripts/training/phrase-extract/HoleCollection.h diff --git a/scripts/training/phrase-extract/InputFileStream.cpp b/scripts/training/phrase-extract/InputFileStream.cpp index d111903e6..d111903e6 100755..100644 --- a/scripts/training/phrase-extract/InputFileStream.cpp +++ b/scripts/training/phrase-extract/InputFileStream.cpp diff --git a/scripts/training/phrase-extract/InputFileStream.h b/scripts/training/phrase-extract/InputFileStream.h index e2a31bc82..e2a31bc82 100755..100644 --- a/scripts/training/phrase-extract/InputFileStream.h +++ b/scripts/training/phrase-extract/InputFileStream.h diff --git a/scripts/training/phrase-extract/Jamfile b/scripts/training/phrase-extract/Jamfile index 369d8cc00..369d8cc00 100755..100644 --- a/scripts/training/phrase-extract/Jamfile +++ b/scripts/training/phrase-extract/Jamfile diff --git a/scripts/training/phrase-extract/PhraseAlignment.cpp b/scripts/training/phrase-extract/PhraseAlignment.cpp index 6ff7cc97a..6ff7cc97a 100755..100644 --- a/scripts/training/phrase-extract/PhraseAlignment.cpp +++ b/scripts/training/phrase-extract/PhraseAlignment.cpp diff --git a/scripts/training/phrase-extract/PhraseAlignment.h b/scripts/training/phrase-extract/PhraseAlignment.h index 8b8f5115c..8b8f5115c 100755..100644 --- a/scripts/training/phrase-extract/PhraseAlignment.h +++ b/scripts/training/phrase-extract/PhraseAlignment.h diff --git a/scripts/training/phrase-extract/RuleExist.h b/scripts/training/phrase-extract/RuleExist.h index cf7fae3cd..cf7fae3cd 100755..100644 --- a/scripts/training/phrase-extract/RuleExist.h +++ b/scripts/training/phrase-extract/RuleExist.h diff --git a/scripts/training/phrase-extract/RuleExtractionOptions.h b/scripts/training/phrase-extract/RuleExtractionOptions.h index f132be84b..f132be84b 100755..100644 --- a/scripts/training/phrase-extract/RuleExtractionOptions.h +++ b/scripts/training/phrase-extract/RuleExtractionOptions.h diff --git a/scripts/training/phrase-extract/SafeGetline.h b/scripts/training/phrase-extract/SafeGetline.h index 0e03b8468..0e03b8468 100755..100644 --- a/scripts/training/phrase-extract/SafeGetline.h +++ b/scripts/training/phrase-extract/SafeGetline.h diff --git a/scripts/training/phrase-extract/SentenceAlignment.cpp b/scripts/training/phrase-extract/SentenceAlignment.cpp index a94a34e36..a94a34e36 100755..100644 --- a/scripts/training/phrase-extract/SentenceAlignment.cpp +++ b/scripts/training/phrase-extract/SentenceAlignment.cpp diff --git a/scripts/training/phrase-extract/SentenceAlignment.h b/scripts/training/phrase-extract/SentenceAlignment.h index 3903602ea..3903602ea 100755..100644 --- a/scripts/training/phrase-extract/SentenceAlignment.h +++ b/scripts/training/phrase-extract/SentenceAlignment.h diff --git a/scripts/training/phrase-extract/SentenceAlignmentWithSyntax.cpp b/scripts/training/phrase-extract/SentenceAlignmentWithSyntax.cpp index 39c95c221..39c95c221 100755..100644 --- a/scripts/training/phrase-extract/SentenceAlignmentWithSyntax.cpp +++ b/scripts/training/phrase-extract/SentenceAlignmentWithSyntax.cpp diff --git a/scripts/training/phrase-extract/SentenceAlignmentWithSyntax.h b/scripts/training/phrase-extract/SentenceAlignmentWithSyntax.h index 193afe386..193afe386 100755..100644 --- a/scripts/training/phrase-extract/SentenceAlignmentWithSyntax.h +++ b/scripts/training/phrase-extract/SentenceAlignmentWithSyntax.h diff --git a/scripts/training/phrase-extract/SyntaxTree.cpp b/scripts/training/phrase-extract/SyntaxTree.cpp index 2601cdb4c..2601cdb4c 100755..100644 --- a/scripts/training/phrase-extract/SyntaxTree.cpp +++ b/scripts/training/phrase-extract/SyntaxTree.cpp diff --git a/scripts/training/phrase-extract/SyntaxTree.h b/scripts/training/phrase-extract/SyntaxTree.h index 54cb6f0f1..54cb6f0f1 100755..100644 --- a/scripts/training/phrase-extract/SyntaxTree.h +++ b/scripts/training/phrase-extract/SyntaxTree.h diff --git a/scripts/training/phrase-extract/XmlException.h b/scripts/training/phrase-extract/XmlException.h index 15ee91f20..15ee91f20 100755..100644 --- a/scripts/training/phrase-extract/XmlException.h +++ b/scripts/training/phrase-extract/XmlException.h diff --git a/scripts/training/phrase-extract/XmlTree.cpp b/scripts/training/phrase-extract/XmlTree.cpp index 716414f86..716414f86 100755..100644 --- a/scripts/training/phrase-extract/XmlTree.cpp +++ b/scripts/training/phrase-extract/XmlTree.cpp diff --git a/scripts/training/phrase-extract/XmlTree.h b/scripts/training/phrase-extract/XmlTree.h index 7e6bbecea..7e6bbecea 100755..100644 --- a/scripts/training/phrase-extract/XmlTree.h +++ b/scripts/training/phrase-extract/XmlTree.h diff --git a/scripts/training/phrase-extract/consolidate-direct.cpp b/scripts/training/phrase-extract/consolidate-direct.cpp index be8a5f9b5..be8a5f9b5 100755..100644 --- a/scripts/training/phrase-extract/consolidate-direct.cpp +++ b/scripts/training/phrase-extract/consolidate-direct.cpp diff --git a/scripts/training/phrase-extract/consolidate-direct.vcxproj b/scripts/training/phrase-extract/consolidate-direct.vcxproj index a84d2cce6..a84d2cce6 100755..100644 --- a/scripts/training/phrase-extract/consolidate-direct.vcxproj +++ b/scripts/training/phrase-extract/consolidate-direct.vcxproj diff --git a/scripts/training/phrase-extract/consolidate-reverse.cpp b/scripts/training/phrase-extract/consolidate-reverse.cpp index c86d870c8..c86d870c8 100755..100644 --- a/scripts/training/phrase-extract/consolidate-reverse.cpp +++ b/scripts/training/phrase-extract/consolidate-reverse.cpp diff --git a/scripts/training/phrase-extract/consolidate.cpp b/scripts/training/phrase-extract/consolidate.cpp index cabd0e1b4..cabd0e1b4 100755..100644 --- a/scripts/training/phrase-extract/consolidate.cpp +++ b/scripts/training/phrase-extract/consolidate.cpp diff --git a/scripts/training/phrase-extract/consolidate.vcxproj b/scripts/training/phrase-extract/consolidate.vcxproj index 1e77a90f0..1e77a90f0 100755..100644 --- a/scripts/training/phrase-extract/consolidate.vcxproj +++ b/scripts/training/phrase-extract/consolidate.vcxproj diff --git a/scripts/training/phrase-extract/extract-ghkm/Alignment.cpp b/scripts/training/phrase-extract/extract-ghkm/Alignment.cpp index fcd5e14e1..fcd5e14e1 100755..100644 --- a/scripts/training/phrase-extract/extract-ghkm/Alignment.cpp +++ b/scripts/training/phrase-extract/extract-ghkm/Alignment.cpp diff --git a/scripts/training/phrase-extract/extract-ghkm/Alignment.h b/scripts/training/phrase-extract/extract-ghkm/Alignment.h index bc42191e1..bc42191e1 100755..100644 --- a/scripts/training/phrase-extract/extract-ghkm/Alignment.h +++ b/scripts/training/phrase-extract/extract-ghkm/Alignment.h diff --git a/scripts/training/phrase-extract/extract-ghkm/AlignmentGraph.cpp b/scripts/training/phrase-extract/extract-ghkm/AlignmentGraph.cpp index c1d132648..c1d132648 100755..100644 --- a/scripts/training/phrase-extract/extract-ghkm/AlignmentGraph.cpp +++ b/scripts/training/phrase-extract/extract-ghkm/AlignmentGraph.cpp diff --git a/scripts/training/phrase-extract/extract-ghkm/AlignmentGraph.h b/scripts/training/phrase-extract/extract-ghkm/AlignmentGraph.h index 94948758a..94948758a 100755..100644 --- a/scripts/training/phrase-extract/extract-ghkm/AlignmentGraph.h +++ b/scripts/training/phrase-extract/extract-ghkm/AlignmentGraph.h diff --git a/scripts/training/phrase-extract/extract-ghkm/ComposedRule.cpp b/scripts/training/phrase-extract/extract-ghkm/ComposedRule.cpp index 7a7fba106..7a7fba106 100755..100644 --- a/scripts/training/phrase-extract/extract-ghkm/ComposedRule.cpp +++ b/scripts/training/phrase-extract/extract-ghkm/ComposedRule.cpp diff --git a/scripts/training/phrase-extract/extract-ghkm/ComposedRule.h b/scripts/training/phrase-extract/extract-ghkm/ComposedRule.h index 34394c935..34394c935 100755..100644 --- a/scripts/training/phrase-extract/extract-ghkm/ComposedRule.h +++ b/scripts/training/phrase-extract/extract-ghkm/ComposedRule.h diff --git a/scripts/training/phrase-extract/extract-ghkm/Exception.h b/scripts/training/phrase-extract/extract-ghkm/Exception.h index 9928785f0..9928785f0 100755..100644 --- a/scripts/training/phrase-extract/extract-ghkm/Exception.h +++ b/scripts/training/phrase-extract/extract-ghkm/Exception.h diff --git a/scripts/training/phrase-extract/extract-ghkm/ExtractGHKM.cpp b/scripts/training/phrase-extract/extract-ghkm/ExtractGHKM.cpp index dad326131..dad326131 100755..100644 --- a/scripts/training/phrase-extract/extract-ghkm/ExtractGHKM.cpp +++ b/scripts/training/phrase-extract/extract-ghkm/ExtractGHKM.cpp diff --git a/scripts/training/phrase-extract/extract-ghkm/ExtractGHKM.h b/scripts/training/phrase-extract/extract-ghkm/ExtractGHKM.h index 4c06c2646..4c06c2646 100755..100644 --- a/scripts/training/phrase-extract/extract-ghkm/ExtractGHKM.h +++ b/scripts/training/phrase-extract/extract-ghkm/ExtractGHKM.h diff --git a/scripts/training/phrase-extract/extract-ghkm/Jamfile b/scripts/training/phrase-extract/extract-ghkm/Jamfile index 860ceba31..860ceba31 100755..100644 --- a/scripts/training/phrase-extract/extract-ghkm/Jamfile +++ b/scripts/training/phrase-extract/extract-ghkm/Jamfile diff --git a/scripts/training/phrase-extract/extract-ghkm/Main.cpp b/scripts/training/phrase-extract/extract-ghkm/Main.cpp index faf3230a6..faf3230a6 100755..100644 --- a/scripts/training/phrase-extract/extract-ghkm/Main.cpp +++ b/scripts/training/phrase-extract/extract-ghkm/Main.cpp diff --git a/scripts/training/phrase-extract/extract-ghkm/Node.cpp b/scripts/training/phrase-extract/extract-ghkm/Node.cpp index beb7470b8..beb7470b8 100755..100644 --- a/scripts/training/phrase-extract/extract-ghkm/Node.cpp +++ b/scripts/training/phrase-extract/extract-ghkm/Node.cpp diff --git a/scripts/training/phrase-extract/extract-ghkm/Node.h b/scripts/training/phrase-extract/extract-ghkm/Node.h index 228fdc812..228fdc812 100755..100644 --- a/scripts/training/phrase-extract/extract-ghkm/Node.h +++ b/scripts/training/phrase-extract/extract-ghkm/Node.h diff --git a/scripts/training/phrase-extract/extract-ghkm/Options.h b/scripts/training/phrase-extract/extract-ghkm/Options.h index a34a35744..a34a35744 100755..100644 --- a/scripts/training/phrase-extract/extract-ghkm/Options.h +++ b/scripts/training/phrase-extract/extract-ghkm/Options.h diff --git a/scripts/training/phrase-extract/extract-ghkm/ParseTree.cpp b/scripts/training/phrase-extract/extract-ghkm/ParseTree.cpp index 052b8dee1..052b8dee1 100755..100644 --- a/scripts/training/phrase-extract/extract-ghkm/ParseTree.cpp +++ b/scripts/training/phrase-extract/extract-ghkm/ParseTree.cpp diff --git a/scripts/training/phrase-extract/extract-ghkm/ParseTree.h b/scripts/training/phrase-extract/extract-ghkm/ParseTree.h index ec6fc147a..ec6fc147a 100755..100644 --- a/scripts/training/phrase-extract/extract-ghkm/ParseTree.h +++ b/scripts/training/phrase-extract/extract-ghkm/ParseTree.h diff --git a/scripts/training/phrase-extract/extract-ghkm/ScfgRule.cpp b/scripts/training/phrase-extract/extract-ghkm/ScfgRule.cpp index 648fe6461..648fe6461 100755..100644 --- a/scripts/training/phrase-extract/extract-ghkm/ScfgRule.cpp +++ b/scripts/training/phrase-extract/extract-ghkm/ScfgRule.cpp diff --git a/scripts/training/phrase-extract/extract-ghkm/ScfgRule.h b/scripts/training/phrase-extract/extract-ghkm/ScfgRule.h index 1ed534d9e..1ed534d9e 100755..100644 --- a/scripts/training/phrase-extract/extract-ghkm/ScfgRule.h +++ b/scripts/training/phrase-extract/extract-ghkm/ScfgRule.h diff --git a/scripts/training/phrase-extract/extract-ghkm/ScfgRuleWriter.cpp b/scripts/training/phrase-extract/extract-ghkm/ScfgRuleWriter.cpp index 4be3f048d..4be3f048d 100755..100644 --- a/scripts/training/phrase-extract/extract-ghkm/ScfgRuleWriter.cpp +++ b/scripts/training/phrase-extract/extract-ghkm/ScfgRuleWriter.cpp diff --git a/scripts/training/phrase-extract/extract-ghkm/ScfgRuleWriter.h b/scripts/training/phrase-extract/extract-ghkm/ScfgRuleWriter.h index edea1e95c..edea1e95c 100755..100644 --- a/scripts/training/phrase-extract/extract-ghkm/ScfgRuleWriter.h +++ b/scripts/training/phrase-extract/extract-ghkm/ScfgRuleWriter.h diff --git a/scripts/training/phrase-extract/extract-ghkm/Span.cpp b/scripts/training/phrase-extract/extract-ghkm/Span.cpp index f0eccbdf2..f0eccbdf2 100755..100644 --- a/scripts/training/phrase-extract/extract-ghkm/Span.cpp +++ b/scripts/training/phrase-extract/extract-ghkm/Span.cpp diff --git a/scripts/training/phrase-extract/extract-ghkm/Span.h b/scripts/training/phrase-extract/extract-ghkm/Span.h index 003d1ef84..003d1ef84 100755..100644 --- a/scripts/training/phrase-extract/extract-ghkm/Span.h +++ b/scripts/training/phrase-extract/extract-ghkm/Span.h diff --git a/scripts/training/phrase-extract/extract-ghkm/Subgraph.cpp b/scripts/training/phrase-extract/extract-ghkm/Subgraph.cpp index e5aedbb16..e5aedbb16 100755..100644 --- a/scripts/training/phrase-extract/extract-ghkm/Subgraph.cpp +++ b/scripts/training/phrase-extract/extract-ghkm/Subgraph.cpp diff --git a/scripts/training/phrase-extract/extract-ghkm/Subgraph.h b/scripts/training/phrase-extract/extract-ghkm/Subgraph.h index e84903502..e84903502 100755..100644 --- a/scripts/training/phrase-extract/extract-ghkm/Subgraph.h +++ b/scripts/training/phrase-extract/extract-ghkm/Subgraph.h diff --git a/scripts/training/phrase-extract/extract-ghkm/XmlTreeParser.cpp b/scripts/training/phrase-extract/extract-ghkm/XmlTreeParser.cpp index ab4616918..ab4616918 100755..100644 --- a/scripts/training/phrase-extract/extract-ghkm/XmlTreeParser.cpp +++ b/scripts/training/phrase-extract/extract-ghkm/XmlTreeParser.cpp diff --git a/scripts/training/phrase-extract/extract-ghkm/XmlTreeParser.h b/scripts/training/phrase-extract/extract-ghkm/XmlTreeParser.h index 16f4c3f8e..16f4c3f8e 100755..100644 --- a/scripts/training/phrase-extract/extract-ghkm/XmlTreeParser.h +++ b/scripts/training/phrase-extract/extract-ghkm/XmlTreeParser.h diff --git a/scripts/training/phrase-extract/extract-lex.cpp b/scripts/training/phrase-extract/extract-lex.cpp index 0be2b773a..0be2b773a 100755..100644 --- a/scripts/training/phrase-extract/extract-lex.cpp +++ b/scripts/training/phrase-extract/extract-lex.cpp diff --git a/scripts/training/phrase-extract/extract-lex.h b/scripts/training/phrase-extract/extract-lex.h index cd705a034..cd705a034 100755..100644 --- a/scripts/training/phrase-extract/extract-lex.h +++ b/scripts/training/phrase-extract/extract-lex.h diff --git a/scripts/training/phrase-extract/extract-lex.vcxproj b/scripts/training/phrase-extract/extract-lex.vcxproj index 44615ac53..44615ac53 100755..100644 --- a/scripts/training/phrase-extract/extract-lex.vcxproj +++ b/scripts/training/phrase-extract/extract-lex.vcxproj diff --git a/scripts/training/phrase-extract/extract-rules.cpp b/scripts/training/phrase-extract/extract-rules.cpp index 77f7cd01c..77f7cd01c 100755..100644 --- a/scripts/training/phrase-extract/extract-rules.cpp +++ b/scripts/training/phrase-extract/extract-rules.cpp diff --git a/scripts/training/phrase-extract/extract-rules.vcxproj b/scripts/training/phrase-extract/extract-rules.vcxproj index ecd36fe50..ecd36fe50 100755..100644 --- a/scripts/training/phrase-extract/extract-rules.vcxproj +++ b/scripts/training/phrase-extract/extract-rules.vcxproj diff --git a/scripts/training/phrase-extract/extract.cpp b/scripts/training/phrase-extract/extract.cpp index dee6e2ae3..dee6e2ae3 100755..100644 --- a/scripts/training/phrase-extract/extract.cpp +++ b/scripts/training/phrase-extract/extract.cpp diff --git a/scripts/training/phrase-extract/extract.vcxproj b/scripts/training/phrase-extract/extract.vcxproj index 60a1128eb..60a1128eb 100755..100644 --- a/scripts/training/phrase-extract/extract.vcxproj +++ b/scripts/training/phrase-extract/extract.vcxproj diff --git a/scripts/training/phrase-extract/extract.xcodeproj/project.pbxproj b/scripts/training/phrase-extract/extract.xcodeproj/project.pbxproj index 8a3f58b92..8a3f58b92 100755..100644 --- a/scripts/training/phrase-extract/extract.xcodeproj/project.pbxproj +++ b/scripts/training/phrase-extract/extract.xcodeproj/project.pbxproj diff --git a/scripts/training/phrase-extract/gzfilebuf.h b/scripts/training/phrase-extract/gzfilebuf.h index b5b0ce87f..b5b0ce87f 100755..100644 --- a/scripts/training/phrase-extract/gzfilebuf.h +++ b/scripts/training/phrase-extract/gzfilebuf.h diff --git a/scripts/training/phrase-extract/hierarchical.h b/scripts/training/phrase-extract/hierarchical.h index 40f6744ff..40f6744ff 100755..100644 --- a/scripts/training/phrase-extract/hierarchical.h +++ b/scripts/training/phrase-extract/hierarchical.h diff --git a/scripts/training/phrase-extract/phrase-extract.sln b/scripts/training/phrase-extract/phrase-extract.sln index 800c26192..800c26192 100755..100644 --- a/scripts/training/phrase-extract/phrase-extract.sln +++ b/scripts/training/phrase-extract/phrase-extract.sln diff --git a/scripts/training/phrase-extract/relax-parse.cpp b/scripts/training/phrase-extract/relax-parse.cpp index e5e510e30..e5e510e30 100755..100644 --- a/scripts/training/phrase-extract/relax-parse.cpp +++ b/scripts/training/phrase-extract/relax-parse.cpp diff --git a/scripts/training/phrase-extract/relax-parse.h b/scripts/training/phrase-extract/relax-parse.h index cdde3f16c..cdde3f16c 100755..100644 --- a/scripts/training/phrase-extract/relax-parse.h +++ b/scripts/training/phrase-extract/relax-parse.h diff --git a/scripts/training/phrase-extract/score.cpp b/scripts/training/phrase-extract/score.cpp index e04de4f93..e04de4f93 100755..100644 --- a/scripts/training/phrase-extract/score.cpp +++ b/scripts/training/phrase-extract/score.cpp diff --git a/scripts/training/phrase-extract/score.h b/scripts/training/phrase-extract/score.h index ea50d8cb7..ea50d8cb7 100755..100644 --- a/scripts/training/phrase-extract/score.h +++ b/scripts/training/phrase-extract/score.h diff --git a/scripts/training/phrase-extract/score.vcxproj b/scripts/training/phrase-extract/score.vcxproj index e5dc1df9a..e5dc1df9a 100755..100644 --- a/scripts/training/phrase-extract/score.vcxproj +++ b/scripts/training/phrase-extract/score.vcxproj diff --git a/scripts/training/phrase-extract/statistics.cpp b/scripts/training/phrase-extract/statistics.cpp index 1083621ec..1083621ec 100755..100644 --- a/scripts/training/phrase-extract/statistics.cpp +++ b/scripts/training/phrase-extract/statistics.cpp diff --git a/scripts/training/phrase-extract/tables-core.cpp b/scripts/training/phrase-extract/tables-core.cpp index 399026930..399026930 100755..100644 --- a/scripts/training/phrase-extract/tables-core.cpp +++ b/scripts/training/phrase-extract/tables-core.cpp diff --git a/scripts/training/phrase-extract/tables-core.h b/scripts/training/phrase-extract/tables-core.h index 2db8086e5..2db8086e5 100755..100644 --- a/scripts/training/phrase-extract/tables-core.h +++ b/scripts/training/phrase-extract/tables-core.h diff --git a/scripts/training/symal/Jamfile b/scripts/training/symal/Jamfile index 899046bd8..899046bd8 100755..100644 --- a/scripts/training/symal/Jamfile +++ b/scripts/training/symal/Jamfile diff --git a/scripts/training/symal/cmd.c b/scripts/training/symal/cmd.c index 149fc7290..149fc7290 100755..100644 --- a/scripts/training/symal/cmd.c +++ b/scripts/training/symal/cmd.c diff --git a/scripts/training/symal/cmd.h b/scripts/training/symal/cmd.h index 17231db90..17231db90 100755..100644 --- a/scripts/training/symal/cmd.h +++ b/scripts/training/symal/cmd.h diff --git a/scripts/training/symal/symal.cpp b/scripts/training/symal/symal.cpp index 329e9e585..329e9e585 100755..100644 --- a/scripts/training/symal/symal.cpp +++ b/scripts/training/symal/symal.cpp diff --git a/scripts/training/symal/symal.vcproj b/scripts/training/symal/symal.vcproj index 6eac62f4a..6eac62f4a 100755..100644 --- a/scripts/training/symal/symal.vcproj +++ b/scripts/training/symal/symal.vcproj diff --git a/scripts/training/train-model.perl.missing_bin_dir b/scripts/training/train-model.perl.missing_bin_dir index d6fa95b34..d6fa95b34 100755..100644 --- a/scripts/training/train-model.perl.missing_bin_dir +++ b/scripts/training/train-model.perl.missing_bin_dir diff --git a/util/COPYING b/util/COPYING index 94a9ed024..94a9ed024 100755..100644 --- a/util/COPYING +++ b/util/COPYING diff --git a/util/COPYING.LESSER b/util/COPYING.LESSER index cca7fc278..cca7fc278 100755..100644 --- a/util/COPYING.LESSER +++ b/util/COPYING.LESSER diff --git a/util/Jamfile b/util/Jamfile index b89149221..b89149221 100755..100644 --- a/util/Jamfile +++ b/util/Jamfile diff --git a/util/LICENSE b/util/LICENSE index 0ba079e30..0ba079e30 100755..100644 --- a/util/LICENSE +++ b/util/LICENSE diff --git a/util/bit_packing.cc b/util/bit_packing.cc index 41999b726..41999b726 100755..100644 --- a/util/bit_packing.cc +++ b/util/bit_packing.cc diff --git a/util/bit_packing.hh b/util/bit_packing.hh index f28f71f81..f28f71f81 100755..100644 --- a/util/bit_packing.hh +++ b/util/bit_packing.hh diff --git a/util/bit_packing_test.cc b/util/bit_packing_test.cc index 4edc2004c..4edc2004c 100755..100644 --- a/util/bit_packing_test.cc +++ b/util/bit_packing_test.cc diff --git a/util/check.hh b/util/check.hh index 2c63b5630..2c63b5630 100755..100644 --- a/util/check.hh +++ b/util/check.hh diff --git a/util/ersatz_progress.cc b/util/ersatz_progress.cc index a82ce6726..a82ce6726 100755..100644 --- a/util/ersatz_progress.cc +++ b/util/ersatz_progress.cc diff --git a/util/ersatz_progress.hh b/util/ersatz_progress.hh index 92c345fee..92c345fee 100755..100644 --- a/util/ersatz_progress.hh +++ b/util/ersatz_progress.hh diff --git a/util/exception.cc b/util/exception.cc index c4f8c04ce..c4f8c04ce 100755..100644 --- a/util/exception.cc +++ b/util/exception.cc diff --git a/util/exception.hh b/util/exception.hh index 6d6a37cb1..6d6a37cb1 100755..100644 --- a/util/exception.hh +++ b/util/exception.hh diff --git a/util/file.cc b/util/file.cc index 77922cfad..77922cfad 100755..100644 --- a/util/file.cc +++ b/util/file.cc diff --git a/util/file.hh b/util/file.hh index 04023dec0..04023dec0 100755..100644 --- a/util/file.hh +++ b/util/file.hh diff --git a/util/file_piece.cc b/util/file_piece.cc index f0d49d555..f0d49d555 100755..100644 --- a/util/file_piece.cc +++ b/util/file_piece.cc diff --git a/util/file_piece.hh b/util/file_piece.hh index b81ac0e20..b81ac0e20 100755..100644 --- a/util/file_piece.hh +++ b/util/file_piece.hh diff --git a/util/file_piece_test.cc b/util/file_piece_test.cc index f912e18af..f912e18af 100755..100644 --- a/util/file_piece_test.cc +++ b/util/file_piece_test.cc diff --git a/util/getopt.c b/util/getopt.c index 5dfe545de..5dfe545de 100755..100644 --- a/util/getopt.c +++ b/util/getopt.c diff --git a/util/getopt.hh b/util/getopt.hh index 6ad977324..6ad977324 100755..100644 --- a/util/getopt.hh +++ b/util/getopt.hh diff --git a/util/have.hh b/util/have.hh index aca8c6264..aca8c6264 100755..100644 --- a/util/have.hh +++ b/util/have.hh diff --git a/util/joint_sort.hh b/util/joint_sort.hh index cf3d84321..cf3d84321 100755..100644 --- a/util/joint_sort.hh +++ b/util/joint_sort.hh diff --git a/util/joint_sort_test.cc b/util/joint_sort_test.cc index 4dc859164..4dc859164 100755..100644 --- a/util/joint_sort_test.cc +++ b/util/joint_sort_test.cc diff --git a/util/key_value_packing.hh b/util/key_value_packing.hh index 8339980b5..8339980b5 100755..100644 --- a/util/key_value_packing.hh +++ b/util/key_value_packing.hh diff --git a/util/key_value_packing_test.cc b/util/key_value_packing_test.cc index a0d33fd76..a0d33fd76 100755..100644 --- a/util/key_value_packing_test.cc +++ b/util/key_value_packing_test.cc diff --git a/util/mmap.cc b/util/mmap.cc index d3a2526fa..d3a2526fa 100755..100644 --- a/util/mmap.cc +++ b/util/mmap.cc diff --git a/util/mmap.hh b/util/mmap.hh index 921147c34..921147c34 100755..100644 --- a/util/mmap.hh +++ b/util/mmap.hh diff --git a/util/murmur_hash.cc b/util/murmur_hash.cc index ef5783fec..ef5783fec 100755..100644 --- a/util/murmur_hash.cc +++ b/util/murmur_hash.cc diff --git a/util/murmur_hash.hh b/util/murmur_hash.hh index 638aaeb22..638aaeb22 100755..100644 --- a/util/murmur_hash.hh +++ b/util/murmur_hash.hh diff --git a/util/probing_hash_table.hh b/util/probing_hash_table.hh index f466cebc9..f466cebc9 100755..100644 --- a/util/probing_hash_table.hh +++ b/util/probing_hash_table.hh diff --git a/util/probing_hash_table_test.cc b/util/probing_hash_table_test.cc index ef68e5f22..ef68e5f22 100755..100644 --- a/util/probing_hash_table_test.cc +++ b/util/probing_hash_table_test.cc diff --git a/util/proxy_iterator.hh b/util/proxy_iterator.hh index 121a45fa3..121a45fa3 100755..100644 --- a/util/proxy_iterator.hh +++ b/util/proxy_iterator.hh diff --git a/util/scoped.hh b/util/scoped.hh index 93e2e8176..93e2e8176 100755..100644 --- a/util/scoped.hh +++ b/util/scoped.hh diff --git a/util/sized_iterator.hh b/util/sized_iterator.hh index aabcc5319..aabcc5319 100755..100644 --- a/util/sized_iterator.hh +++ b/util/sized_iterator.hh diff --git a/util/sorted_uniform.hh b/util/sorted_uniform.hh index 7700d9e64..7700d9e64 100755..100644 --- a/util/sorted_uniform.hh +++ b/util/sorted_uniform.hh diff --git a/util/sorted_uniform_test.cc b/util/sorted_uniform_test.cc index ac7a0bfc5..ac7a0bfc5 100755..100644 --- a/util/sorted_uniform_test.cc +++ b/util/sorted_uniform_test.cc diff --git a/util/string_piece.hh b/util/string_piece.hh index 5de053aa8..5de053aa8 100755..100644 --- a/util/string_piece.hh +++ b/util/string_piece.hh diff --git a/util/tokenize_piece.hh b/util/tokenize_piece.hh index 1209042d8..1209042d8 100755..100644 --- a/util/tokenize_piece.hh +++ b/util/tokenize_piece.hh diff --git a/util/tokenize_piece_test.cc b/util/tokenize_piece_test.cc index d856018fb..d856018fb 100755..100644 --- a/util/tokenize_piece_test.cc +++ b/util/tokenize_piece_test.cc diff --git a/util/util.xcodeproj/project.pbxproj b/util/util.xcodeproj/project.pbxproj index 2f8134a39..2f8134a39 100755..100644 --- a/util/util.xcodeproj/project.pbxproj +++ b/util/util.xcodeproj/project.pbxproj |
