Commit Graph

828 Commits

Author SHA1 Message Date
Ulrich Germann
883c34aee9 Merge branch 'master' of http://github.com/moses-smt/mosesdecoder into mmt-dev
Conflicts:
	moses/SearchNormalBatch.cpp
	moses/TranslationModel/UG/mm/ug_bitext.h
	moses/TranslationModel/UG/mm/ug_typedefs.h
	moses/TranslationModel/UG/mmsapt.cpp
	moses/TranslationModel/UG/mmsapt.h
2015-08-07 14:14:19 +01:00
Ulrich Germann
a07eb65118 sptr<> -> SPTR<> in preparation for merge with legacy master 2015-08-07 13:35:02 +01:00
Hieu Hoang
d94c2d210b #define name clashed with internal class name when using clang 2015-08-02 06:33:32 +04:00
Ulrich Germann
51bc36d131 Report bias server errors. 2015-07-31 23:21:56 +00:00
Ulrich Germann
fd93df3b8f Added virtual deconstructor. 2015-07-31 23:21:01 +00:00
Ulrich Germann
362f26d5eb Logging in constructor of http_client. Member function to return server error message. 2015-07-31 23:19:03 +00:00
Ulrich Germann
3439de6341 Bug fix in uri_encode. Logging of lookup in http_client constructor. 2015-07-31 23:18:08 +00:00
Ulrich Germann
ecfc8d8b1a Logging in query_bias_server(). 2015-07-31 17:06:31 +01:00
Ulrich Germann
6ab2d4d3eb Removed ranking stuff prior to merge with master. 2015-07-28 20:15:14 +01:00
Ulrich Germann
451016891e No ranked sampling for the time being. 2015-07-28 19:35:27 +01:00
Ulrich Germann
d67723fd29 Merge branch 'master' of http://github.com/moses-smt/mosesdecoder into ranked-sampling
Conflicts:
	moses/TargetPhrase.cpp
	moses/TargetPhrase.h
2015-07-28 14:29:49 +01:00
Ulrich Germann
d1cb249a7f Removed building of cooccurrence table from mmlex-build. 2015-07-28 14:24:06 +01:00
Ulrich Germann
2faa9e6fe4 Multi-threaded sorting when building suffix array. 2015-07-28 14:23:23 +01:00
Ulrich Germann
70a1c88614 New dummy bias that always returns 1.
Purpose: to keep track of phrase counts per document. If no bias is given,
no per-documents counts are stored.
2015-07-26 21:23:13 +01:00
Ulrich Germann
f26e2008ca work in progress 2015-07-26 21:21:19 +01:00
Ulrich Germann
a1652b4a97 Fix typo. 2015-07-26 21:20:40 +01:00
Ulrich Germann
8da4804631 Initial check-in. 2015-07-23 00:13:19 +01:00
Ulrich Germann
8e393c79ab Logging of priming time in ranked sampling. 2015-07-23 00:12:34 +01:00
Ulrich Germann
f1bde0af05 Map instead of vector for bias map in SamplingBias. 2015-07-23 00:12:00 +01:00
Ulrich Germann
09d0909e0f Trying to make sampling more efficient for large document collections underlying the sampling phrase table. 2015-07-23 00:10:52 +01:00
Ulrich Germann
053037816b Increased verbosity threshold for logging document map. 2015-07-23 00:08:33 +01:00
Ulrich Germann
5aaa8fcbfa 1. Fixed concurrency issue in context handling.
2. Added phrase table feature function PScoreLengthRatio.
2015-07-21 15:36:28 +01:00
Ulrich Germann
506e02bdec Added utility function len_from_pid(). 2015-07-21 15:32:47 +01:00
Ulrich Germann
80db5487bc Fixed typo in comment. 2015-07-21 15:31:46 +01:00
Philipp Koehn
b4b30cff7a fix some compile time warnings about unsigned / signed int 2015-07-20 11:45:23 -04:00
Ulrich Germann
ad4fdc59c2 Re-enabled actual caching (get always returned NULL). Moved point of locking in release() in an attempt to battle segfaults. 2015-07-18 19:02:47 +01:00
Ulrich Germann
e94007c7f4 Mmsapt can now handle factorized phrase tables with more than one factor. 2015-07-13 17:51:44 +01:00
Ulrich Germann
cc5f128944 Allow 'ranked' as alias for sampling method 'rank'. 2015-07-11 00:24:20 +01:00
Ulrich Germann
03e19dd915 Commented out m_rnd_denom. Not used. 2015-07-07 20:16:41 +01:00
Ulrich Germann
8bdbfe583f 1. Added initialization of pstats cache on ContextForQuery.
2. Code cleanup: removed obsolete code.
2015-07-07 00:12:56 +01:00
Ulrich Germann
47eb0bd41e Added seeding of random generator to produce the same results across repeated runs of the decoder. 2015-07-07 00:12:20 +01:00
Ulrich Germann
4dd2ea3117 Added random sampling to BitextSampler. 2015-07-05 13:08:57 +01:00
Ulrich Germann
e1f31666c3 Fixes to make things compile after merging with branch mmt-dev. 2015-07-03 17:20:27 +01:00
Ulrich Germann
98c03dc047 Merge branch 'mmt-dev' into ranked-sampling.
Conflicts:
	moses/TranslationModel/UG/mm/ug_bitext.h
	moses/TranslationModel/UG/mm/ug_bitext_jstats.cc
	moses/TranslationModel/UG/mm/ug_bitext_jstats.h
	moses/TranslationModel/UG/mm/ug_bitext_pstats.cc
	moses/TranslationModel/UG/mm/ug_sampling_bias.cc
	moses/TranslationModel/UG/mm/ug_sampling_bias.h
2015-07-03 15:30:33 +01:00
Ulrich Germann
9dae3eb785 Code cleanup. 2015-07-03 15:11:21 +01:00
Ulrich Germann
f78bb4a6e9 Bigger K-best list to accommodate phrase extraction failure. 2015-07-02 23:56:53 +01:00
Ulrich Germann
1c25b29ebb Show from which documents phrase translations were collected. 2015-07-02 23:55:14 +01:00
Ulrich Germann
64ec34df5d Proper indentation with spaces (no tabs). 2015-07-02 23:49:00 +01:00
Ulrich Germann
b05ca8cb80 Fixes to make code compile on various versions of gcc. 2015-07-02 18:06:55 +01:00
Ulrich Germann
e94921dc44 Removal of 'using namespace ...' from several header files. 2015-07-02 01:32:34 +01:00
Ulrich Germann
61067b4fa5 Merge branch 'FF_ttptr' of http://github.com/moses-smt/mosesdecoder 2015-07-01 13:25:26 +01:00
Ulrich Germann
41a11dfe8a Allow ports other than 80 as the server ports for the context bias server. 2015-06-25 18:37:28 +01:00
XapaJIaMnu
fcc9bb1e60 when using the suffix array PT, set the ttask in the targetPhrase 2015-06-25 16:52:14 +01:00
XapaJIaMnu
a3ecd9f2a7 Revert "Break everything by trying to add ttasksptr to TargetPhrase" and try an easier approach
This reverts commit afdc1b480e.
2015-06-25 15:47:39 +01:00
XapaJIaMnu
afdc1b480e Break everything by trying to add ttasksptr to TargetPhrase 2015-06-25 15:47:17 +01:00
Ulrich Germann
22cc22064c Changed implementation of indocs (to keep track of which documents phrases come from) from vector to map. 2015-06-25 15:43:13 +01:00
XapaJIaMnu
47a488767e Enable the bias weights to be (re)set by the server. 2015-06-25 13:12:33 +01:00
Ulrich Germann
78b2810cfe Allow context server to use ports other than 80. 2015-06-24 18:09:22 +01:00
XapaJIaMnu
5a0168a6fa forgot to negate a condition 2015-06-23 17:27:01 +01:00
XapaJIaMnu
e50926abf6 Enable the Suffix array to get context_weights from command line 2015-06-23 16:58:58 +01:00