Commit Graph

102 Commits

Author SHA1 Message Date
Ulrich Germann
9db9492294 Bug fix related to where context weights live. 2015-10-28 11:18:06 +00:00
Ulrich Germann
06a516842d Moses server now accepts context weights as translation request parameters. 2015-10-21 00:56:29 +01:00
Ulrich Germann
796a57f3ee Bug fix related to TargetPhraseCollectionCache used in Mmsapt. 2015-10-19 16:21:00 +01:00
Ulrich Germann
bdb0227ee9 Life cycle of TargetPhraseCollection is now managed via shared pointers. 2015-10-18 21:27:58 +01:00
Ulrich Germann
cdcafd817b InputPath now has a weak pointer to the TranslationTask it belongs to. 2015-10-17 16:36:21 +01:00
Ulrich Germann
2df1301946 Merge branch 'master' of http://github.com/moses-smt/mosesdecoder into ranked-sampling 2015-10-08 18:33:22 +01:00
Ulrich Germann
1acb7dd622 Overhaul of TargetPhraseCollectionCache. 2015-10-08 18:32:58 +01:00
Ulrich Germann
1828ffd1e6 Restored original ranked sampling method. Davide C.'s variant is now called ranked(_sampling)2. 2015-09-20 11:02:18 +01:00
Davide Caroselli
0ad989df36 Ranked sampling now supports the 'min-sample' parameter to limit the number of out-domain samples collected during sampling. 2015-09-16 15:38:28 +02:00
Ulrich Germann
58d9d88a9f Merge branch 'master' of http://github.com/moses-smt/mosesdecoder 2015-09-14 09:58:30 +01:00
Ulrich Germann
b237237a6d Enabled support for ranked sampling. 2015-09-04 00:01:46 +01:00
mjdenkowski
fc87833b8b Compatibility: mmsapt and factored translation with generation models 2015-09-02 02:04:33 -04:00
mjdenkowski
50d99452d5 Revert "Compatibility: mmsapt and factored translation with generation models"
(Make this a pull request to get at least one more set of eyes on it)
This reverts commit 28f4e3b1a7.
2015-09-02 02:01:17 -04:00
mjdenkowski
28f4e3b1a7 Compatibility: mmsapt and factored translation with generation models 2015-09-02 01:55:06 -04:00
Ulrich Germann
1dcd077806 More namespace fixes. 2015-08-10 15:14:44 +01:00
Ulrich Germann
f20c4cbbc0 Namespace refactoring in mmsapt. 2015-08-09 20:51:21 +01:00
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
6ab2d4d3eb Removed ranking stuff prior to merge with master. 2015-07-28 20:15:14 +01:00
Ulrich Germann
8e393c79ab Logging of priming time in ranked sampling. 2015-07-23 00:12:34 +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
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
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
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
e94921dc44 Removal of 'using namespace ...' from several header files. 2015-07-02 01:32:34 +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
XapaJIaMnu
47a488767e Enable the bias weights to be (re)set by the server. 2015-06-25 13:12:33 +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
Ulrich Germann
65bd46df65 Added feature with cumulative bias. 2015-06-19 21:50:01 +01:00
Ulrich Germann
a627fd3cc6 Bug fix: set_bias_for_ranking needs to lock. 2015-06-15 14:22:32 +01:00
Ulrich Germann
3a5acb56cc Added some logging messages. 2015-06-08 15:32:53 +01:00
Ulrich Germann
5e2e63f678 Integration of ranked sampling. 2015-06-08 14:06:54 +01:00
Ulrich Germann
623eb7bb77 Instantiation of btfix via boost::intrusive_ptr in Mmsapt.
This is in preparation for distinct bitext samplers which need to
ensure the lifetime of the bitext while sampling.
2015-06-05 21:15:47 +01:00
Ulrich Germann
1b4b3a5103 Mmsapt: btfix now instatiated via intrusive pointer
... to prevent deletion while Mmsapt is live.
2015-06-05 16:27:49 +01:00
Ulrich Germann
da052b7f2b Removed dependency on libcurlpp, as it was difficult to link that staticly. 2015-05-24 16:05:14 +01:00
Ulrich Germann
dcb8e5d3e0 Preparation for allowing context-aware decoding. 2015-05-19 02:35:39 +01:00
Jeroen Vermeulen
0859e9a844 Remove trailing whitespace from C++ files. 2015-05-13 17:05:43 +07:00
Ulrich Germann
db5ccff364 Tweaks to logging for biased sampling. 2015-05-11 00:33:21 +01:00
Jeroen Vermeulen
eca5824100 Remove trailing whitespace in C++ files. 2015-04-30 12:05:11 +07:00
Ulrich Germann
e4f5c69109 One step closer to eliminating the requirement to provide num-features=... in the config file.
Some FF (Mmsapt, LexicalReordering, Many single-value FF) provide this number during "registration";
when missing, a default weight vector of uniform 1.0 is automatically generated. This eliminates the
need for the user to figure out what the exact number of features is for each FF, which can get complicated,
e.g. in the case of Mmsapt/PhraseDictionaryBitextSampling.
2015-04-29 20:16:52 +01:00
Hieu Hoang
41529227b2 boost unique lock 2015-04-26 18:11:11 +04:00
Ulrich Germann
0d72cdd72c Merge branch 'master' of https://github.com/moses-smt/mosesdecoder into mmt-dev
Conflicts:
	moses/Syntax/F2S/Manager-inl.h
	moses/TranslationModel/UG/mmsapt.cpp
2015-04-26 02:12:16 +01:00
Ulrich Germann
2c0851099b Work on integrating hierarchical lexicalized reordering models with sampled phrase tables. 2015-04-21 17:48:48 +01:00