diff options
| author | Eva Hasler <ehasler@saxnot.inf.ed.ac.uk> | 2012-05-10 21:54:24 +0400 |
|---|---|---|
| committer | Eva Hasler <ehasler@saxnot.inf.ed.ac.uk> | 2012-05-10 21:54:24 +0400 |
| commit | 30deedde9f1ce5ef22a5f3c4a6b660bac48989cd (patch) | |
| tree | 239051c1b15325a9f53a358c781293801721e3aa | |
| parent | 93bb01b2e408a1fbdbbdfec8f4b89ade561759d7 (diff) | |
changed permission, everything changed..
1431 files changed, 722 insertions, 442 deletions
diff --git a/.gitignore b/.gitignore index facb831bb..ab42a4b4a 100644..100755 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,11 @@ *.so +*.lo +*.o +*.la *.a *.swp +*.save +*.cmd *~ dist* jam-files/bjam @@ -17,6 +22,8 @@ misc/processLexicalTable misc/processPhraseTable misc/queryLexicalTable mira/mira +mira/Makefile +mira/Makefile.in misc/queryPhraseTable moses-chart-cmd/src/moses_chart moses-cmd/src/checkplf @@ -48,3 +55,5 @@ scripts/training/symal/symal scripts/training/train-model.perl dist bin +srilm +giza-pp diff --git a/BUILD-INSTRUCTIONS.txt b/BUILD-INSTRUCTIONS.txt index e5c0ad8ea..e5c0ad8ea 100644..100755 --- a/BUILD-INSTRUCTIONS.txt +++ b/BUILD-INSTRUCTIONS.txt diff --git a/OnDiskPt/Jamfile b/OnDiskPt/Jamfile index f9811c05b..f9811c05b 100644..100755 --- a/OnDiskPt/Jamfile +++ b/OnDiskPt/Jamfile diff --git a/OnDiskPt/Main.cpp b/OnDiskPt/Main.cpp index 5b3ac6cb8..5b3ac6cb8 100644..100755 --- a/OnDiskPt/Main.cpp +++ b/OnDiskPt/Main.cpp diff --git a/OnDiskPt/Main.h b/OnDiskPt/Main.h index 41a24a239..41a24a239 100644..100755 --- a/OnDiskPt/Main.h +++ b/OnDiskPt/Main.h diff --git a/OnDiskPt/OnDiskWrapper.cpp b/OnDiskPt/OnDiskWrapper.cpp index 79b0563a8..79b0563a8 100644..100755 --- a/OnDiskPt/OnDiskWrapper.cpp +++ b/OnDiskPt/OnDiskWrapper.cpp diff --git a/OnDiskPt/OnDiskWrapper.h b/OnDiskPt/OnDiskWrapper.h index c49afdda1..c49afdda1 100644..100755 --- a/OnDiskPt/OnDiskWrapper.h +++ b/OnDiskPt/OnDiskWrapper.h diff --git a/OnDiskPt/Phrase.cpp b/OnDiskPt/Phrase.cpp index b6ccd0721..b6ccd0721 100644..100755 --- a/OnDiskPt/Phrase.cpp +++ b/OnDiskPt/Phrase.cpp diff --git a/OnDiskPt/Phrase.h b/OnDiskPt/Phrase.h index 093510e64..093510e64 100644..100755 --- a/OnDiskPt/Phrase.h +++ b/OnDiskPt/Phrase.h diff --git a/OnDiskPt/PhraseNode.cpp b/OnDiskPt/PhraseNode.cpp index 98a55dbc1..98a55dbc1 100644..100755 --- a/OnDiskPt/PhraseNode.cpp +++ b/OnDiskPt/PhraseNode.cpp diff --git a/OnDiskPt/PhraseNode.h b/OnDiskPt/PhraseNode.h index 279ca278a..279ca278a 100644..100755 --- a/OnDiskPt/PhraseNode.h +++ b/OnDiskPt/PhraseNode.h diff --git a/OnDiskPt/SourcePhrase.cpp b/OnDiskPt/SourcePhrase.cpp index 595748c70..595748c70 100644..100755 --- a/OnDiskPt/SourcePhrase.cpp +++ b/OnDiskPt/SourcePhrase.cpp diff --git a/OnDiskPt/SourcePhrase.h b/OnDiskPt/SourcePhrase.h index b4ae46705..b4ae46705 100644..100755 --- a/OnDiskPt/SourcePhrase.h +++ b/OnDiskPt/SourcePhrase.h diff --git a/OnDiskPt/TargetPhrase.cpp b/OnDiskPt/TargetPhrase.cpp index aedb2a37e..aedb2a37e 100644..100755 --- a/OnDiskPt/TargetPhrase.cpp +++ b/OnDiskPt/TargetPhrase.cpp diff --git a/OnDiskPt/TargetPhrase.h b/OnDiskPt/TargetPhrase.h index 1ff6f46a2..1ff6f46a2 100644..100755 --- a/OnDiskPt/TargetPhrase.h +++ b/OnDiskPt/TargetPhrase.h diff --git a/OnDiskPt/TargetPhraseCollection.cpp b/OnDiskPt/TargetPhraseCollection.cpp index 295726ce1..295726ce1 100644..100755 --- a/OnDiskPt/TargetPhraseCollection.cpp +++ b/OnDiskPt/TargetPhraseCollection.cpp diff --git a/OnDiskPt/TargetPhraseCollection.h b/OnDiskPt/TargetPhraseCollection.h index 6d95fb356..6d95fb356 100644..100755 --- a/OnDiskPt/TargetPhraseCollection.h +++ b/OnDiskPt/TargetPhraseCollection.h diff --git a/OnDiskPt/Vocab.cpp b/OnDiskPt/Vocab.cpp index 86072edc6..86072edc6 100644..100755 --- a/OnDiskPt/Vocab.cpp +++ b/OnDiskPt/Vocab.cpp diff --git a/OnDiskPt/Vocab.h b/OnDiskPt/Vocab.h index 360aedf4a..360aedf4a 100644..100755 --- a/OnDiskPt/Vocab.h +++ b/OnDiskPt/Vocab.h diff --git a/OnDiskPt/Word.cpp b/OnDiskPt/Word.cpp index a8d4c683a..a8d4c683a 100644..100755 --- a/OnDiskPt/Word.cpp +++ b/OnDiskPt/Word.cpp diff --git a/OnDiskPt/Word.h b/OnDiskPt/Word.h index 0c0b55a09..0c0b55a09 100644..100755 --- a/OnDiskPt/Word.h +++ b/OnDiskPt/Word.h diff --git a/contrib/Extract_TMX_Corpus/Extract_TMX_Corpus.rsrc.py b/contrib/Extract_TMX_Corpus/Extract_TMX_Corpus.rsrc.py index 93e19edf2..93e19edf2 100644..100755 --- a/contrib/Extract_TMX_Corpus/Extract_TMX_Corpus.rsrc.py +++ b/contrib/Extract_TMX_Corpus/Extract_TMX_Corpus.rsrc.py diff --git a/contrib/Extract_TMX_Corpus/LanguageCodes.txt b/contrib/Extract_TMX_Corpus/LanguageCodes.txt index 22ca66c73..22ca66c73 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/contrib/Moses2TMX/LanguageCodes.txt +++ b/contrib/Moses2TMX/LanguageCodes.txt diff --git a/contrib/Moses2TMX/Moses2TMX.rsrc.py b/contrib/Moses2TMX/Moses2TMX.rsrc.py index dc1570c7f..dc1570c7f 100644..100755 --- a/contrib/Moses2TMX/Moses2TMX.rsrc.py +++ b/contrib/Moses2TMX/Moses2TMX.rsrc.py diff --git a/contrib/Moses2TMX/_READ_ME_FIRST.txt b/contrib/Moses2TMX/_READ_ME_FIRST.txt index cbc667a31..cbc667a31 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/contrib/eppex/config.h.in +++ b/contrib/eppex/config.h.in diff --git a/contrib/eppex/configure.ac b/contrib/eppex/configure.ac index 6c64b77af..6c64b77af 100644..100755 --- 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 100644..100755 --- a/contrib/eppex/counter.cpp +++ b/contrib/eppex/counter.cpp diff --git a/contrib/eppex/eppex.cpp b/contrib/eppex/eppex.cpp index d382890d2..d382890d2 100644..100755 --- a/contrib/eppex/eppex.cpp +++ b/contrib/eppex/eppex.cpp diff --git a/contrib/eppex/m4/ax_boost_base.m4 b/contrib/eppex/m4/ax_boost_base.m4 index 2e5afd091..2e5afd091 100644..100755 --- a/contrib/eppex/m4/ax_boost_base.m4 +++ b/contrib/eppex/m4/ax_boost_base.m4 diff --git a/contrib/eppex/phrase-extract.cpp b/contrib/eppex/phrase-extract.cpp index 5dff43b78..5dff43b78 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/contrib/eppex/typedefs.h +++ b/contrib/eppex/typedefs.h diff --git a/contrib/lmserver/AUTHORS b/contrib/lmserver/AUTHORS index 4d9dfd0cd..4d9dfd0cd 100644..100755 --- a/contrib/lmserver/AUTHORS +++ b/contrib/lmserver/AUTHORS diff --git a/contrib/lmserver/COPYING b/contrib/lmserver/COPYING index cdfc50626..cdfc50626 100644..100755 --- a/contrib/lmserver/COPYING +++ b/contrib/lmserver/COPYING diff --git a/contrib/lmserver/ChangeLog b/contrib/lmserver/ChangeLog index 4083f59b8..4083f59b8 100644..100755 --- a/contrib/lmserver/ChangeLog +++ b/contrib/lmserver/ChangeLog diff --git a/contrib/lmserver/Makefile.am b/contrib/lmserver/Makefile.am index ec06d0da2..ec06d0da2 100644..100755 --- 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 100644..100755 --- a/contrib/lmserver/Makefile.in +++ b/contrib/lmserver/Makefile.in diff --git a/contrib/lmserver/NEWS b/contrib/lmserver/NEWS index e69de29bb..e69de29bb 100644..100755 --- a/contrib/lmserver/NEWS +++ b/contrib/lmserver/NEWS diff --git a/contrib/lmserver/README b/contrib/lmserver/README index dd9dde134..dd9dde134 100644..100755 --- a/contrib/lmserver/README +++ b/contrib/lmserver/README diff --git a/contrib/lmserver/aclocal.m4 b/contrib/lmserver/aclocal.m4 index 01ee4a076..01ee4a076 100644..100755 --- a/contrib/lmserver/aclocal.m4 +++ b/contrib/lmserver/aclocal.m4 diff --git a/contrib/lmserver/config.h.in b/contrib/lmserver/config.h.in index afdac98b6..afdac98b6 100644..100755 --- a/contrib/lmserver/config.h.in +++ b/contrib/lmserver/config.h.in diff --git a/contrib/lmserver/configure.ac b/contrib/lmserver/configure.ac index 62ab5dc02..62ab5dc02 100644..100755 --- 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 100644..100755 --- a/contrib/lmserver/daemon.c +++ b/contrib/lmserver/daemon.c diff --git a/contrib/lmserver/examples/LMClient.java b/contrib/lmserver/examples/LMClient.java index ee1a42e28..ee1a42e28 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/contrib/lmserver/examples/lmclient.cc +++ b/contrib/lmserver/examples/lmclient.cc diff --git a/contrib/lmserver/lmserver.c b/contrib/lmserver/lmserver.c index d3aa685cc..d3aa685cc 100644..100755 --- 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 100644..100755 --- a/contrib/lmserver/lmserver.h +++ b/contrib/lmserver/lmserver.h diff --git a/contrib/lmserver/srilm.cc b/contrib/lmserver/srilm.cc index 657bed3c4..657bed3c4 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/contrib/memscore/config.h.in +++ b/contrib/memscore/config.h.in diff --git a/contrib/memscore/configure.ac b/contrib/memscore/configure.ac index 23af85df2..23af85df2 100644..100755 --- 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 100644..100755 --- a/contrib/memscore/datastorage.h +++ b/contrib/memscore/datastorage.h diff --git a/contrib/memscore/lexdecom.cpp b/contrib/memscore/lexdecom.cpp index b0a47f440..b0a47f440 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/contrib/memscore/memscore.h +++ b/contrib/memscore/memscore.h diff --git a/contrib/memscore/phraselm.cpp b/contrib/memscore/phraselm.cpp index 0f94f4326..0f94f4326 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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/Extract_TMX_Corpus.py b/contrib/moses-for-mere-mortals/Windows-add-ins/Extract_TMX_Corpus-1.043/Extract_TMX_Corpus.py index 67fbec0f7..67fbec0f7 100644..100755 --- a/contrib/moses-for-mere-mortals/Windows-add-ins/Extract_TMX_Corpus-1.043/Extract_TMX_Corpus.py +++ b/contrib/moses-for-mere-mortals/Windows-add-ins/Extract_TMX_Corpus-1.043/Extract_TMX_Corpus.py diff --git a/contrib/moses-for-mere-mortals/Windows-add-ins/Extract_TMX_Corpus-1.043/Extract_TMX_Corpus.rsrc.py b/contrib/moses-for-mere-mortals/Windows-add-ins/Extract_TMX_Corpus-1.043/Extract_TMX_Corpus.rsrc.py index 93e19edf2..93e19edf2 100644..100755 --- a/contrib/moses-for-mere-mortals/Windows-add-ins/Extract_TMX_Corpus-1.043/Extract_TMX_Corpus.rsrc.py +++ b/contrib/moses-for-mere-mortals/Windows-add-ins/Extract_TMX_Corpus-1.043/Extract_TMX_Corpus.rsrc.py 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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/Moses2TMX.py b/contrib/moses-for-mere-mortals/Windows-add-ins/Moses2TMX-1.032/Moses2TMX.py index 43ec3c78c..43ec3c78c 100644..100755 --- a/contrib/moses-for-mere-mortals/Windows-add-ins/Moses2TMX-1.032/Moses2TMX.py +++ b/contrib/moses-for-mere-mortals/Windows-add-ins/Moses2TMX-1.032/Moses2TMX.py diff --git a/contrib/moses-for-mere-mortals/Windows-add-ins/Moses2TMX-1.032/Moses2TMX.rsrc.py b/contrib/moses-for-mere-mortals/Windows-add-ins/Moses2TMX-1.032/Moses2TMX.rsrc.py index dc1570c7f..dc1570c7f 100644..100755 --- a/contrib/moses-for-mere-mortals/Windows-add-ins/Moses2TMX-1.032/Moses2TMX.rsrc.py +++ b/contrib/moses-for-mere-mortals/Windows-add-ins/Moses2TMX-1.032/Moses2TMX.rsrc.py 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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/mert-moses-new-modif.pl b/contrib/moses-for-mere-mortals/scripts/modified-scripts/mert-moses-new-modif.pl index bab8532cc..bab8532cc 100644..100755 --- a/contrib/moses-for-mere-mortals/scripts/modified-scripts/mert-moses-new-modif.pl +++ b/contrib/moses-for-mere-mortals/scripts/modified-scripts/mert-moses-new-modif.pl 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/contrib/server/Jamfile +++ b/contrib/server/Jamfile diff --git a/contrib/server/mosesserver.cpp b/contrib/server/mosesserver.cpp index bbd8ec452..5609fac30 100644..100755 --- a/contrib/server/mosesserver.cpp +++ b/contrib/server/mosesserver.cpp @@ -16,6 +16,7 @@ # include "LanguageModelORLM.h" #endif #include <boost/algorithm/string.hpp> +#include "BleuScoreFeature.h" using namespace Moses; using namespace std; @@ -148,8 +149,13 @@ public: // system.methodHelp RPC. this->_signature = "S:S"; this->_help = "Does translation"; + + const StaticData &staticData = StaticData::Instance(); + m_bleuScoreFeature = staticData.GetBleuScoreFeature(); } + BleuScoreFeature *m_bleuScoreFeature; + void execute(xmlrpc_c::paramList const& paramList, xmlrpc_c::value * const retvalP) { const params_t params = paramList.getStruct(0); @@ -163,6 +169,28 @@ public: const string source( (xmlrpc_c::value_string(si->second))); + si = params.find("id"); + if (si == params.end()) { + throw xmlrpc_c::fault("Missing sentence id", + xmlrpc_c::fault::CODE_PARSE); + } + int sentenceid = xmlrpc_c::value_int(si->second); + if (sentenceid < -1) { + throw xmlrpc_c::fault("Sentence id has to be >= 0", + xmlrpc_c::fault::CODE_PARSE); + } + + cerr << "Loading reference info for sentence " << sentenceid << endl; + vector<string> sourceTokens; + boost::split(sourceTokens, source, boost::is_any_of("\t ")); + m_bleuScoreFeature->SetCurrSourceLength(sourceTokens.size()); + bool avgRefLength = false; + if (avgRefLength) + m_bleuScoreFeature->SetCurrAvgRefLength(sentenceid); + else + m_bleuScoreFeature->SetCurrShortestRefLength(sentenceid); + m_bleuScoreFeature->SetCurrReferenceNgrams(sentenceid); + cerr << "Input: " << source; si = params.find("align"); bool addAlignInfo = (si != params.end()); @@ -197,7 +225,7 @@ public: map<string, xmlrpc_c::value> retData; pair<string, xmlrpc_c::value> text("text", xmlrpc_c::value_string(out.str())); - cerr << "Output: " << out.str() << endl << endl; + cerr << "\nOutput: " << out.str() << endl << endl; if (addAlignInfo) { retData.insert(pair<string, xmlrpc_c::value>("align", xmlrpc_c::value_array(alignInfo))); } @@ -261,11 +289,12 @@ public: } searchGraphXmlNode["cover-start"] = xmlrpc_c::value_int(hypo->GetCurrSourceWordsRange().GetStartPos()); searchGraphXmlNode["cover-end"] = xmlrpc_c::value_int(hypo->GetCurrSourceWordsRange().GetEndPos()); + searchGraphXmlNode["src-phrase"] = xmlrpc_c::value_string(hypo->GetSourcePhraseStringRep()); + searchGraphXmlNode["tgt-phrase"] = xmlrpc_c::value_string(hypo->GetTargetPhraseStringRep()); + ScoreComponentCollection scoreBreakdown = hypo->GetScoreBreakdown(); + scoreBreakdown.MinusEquals(prevHypo->GetScoreBreakdown()); stringstream tmp; - tmp << hypo->GetSourcePhraseStringRep() << "|" << hypo->GetCurrTargetPhrase().GetStringRep(StaticData::Instance().GetOutputFactorOrder()); - searchGraphXmlNode["out"] = xmlrpc_c::value_string(tmp.str()); - tmp.str(""); - tmp << hypo->GetScoreBreakdown(); + tmp << scoreBreakdown; searchGraphXmlNode["scores"] = xmlrpc_c::value_string(tmp.str()); } searchGraphXml.push_back(xmlrpc_c::value_struct(searchGraphXmlNode)); @@ -311,19 +340,52 @@ const char* ffNames[] = { "Distortion", "WordPenalty", "!UnknownWordPenalty 1", "LexicalReordering_wbe-msd-bidirectional-fe-allff_2", "LexicalReordering_wbe-msd-bidirectional-fe-allff_3", "LexicalReordering_wbe-msd-bidirectional-fe-allff_4", "LexicalReordering_wbe-msd-bidirectional-fe-allff_5", "LexicalReordering_wbe-msd-bidirectional-fe-allff_6", "LM", "PhraseModel_1", "PhraseModel_2", "PhraseModel_3", - "PhraseModel_4", "PhraseModel_5" }; + "PhraseModel_4", "PhraseModel_5", "BleuScoreFeature" }; //const char* ffNames[] = { "Distortion", "WordPenalty", "!UnknownWordPenalty 1", "LM", "PhraseModel_1", "PhraseModel_2" }; -class WeightUpdater: public xmlrpc_c::method +bool setCoreWeights(ScoreComponentCollection &weights, vector<string> &coreWeightVector, const vector<const ScoreProducer*> &featureFunctions) { + vector< float > store_weights; + for (size_t i=0; i<coreWeightVector.size(); ++i) { + string name(ffNames[i]); + float weight = Scan<float>(coreWeightVector[i]); + + VERBOSE(1, "loading core weight " << name << endl); + for (size_t i=0; i < featureFunctions.size(); ++i) { + std::string prefix = featureFunctions[i]->GetScoreProducerDescription(); + if (name.substr( 0, prefix.length() ).compare( prefix ) == 0) { + size_t numberScoreComponents = featureFunctions[i]->GetNumScoreComponents(); + if (numberScoreComponents == 1) { + VERBOSE(1, "assign 1 weight for " << featureFunctions[i]->GetScoreProducerDescription()); + VERBOSE(1, " (" << weight << ")" << endl << endl); + weights.Assign(featureFunctions[i], weight); + } + else { + store_weights.push_back(weight); + if (store_weights.size() == numberScoreComponents) { + VERBOSE(1, "assign " << store_weights.size() << " weights for " << featureFunctions[i]->GetScoreProducerDescription() << " ("); + for (size_t j=0; j < store_weights.size(); ++j) + VERBOSE(1, store_weights[j] << " "); + VERBOSE(1, ")" << endl << endl); + weights.Assign(featureFunctions[i], store_weights); + store_weights.clear(); + } + } + } + } + } + return true; +} + +class WeightSetter: public xmlrpc_c::method { public: - WeightUpdater() { + WeightSetter() { // signature and help strings are documentation -- the client // can query this information with a system.methodSignature and // system.methodHelp RPC. this->_signature = "S:S"; - this->_help = "Updates Moses weights"; + this->_help = "Sets Moses weights"; } void execute(xmlrpc_c::paramList const& paramList, @@ -331,7 +393,7 @@ public: const params_t params = paramList.getStruct(0); paramList.verifyEnd(1); - ScoreComponentCollection updatedWeights; + ScoreComponentCollection weightUpdate; params_t::const_iterator si = params.find("core-weights"); string coreWeights; @@ -344,10 +406,10 @@ public: VERBOSE(1, "core weights: " << coreWeights << endl); StaticData &staticData = StaticData::InstanceNonConst(); - const vector<const ScoreProducer*> featureFunctions = staticData.GetTranslationSystem(TranslationSystem::DEFAULT).GetFeatureFunctions(); - vector<string> coreWeightVector; - boost::split(coreWeightVector, coreWeights, boost::is_any_of(",")); - loadCoreWeight(updatedWeights, coreWeightVector, featureFunctions); + const vector<const ScoreProducer*> featureFunctions = staticData.GetTranslationSystem(TranslationSystem::DEFAULT).GetFeatureFunctions(); + vector<string> coreWeightVector; + boost::split(coreWeightVector, coreWeights, boost::is_any_of(",")); + setCoreWeights(weightUpdate, coreWeightVector, featureFunctions); si = params.find("sparse-weights"); string sparseWeights; @@ -355,61 +417,100 @@ public: sparseWeights = xmlrpc_c::value_string(si->second); VERBOSE(1, "sparse weights: " << sparseWeights << endl); - vector<string> sparseWeightVector; - boost::split(sparseWeightVector, sparseWeights, boost::is_any_of("\t ")); - for(size_t i=0; i<sparseWeightVector.size(); ++i) { - vector<string> name_value; - boost::split(name_value, sparseWeightVector[i], boost::is_any_of("=")); - if (name_value.size() > 2) { - string tmp1 = name_value[name_value.size()-1]; - name_value.erase(name_value.end()); - string tmp2 = boost::algorithm::join(name_value, "="); - name_value[0] = tmp2; - name_value[1] = tmp1; - } - const string name(name_value[0]); - float value = Scan<float>(name_value[1]); - VERBOSE(1, "Setting sparse weight " << name << " to value " << value << "." << endl); - updatedWeights.Assign(name, value); + if (sparseWeights != "") { + vector<string> sparseWeightVector; + boost::split(sparseWeightVector, sparseWeights, boost::is_any_of("\t ")); + for(size_t i=0; i<sparseWeightVector.size(); ++i) { + vector<string> name_value; + boost::split(name_value, sparseWeightVector[i], boost::is_any_of("=")); + if (name_value.size() > 2) { + string tmp1 = name_value[name_value.size()-1]; + name_value.erase(name_value.end()); + string tmp2 = boost::algorithm::join(name_value, "="); + name_value[0] = tmp2; + name_value[1] = tmp1; + } + const string name(name_value[0]); + float value = Scan<float>(name_value[1]); + VERBOSE(1, "Setting sparse weight " << name << " to value " << value << "." << endl); + weightUpdate.Assign(name, value); + } } } - staticData.SetAllWeights(updatedWeights); - cerr << "\nUpdated weights: " << staticData.GetAllWeights() << endl; - *retvalP = xmlrpc_c::value_string("Weights updated!"); + // Set moses weights to new weights + staticData.SetAllWeights(weightUpdate); + cerr << "\nSet weights: " << staticData.GetAllWeights() << endl; + *retvalP = xmlrpc_c::value_string("Weights set!"); + } +}; + +class WeightAdder: public xmlrpc_c::method +{ +public: + WeightAdder() { + // signature and help strings are documentation -- the client + // can query this information with a system.methodSignature and + // system.methodHelp RPC. + this->_signature = "S:S"; + this->_help = "Adds an update to Moses weights"; } - bool loadCoreWeight(ScoreComponentCollection &weights, vector<string> &coreWeightVector, const vector<const ScoreProducer*> &featureFunctions) { - vector< float > store_weights; - for (size_t i=0; i<coreWeightVector.size(); ++i) { - string name(ffNames[i]); - float weight = Scan<float>(coreWeightVector[i]); - - VERBOSE(1, "loading core weight " << name << endl); - for (size_t i=0; i < featureFunctions.size(); ++i) { - std::string prefix = featureFunctions[i]->GetScoreProducerDescription(); - if (name.substr( 0, prefix.length() ).compare( prefix ) == 0) { - size_t numberScoreComponents = featureFunctions[i]->GetNumScoreComponents(); - if (numberScoreComponents == 1) { - VERBOSE(1, "assign 1 weight for " << featureFunctions[i]->GetScoreProducerDescription()); - VERBOSE(1, " (" << weight << ")" << endl << endl); - weights.Assign(featureFunctions[i], weight); - } - else { - store_weights.push_back(weight); - if (store_weights.size() == numberScoreComponents) { - VERBOSE(1, "assign " << store_weights.size() << " weights for " << featureFunctions[i]->GetScoreProducerDescription() << " ("); - for (size_t j=0; j < store_weights.size(); ++j) - VERBOSE(1, store_weights[j] << " "); - VERBOSE(1, ")" << endl << endl); - weights.Assign(featureFunctions[i], store_weights); - store_weights.clear(); - } - } - } + void execute(xmlrpc_c::paramList const& paramList, + xmlrpc_c::value * const retvalP) { + const params_t params = paramList.getStruct(0); + paramList.verifyEnd(1); + + ScoreComponentCollection weightUpdate; + + params_t::const_iterator si = params.find("core-weights"); + string coreWeights; + if (si == params.end()) { + throw xmlrpc_c::fault( + "Missing core weights", + xmlrpc_c::fault::CODE_PARSE); + } + coreWeights = xmlrpc_c::value_string(si->second); + VERBOSE(1, "core weights: " << coreWeights << endl); + + StaticData &staticData = StaticData::InstanceNonConst(); + const vector<const ScoreProducer*> featureFunctions = staticData.GetTranslationSystem(TranslationSystem::DEFAULT).GetFeatureFunctions(); + vector<string> coreWeightVector; + boost::split(coreWeightVector, coreWeights, boost::is_any_of(",")); + setCoreWeights(weightUpdate, coreWeightVector, featureFunctions); + + si = params.find("sparse-weights"); + string sparseWeights; + if (si != params.end()) { + sparseWeights = xmlrpc_c::value_string(si->second); + VERBOSE(1, "sparse weights: " << sparseWeights << endl); + + if (sparseWeights != "") { + vector<string> sparseWeightVector; + boost::split(sparseWeightVector, sparseWeights, boost::is_any_of("\t ")); + for(size_t i=0; i<sparseWeightVector.size(); ++i) { + vector<string> name_value; + boost::split(name_value, sparseWeightVector[i], boost::is_any_of("=")); + if (name_value.size() > 2) { + string tmp1 = name_value[name_value.size()-1]; + name_value.erase(name_value.end()); + string tmp2 = boost::algorithm::join(name_value, "="); + name_value[0] = tmp2; + name_value[1] = tmp1; } + const string name(name_value[0]); + float value = Scan<float>(name_value[1]); + VERBOSE(1, "Setting sparse weight " << name << " to value " << value << "." << endl); + weightUpdate.Assign(name, value); } - return true; + } + } + + // add new weights to Moses weights and write back to staticData + weightUpdate.PlusEquals(staticData.GetAllWeights()); + staticData.SetAllWeights(weightUpdate); + cerr << "\nUpdated weights: " << staticData.GetAllWeights() << endl; + *retvalP = xmlrpc_c::value_string("Weights updated!"); } }; @@ -428,7 +529,7 @@ int main(int argc, char** argv) //Extract port and log, send other args to moses char** mosesargv = new char*[argc+2]; int mosesargc = 0; - int port = 8080; + int port = 50005; const char* logfile = "/dev/null"; bool isSerial = false; @@ -486,18 +587,22 @@ int main(int argc, char** argv) if (!StaticData::LoadDataStatic(params)) { exit(1); } - + cerr << "start weights: " << StaticData::Instance().GetAllWeights() << endl; xmlrpc_c::registry myRegistry; xmlrpc_c::methodPtr const translator(new Translator); xmlrpc_c::methodPtr const updater(new Updater); - xmlrpc_c::methodPtr const weightUpdater(new WeightUpdater); + xmlrpc_c::methodPtr const weightSetter(new WeightSetter); + xmlrpc_c::methodPtr const weightAdder(new WeightAdder); myRegistry.addMethod("translate", translator); myRegistry.addMethod("updater", updater); - myRegistry.addMethod("updateWeights", weightUpdater); + myRegistry.addMethod("setWeights", weightSetter); + myRegistry.addMethod("addWeights", weightAdder); + // backwards compatibility + myRegistry.addMethod("updateWeights", weightSetter); xmlrpc_c::serverAbyss myAbyssServer( myRegistry, diff --git a/contrib/server/sgclient_weightUpdate.perl b/contrib/server/sgclient_weightUpdate.perl index a9fe7dc77..4a0a67bbe 100755 --- a/contrib/server/sgclient_weightUpdate.perl +++ b/contrib/server/sgclient_weightUpdate.perl @@ -1,22 +1,20 @@ #!/usr/bin/perl -w use strict; - -use Encode; use Frontier::Client; -#my $proxy = XMLRPC::Lite->proxy($url); +my $output_suffix = $ARGV[0]; +$output_suffix = "" if (not $output_suffix); -my $port = "8080"; +my $port = "50007"; my $url = "http://localhost:".$port."/RPC2"; my $server = Frontier::Client->new('url' => $url, 'encoding' => 'UTF-8'); my $verbose=0; -my $translations="translations.out"; +my $translations="translations$output_suffix.out"; open TR, ">:utf8", $translations; -my $sg_out="searchGraph.out"; +my $sg_out="searchGraph$output_suffix.out"; open SG, ">:utf8", $sg_out; -#for (my $i=0;$i<scalar(@SENTENCE);$i++) my $i=0; while (my $text = <STDIN>) { @@ -26,16 +24,20 @@ while (my $text = <STDIN>) # update weights my $core_weights = "0.0314787,-0.138354,1,0.0867223,0.0349965,0.104774,0.0607203,0.0516889,0.113694,0.0947218,0.0642702,0.0385324,0.0560749,0.0434684,0.0805031"; - #my $core_weights = "0.3,-1,1,0.3,0.3,0.3,0.3,0.3,0.3,0.5,0.2,0.2,0.2,0.2,0.2"; - #my $core_weights = "0.031,-0.138,1.000,0.095,0.064,0.039"; - #my $core_weights = "0.001,-0.001,1.000,1,1,1"; - my $sparse_weights = "pp_dummy~dummy=0.001"; + #my $core_weights = "0.0314787,-0.138354,1,0.0867223,0.0349965,0.104774,0.0607203,0.0516889,0.113694,0.0947218,0.0642702,0.0385324,0.0560749,0.0434684,0.0805031,0"; + #my $sparse_weights = "pp_dummy~dummy=0.001"; + my $sparse_weights = ""; my %param = ("core-weights" => $core_weights, "sparse-weights" => $sparse_weights); - $server->call("updateWeights",(\%param)); + $server->call("setWeights",(\%param)); + + #my $core_weight_update = "0.1,0.1,0,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1,0.1"; + #my $sparse_weight_update = "pp_dummy~dummy=0.1"; + #my %param_update = ("core-weights" => $core_weight_update, "sparse-weights" => $sparse_weight_update); + #$server->call("addWeights",(\%param_update)); # translate #my %param = ("text" => $server->string($SENTENCE[$i]) , "sg" => "true"); - %param = ("text" => $text, "sg" => "true"); + %param = ("text" => $text, "id" => $i, "sg" => "true"); my $result = $server->call("translate",(\%param)); $date = `date`; @@ -43,7 +45,7 @@ while (my $text = <STDIN>) print "[$date] sentence $i: process translation\n" if $verbose; # process translation - my $mt_output = Encode::encode('UTF-8',$result->{'text'}); # no idea why that is necessary + my $mt_output = $result->{'text'}; $mt_output =~ s/\|\S+//g; # no multiple factors, only first print "sentence $i >> $translations \n"; print TR $mt_output."\n"; @@ -54,15 +56,15 @@ while (my $text = <STDIN>) foreach my $sgn (@$sg_ref) { # print out in extended format if ($sgn->{hyp} eq 0) { - print SG "$i hyp=$sgn->{hyp} stack=$sgn->{stack} forward=$sgn->{forward} fscore=$sgn->{fscore} \n"; + print SG "$i hyp=$sgn->{'hyp'} stack=$sgn->{'stack'} forward=$sgn->{'forward'} fscore=$sgn->{'fscore'} \n"; } else { - print SG "$i hyp=$sgn->{hyp} stack=$sgn->{stack} back=$sgn->{back} score=$sgn->{score} transition=$sgn->{transition} "; + print SG "$i hyp=$sgn->{'hyp'} stack=$sgn->{'stack'} back=$sgn->{'back'} score=$sgn->{'score'} transition=$sgn->{'transition'} "; if ($sgn->{"recombined"}) { - print SG "recombined=$sgn->{recombined} "; + print SG "recombined=$sgn->{'recombined'} "; } - print SG "forward=$sgn->{forward} fscore=$sgn->{fscore} covered=$sgn->{'cover-start'}-$sgn->{'cover-end'} "; - print SG "scores=\"$sgn->{scores}\" out=\"$sgn->{out}\" \n"; + print SG "forward=$sgn->{'forward'} fscore=$sgn->{'fscore'} covered=$sgn->{'cover-start'}-$sgn->{'cover-end'} "; + print SG "scores=\"$sgn->{'scores'}\" src-phrase=\"$sgn->{'src-phrase'}\" tgt-phrase=\"$sgn->{'tgt-phrase'}\" \n"; } } diff --git a/contrib/sigtest-filter/Makefile b/contrib/sigtest-filter/Makefile index ddefc907b..ddefc907b 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/contrib/sigtest-filter/WIN32_functions.h +++ b/contrib/sigtest-filter/WIN32_functions.h diff --git a/contrib/sigtest-filter/filter-pt.cpp b/contrib/sigtest-filter/filter-pt.cpp index b0828ae33..b0828ae33 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/contrib/synlm/hhmm/wsjparse/include/TextObsVars.h +++ b/contrib/synlm/hhmm/wsjparse/include/TextObsVars.h diff --git a/contrib/web/bin/daemon.pl b/contrib/web/bin/daemon.pl index 8e6a08739..8e6a08739 100644..100755 --- a/contrib/web/bin/daemon.pl +++ b/contrib/web/bin/daemon.pl diff --git a/contrib/web/bin/detokenizer.perl b/contrib/web/bin/detokenizer.perl index 4d53aeddd..4d53aeddd 100644..100755 --- a/contrib/web/bin/detokenizer.perl +++ b/contrib/web/bin/detokenizer.perl diff --git a/contrib/web/bin/nonbreaking_prefixes/nonbreaking_prefix.de b/contrib/web/bin/nonbreaking_prefixes/nonbreaking_prefix.de index c24f2080f..c24f2080f 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/contrib/web/bin/nonbreaking_prefixes/nonbreaking_prefix.en +++ b/contrib/web/bin/nonbreaking_prefixes/nonbreaking_prefix.en diff --git a/contrib/web/bin/start-daemon-cluster.pl b/contrib/web/bin/start-daemon-cluster.pl index 7bf87842c..7bf87842c 100644..100755 --- a/contrib/web/bin/start-daemon-cluster.pl +++ b/contrib/web/bin/start-daemon-cluster.pl diff --git a/contrib/web/bin/tokenizer.perl b/contrib/web/bin/tokenizer.perl index 4e1f5ac05..4e1f5ac05 100644..100755 --- a/contrib/web/bin/tokenizer.perl +++ b/contrib/web/bin/tokenizer.perl diff --git a/contrib/web/index.cgi b/contrib/web/index.cgi index dcc20b0aa..dcc20b0aa 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/contrib/web/translate.cgi +++ b/contrib/web/translate.cgi diff --git a/cruise-control/README b/cruise-control/README index 3d65d7aac..3d65d7aac 100644..100755 --- a/cruise-control/README +++ b/cruise-control/README diff --git a/cruise-control/config.ems b/cruise-control/config.ems index eee15ec72..eee15ec72 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/jam-files/engine/builtins.h +++ b/jam-files/engine/builtins.h diff --git a/jam-files/engine/bump_version.py b/jam-files/engine/bump_version.py index 9423c4c77..9423c4c77 100644..100755 --- a/jam-files/engine/bump_version.py +++ b/jam-files/engine/bump_version.py diff --git a/jam-files/engine/class.c b/jam-files/engine/class.c index ff4ec5680..ff4ec5680 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/jam-files/engine/debian/jam.man.sgml +++ b/jam-files/engine/debian/jam.man.sgml diff --git a/jam-files/engine/debug.c b/jam-files/engine/debug.c index 7290555a7..7290555a7 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/jam-files/engine/yyacc.c +++ b/jam-files/engine/yyacc.c diff --git a/lm/COPYING b/lm/COPYING index 94a9ed024..94a9ed024 100644..100755 --- a/lm/COPYING +++ b/lm/COPYING diff --git a/lm/COPYING.LESSER b/lm/COPYING.LESSER index cca7fc278..cca7fc278 100644..100755 --- a/lm/COPYING.LESSER +++ b/lm/COPYING.LESSER diff --git a/lm/Jamfile b/lm/Jamfile index 19cbaec4b..19cbaec4b 100644..100755 --- a/lm/Jamfile +++ b/lm/Jamfile diff --git a/lm/LICENSE b/lm/LICENSE index ea98515f4..ea98515f4 100644..100755 --- a/lm/LICENSE +++ b/lm/LICENSE diff --git a/lm/README b/lm/README index d9307ed05..d9307ed05 100644..100755 --- a/lm/README +++ b/lm/README diff --git a/lm/bhiksha.cc b/lm/bhiksha.cc index cdeafb478..cdeafb478 100644..100755 --- a/lm/bhiksha.cc +++ b/lm/bhiksha.cc diff --git a/lm/bhiksha.hh b/lm/bhiksha.hh index 5182ee2e7..5182ee2e7 100644..100755 --- a/lm/bhiksha.hh +++ b/lm/bhiksha.hh diff --git a/lm/binary_format.cc b/lm/binary_format.cc index ab0166a65..ab0166a65 100644..100755 --- 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 100644..100755 --- a/lm/binary_format.hh +++ b/lm/binary_format.hh diff --git a/lm/blank.hh b/lm/blank.hh index 4da812096..4da812096 100644..100755 --- a/lm/blank.hh +++ b/lm/blank.hh diff --git a/lm/build_binary.cc b/lm/build_binary.cc index e235cc5a3..e235cc5a3 100644..100755 --- a/lm/build_binary.cc +++ b/lm/build_binary.cc diff --git a/lm/config.cc b/lm/config.cc index 297589a47..297589a47 100644..100755 --- a/lm/config.cc +++ b/lm/config.cc diff --git a/lm/config.hh b/lm/config.hh index 8564661bf..8564661bf 100644..100755 --- a/lm/config.hh +++ b/lm/config.hh diff --git a/lm/enumerate_vocab.hh b/lm/enumerate_vocab.hh index 27263621e..27263621e 100644..100755 --- a/lm/enumerate_vocab.hh +++ b/lm/enumerate_vocab.hh diff --git a/lm/facade.hh b/lm/facade.hh index 8b1860176..8b1860176 100644..100755 --- a/lm/facade.hh +++ b/lm/facade.hh diff --git a/lm/left.hh b/lm/left.hh index 41f71f849..41f71f849 100644..100755 --- a/lm/left.hh +++ b/lm/left.hh diff --git a/lm/left_test.cc b/lm/left_test.cc index c85e5efa8..c85e5efa8 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/lm/max_order.hh +++ b/lm/max_order.hh diff --git a/lm/model.cc b/lm/model.cc index 042955efd..042955efd 100644..100755 --- a/lm/model.cc +++ b/lm/model.cc diff --git a/lm/model.hh b/lm/model.hh index 731d60b7e..731d60b7e 100644..100755 --- a/lm/model.hh +++ b/lm/model.hh diff --git a/lm/model_test.cc b/lm/model_test.cc index 461704d43..461704d43 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/lm/ngram_query.cc +++ b/lm/ngram_query.cc diff --git a/lm/quantize.cc b/lm/quantize.cc index 8de37e827..8de37e827 100644..100755 --- a/lm/quantize.cc +++ b/lm/quantize.cc diff --git a/lm/quantize.hh b/lm/quantize.hh index 6d130a577..6d130a577 100644..100755 --- a/lm/quantize.hh +++ b/lm/quantize.hh diff --git a/lm/read_arpa.cc b/lm/read_arpa.cc index 05f761be6..05f761be6 100644..100755 --- 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 100644..100755 --- a/lm/read_arpa.hh +++ b/lm/read_arpa.hh diff --git a/lm/return.hh b/lm/return.hh index 1b55091b2..1b55091b2 100644..100755 --- a/lm/return.hh +++ b/lm/return.hh diff --git a/lm/search_hashed.cc b/lm/search_hashed.cc index f803b632e..f803b632e 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/lm/search_trie.hh +++ b/lm/search_trie.hh diff --git a/lm/test.arpa b/lm/test.arpa index ef214eae3..ef214eae3 100644..100755 --- a/lm/test.arpa +++ b/lm/test.arpa diff --git a/lm/test_nounk.arpa b/lm/test_nounk.arpa index 060733d98..060733d98 100644..100755 --- a/lm/test_nounk.arpa +++ b/lm/test_nounk.arpa diff --git a/lm/trie.cc b/lm/trie.cc index 20075bb83..20075bb83 100644..100755 --- a/lm/trie.cc +++ b/lm/trie.cc diff --git a/lm/trie.hh b/lm/trie.hh index ebe9910f0..ebe9910f0 100644..100755 --- a/lm/trie.hh +++ b/lm/trie.hh diff --git a/lm/trie_sort.cc b/lm/trie_sort.cc index 9d1d5f27f..9d1d5f27f 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/lm/virtual_interface.hh +++ b/lm/virtual_interface.hh diff --git a/lm/vocab.cc b/lm/vocab.cc index c10743ceb..c10743ceb 100644..100755 --- a/lm/vocab.cc +++ b/lm/vocab.cc diff --git a/lm/vocab.hh b/lm/vocab.hh index 48db3d627..48db3d627 100644..100755 --- a/lm/vocab.hh +++ b/lm/vocab.hh diff --git a/lm/weights.hh b/lm/weights.hh index 1f38cf5e1..1f38cf5e1 100644..100755 --- a/lm/weights.hh +++ b/lm/weights.hh diff --git a/lm/word_index.hh b/lm/word_index.hh index 67841c30a..67841c30a 100644..100755 --- a/lm/word_index.hh +++ b/lm/word_index.hh diff --git a/mert/BleuScorer.cpp b/mert/BleuScorer.cpp index 4779205ac..4779205ac 100644..100755 --- a/mert/BleuScorer.cpp +++ b/mert/BleuScorer.cpp diff --git a/mert/BleuScorer.h b/mert/BleuScorer.h index abd80478c..abd80478c 100644..100755 --- a/mert/BleuScorer.h +++ b/mert/BleuScorer.h diff --git a/mert/CderScorer.cpp b/mert/CderScorer.cpp index fc8d69f5f..fc8d69f5f 100644..100755 --- a/mert/CderScorer.cpp +++ b/mert/CderScorer.cpp diff --git a/mert/CderScorer.h b/mert/CderScorer.h index 359ac31e9..359ac31e9 100644..100755 --- a/mert/CderScorer.h +++ b/mert/CderScorer.h diff --git a/mert/Data.cpp b/mert/Data.cpp index c23c121ac..c23c121ac 100644..100755 --- a/mert/Data.cpp +++ b/mert/Data.cpp diff --git a/mert/Data.h b/mert/Data.h index f2610c8dd..f2610c8dd 100644..100755 --- a/mert/Data.h +++ b/mert/Data.h diff --git a/mert/FeatureArray.cpp b/mert/FeatureArray.cpp index dbf601bdf..dbf601bdf 100644..100755 --- a/mert/FeatureArray.cpp +++ b/mert/FeatureArray.cpp diff --git a/mert/FeatureArray.h b/mert/FeatureArray.h index f96c6d7d4..f96c6d7d4 100644..100755 --- a/mert/FeatureArray.h +++ b/mert/FeatureArray.h diff --git a/mert/FeatureData.cpp b/mert/FeatureData.cpp index 04c6430ce..04c6430ce 100644..100755 --- a/mert/FeatureData.cpp +++ b/mert/FeatureData.cpp diff --git a/mert/FeatureData.h b/mert/FeatureData.h index 75c532896..75c532896 100644..100755 --- a/mert/FeatureData.h +++ b/mert/FeatureData.h diff --git a/mert/FeatureDataIterator.cpp b/mert/FeatureDataIterator.cpp index c11664817..c11664817 100644..100755 --- a/mert/FeatureDataIterator.cpp +++ b/mert/FeatureDataIterator.cpp diff --git a/mert/FeatureDataIterator.h b/mert/FeatureDataIterator.h index 81f072970..81f072970 100644..100755 --- a/mert/FeatureDataIterator.h +++ b/mert/FeatureDataIterator.h diff --git a/mert/FeatureStats.cpp b/mert/FeatureStats.cpp index a02c4c3d3..a02c4c3d3 100644..100755 --- a/mert/FeatureStats.cpp +++ b/mert/FeatureStats.cpp diff --git a/mert/FeatureStats.h b/mert/FeatureStats.h index 39bffa93e..39bffa93e 100644..100755 --- a/mert/FeatureStats.h +++ b/mert/FeatureStats.h diff --git a/mert/FileStream.cpp b/mert/FileStream.cpp index 11fd58e26..11fd58e26 100644..100755 --- a/mert/FileStream.cpp +++ b/mert/FileStream.cpp diff --git a/mert/FileStream.h b/mert/FileStream.h index afa8d9a29..afa8d9a29 100644..100755 --- a/mert/FileStream.h +++ b/mert/FileStream.h diff --git a/mert/Jamfile b/mert/Jamfile index 924afd57d..924afd57d 100644..100755 --- a/mert/Jamfile +++ b/mert/Jamfile diff --git a/mert/MergeScorer.cpp b/mert/MergeScorer.cpp index 0b9de73f1..0b9de73f1 100644..100755 --- a/mert/MergeScorer.cpp +++ b/mert/MergeScorer.cpp diff --git a/mert/MergeScorer.h b/mert/MergeScorer.h index 10e034ac6..10e034ac6 100644..100755 --- a/mert/MergeScorer.h +++ b/mert/MergeScorer.h diff --git a/mert/Optimizer.cpp b/mert/Optimizer.cpp index 73fabb9ad..73fabb9ad 100644..100755 --- a/mert/Optimizer.cpp +++ b/mert/Optimizer.cpp diff --git a/mert/Optimizer.h b/mert/Optimizer.h index aa588994d..aa588994d 100644..100755 --- a/mert/Optimizer.h +++ b/mert/Optimizer.h diff --git a/mert/PerScorer.cpp b/mert/PerScorer.cpp index 765cb0876..765cb0876 100644..100755 --- a/mert/PerScorer.cpp +++ b/mert/PerScorer.cpp diff --git a/mert/PerScorer.h b/mert/PerScorer.h index 800a3caf1..800a3caf1 100644..100755 --- a/mert/PerScorer.h +++ b/mert/PerScorer.h diff --git a/mert/Point.cpp b/mert/Point.cpp index 322f10f77..322f10f77 100644..100755 --- a/mert/Point.cpp +++ b/mert/Point.cpp diff --git a/mert/Point.h b/mert/Point.h index 55d173215..55d173215 100644..100755 --- a/mert/Point.h +++ b/mert/Point.h diff --git a/mert/ScopedVector.h b/mert/ScopedVector.h index 1fbce88b7..1fbce88b7 100644..100755 --- a/mert/ScopedVector.h +++ b/mert/ScopedVector.h diff --git a/mert/ScoreArray.cpp b/mert/ScoreArray.cpp index b26b93114..b26b93114 100644..100755 --- a/mert/ScoreArray.cpp +++ b/mert/ScoreArray.cpp diff --git a/mert/ScoreArray.h b/mert/ScoreArray.h index 1240a704a..1240a704a 100644..100755 --- a/mert/ScoreArray.h +++ b/mert/ScoreArray.h diff --git a/mert/ScoreData.cpp b/mert/ScoreData.cpp index 914245bf7..914245bf7 100644..100755 --- a/mert/ScoreData.cpp +++ b/mert/ScoreData.cpp diff --git a/mert/ScoreData.h b/mert/ScoreData.h index cb4fb30f9..cb4fb30f9 100644..100755 --- a/mert/ScoreData.h +++ b/mert/ScoreData.h diff --git a/mert/ScoreDataIterator.cpp b/mert/ScoreDataIterator.cpp index 4cac63c54..4cac63c54 100644..100755 --- a/mert/ScoreDataIterator.cpp +++ b/mert/ScoreDataIterator.cpp diff --git a/mert/ScoreDataIterator.h b/mert/ScoreDataIterator.h index 4633b8651..4633b8651 100644..100755 --- a/mert/ScoreDataIterator.h +++ b/mert/ScoreDataIterator.h diff --git a/mert/ScoreStats.cpp b/mert/ScoreStats.cpp index eb1750983..eb1750983 100644..100755 --- a/mert/ScoreStats.cpp +++ b/mert/ScoreStats.cpp diff --git a/mert/ScoreStats.h b/mert/ScoreStats.h index 43a6f1f23..43a6f1f23 100644..100755 --- a/mert/ScoreStats.h +++ b/mert/ScoreStats.h diff --git a/mert/Scorer.cpp b/mert/Scorer.cpp index 0bde898f0..0bde898f0 100644..100755 --- a/mert/Scorer.cpp +++ b/mert/Scorer.cpp diff --git a/mert/Scorer.h b/mert/Scorer.h index c36f2e03a..c36f2e03a 100644..100755 --- a/mert/Scorer.h +++ b/mert/Scorer.h diff --git a/mert/ScorerFactory.cpp b/mert/ScorerFactory.cpp index 2f47092ef..2f47092ef 100644..100755 --- a/mert/ScorerFactory.cpp +++ b/mert/ScorerFactory.cpp diff --git a/mert/ScorerFactory.h b/mert/ScorerFactory.h index f6054c770..f6054c770 100644..100755 --- a/mert/ScorerFactory.h +++ b/mert/ScorerFactory.h diff --git a/mert/TERsrc/alignmentStruct.cpp b/mert/TERsrc/alignmentStruct.cpp index 15b4a8032..15b4a8032 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/mert/TERsrc/tools.h +++ b/mert/TERsrc/tools.h diff --git a/mert/TODO b/mert/TODO index 2559e78b5..2559e78b5 100644..100755 --- a/mert/TODO +++ b/mert/TODO diff --git a/mert/TerScorer.cpp b/mert/TerScorer.cpp index 3f4ca65e8..3f4ca65e8 100644..100755 --- a/mert/TerScorer.cpp +++ b/mert/TerScorer.cpp diff --git a/mert/TerScorer.h b/mert/TerScorer.h index 0e9996a99..0e9996a99 100644..100755 --- a/mert/TerScorer.h +++ b/mert/TerScorer.h diff --git a/mert/Timer.cpp b/mert/Timer.cpp index 373eb4a2e..373eb4a2e 100644..100755 --- a/mert/Timer.cpp +++ b/mert/Timer.cpp diff --git a/mert/Timer.h b/mert/Timer.h index 403547620..403547620 100644..100755 --- a/mert/Timer.h +++ b/mert/Timer.h diff --git a/mert/Types.h b/mert/Types.h index 1d0fd0dd0..1d0fd0dd0 100644..100755 --- a/mert/Types.h +++ b/mert/Types.h diff --git a/mert/Util.cpp b/mert/Util.cpp index 3769c71e7..3769c71e7 100644..100755 --- a/mert/Util.cpp +++ b/mert/Util.cpp diff --git a/mert/Util.h b/mert/Util.h index da68685c3..da68685c3 100644..100755 --- a/mert/Util.h +++ b/mert/Util.h diff --git a/mert/evaluator.cpp b/mert/evaluator.cpp index c1d6039da..c1d6039da 100644..100755 --- a/mert/evaluator.cpp +++ b/mert/evaluator.cpp diff --git a/mert/example/NBEST b/mert/example/NBEST index 65b895772..65b895772 100644..100755 --- a/mert/example/NBEST +++ b/mert/example/NBEST diff --git a/mert/example/README b/mert/example/README index 7ece55a53..7ece55a53 100644..100755 --- a/mert/example/README +++ b/mert/example/README diff --git a/mert/example/README.oldmert b/mert/example/README.oldmert index c5ee329d9..c5ee329d9 100644..100755 --- a/mert/example/README.oldmert +++ b/mert/example/README.oldmert diff --git a/mert/example/REF b/mert/example/REF index e6b2e4f58..e6b2e4f58 100644..100755 --- a/mert/example/REF +++ b/mert/example/REF diff --git a/mert/example/REF.0 b/mert/example/REF.0 index b2d4caf39..b2d4caf39 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/mert/example/init.opt +++ b/mert/example/init.opt diff --git a/mert/extractor.cpp b/mert/extractor.cpp index 990943ba5..990943ba5 100644..100755 --- a/mert/extractor.cpp +++ b/mert/extractor.cpp diff --git a/mert/gzfilebuf.h b/mert/gzfilebuf.h index f9cd8a446..f9cd8a446 100644..100755 --- a/mert/gzfilebuf.h +++ b/mert/gzfilebuf.h diff --git a/mert/init.opt b/mert/init.opt index 32ab00796..32ab00796 100644..100755 --- a/mert/init.opt +++ b/mert/init.opt diff --git a/mert/pro.cpp b/mert/pro.cpp index 9b6812704..9b6812704 100644..100755 --- a/mert/pro.cpp +++ b/mert/pro.cpp diff --git a/mert/test_scorer.cpp b/mert/test_scorer.cpp index c1d52fcbe..c1d52fcbe 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 3fe670a1c..f6912e4b9 100644..100755 --- a/mira/Decoder.cpp +++ b/mira/Decoder.cpp @@ -76,7 +76,7 @@ namespace Mira { delete[] mosesargv; const StaticData &staticData = StaticData::Instance(); - m_bleuScoreFeature = staticData.GetBleuScoreFeature(); + m_bleuScoreFeature = staticData.GetBleuScoreFeature(); } void MosesDecoder::cleanup(bool chartDecoding) { @@ -335,6 +335,7 @@ namespace Mira { m_sentence->Read(in,inputFactorOrder); // set weight of BleuScoreFeature + //cerr << "Reload Bleu feature weight: " << bleuObjectiveWeight*bleuScoreWeight << " (" << bleuObjectiveWeight << "*" << bleuScoreWeight << ")" << endl; staticData.ReLoadBleuScoreFeatureParameter(bleuObjectiveWeight*bleuScoreWeight); m_bleuScoreFeature->SetCurrSourceLength((*m_sentence).GetSize()); diff --git a/mira/Decoder.h b/mira/Decoder.h index be9ed2f9a..be9ed2f9a 100644..100755 --- a/mira/Decoder.h +++ b/mira/Decoder.h diff --git a/mira/Hildreth.cpp b/mira/Hildreth.cpp index 53d1e0881..53d1e0881 100644..100755 --- a/mira/Hildreth.cpp +++ b/mira/Hildreth.cpp diff --git a/mira/Hildreth.h b/mira/Hildreth.h index 699115242..699115242 100644..100755 --- a/mira/Hildreth.h +++ b/mira/Hildreth.h diff --git a/mira/HildrethTest.cpp b/mira/HildrethTest.cpp index a32dcd1d3..a32dcd1d3 100644..100755 --- a/mira/HildrethTest.cpp +++ b/mira/HildrethTest.cpp diff --git a/mira/Jamfile b/mira/Jamfile index cede96233..cede96233 100644..100755 --- a/mira/Jamfile +++ b/mira/Jamfile diff --git a/mira/Main.cpp b/mira/Main.cpp index 498534b63..dabbcd988 100644..100755 --- a/mira/Main.cpp +++ b/mira/Main.cpp @@ -51,196 +51,206 @@ using namespace Moses; namespace po = boost::program_options; int main(int argc, char** argv) { - size_t rank = 0; - size_t size = 1; + size_t rank = 0; + size_t size = 1; #ifdef MPI_ENABLE - mpi::environment env(argc,argv); - mpi::communicator world; - rank = world.rank(); - size = world.size(); + mpi::environment env(argc,argv); + mpi::communicator world; + rank = world.rank(); + size = world.size(); #endif - - bool help; - int verbosity; - string mosesConfigFile; - string inputFile; - vector<string> referenceFiles; - vector<string> mosesConfigFilesFolds, inputFilesFolds, referenceFilesFolds; - string coreWeightFile, startWeightFile; - size_t epochs; - string learner; - bool shuffle; - size_t mixingFrequency; - size_t weightDumpFrequency; - string weightDumpStem; - bool scale_margin, scale_margin_precision; - bool scale_update, scale_update_precision; - size_t n; - size_t batchSize; - bool distinctNbest; - bool accumulateWeights; - float historySmoothing; - bool scaleByInputLength, scaleByAvgInputLength; - bool scaleByInverseLength, scaleByAvgInverseLength; - float scaleByX; - float slack; - bool averageWeights; - bool weightConvergence; - float learning_rate; - float mira_learning_rate; - float perceptron_learning_rate; - string decoder_settings; - float min_weight_change; - bool normaliseWeights, normaliseMargin; - bool print_feature_values; - bool historyBleu ; - bool sentenceBleu; - float bleuWeight, bleuWeight_hope, bleuWeight_fear; - bool perceptron_update; - bool hope_fear, hope_model; - bool model_hope_fear, rank_only; - int hope_n, fear_n, rank_n; - size_t bleu_smoothing_scheme; - float min_oracle_bleu; - float minBleuRatio, maxBleuRatio; - bool boost; - bool decode_hope, decode_fear, decode_model; - string decode_filename; - bool batchEqualsShard; - bool sparseAverage, dumpMixedWeights, sparseNoAverage; - int featureCutoff; - bool pruneZeroWeights; - bool megam; - bool printFeatureCounts, printNbestWithFeatures; - bool avgRefLength; - bool print_weights, print_core_weights, clear_static, debug_model, scale_lm, bleu_weight_lm, bleu_weight_lm_adjust, scale_wp; - float scale_lm_factor, bleu_weight_lm_factor, scale_wp_factor; - bool sample; - string moses_src; - bool external_score = false, scale_all, dummy; - float sigmoidParam, scale_all_factor; - po::options_description desc("Allowed options"); - desc.add_options() - ("accumulate-weights", po::value<bool>(&accumulateWeights)->default_value(false), "Accumulate and average weights over all epochs") - ("average-weights", po::value<bool>(&averageWeights)->default_value(false), "Set decoder weights to average weights after each update") - ("avg-ref-length", po::value<bool>(&avgRefLength)->default_value(false), "Use average reference length instead of shortest for BLEU score feature") - ("batch-equals-shard", po::value<bool>(&batchEqualsShard)->default_value(false), "Batch size is equal to shard size (purely batch)") - ("batch-size,b", po::value<size_t>(&batchSize)->default_value(1), "Size of batch that is send to optimiser for weight adjustments") - ("bw", po::value<float>(&bleuWeight)->default_value(1.0), "Bleu score weight used in the decoder objective function (on top of the Bleu objective weight)") - ("bw-hope", po::value<float>(&bleuWeight_hope)->default_value(-1), "Bleu score weight used in the decoder objective function for hope translations") - ("bw-fear", po::value<float>(&bleuWeight_fear)->default_value(-1), "Bleu score weight used in the decoder objective function for fear translations") - ("blm", po::value<bool>(&bleu_weight_lm)->default_value(false), "Make bleu weight depend on lm weight") - ("blm-factor", po::value<float>(&bleu_weight_lm_factor)->default_value(2.0), "Make bleu weight depend on lm weight by this factor") - ("blm-adjust", po::value<bool>(&bleu_weight_lm_adjust)->default_value(false), "Adjust bleu weight when lm weight changes") - ("bleu-smoothing-scheme", po::value<size_t>(&bleu_smoothing_scheme)->default_value(1), "Set a smoothing scheme for sentence-Bleu: +1 (1), +0.1 (2), papineni (3) (default:1)") - ("boost", po::value<bool>(&boost)->default_value(false), "Apply boosting factor to updates on misranked candidates") - ("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)") - ("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") - ("decode-model", po::value<bool>(&decode_model)->default_value(false), "Decode dev input set according to normal objective") - ("decode-filename", po::value<string>(&decode_filename), "Filename for Bleu objective translations") - ("decoder-settings", po::value<string>(&decoder_settings)->default_value(""), "Decoder settings for tuning runs") - ("distinct-nbest", po::value<bool>(&distinctNbest)->default_value(true), "Use n-best list with distinct translations in inference step") - ("dummy", po::value<bool>(&dummy)->default_value(false), "****") - ("dump-mixed-weights", po::value<bool>(&dumpMixedWeights)->default_value(false), "Dump mixed weights instead of averaged weights") - ("epochs,e", po::value<size_t>(&epochs)->default_value(10), "Number of epochs") - ("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") - ("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") - ("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") - ("min-bleu-ratio", po::value<float>(&minBleuRatio)->default_value(-1), "Set a minimum BLEU ratio between hope and fear") - ("max-bleu-ratio", po::value<float>(&maxBleuRatio)->default_value(-1), "Set a maximum BLEU ratio between hope and fear") - ("megam", po::value<bool>(&megam)->default_value(false), "Use megam for optimization step") - ("min-oracle-bleu", po::value<float>(&min_oracle_bleu)->default_value(0), "Set a minimum oracle BLEU score") - ("min-weight-change", po::value<float>(&min_weight_change)->default_value(0.01), "Set minimum weight change for stopping criterion") - ("mira-learning-rate", po::value<float>(&mira_learning_rate)->default_value(1), "Learning rate for MIRA (fixed or flexible)") - ("mixing-frequency", po::value<size_t>(&mixingFrequency)->default_value(1), "How often per epoch to mix weights, when using mpi") - ("model-hope-fear", po::value<bool>(&model_hope_fear)->default_value(false), "Use model, hope and fear translations for optimisation") - ("moses-src", po::value<string>(&moses_src)->default_value(""), "Moses source directory") - ("nbest,n", po::value<size_t>(&n)->default_value(1), "Number of translations in n-best list") - ("normalise-weights", po::value<bool>(&normaliseWeights)->default_value(false), "Whether to normalise the updated weights before passing them to the decoder") - ("normalise-margin", po::value<bool>(&normaliseMargin)->default_value(false), "Normalise the margin: squash between 0 and 1") - ("perceptron-learning-rate", po::value<float>(&perceptron_learning_rate)->default_value(0.01), "Perceptron learning rate") - ("print-feature-values", po::value<bool>(&print_feature_values)->default_value(false), "Print out feature values") - ("print-feature-counts", po::value<bool>(&printFeatureCounts)->default_value(false), "Print out feature values, print feature list with hope counts after 1st epoch") - ("print-nbest-with-features", po::value<bool>(&printNbestWithFeatures)->default_value(false), "Print out feature values, print feature list with hope counts after 1st epoch") - ("print-weights", po::value<bool>(&print_weights)->default_value(false), "Print out current weights") - ("print-core-weights", po::value<bool>(&print_core_weights)->default_value(false), "Print out current core weights") - ("prune-zero-weights", po::value<bool>(&pruneZeroWeights)->default_value(false), "Prune zero-valued sparse feature weights") - ("rank-n", po::value<int>(&rank_n)->default_value(-1), "Number of translations used for ranking") - ("rank-only", po::value<bool>(&rank_only)->default_value(false), "Use only model translations for optimisation") - ("reference-files,r", po::value<vector<string> >(&referenceFiles), "Reference translation files for training") - ("reference-files-folds", po::value<vector<string> >(&referenceFilesFolds), "Reference translation files for training, one for each fold") - ("sample", po::value<bool>(&sample)->default_value(false), "Sample a translation pair from hope/(model)/fear translations") - ("scale-all", po::value<bool>(&scale_all)->default_value(false), "Scale all core features") - ("scale-all-factor", po::value<float>(&scale_all_factor)->default_value(2), "Scaling factor for all core features") - ("scale-by-inverse-length", po::value<bool>(&scaleByInverseLength)->default_value(false), "Scale the BLEU score by (a history of) the inverse input length") - ("scale-by-input-length", po::value<bool>(&scaleByInputLength)->default_value(true), "Scale the BLEU score by (a history of) the input length") - ("scale-by-avg-input-length", po::value<bool>(&scaleByAvgInputLength)->default_value(false), "Scale BLEU by an average of the input length") - ("scale-by-avg-inverse-length", po::value<bool>(&scaleByAvgInverseLength)->default_value(false), "Scale BLEU by an average of the inverse input length") - ("scale-by-x", po::value<float>(&scaleByX)->default_value(1), "Scale the BLEU score by value x") - ("scale-lm", po::value<bool>(&scale_lm)->default_value(false), "Scale the language model feature") - ("scale-factor-lm", po::value<float>(&scale_lm_factor)->default_value(2), "Scale the language model feature by this factor") - ("scale-wp", po::value<bool>(&scale_wp)->default_value(false), "Scale the word penalty feature") - ("scale-factor-wp", po::value<float>(&scale_wp_factor)->default_value(2), "Scale the word penalty feature by this factor") - ("scale-margin", po::value<bool>(&scale_margin)->default_value(0), "Scale the margin by the Bleu score of the oracle translation") - ("scale-margin-precision", po::value<bool>(&scale_margin_precision)->default_value(0), "Scale the margin by the precision of the oracle translation") - ("scale-update", po::value<bool>(&scale_update)->default_value(0), "Scale the update by the Bleu score of the oracle translation") - ("scale-update-precision", po::value<bool>(&scale_update_precision)->default_value(0), "Scale the update by the precision of the oracle translation") - ("sentence-level-bleu", po::value<bool>(&sentenceBleu)->default_value(true), "Use a sentences level Bleu scoring function") - ("shuffle", po::value<bool>(&shuffle)->default_value(false), "Shuffle input sentences before processing") - ("sigmoid-param", po::value<float>(&sigmoidParam)->default_value(1), "y=sigmoidParam is the axis that this sigmoid approaches") - ("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 the start weights (already tuned, have to be non-zero)") - ("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, when using mpi") - ("weight-dump-stem", po::value<string>(&weightDumpStem)->default_value("weights"), "Stem of filename to use for dumping weights"); - - po::options_description cmdline_options; - cmdline_options.add(desc); - po::variables_map vm; - po::store(po::command_line_parser(argc, argv). options(cmdline_options).run(), vm); - po::notify(vm); - - if (help) { - std::cout << "Usage: " + string(argv[0]) - + " -f mosesini-file -i input-file -r reference-file(s) [options]" - << std::endl; - std::cout << desc << std::endl; - return 0; - } - - const StaticData &staticData = StaticData::Instance(); - - // create threadpool, if using multi-threaded decoding - // note: multi-threading is done on sentence-level, - // each thread translates one sentence -/*#ifdef WITH_THREADS - if (threadcount < 1) { - cerr << "Error: Need to specify a positive number of threads" << endl; - exit(1); - } - ThreadPool pool(threadcount); -#else - if (threadcount > 1) { - cerr << "Error: Thread count of " << threadcount << " but moses not built with thread support" << endl; - exit(1); + + bool help; + int verbosity; + string mosesConfigFile; + string inputFile; + vector<string> referenceFiles; + vector<string> mosesConfigFilesFolds, inputFilesFolds, referenceFilesFolds; + string coreWeightFile, startWeightFile; + size_t epochs; + string learner; + bool shuffle; + size_t mixingFrequency; + size_t weightDumpFrequency; + string weightDumpStem; + bool scale_margin, scale_margin_precision; + bool scale_update, scale_update_precision; + size_t n; + size_t batchSize; + bool distinctNbest; + bool accumulateWeights; + float historySmoothing; + bool scaleByInputLength, scaleByAvgInputLength; + bool scaleByInverseLength, scaleByAvgInverseLength; + float scaleByX; + float slack; + bool averageWeights; + bool weightConvergence; + float learning_rate; + float mira_learning_rate; + float perceptron_learning_rate; + string decoder_settings; + float min_weight_change; + bool normaliseWeights, normaliseMargin; + bool print_feature_values; + bool historyBleu ; + bool sentenceBleu; + bool perceptron_update; + bool hope_fear, hope_model; + bool model_hope_fear, rank_only; + int hope_n, fear_n, rank_n; + size_t bleu_smoothing_scheme; + float min_oracle_bleu; + float minBleuRatio, maxBleuRatio; + bool boost; + bool decode_hope, decode_fear, decode_model; + string decode_filename; + bool batchEqualsShard; + bool sparseAverage, dumpMixedWeights, sparseNoAverage; + int featureCutoff; + bool pruneZeroWeights; + bool megam; + bool printFeatureCounts, printNbestWithFeatures; + bool avgRefLength; + bool print_weights, print_core_weights, clear_static, debug_model, scale_lm, scale_wp; + float scale_lm_factor, scale_wp_factor; + bool sample; + string moses_src; + bool external_score = false; + bool most_violated; + float sigmoidParam; + float bleuWeight, bleuWeight_hope, bleuWeight_fear; + bool bleu_weight_lm, bleu_weight_lm_adjust; + float bleu_weight_lm_factor; + bool scale_all; + float scale_all_factor; + bool l1_regularize, l2_regularize; + float l1_lambda, l2_lambda; + po::options_description desc("Allowed options"); + desc.add_options() + ("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") + + ("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") + + ("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") + + ("accumulate-weights", po::value<bool>(&accumulateWeights)->default_value(false), "Accumulate and average weights over all epochs") + ("average-weights", po::value<bool>(&averageWeights)->default_value(false), "Set decoder weights to average weights after each update") + ("avg-ref-length", po::value<bool>(&avgRefLength)->default_value(false), "Use average reference length instead of shortest for BLEU score feature") + ("batch-equals-shard", po::value<bool>(&batchEqualsShard)->default_value(false), "Batch size is equal to shard size (purely batch)") + ("batch-size,b", po::value<size_t>(&batchSize)->default_value(1), "Size of batch that is send to optimiser for weight adjustments") + ("bleu-smoothing-scheme", po::value<size_t>(&bleu_smoothing_scheme)->default_value(1), "Set a smoothing scheme for sentence-Bleu: +1 (1), +0.1 (2), papineni (3) (default:1)") + ("boost", po::value<bool>(&boost)->default_value(false), "Apply boosting factor to updates on misranked candidates") + ("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)") + ("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") + ("decode-model", po::value<bool>(&decode_model)->default_value(false), "Decode dev input set according to normal objective") + ("decode-filename", po::value<string>(&decode_filename), "Filename for Bleu objective translations") + ("decoder-settings", po::value<string>(&decoder_settings)->default_value(""), "Decoder settings for tuning runs") + ("distinct-nbest", po::value<bool>(&distinctNbest)->default_value(true), "Use n-best list with distinct translations in inference step") + ("dump-mixed-weights", po::value<bool>(&dumpMixedWeights)->default_value(false), "Dump mixed weights instead of averaged weights") + ("epochs,e", po::value<size_t>(&epochs)->default_value(10), "Number of epochs") + ("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") + ("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") + ("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-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") + ("max-bleu-ratio", po::value<float>(&maxBleuRatio)->default_value(-1), "Set a maximum BLEU ratio between hope and fear") + ("megam", po::value<bool>(&megam)->default_value(false), "Use megam for optimization step") + ("min-oracle-bleu", po::value<float>(&min_oracle_bleu)->default_value(0), "Set a minimum oracle BLEU score") + ("min-weight-change", po::value<float>(&min_weight_change)->default_value(0.01), "Set minimum weight change for stopping criterion") + ("mira-learning-rate", po::value<float>(&mira_learning_rate)->default_value(1), "Learning rate for MIRA (fixed or flexible)") + ("mixing-frequency", po::value<size_t>(&mixingFrequency)->default_value(1), "How often per epoch to mix weights, when using mpi") + ("model-hope-fear", po::value<bool>(&model_hope_fear)->default_value(false), "Use model, hope and fear translations for optimisation") + ("moses-src", po::value<string>(&moses_src)->default_value(""), "Moses source directory") + ("most-violated", po::value<bool>(&most_violated)->default_value(false), "Pick hypotheses according to constraint violation") + ("nbest,n", po::value<size_t>(&n)->default_value(1), "Number of translations in n-best list") + ("normalise-weights", po::value<bool>(&normaliseWeights)->default_value(false), "Whether to normalise the updated weights before passing them to the decoder") + ("normalise-margin", po::value<bool>(&normaliseMargin)->default_value(false), "Normalise the margin: squash between 0 and 1") + ("perceptron-learning-rate", po::value<float>(&perceptron_learning_rate)->default_value(0.01), "Perceptron learning rate") + ("print-feature-values", po::value<bool>(&print_feature_values)->default_value(false), "Print out feature values") + ("print-feature-counts", po::value<bool>(&printFeatureCounts)->default_value(false), "Print out feature values, print feature list with hope counts after 1st epoch") + ("print-nbest-with-features", po::value<bool>(&printNbestWithFeatures)->default_value(false), "Print out feature values, print feature list with hope counts after 1st epoch") + ("print-weights", po::value<bool>(&print_weights)->default_value(false), "Print out current weights") + ("print-core-weights", po::value<bool>(&print_core_weights)->default_value(true), "Print out current core weights") + ("prune-zero-weights", po::value<bool>(&pruneZeroWeights)->default_value(false), "Prune zero-valued sparse feature weights") + ("rank-n", po::value<int>(&rank_n)->default_value(-1), "Number of translations used for ranking") + ("rank-only", po::value<bool>(&rank_only)->default_value(false), "Use only model translations for optimisation") + ("reference-files,r", po::value<vector<string> >(&referenceFiles), "Reference translation files for training") + ("reference-files-folds", po::value<vector<string> >(&referenceFilesFolds), "Reference translation files for training, one for each fold") + ("sample", po::value<bool>(&sample)->default_value(false), "Sample a translation pair from hope/(model)/fear translations") + ("scale-by-inverse-length", po::value<bool>(&scaleByInverseLength)->default_value(false), "Scale BLEU by (history of) inverse input length") + ("scale-by-input-length", po::value<bool>(&scaleByInputLength)->default_value(true), "Scale BLEU by (history of) input length") + ("scale-by-avg-input-length", po::value<bool>(&scaleByAvgInputLength)->default_value(false), "Scale BLEU by average input length") + ("scale-by-avg-inverse-length", po::value<bool>(&scaleByAvgInverseLength)->default_value(false), "Scale BLEU by average inverse input length") + ("scale-by-x", po::value<float>(&scaleByX)->default_value(1), "Scale the BLEU score by value x") + ("scale-lm", po::value<bool>(&scale_lm)->default_value(false), "Scale the language model feature") + ("scale-factor-lm", po::value<float>(&scale_lm_factor)->default_value(2), "Scale the language model feature by this factor") + ("scale-wp", po::value<bool>(&scale_wp)->default_value(false), "Scale the word penalty feature") + ("scale-factor-wp", po::value<float>(&scale_wp_factor)->default_value(2), "Scale the word penalty feature by this factor") + ("scale-margin", po::value<bool>(&scale_margin)->default_value(0), "Scale the margin by the Bleu score of the oracle translation") + ("scale-margin-precision", po::value<bool>(&scale_margin_precision)->default_value(0), "Scale margin by precision of oracle") + ("scale-update", po::value<bool>(&scale_update)->default_value(0), "Scale update by Bleu score of oracle") + ("scale-update-precision", po::value<bool>(&scale_update_precision)->default_value(0), "Scale update by precision of oracle") + ("sentence-level-bleu", po::value<bool>(&sentenceBleu)->default_value(true), "Use a sentences level Bleu scoring function") + ("shuffle", po::value<bool>(&shuffle)->default_value(false), "Shuffle input sentences before processing") + ("sigmoid-param", po::value<float>(&sigmoidParam)->default_value(1), "y=sigmoidParam is the axis that this sigmoid approaches") + ("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") + ("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)") + ("weight-dump-stem", po::value<string>(&weightDumpStem)->default_value("weights"), "Stem of filename to use for dumping weights"); + + po::options_description cmdline_options; + cmdline_options.add(desc); + po::variables_map vm; + po::store(po::command_line_parser(argc, argv). options(cmdline_options).run(), vm); + po::notify(vm); + + if (help) { + std::cout << "Usage: " + string(argv[0]) + + " -f mosesini-file -i input-file -r reference-file(s) [options]" << std::endl; + std::cout << desc << std::endl; + return 0; } -#endif*/ + + const StaticData &staticData = StaticData::Instance(); + + cerr << "scale-all: " << scale_all << endl; + cerr << "scale-all-factor: " << scale_all_factor << endl; + cerr << "bleu weight: " << bleuWeight << endl; + cerr << "bleu weight hope: " << bleuWeight_hope << endl; + cerr << "bleu weight fear: " << bleuWeight_fear << endl;; + cerr << "bleu weight depends on lm: " << bleu_weight_lm << endl; + cerr << "by this factor: " << bleu_weight_lm_factor << endl; + cerr << "adjust dynamically: " << bleu_weight_lm_adjust << endl; + cerr << "l1-reg: " << l1_regularize << endl; + cerr << "l1-lambda: " << l1_lambda << endl; + cerr << "l2-reg: " << l2_regularize << endl; + cerr << "l2-lambda: " << l2_lambda << endl; bool trainWithMultipleFolds = false; if (mosesConfigFilesFolds.size() > 0 || inputFilesFolds.size() > 0 || referenceFilesFolds.size() > 0) { @@ -403,28 +413,28 @@ int main(int argc, char** argv) { // Optionally shuffle the sentences vector<size_t> order; if (trainWithMultipleFolds) { - for (size_t i = 0; i < inputSentencesFolds[myFold].size(); ++i) { - order.push_back(i); - } - - if (shuffle) { - cerr << "Shuffling input sentences.." << endl; - RandomIndex rindex; - random_shuffle(order.begin(), order.end(), rindex); - } + for (size_t i = 0; i < inputSentencesFolds[myFold].size(); ++i) { + order.push_back(i); + } + + /*if (shuffle) { + cerr << "Shuffling input sentences.." << endl; + RandomIndex rindex; + random_shuffle(order.begin(), order.end(), rindex); + }*/ } else { - if (rank == 0) { - for (size_t i = 0; i < inputSentences.size(); ++i) { - order.push_back(i); - } - - if (shuffle) { - cerr << "Shuffling input sentences.." << endl; - RandomIndex rindex; - random_shuffle(order.begin(), order.end(), rindex); - } - } + if (rank == 0) { + for (size_t i = 0; i < inputSentences.size(); ++i) { + order.push_back(i); + } + + /*if (shuffle) { + cerr << "Shuffling input sentences.." << endl; + RandomIndex rindex; + random_shuffle(order.begin(), order.end(), rindex); + }*/ + } } // initialise optimizer @@ -567,11 +577,6 @@ int main(int argc, char** argv) { } decoder->setWeights(initialWeights); - if (dummy == true) { - scale_all = true; - scale_all_factor = 2; - } - if (scale_all) { cerr << "Scale all core features by factor " << scale_all_factor << endl; scale_lm = true; @@ -587,6 +592,7 @@ int main(int argc, char** argv) { for (LMList::const_iterator i = lmList.begin(); i != lmList.end(); ++i) lmSum += abs(initialWeights.GetScoreForProducer(*i)); bleuWeight = lmSum * bleu_weight_lm_factor; + cerr << "Set bleu weight to lm weight * " << bleu_weight_lm_factor << endl; } if (bleuWeight_hope == -1) { @@ -633,6 +639,52 @@ int main(int argc, char** argv) { // int sumStillViolatedConstraints; float epsilon = 0.0001; for (size_t epoch = 0; epoch < epochs && !stop; ++epoch) { + if (shuffle) { + if (trainWithMultipleFolds || rank == 0) { + cerr << "Rank " << rank << ", epoch " << epoch << ", shuffling input sentences.." << endl; + RandomIndex rindex; + random_shuffle(order.begin(), order.end(), rindex); + } + +#ifdef MPI_ENABLE + if (!trainWithMultipleFolds) + mpi::broadcast(world, order, 0); +#endif + + // redo shards + vector<size_t> shard; + if (trainWithMultipleFolds) { + float shardSize = (float) (order.size())/coresPerFold; + size_t shardStart = (size_t) (shardSize * (rank % coresPerFold)); + size_t shardEnd = shardStart + shardSize; + if (rank % coresPerFold == coresPerFold - 1) { // last rank of each fold + shardEnd = order.size(); + shardSize = shardEnd - shardStart; + } + VERBOSE(1, "Rank: " << rank << ", shard size: " << shardSize << endl); + VERBOSE(1, "Rank: " << rank << ", shard start: " << shardStart << " shard end: " << shardEnd << endl); + shard.resize(shardSize); + copy(order.begin() + shardStart, order.begin() + shardEnd, shard.begin()); + batchSize = 1; + } + else { + float shardSize = (float) (order.size()) / size; + size_t shardStart = (size_t) (shardSize * rank); + size_t shardEnd = (size_t) (shardSize * (rank + 1)); + if (rank == size - 1) { + shardEnd = order.size(); + shardSize = shardEnd - shardStart; + } + VERBOSE(1, "Shard size: " << shardSize << endl); + VERBOSE(1, "Rank: " << rank << " Shard start: " << shardStart << " Shard end: " << shardEnd << endl); + shard.resize(shardSize); + copy(order.begin() + shardStart, order.begin() + shardEnd, shard.begin()); + if (batchEqualsShard) + batchSize = shardSize; + } + } + + // sum of violated constraints in an epoch // sumStillViolatedConstraints = 0; @@ -827,6 +879,8 @@ int main(int argc, char** argv) { int oracleSize = (int)oracle.size(); cerr << endl; + //exit(0); + // count sparse features occurring in hope translation featureValuesHope[batchPosition][0].IncrementSparseHopeFeatures(); @@ -1116,10 +1170,10 @@ int main(int argc, char** argv) { examples_in_batch++; if (sample) { - float bleuBest = -1000; - float bleuWorst = 1000; - size_t indexBest = -1; - size_t indexWorst = -1; + float bleuHope = -1000; + float bleuFear = 1000; + size_t indexHope = -1; + size_t indexFear = -1; cerr << "Rank " << rank << ", epoch " << epoch << ", external score? " << external_score << endl; if (external_score) { @@ -1145,104 +1199,155 @@ int main(int argc, char** argv) { 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] - bleuBest) < epsilon) { // equal bleu scores - if (modelScores[batchPosition][i] > modelScores[batchPosition][indexBest]) { - if (abs(modelScores[batchPosition][i] - modelScores[batchPosition][indexBest]) > epsilon) { - bleuBest = bleuScoresNbest[i]; - indexBest = i; + 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] > bleuBest) { // greater than current best - bleuBest = bleuScoresNbest[i]; - indexBest = i; + else if (bleuScoresNbest[i] > bleuHope) { // greater than current best + bleuHope = bleuScoresNbest[i]; + indexHope = i; } - if (abs(bleuScoresNbest[i] - bleuWorst) < epsilon) { // equal bleu scores - if (modelScores[batchPosition][i] > modelScores[batchPosition][indexWorst]) { - if (abs(modelScores[batchPosition][i] - modelScores[batchPosition][indexWorst]) > epsilon) { - bleuWorst = bleuScoresNbest[i]; - indexWorst = 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] < bleuWorst) { // worse than current worst - bleuWorst = bleuScoresNbest[i]; - indexWorst = i; + else if (bleuScoresNbest[i] < bleuFear) { // worse than current worst + bleuFear = bleuScoresNbest[i]; + indexFear = i; } } } else { cerr << "Rank " << rank << ", epoch " << epoch << ", use dynamic score." << endl; - // 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] - bleuBest) < epsilon) { // equal bleu scores - if (modelScores[batchPosition][i] > modelScores[batchPosition][indexBest]) { - if (abs(modelScores[batchPosition][i] - modelScores[batchPosition][indexBest]) > epsilon) { - bleuBest = bleuScores[batchPosition][i]; - indexBest = i; + if (most_violated) { + cerr << "Rank " << rank << ", epoch " << epoch << ", pick pair with most violated constraint" << endl; + // find hypotheses care with most strongly violated constraint + float currentViolation = 0; + float currentBleuDiff, currentModelDiff; + //float minBleuDiff = 0.5; + for (size_t i=0; i<bleuScores[batchPosition].size(); ++i) { + for (size_t j=i+1; j<bleuScores[batchPosition].size(); ++j) { + //if (abs(bleuScores[batchPosition][i] - bleuScores[batchPosition][j]) < minBleuDiff) + // continue; + + size_t iHope, iFear; + if (bleuScores[batchPosition][i] >= bleuScores[batchPosition][j]) { + if (abs(bleuScores[batchPosition][i] - bleuScores[batchPosition][j]) > epsilon) { + // hope/fear + iHope = i; + iFear = j; + } + else + continue; // equal Bleu scores + } + else { + // fear/hope + iFear = i; + iHope = j; + } + + float bleuDiff = bleuScores[batchPosition][iHope] - bleuScores[batchPosition][iFear]; + float modelDiff = modelScores[batchPosition][iHope] - modelScores[batchPosition][iFear]; + if (bleuDiff > modelDiff) { + float diff = bleuDiff - modelDiff; + if (diff > epsilon && diff > currentViolation) { + currentViolation = diff; + currentBleuDiff = bleuDiff; + currentModelDiff = modelDiff; + indexHope = iHope; + indexFear = iFear; + bleuHope = bleuScores[batchPosition][iHope]; + bleuFear = bleuScores[batchPosition][iFear]; + } } } } - else if (bleuScores[batchPosition][i] > bleuBest) { // greater than current best - bleuBest = bleuScores[batchPosition][i]; - indexBest = i; - } - - if (abs(bleuScores[batchPosition][i] - bleuWorst) < epsilon) { // equal bleu scores - if (modelScores[batchPosition][i] > modelScores[batchPosition][indexWorst]) { - if (abs(modelScores[batchPosition][i] - modelScores[batchPosition][indexWorst]) > epsilon) { - bleuWorst = bleuScores[batchPosition][i]; - indexWorst = i; + } + else { + // 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) { // greater 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; + } } - else if (bleuScores[batchPosition][i] < bleuWorst) { // worse than current worst - bleuWorst = bleuScores[batchPosition][i]; - indexWorst = i; - } } } - if ((external_score && (bleuBest*current_input_length <= bleuWorst*current_input_length)) || (bleuBest <= bleuWorst)) { - if (external_score) { - if (abs(bleuBest*current_input_length - bleuWorst*current_input_length) < epsilon) { - cerr << "Rank " << rank << ", epoch " << epoch << ", WARNING: HOPE and FEAR have equal Bleu." << endl; + if (bleuHope == -1000 || bleuFear == 1000) { + cerr << "Rank " << rank << ", epoch " << epoch << ", no appropriate hypotheses found.." << endl; + } + else { + if ((external_score && (bleuHope*current_input_length <= bleuFear*current_input_length)) || (bleuHope <= bleuFear)) { + if (external_score) { + if (abs(bleuHope*current_input_length - bleuFear*current_input_length) < epsilon) { + cerr << "Rank " << rank << ", epoch " << epoch << ", WARNING: HOPE and FEAR have equal Bleu." << endl; + } + else { + cerr << "Rank " << rank << ", epoch " << epoch << ", ERROR: FEAR has better Bleu than HOPE." << endl; + } } else { - cerr << "Rank " << rank << ", epoch " << epoch << ", ERROR: FEAR has better Bleu than HOPE." << endl; + 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 (abs(bleuBest - bleuWorst) < epsilon) { - cerr << "\nRank " << rank << ", epoch " << epoch << ", WARNING: HOPE and FEAR have equal Bleu." << endl; + 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); + 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 << "\nRank " << rank << ", epoch " << epoch << ", ERROR: FEAR has better Bleu than HOPE." << endl; + bleuScoresHopeSample[batchPosition].push_back(bleuHope); + bleuScoresFearSample[batchPosition].push_back(bleuFear); + cerr << "\nRank " << rank << ", epoch " << epoch << ", Best: " << bleuHope << " (" << indexHope << ")" << endl; + cerr << "Rank " << rank << ", epoch " << epoch << ", Worst: " << bleuFear << " (" << indexFear << ")" << endl; } - } + + 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]); + } } - else { - if (external_score) { - // use actual sentence bleu (not dynamically computed) - bleuScoresHopeSample[batchPosition].push_back(bleuBest*current_input_length); - bleuScoresFearSample[batchPosition].push_back(bleuWorst*current_input_length); - cerr << "Rank " << rank << ", epoch " << epoch << ", Best: " << bleuBest*current_input_length << " (" << indexBest << ")" << endl; - cerr << "Rank " << rank << ", epoch " << epoch << ", Worst: " << bleuWorst*current_input_length << " (" << indexWorst << ")" << endl; - } - else { - bleuScoresHopeSample[batchPosition].push_back(bleuBest); - bleuScoresFearSample[batchPosition].push_back(bleuWorst); - cerr << "\nRank " << rank << ", epoch " << epoch << ", Best: " << bleuBest << " (" << indexBest << ")" << endl; - cerr << "Rank " << rank << ", epoch " << epoch << ", Worst: " << bleuWorst << " (" << indexWorst << ")" << endl; - } - - featureValuesHopeSample[batchPosition].push_back(featureValues[batchPosition][indexBest]); - featureValuesFearSample[batchPosition].push_back(featureValues[batchPosition][indexWorst]); - modelScoresHopeSample[batchPosition].push_back(modelScores[batchPosition][indexBest]); - modelScoresFearSample[batchPosition].push_back(modelScores[batchPosition][indexWorst]); - } } } @@ -1595,8 +1700,14 @@ int main(int argc, char** argv) { cerr << "Rank " << rank << ", epoch " << epoch << ", applying update.." << endl; cerr << "Rank " << rank << ", epoch " << epoch << ", update: " << weightUpdate << endl; mosesWeights.PlusEquals(weightUpdate); + if (l2_regularize) { + mixedWeights.L2Regularize(l2_lambda); + cerr << "Rank " << rank << ", epoch " << epoch << ", " + << "l2-reg. on mixedWeights with lambda=" << l2_lambda << endl; + } + if (normaliseWeights) - mosesWeights.L1Normalise(); + mosesWeights.L1Normalise(); cumulativeWeights.PlusEquals(mosesWeights); if (sparseAverage) { @@ -1680,24 +1791,35 @@ int main(int argc, char** argv) { ++weightMixingThisEpoch; if (pruneZeroWeights) { - size_t pruned = mixedWeights.PruneZeroWeightFeatures(); - cerr << "Rank " << rank << ", epoch " << epoch << ", " - << pruned << " zero-weighted features pruned from mixedWeights." << endl; - - pruned = cumulativeWeights.PruneZeroWeightFeatures(); - cerr << "Rank " << rank << ", epoch " << epoch << ", " - << pruned << " zero-weighted features pruned from cumulativeWeights." << endl; + size_t pruned = mixedWeights.PruneZeroWeightFeatures(); + cerr << "Rank " << rank << ", epoch " << epoch << ", " + << pruned << " zero-weighted features pruned from mixedWeights." << endl; + + pruned = cumulativeWeights.PruneZeroWeightFeatures(); + cerr << "Rank " << rank << ", epoch " << epoch << ", " + << pruned << " zero-weighted features pruned from cumulativeWeights." << endl; } if (featureCutoff != -1 && weightMixingThisEpoch == mixingFrequency) { - size_t pruned = mixedWeights.PruneSparseFeatures(featureCutoff); - cerr << "Rank " << rank << ", epoch " << epoch << ", " - << pruned << " features pruned from mixedWeights." << endl; + size_t pruned = mixedWeights.PruneSparseFeatures(featureCutoff); + cerr << "Rank " << rank << ", epoch " << epoch << ", " + << pruned << " features pruned from mixedWeights." << endl; - pruned = cumulativeWeights.PruneSparseFeatures(featureCutoff); - cerr << "Rank " << rank << ", epoch " << epoch << ", " - << pruned << " features pruned from cumulativeWeights." << endl; + pruned = cumulativeWeights.PruneSparseFeatures(featureCutoff); + cerr << "Rank " << rank << ", epoch " << epoch << ", " + << 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; + } } // broadcast average weights from process 0 @@ -1753,13 +1875,13 @@ int main(int argc, char** argv) { if (proceed) { #ifdef MPI_ENABLE // average across processes - mpi::reduce(world, tmpAverageWeights, mixedAverageWeights, SCCPlus(), 0); - ScoreComponentCollection totalBinary; - if (sparseAverage) { - ScoreComponentCollection binary; - binary.SetToBinaryOf(mosesWeights); - mpi::reduce(world, binary, totalBinary, SCCPlus(), 0); - } + mpi::reduce(world, tmpAverageWeights, mixedAverageWeights, SCCPlus(), 0); + ScoreComponentCollection totalBinary; + if (sparseAverage) { + ScoreComponentCollection binary; + binary.SetToBinaryOf(mosesWeights); + mpi::reduce(world, binary, totalBinary, SCCPlus(), 0); + } #endif #ifndef MPI_ENABLE mixedAverageWeights = tmpAverageWeights; diff --git a/mira/Main.h b/mira/Main.h index 95a5374a5..95a5374a5 100644..100755 --- a/mira/Main.h +++ b/mira/Main.h diff --git a/mira/Makefile.am b/mira/Makefile.am index cd490c853..cd490c853 100644..100755 --- a/mira/Makefile.am +++ b/mira/Makefile.am diff --git a/mira/MiraOptimiser.cpp b/mira/MiraOptimiser.cpp index 6f30c8fd7..6f30c8fd7 100644..100755 --- a/mira/MiraOptimiser.cpp +++ b/mira/MiraOptimiser.cpp diff --git a/mira/MiraTest.cpp b/mira/MiraTest.cpp index 774b324f8..774b324f8 100644..100755 --- a/mira/MiraTest.cpp +++ b/mira/MiraTest.cpp diff --git a/mira/Optimiser.h b/mira/Optimiser.h index 8ad38bd5a..8ad38bd5a 100644..100755 --- a/mira/Optimiser.h +++ b/mira/Optimiser.h diff --git a/mira/Perceptron.cpp b/mira/Perceptron.cpp index 409d2ba34..409d2ba34 100644..100755 --- a/mira/Perceptron.cpp +++ b/mira/Perceptron.cpp diff --git a/mira/expt.cfg b/mira/expt.cfg index 416eb1d3f..416eb1d3f 100644..100755 --- 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 100644..100755 --- a/mira/mira.xcodeproj/project.pbxproj +++ b/mira/mira.xcodeproj/project.pbxproj diff --git a/misc/GenerateTuples.cpp b/misc/GenerateTuples.cpp index 58e9697fd..58e9697fd 100644..100755 --- a/misc/GenerateTuples.cpp +++ b/misc/GenerateTuples.cpp diff --git a/misc/GenerateTuples.h b/misc/GenerateTuples.h index 728f28823..728f28823 100644..100755 --- a/misc/GenerateTuples.h +++ b/misc/GenerateTuples.h diff --git a/misc/Jamfile b/misc/Jamfile index e8a133367..e8a133367 100644..100755 --- a/misc/Jamfile +++ b/misc/Jamfile diff --git a/misc/misc.xcodeproj/project.pbxproj b/misc/misc.xcodeproj/project.pbxproj index 0b52b8170..0b52b8170 100644..100755 --- 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 100644..100755 --- a/misc/pmoses/AUTHORS +++ b/misc/pmoses/AUTHORS diff --git a/misc/pmoses/ChangeLog b/misc/pmoses/ChangeLog index e69de29bb..e69de29bb 100644..100755 --- a/misc/pmoses/ChangeLog +++ b/misc/pmoses/ChangeLog diff --git a/misc/pmoses/Makefile.am b/misc/pmoses/Makefile.am index 2d9810f28..2d9810f28 100644..100755 --- a/misc/pmoses/Makefile.am +++ b/misc/pmoses/Makefile.am diff --git a/misc/pmoses/NEWS b/misc/pmoses/NEWS index e69de29bb..e69de29bb 100644..100755 --- a/misc/pmoses/NEWS +++ b/misc/pmoses/NEWS diff --git a/misc/pmoses/README b/misc/pmoses/README index 31a2e6e4f..31a2e6e4f 100644..100755 --- a/misc/pmoses/README +++ b/misc/pmoses/README diff --git a/misc/pmoses/configure.ac b/misc/pmoses/configure.ac index 63b465a8b..63b465a8b 100644..100755 --- 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 100644..100755 --- a/misc/pmoses/pmoses.cc +++ b/misc/pmoses/pmoses.cc diff --git a/misc/processLexicalTable.cpp b/misc/processLexicalTable.cpp index a81c65965..a81c65965 100644..100755 --- a/misc/processLexicalTable.cpp +++ b/misc/processLexicalTable.cpp diff --git a/misc/processLexicalTable.vcxproj b/misc/processLexicalTable.vcxproj index cb32fb1c4..cb32fb1c4 100644..100755 --- a/misc/processLexicalTable.vcxproj +++ b/misc/processLexicalTable.vcxproj diff --git a/misc/processPhraseTable.cpp b/misc/processPhraseTable.cpp index 7eca79349..7eca79349 100644..100755 --- a/misc/processPhraseTable.cpp +++ b/misc/processPhraseTable.cpp diff --git a/misc/processPhraseTable.vcxproj b/misc/processPhraseTable.vcxproj index 692eff058..692eff058 100644..100755 --- a/misc/processPhraseTable.vcxproj +++ b/misc/processPhraseTable.vcxproj diff --git a/misc/queryLexicalTable.cpp b/misc/queryLexicalTable.cpp index 166549267..166549267 100644..100755 --- a/misc/queryLexicalTable.cpp +++ b/misc/queryLexicalTable.cpp diff --git a/misc/queryPhraseTable.cpp b/misc/queryPhraseTable.cpp index 109c7e69e..109c7e69e 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/moses/src/BitmapContainer.h +++ b/moses/src/BitmapContainer.h diff --git a/moses/src/BleuScoreFeature.cpp b/moses/src/BleuScoreFeature.cpp index 64aa1c141..f1c888e70 100644..100755 --- a/moses/src/BleuScoreFeature.cpp +++ b/moses/src/BleuScoreFeature.cpp @@ -24,10 +24,10 @@ int BleuScoreState::Compare(const FFState& o) const const BleuScoreState& other = dynamic_cast<const BleuScoreState&>(o); - if (m_target_length < other.m_target_length) + /*if (m_target_length < other.m_target_length) return -1; if (m_target_length > other.m_target_length) - return 1; + return 1;*/ int c = m_words.Compare(other.m_words); @@ -35,14 +35,14 @@ int BleuScoreState::Compare(const FFState& o) const 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; + 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; } diff --git a/moses/src/BleuScoreFeature.h b/moses/src/BleuScoreFeature.h index f7d9e3e63..f7d9e3e63 100644..100755 --- a/moses/src/BleuScoreFeature.h +++ b/moses/src/BleuScoreFeature.h diff --git a/moses/src/CellCollection.h b/moses/src/CellCollection.h index 5b99fe0fe..5b99fe0fe 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/moses/src/ChartHypothesisCollection.h +++ b/moses/src/ChartHypothesisCollection.h diff --git a/moses/src/ChartManager.cpp b/moses/src/ChartManager.cpp index b2ed3a435..b2ed3a435 100644..100755 --- a/moses/src/ChartManager.cpp +++ b/moses/src/ChartManager.cpp diff --git a/moses/src/ChartManager.h b/moses/src/ChartManager.h index dbcd42b6c..dbcd42b6c 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/moses/src/ChartRuleLookupManagerMemory.h +++ b/moses/src/ChartRuleLookupManagerMemory.h diff --git a/moses/src/ChartRuleLookupManagerOnDisk.cpp b/moses/src/ChartRuleLookupManagerOnDisk.cpp index 17e57f73c..17e57f73c 100644..100755 --- a/moses/src/ChartRuleLookupManagerOnDisk.cpp +++ b/moses/src/ChartRuleLookupManagerOnDisk.cpp diff --git a/moses/src/ChartRuleLookupManagerOnDisk.h b/moses/src/ChartRuleLookupManagerOnDisk.h index ba87dbbf8..ba87dbbf8 100644..100755 --- a/moses/src/ChartRuleLookupManagerOnDisk.h +++ b/moses/src/ChartRuleLookupManagerOnDisk.h diff --git a/moses/src/ChartTranslationOption.cpp b/moses/src/ChartTranslationOption.cpp index 6aa04d189..6aa04d189 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/moses/src/FeatureFunction.h +++ b/moses/src/FeatureFunction.h diff --git a/moses/src/FeatureVector.cpp b/moses/src/FeatureVector.cpp index 8fa7e1f70..f53b7e80a 100644..100755 --- a/moses/src/FeatureVector.cpp +++ b/moses/src/FeatureVector.cpp @@ -540,6 +540,24 @@ namespace Moses { return norm; } + void FVector::l1regularize(float lambda) { + 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); + } + } + } + + void FVector::l2regularize(float lambda) { + for (iterator i = begin(); i != end(); ++i) { + i->second *= (1 - lambda); + } + } + FValue FVector::sum() const { FValue sum = 0; for (const_iterator i = cbegin(); i != cend(); ++i) { diff --git a/moses/src/FeatureVector.h b/moses/src/FeatureVector.h index fa6ca2301..a291cafbb 100644..100755 --- a/moses/src/FeatureVector.h +++ b/moses/src/FeatureVector.h @@ -189,6 +189,8 @@ namespace Moses { FValue l1norm_coreFeatures() const; FValue l2norm() const; FValue linfnorm() const; + void l1regularize(float lambda); + void l2regularize(float lambda); FValue sum() const; /** pretty printing */ diff --git a/moses/src/FeatureVectorTest.cpp b/moses/src/FeatureVectorTest.cpp index af1829e62..af1829e62 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/moses/src/GlobalLexicalModelUnlimited.h +++ b/moses/src/GlobalLexicalModelUnlimited.h diff --git a/moses/src/Hypothesis.cpp b/moses/src/Hypothesis.cpp index dd324f162..72105ec7b 100644..100755 --- a/moses/src/Hypothesis.cpp +++ b/moses/src/Hypothesis.cpp @@ -247,14 +247,6 @@ int Hypothesis::RecombineCompare(const Hypothesis &compare) const } if (comp != 0) return comp; } - - string hypo1 = GetOutputString(); - string hypo2 = compare.GetOutputString(); - if (hypo1.compare(hypo2) != 0) { - cerr << "Recombining hypotheses.. " << endl; - cerr << "1: " << hypo1 << endl; - cerr << "2: " << hypo2 << endl; - } return 0; } diff --git a/moses/src/Hypothesis.h b/moses/src/Hypothesis.h index 23980326e..23980326e 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/moses/src/InputType.h +++ b/moses/src/InputType.h diff --git a/moses/src/Jamfile b/moses/src/Jamfile index b6e379070..b6e379070 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/moses/src/PCNTools.h +++ b/moses/src/PCNTools.h diff --git a/moses/src/PDTAimp.h b/moses/src/PDTAimp.h index 7bff39c07..7bff39c07 100644..100755 --- a/moses/src/PDTAimp.h +++ b/moses/src/PDTAimp.h diff --git a/moses/src/Parameter.cpp b/moses/src/Parameter.cpp index 0815f6f2d..0815f6f2d 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/moses/src/PhraseBoundaryFeature.h +++ b/moses/src/PhraseBoundaryFeature.h diff --git a/moses/src/PhraseDictionary.cpp b/moses/src/PhraseDictionary.cpp index 0fc39a286..0fc39a286 100644..100755 --- a/moses/src/PhraseDictionary.cpp +++ b/moses/src/PhraseDictionary.cpp diff --git a/moses/src/PhraseDictionary.h b/moses/src/PhraseDictionary.h index e8f478079..e8f478079 100644..100755 --- a/moses/src/PhraseDictionary.h +++ b/moses/src/PhraseDictionary.h diff --git a/moses/src/PhraseDictionaryALSuffixArray.cpp b/moses/src/PhraseDictionaryALSuffixArray.cpp index 71b810a91..71b810a91 100644..100755 --- a/moses/src/PhraseDictionaryALSuffixArray.cpp +++ b/moses/src/PhraseDictionaryALSuffixArray.cpp diff --git a/moses/src/PhraseDictionaryALSuffixArray.h b/moses/src/PhraseDictionaryALSuffixArray.h index 79c928c69..79c928c69 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/moses/src/PhraseDictionaryNodeSCFG.h +++ b/moses/src/PhraseDictionaryNodeSCFG.h diff --git a/moses/src/PhraseDictionaryOnDisk.cpp b/moses/src/PhraseDictionaryOnDisk.cpp index 3c89408f5..3c89408f5 100644..100755 --- a/moses/src/PhraseDictionaryOnDisk.cpp +++ b/moses/src/PhraseDictionaryOnDisk.cpp diff --git a/moses/src/PhraseDictionaryOnDisk.h b/moses/src/PhraseDictionaryOnDisk.h index 0a8dfc808..0a8dfc808 100644..100755 --- a/moses/src/PhraseDictionaryOnDisk.h +++ b/moses/src/PhraseDictionaryOnDisk.h diff --git a/moses/src/PhraseDictionarySCFG.cpp b/moses/src/PhraseDictionarySCFG.cpp index c3a243990..c3a243990 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/moses/src/PhraseDictionaryTree.h +++ b/moses/src/PhraseDictionaryTree.h diff --git a/moses/src/PhraseDictionaryTreeAdaptor.cpp b/moses/src/PhraseDictionaryTreeAdaptor.cpp index cce4a2ee4..cce4a2ee4 100644..100755 --- a/moses/src/PhraseDictionaryTreeAdaptor.cpp +++ b/moses/src/PhraseDictionaryTreeAdaptor.cpp diff --git a/moses/src/PhraseDictionaryTreeAdaptor.h b/moses/src/PhraseDictionaryTreeAdaptor.h index c38e234fb..c38e234fb 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/moses/src/RuleTableLoaderStandard.h +++ b/moses/src/RuleTableLoaderStandard.h diff --git a/moses/src/ScoreComponentCollection.cpp b/moses/src/ScoreComponentCollection.cpp index d52b80f35..3d0f71bc9 100644..100755 --- a/moses/src/ScoreComponentCollection.cpp +++ b/moses/src/ScoreComponentCollection.cpp @@ -127,6 +127,14 @@ float ScoreComponentCollection::GetLInfNorm() const { return m_scores.linfnorm(); } +void ScoreComponentCollection::L1Regularize(float lambda) { + m_scores.l1regularize(lambda); +} + +void ScoreComponentCollection::L2Regularize(float lambda) { + m_scores.l2regularize(lambda); +} + void ScoreComponentCollection::Save(ostream& out) const { ScoreIndexMap::const_iterator iter = s_scoreIndexes.begin(); for (; iter != s_scoreIndexes.end(); ++iter ) { diff --git a/moses/src/ScoreComponentCollection.h b/moses/src/ScoreComponentCollection.h index d53eee247..994aad1b6 100644..100755 --- a/moses/src/ScoreComponentCollection.h +++ b/moses/src/ScoreComponentCollection.h @@ -365,6 +365,8 @@ public: float GetL1Norm() const; float GetL2Norm() const; float GetLInfNorm() const; + void L1Regularize(float lambda); + void L2Regularize(float lambda); void Save(const std::string& filename) const; void Save(std::ostream&) const; diff --git a/moses/src/ScoreComponentCollectionTest.cpp b/moses/src/ScoreComponentCollectionTest.cpp index 10e96a017..10e96a017 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/moses/src/SearchNormal.h +++ b/moses/src/SearchNormal.h diff --git a/moses/src/Sentence.cpp b/moses/src/Sentence.cpp index 87ede7c7a..210e5ccb5 100644..100755 --- a/moses/src/Sentence.cpp +++ b/moses/src/Sentence.cpp @@ -142,7 +142,8 @@ int Sentence::Read(std::istream& in,const std::vector<FactorType>& factorOrder) // set reordering walls, if "-monotone-at-punction" is set if (staticData.UseReorderingConstraint()) { - m_reorderingConstraint.SetMonotoneAtPunctuation( GetSubString( WordsRange(0,GetSize()-1 ) ) ); + if (GetSize() > 0) + m_reorderingConstraint.SetMonotoneAtPunctuation( GetSubString( WordsRange(0,GetSize()-1 ) ) ); } // set walls obtained from xml diff --git a/moses/src/Sentence.h b/moses/src/Sentence.h index b1c25f9dd..b1c25f9dd 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/moses/src/SquareMatrix.h +++ b/moses/src/SquareMatrix.h diff --git a/moses/src/StaticData.cpp b/moses/src/StaticData.cpp index 9c02e48e6..9c02e48e6 100644..100755 --- a/moses/src/StaticData.cpp +++ b/moses/src/StaticData.cpp diff --git a/moses/src/StaticData.h b/moses/src/StaticData.h index cd0b69f4d..cd0b69f4d 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/moses/src/TargetNgramFeature.h +++ b/moses/src/TargetNgramFeature.h diff --git a/moses/src/TargetPhrase.cpp b/moses/src/TargetPhrase.cpp index c79b844f8..c79b844f8 100644..100755 --- a/moses/src/TargetPhrase.cpp +++ b/moses/src/TargetPhrase.cpp diff --git a/moses/src/TargetPhrase.h b/moses/src/TargetPhrase.h index 377985c5e..377985c5e 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/moses/src/TranslationOptionList.h +++ b/moses/src/TranslationOptionList.h diff --git a/moses/src/TranslationSystem.cpp b/moses/src/TranslationSystem.cpp index 2086949fd..722ea864e 100644..100755 --- a/moses/src/TranslationSystem.cpp +++ b/moses/src/TranslationSystem.cpp @@ -162,7 +162,7 @@ namespace Moses { float TranslationSystem::GetWeightWordPenalty() const { float weightWP = StaticData::Instance().GetWeight(m_wpProducer); - VERBOSE(1, "Read weightWP from translation sytem: " << weightWP << std::endl); + //VERBOSE(1, "Read weightWP from translation sytem: " << weightWP << std::endl); return weightWP; } @@ -177,10 +177,10 @@ namespace Moses { std::vector<float> TranslationSystem::GetTranslationWeights() const { std::vector<float> weights = StaticData::Instance().GetWeights(GetTranslationScoreProducer()); - VERBOSE(1, "Read weightT from translation sytem.. "); + //VERBOSE(1, "Read weightT from translation sytem.. "); for (size_t i = 0; i < weights.size(); ++i) - VERBOSE(1, weights[i] << " "); - VERBOSE(1, std::endl); + //VERBOSE(1, weights[i] << " "); + //VERBOSE(1, std::endl); return weights; } }; diff --git a/moses/src/TranslationSystem.h b/moses/src/TranslationSystem.h index 615fc7d8a..615fc7d8a 100644..100755 --- a/moses/src/TranslationSystem.h +++ b/moses/src/TranslationSystem.h diff --git a/moses/src/TreeInput.cpp b/moses/src/TreeInput.cpp index d6e0f1e78..d6e0f1e78 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/moses/src/rule.proto +++ b/moses/src/rule.proto diff --git a/regression-testing/Jamfile b/regression-testing/Jamfile index 0c00b516e..0c00b516e 100644..100755 --- a/regression-testing/Jamfile +++ b/regression-testing/Jamfile diff --git a/regression-testing/MosesRegressionTesting.pm b/regression-testing/MosesRegressionTesting.pm index 9eb94a838..9eb94a838 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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/data/FEATSTAT.bin b/regression-testing/tests/mert.basic/data/FEATSTAT.bin Binary files differindex 1770bd0f6..1770bd0f6 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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/truth/results.txt b/regression-testing/tests/mert.basic/truth/results.txt index e3f76c8d0..e3f76c8d0 100644..100755 --- 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/data/nbest.1.gz b/regression-testing/tests/mert.extractor-bin/data/nbest.1.gz Binary files differindex 4e105c27d..4e105c27d 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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/truth/results.txt b/regression-testing/tests/mert.extractor-bin/truth/results.txt index 20b521ad4..20b521ad4 100644..100755 --- 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/data/nbest.1.gz b/regression-testing/tests/mert.extractor-txt/data/nbest.1.gz Binary files differindex 4e105c27d..4e105c27d 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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/truth/results.txt b/regression-testing/tests/mert.extractor-txt/truth/results.txt index 0528e9df9..0528e9df9 100644..100755 --- 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/data/FEATSTAT.bin b/regression-testing/tests/mert.pro/data/FEATSTAT.bin Binary files differindex 1770bd0f6..1770bd0f6 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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/stdout b/regression-testing/tests/mert.pro/stdout index c71cf6fa5..c71cf6fa5 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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/moses.ini b/regression-testing/tests/phrase.lattice-distortion/moses.ini index 80d4c4695..80d4c4695 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/scripts/Jamfile +++ b/scripts/Jamfile diff --git a/scripts/README b/scripts/README index 35dac9dd0..35dac9dd0 100644..100755 --- a/scripts/README +++ b/scripts/README diff --git a/scripts/analysis/README b/scripts/analysis/README index 137b5af87..137b5af87 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/scripts/analysis/smtgui/file-factors +++ b/scripts/analysis/smtgui/file-factors diff --git a/scripts/analysis/smtgui/filter-phrase-table.pl b/scripts/analysis/smtgui/filter-phrase-table.pl index db51da63d..db51da63d 100644..100755 --- a/scripts/analysis/smtgui/filter-phrase-table.pl +++ b/scripts/analysis/smtgui/filter-phrase-table.pl diff --git a/scripts/ems/biconcor/Alignment.cpp b/scripts/ems/biconcor/Alignment.cpp index 979037ee6..979037ee6 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/scripts/ems/experiment.machines +++ b/scripts/ems/experiment.machines diff --git a/scripts/ems/experiment.meta b/scripts/ems/experiment.meta index c2b9da556..941d42fa7 100644..100755 --- a/scripts/ems/experiment.meta +++ b/scripts/ems/experiment.meta @@ -438,6 +438,12 @@ input-from-sgm out: raw-input default-name: tuning/input.txt template: $moses-script-dir/ems/support/input-from-sgm.perl < IN > OUT +input-devtest-from-sgm + in: input-devtest-sgm + out: raw-input-devtest + default-name: tuning/input.devtest.txt + ignore-unless: use-mira + template: $moses-script-dir/ems/support/input-from-sgm.perl < IN > OUT tokenize-input in: raw-input out: tokenized-input @@ -496,14 +502,14 @@ factorize-input-devtest error: incompatible number of words in factor lowercase-input in: factorized-input - out: cased-input + out: truecased-input default-name: tuning/input.lc pass-unless: input-lowercaser ignore-if: input-truecaser template: $input-lowercaser < IN > OUT lowercase-input-devtest in: factorized-input-devtest - out: cased-input-devtest + out: truecased-input-devtest default-name: tuning/input.devtest.lc pass-unless: input-lowercaser ignore-unless: use-mira @@ -511,28 +517,27 @@ lowercase-input-devtest template: $input-lowercaser < IN > OUT truecase-input in: factorized-input TRUECASER:truecase-model - out: cased-input + out: truecased-input rerun-on-change: input-truecaser default-name: tuning/input.tc ignore-unless: input-truecaser template: $input-truecaser -model IN1.$input-extension < IN > OUT truecase-input-devtest in: factorized-input-devtest TRUECASER:truecase-model - out: cased-input-devtest + out: truecased-input-devtest rerun-on-change: input-truecaser default-name: tuning/input.devtest.tc - ignore-unless: input-truecaser - ignore-unless: use-mira + ignore-unless: AND input-truecaser use-mira template: $input-truecaser -model IN1.$input-extension < IN > OUT split-input - in: cased-input SPLITTER:splitter-model + in: truecased-input SPLITTER:splitter-model out: input rerun-on-change: input-splitter default-name: tuning/input.split pass-unless: input-splitter template: $input-splitter -model IN1.$input-extension $input-extension < IN > OUT split-input-devtest - in: cased-input-devtest SPLITTER:splitter-model + in: truecased-input-devtest SPLITTER:splitter-model out: input-devtest rerun-on-change: input-splitter default-name: tuning/input.devtest.split @@ -544,6 +549,12 @@ reference-from-sgm out: raw-reference default-name: tuning/reference.txt template: $moses-script-dir/ems/support/reference-from-sgm.perl IN IN1 OUT +reference-devtest-from-sgm + in: reference-devtest-sgm input-devtest-sgm + out: raw-reference-devtest + default-name: tuning/reference.devtest.txt + ignore-unless: use-mira + template: $moses-script-dir/ems/support/reference-from-sgm.perl IN IN1 OUT tokenize-reference in: raw-reference out: tokenized-reference @@ -561,7 +572,7 @@ tokenize-reference-devtest template: $output-tokenizer < IN > OUT lowercase-reference in: tokenized-reference - out: cased-reference + out: truecased-reference default-name: tuning/reference.lc pass-unless: output-lowercaser ignore-if: output-truecaser @@ -569,7 +580,7 @@ lowercase-reference template: $output-lowercaser < IN > OUT lowercase-reference-devtest in: tokenized-reference-devtest - out: cased-reference-devtest + out: truecased-reference-devtest default-name: tuning/reference.devtest.lc pass-unless: output-lowercaser ignore-if: output-truecaser @@ -578,7 +589,7 @@ lowercase-reference-devtest template: $output-lowercaser < IN > OUT truecase-reference in: tokenized-reference TRUECASER:truecase-model - out: cased-reference + out: truecased-reference rerun-on-change: output-truecaser default-name: tuning/reference.tc ignore-unless: output-truecaser @@ -586,22 +597,21 @@ truecase-reference template: $output-truecaser -model IN1.$output-extension < IN > OUT truecase-reference-devtest in: tokenized-reference-devtest TRUECASER:truecase-model - out: cased-reference-devtest + out: truecased-reference-devtest rerun-on-change: output-truecaser default-name: tuning/reference.devtest.tc - ignore-unless: output-truecaser - ignore-unless: use-mira + ignore-unless: AND output-truecaser use-mira multiref: $moses-script-dir/ems/support/run-command-on-multiple-refsets.perl template: $output-truecaser -model IN1.$output-extension < IN > OUT split-reference - in: cased-reference SPLITTER:splitter-model + in: truecased-reference SPLITTER:splitter-model out: reference default-name: tuning/reference.split pass-unless: output-splitter multiref: $moses-script-dir/ems/support/run-command-on-multiple-refsets.perl template: $output-splitter -model IN1.$output-extension < IN > OUT split-reference-devtest - in: cased-reference-devtest SPLITTER:splitter-model + in: truecased-reference-devtest SPLITTER:splitter-model out: reference-devtest default-name: tuning/reference.devtest.split pass-unless: output-splitter @@ -692,20 +702,20 @@ factorize-input error: incompatible number of words in factor lowercase-input in: factorized-input - out: cased-input + out: truecased-input default-name: evaluation/input.lc pass-unless: input-lowercaser ignore-if: input-truecaser template: $input-lowercaser < IN > OUT truecase-input in: factorized-input TRUECASER:truecase-model - out: cased-input + out: truecased-input default-name: evaluation/input.tc rerun-on-change: input-truecaser ignore-unless: input-truecaser template: $input-truecaser -model IN1.$input-extension < IN > OUT split-input - in: cased-input SPLITTER:splitter-model + in: truecased-input SPLITTER:splitter-model out: input default-name: evaluation/input.split pass-unless: input-splitter diff --git a/scripts/ems/experiment.perl b/scripts/ems/experiment.perl index 8812fab21..60b6142b0 100755 --- a/scripts/ems/experiment.perl +++ b/scripts/ems/experiment.perl @@ -1616,16 +1616,20 @@ sub write_mira_config { 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"; - if ($core_weights) { - open(INI, $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, ">$core_file"); + 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; @@ -1634,9 +1638,9 @@ sub write_mira_config { push(@lm_weights, $_); } - print CORE "LM ".$lm_weights[0]; + print CORE_OR_START "LM ".$lm_weights[0]; for my $i (1 .. $#lm_weights) { - print CORE "LM:".($i+1)." ".$lm_weights[$i]; + print CORE_OR_START "LM:".($i+1)." ".$lm_weights[$i]; } } elsif (/weight-t/) { @@ -1646,7 +1650,7 @@ sub write_mira_config { push(@pm_weights, $_); } for my $i (0 .. $#pm_weights) { - print CORE "PhraseModel_".($i+1)." ".$pm_weights[$i]; + print CORE_OR_START "PhraseModel_".($i+1)." ".$pm_weights[$i]; } } elsif (/weight-d/) { my @d_weights; @@ -1656,20 +1660,20 @@ sub write_mira_config { } for my $i (0 .. $#d_weights) { if ($i == 0) { - print CORE "Distortion ".$d_weights[0]; + print CORE_OR_START "Distortion ".$d_weights[0]; } else { - print CORE "LexicalReordering_wbe-msd-bidirectional-fe-allff_".($i+1)." ".$d_weights[$i]; + print CORE_OR_START "LexicalReordering_wbe-msd-bidirectional-fe-allff_".($i+1)." ".$d_weights[$i]; } } } elsif (/weight-w/) { my $w = <INI>; - print CORE "WordPenalty ".$w; + print CORE_OR_START "WordPenalty ".$w; } } close INI; - close CORE; + close CORE_OR_START; } # mira config file @@ -1687,6 +1691,10 @@ sub write_mira_config { 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"; diff --git a/scripts/ems/web/analysis.php b/scripts/ems/web/analysis.php index 489bdc50d..489bdc50d 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/scripts/generic/fsa-sample.fsa +++ b/scripts/generic/fsa-sample.fsa diff --git a/scripts/generic/fsa2plf.pl b/scripts/generic/fsa2plf.pl index debf8b60d..debf8b60d 100644..100755 --- a/scripts/generic/fsa2plf.pl +++ b/scripts/generic/fsa2plf.pl diff --git a/scripts/regression-testing/MosesScriptsRegressionTesting.pm b/scripts/regression-testing/MosesScriptsRegressionTesting.pm index 6f78961e5..6f78961e5 100644..100755 --- a/scripts/regression-testing/MosesScriptsRegressionTesting.pm +++ b/scripts/regression-testing/MosesScriptsRegressionTesting.pm diff --git a/scripts/regression-testing/create_localized_moses_ini.pl b/scripts/regression-testing/create_localized_moses_ini.pl index b102a4ed4..b102a4ed4 100644..100755 --- a/scripts/regression-testing/create_localized_moses_ini.pl +++ b/scripts/regression-testing/create_localized_moses_ini.pl 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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/tests/mert-moses-new-aggregate/data/archive.list b/scripts/regression-testing/tests/mert-moses-new-aggregate/data/archive.list index 4ec64e892..4ec64e892 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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/input b/scripts/regression-testing/tests/mert-moses-new-aggregate/input index 30358cea1..30358cea1 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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/data/actual.index b/scripts/regression-testing/tests/mert-moses-new-continue/data/actual.index index 7ed6ff82d..7ed6ff82d 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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/input b/scripts/regression-testing/tests/mert-moses-new-continue/input index 30358cea1..30358cea1 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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/data/archive.list b/scripts/regression-testing/tests/mert-moses-new-nocase/data/archive.list index 34e331a91..34e331a91 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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/input b/scripts/regression-testing/tests/mert-moses-new-nocase/input index 30358cea1..30358cea1 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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/data/archive.list b/scripts/regression-testing/tests/mert-moses-new/data/archive.list index 7208e537c..7208e537c 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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/input b/scripts/regression-testing/tests/mert-moses-new/input index 30358cea1..30358cea1 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/scripts/tests/cs-en-sample/train.en +++ b/scripts/tests/cs-en-sample/train.en diff --git a/scripts/tokenizer/nonbreaking_prefixes/README.txt b/scripts/tokenizer/nonbreaking_prefixes/README.txt index 02cdfccb9..02cdfccb9 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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.pl b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.pl index 6b7c106e6..6b7c106e6 100644..100755 --- a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.pl +++ b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.pl diff --git a/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.pt b/scripts/tokenizer/nonbreaking_prefixes/nonbreaking_prefix.pt index 5d65bf25a..5d65bf25a 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/scripts/training/symal/symal.vcproj +++ b/scripts/training/symal/symal.vcproj diff --git a/util/COPYING b/util/COPYING index 94a9ed024..94a9ed024 100644..100755 --- a/util/COPYING +++ b/util/COPYING diff --git a/util/COPYING.LESSER b/util/COPYING.LESSER index cca7fc278..cca7fc278 100644..100755 --- a/util/COPYING.LESSER +++ b/util/COPYING.LESSER diff --git a/util/Jamfile b/util/Jamfile index b89149221..b89149221 100644..100755 --- a/util/Jamfile +++ b/util/Jamfile diff --git a/util/LICENSE b/util/LICENSE index 0ba079e30..0ba079e30 100644..100755 --- a/util/LICENSE +++ b/util/LICENSE diff --git a/util/bit_packing.cc b/util/bit_packing.cc index 41999b726..41999b726 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/util/check.hh +++ b/util/check.hh diff --git a/util/ersatz_progress.cc b/util/ersatz_progress.cc index a82ce6726..a82ce6726 100644..100755 --- 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 100644..100755 --- a/util/ersatz_progress.hh +++ b/util/ersatz_progress.hh diff --git a/util/exception.cc b/util/exception.cc index c4f8c04ce..c4f8c04ce 100644..100755 --- a/util/exception.cc +++ b/util/exception.cc diff --git a/util/exception.hh b/util/exception.hh index 6d6a37cb1..6d6a37cb1 100644..100755 --- a/util/exception.hh +++ b/util/exception.hh diff --git a/util/file.cc b/util/file.cc index 77922cfad..77922cfad 100644..100755 --- a/util/file.cc +++ b/util/file.cc diff --git a/util/file.hh b/util/file.hh index 04023dec0..04023dec0 100644..100755 --- a/util/file.hh +++ b/util/file.hh diff --git a/util/file_piece.cc b/util/file_piece.cc index f0d49d555..f0d49d555 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/util/getopt.c +++ b/util/getopt.c diff --git a/util/getopt.hh b/util/getopt.hh index 6ad977324..6ad977324 100644..100755 --- a/util/getopt.hh +++ b/util/getopt.hh diff --git a/util/have.hh b/util/have.hh index aca8c6264..aca8c6264 100644..100755 --- a/util/have.hh +++ b/util/have.hh diff --git a/util/joint_sort.hh b/util/joint_sort.hh index cf3d84321..cf3d84321 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/util/mmap.cc +++ b/util/mmap.cc diff --git a/util/mmap.hh b/util/mmap.hh index 921147c34..921147c34 100644..100755 --- a/util/mmap.hh +++ b/util/mmap.hh diff --git a/util/murmur_hash.cc b/util/murmur_hash.cc index ef5783fec..ef5783fec 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/util/proxy_iterator.hh +++ b/util/proxy_iterator.hh diff --git a/util/scoped.hh b/util/scoped.hh index 93e2e8176..93e2e8176 100644..100755 --- a/util/scoped.hh +++ b/util/scoped.hh diff --git a/util/sized_iterator.hh b/util/sized_iterator.hh index aabcc5319..aabcc5319 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- 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 100644..100755 --- a/util/util.xcodeproj/project.pbxproj +++ b/util/util.xcodeproj/project.pbxproj |
