Commit Graph

5170 Commits

Author SHA1 Message Date
Ulrich Germann
c610d0a6e7 Code decluttering.
The class StatefuleFeatureFunction now provides an empty dummy implementation
of various (virtual) Evaluate... functions. The corresponding empty
implementations on derived classes have been removed.
2015-11-19 13:54:24 +00:00
Evgeny Matusov
f346dcd37f another fix to debug output for moses server 2015-11-19 12:42:07 +01:00
Evgeny Matusov
aa7ef1738b another update in Debug output for Moses server 2015-11-19 12:20:48 +01:00
Evgeny Matusov
d3fb16d39f changed debug output for moses server 2015-11-19 12:03:19 +01:00
Ulrich Germann
edacfbb9fd Bug fix in server: Moses server now handles the placeholder mechanism for translations provided with the input. 2015-11-18 17:09:52 +00:00
Evgeny Matusov
4e8396744c added first version of regression testing for moses server 2015-11-18 16:21:50 +01:00
Ulrich Germann
220d82041a gcc-4.4.7 was struggling with boost::intrusive_ptr. Switched to shared_ptr. 2015-11-18 10:35:17 +00:00
Barry Haddow
21d8111287 Merge branch 'master' of github.com:moses-smt/mosesdecoder 2015-11-18 09:50:29 +00:00
David Madl
060a5f1b47 forward declare SHyperedge in StatefulFeatureFunction, StatelessFeatureFunction 2015-11-17 16:17:09 +00:00
David Madl
8729a2d47d Measure TimeOtherScore in Search instead of in Hypothesis 2015-11-17 16:15:13 +00:00
David Madl
5fea16a9a6 move options out of Hypothesis 2015-11-17 16:15:13 +00:00
David Madl
73ab44c126 Hypothesis: get rid of calls into Manager from constructor 2015-11-17 16:15:13 +00:00
David Madl
b1ea3d624b Dump two ugly, old overrides of Hypothesis::EvaluateWhenApplied()
A Brief History of Time:

65ddbf3 7/2/12 Wilson, "Implement batched LM requests."
776da79 8/6/15 Hoang, "delete old unused code"
2015-11-17 16:15:13 +00:00
David Madl
e5a8438149 document @param lhs in Phrase::CreateFromString() 2015-11-17 16:15:13 +00:00
David Madl
e36fb96557 LanguageModel, KenLM: avoid StaticData usage
* drop global lmodel-oov-feature option, and add it to LM FF config line instead
	use oov-feature=1 (bool) option instead
* drop LanguageModel::GetWeight()
* KenLM: use m_verbosity of FF instead of IFVERBOSE macro which uses StaticData

* train-model.perl: move language model OOV feature onto LM feature spec line
2015-11-17 16:15:13 +00:00
David Madl
3b63930943 move global Timer to Timer.h
Move ResetUserTime(), PrintUserTime(), GetUserTime() to Timer.h

Do not reset timer in StaticData.
2015-11-17 16:15:13 +00:00
David Madl
0dd6c31f63 FeatureFunction: enable construction without registering 2015-11-17 16:15:13 +00:00
David Madl
3288eb5f50 remove IOWrapper.cpp unused includes such as Incremental.h (and others) 2015-11-17 16:15:13 +00:00
Evgeny Matusov
5e1340cf63 fixed moses server placehoders ; correctly implemented the boolean parameter check function for mosesserver request parameters 2015-11-17 15:16:39 +01:00
Evgeny Matusov
66928f682f second commit of moses server placeholder fix 2015-11-17 15:06:48 +01:00
Evgeny Matusov
7c088c9a95 first commit of placeholder changes to moses server 2015-11-17 14:19:36 +01:00
MosesAdmin
fef50536d6 daily automatic beautifier 2015-11-17 00:00:49 +00:00
Phil Williams
d317fdc373 Store SHyperedge feature scores as deltas instead of totals
This mirrors the change made for the chart decoder in commit 465b4756...
2015-11-16 19:23:27 +00:00
Michael Denkowski
07001f7645 Model support bitmap features in PhraseDictionaryGroup 2015-11-16 11:23:18 -05:00
Michael Denkowski
9df2336d45 Per-model phrase and word counts in PhraseDictionaryGroup 2015-11-13 17:22:27 -05:00
Michael Denkowski
e3cca68ed7 mmsapt-lr-func option for PhraseDictionaryGroup
Support also filling in gaps via averaging for LR functions of member
Mmsapt models
2015-11-13 13:56:26 -05:00
Michael Denkowski
49f4eeca47 default-average-others option for PhraseDictionaryGroup
Average scores of other models to fill in gaps for unseen phrases
2015-11-12 16:33:52 -05:00
Ulrich Germann
7b8a875efb Merge branch 'master' of http://github.com/moses-smt/mosesdecoder 2015-11-12 14:02:16 +00:00
MosesAdmin
dad1bd6127 daily automatic beautifier 2015-11-12 00:00:40 +00:00
Ulrich Germann
b01eb7cbd0 Bug fix: m_reportAllFactors was never initialized or set.
Removed altogether, now using m_options.output.ReportAllFactors.
2015-11-11 19:56:43 +00:00
Ulrich Germann
e357a75972 Merge branch 'master' of ../legacy 2015-11-11 17:28:20 +00:00
Ulrich Germann
858a509d53 Added missing files. 2015-11-11 17:27:53 +00:00
Ulrich Germann
37b63f2d79 Merge branch 'master' of ../legacy into mmt-dev
Conflicts:
	moses/FF/LexicalReordering/LexicalReordering.cpp
2015-11-11 17:19:49 +00:00
Ulrich Germann
f247e26fed More options refactoring (OOV Handling this time). 2015-11-11 17:07:45 +00:00
Ulrich Germann
2ab6b8f16d Merge branch 'master' of http://github.com/moses-smt/mosesdecoder 2015-11-11 01:08:22 +00:00
Ulrich Germann
9826599cb0 Enforce const-ness of command line arguments; bug fix in mosesserver.cpp. 2015-11-11 01:08:05 +00:00
Ulrich Germann
d727829387 Merge branch 'master' of https://github.com/modernmt/mosesdecoder
Conflicts:
	moses/parameters/InputOptions.cpp
	moses/parameters/InputOptions.h
2015-11-10 23:05:13 +00:00
Ulrich Germann
806f888c10 Moved placeholder factor variable from StaticData to InputOptions. 2015-11-10 21:44:48 +00:00
Barry Haddow
1996502fcb Merge branch 'master' of github.com:moses-smt/mosesdecoder 2015-11-10 21:35:59 +00:00
Barry Haddow
ccfe8ba018 remove unused method, and misleading comment 2015-11-10 21:35:08 +00:00
Michael Denkowski
652283c538 Consistent naming: zeros -> default-scores
(Matches LexicalReordering)
2015-11-10 15:48:41 -05:00
Ulrich Germann
2ae2aee953 Indentation. 2015-11-10 20:42:17 +00:00
Ulrich Germann
bd2d24cbb8 Integrated more finegrained abyss server control from mosesserver.cpp; mosesserver is now officially deprecated. 2015-11-10 20:30:06 +00:00
Ulrich Germann
8e9b93c0ce Formatting. 2015-11-10 01:19:50 +00:00
Ulrich Germann
d94bc5df4c Handle lexicalized reordering models with collapseff. 2015-11-10 01:19:17 +00:00
MosesAdmin
1360529667 daily automatic beautifier 2015-11-10 00:00:41 +00:00
Michael Denkowski
9468ca3564 Support default-scores option when using mmsapt reordering 2015-11-09 11:54:33 -05:00
Hieu Hoang
cff712c97e local variable masking class variable 2015-11-09 16:38:32 +00:00
Hieu Hoang
e0b4d1c8c7 beautify 2015-11-09 15:00:24 +00:00
Hieu Hoang
32e29d6b8a Consistent naming: m_futureScore --> m_estimatedScore 2015-11-09 13:40:31 +00:00
Hieu Hoang
d0be56f8ab Consistent naming: total score -> m_futureScore 2015-11-09 12:44:39 +00:00
Hieu Hoang
176573c072 Consistent naming: m_futureScore --> m_estimatedScore 2015-11-09 12:23:43 +00:00
Ulrich Germann
5bb8776fe8 Removed tracing message in Mmsapt. 2015-11-08 01:09:35 +00:00
Michael Denkowski
fb7be206ed Copy extra scores when merging phrases in PhraseDictionaryGroup
This adds compatibility for lr-func in member mmsapts
2015-11-06 12:54:14 -05:00
Hieu Hoang
bd4755a7fe compile error without XMLRPC-C 2015-11-06 09:44:52 -05:00
Hieu Hoang
3727d3b2d6 explicit default constructor. Just in case 2015-11-05 13:41:16 +00:00
Hieu Hoang
6b35fd3108 non-initialised default constructor 2015-11-05 11:36:21 +00:00
Ulrich Germann
a6fb88a074 Added default value for mapping. 2015-11-04 20:58:57 +00:00
Ulrich Germann
b733804fdc Merge branch 'master' of https://github.com/moses-smt/mosesdecoder into mmt-dev 2015-11-04 18:25:32 +00:00
Ulrich Germann
9d7f62c05b Merge branch 'master' of http://github.com/moses-smt/mosesdecoder 2015-11-04 18:12:58 +00:00
Ulrich Germann
ec1ef78d51 Reduction in number of #ifdef HAVE_XMLRPC_C, as per Hieu's request. 2015-11-04 18:12:49 +00:00
Ulrich Germann
c435e46560 Moved implementation of server-specific member functions of Hypothesis class into a separate file. 2015-11-04 17:32:12 +00:00
Michael Denkowski
3366374d0e Looks like this wanted to be commented out prior to commit 2015-11-04 12:19:21 -05:00
Hieu Hoang
4078c30a42 estimatedScore -> estimatedScores 2015-11-04 15:10:45 +00:00
Hieu Hoang
e87dd15f4a equality comparison using pointers 2015-11-04 10:54:46 +00:00
MosesAdmin
0db2f8312a daily automatic beautifier 2015-11-04 00:00:37 +00:00
Hieu Hoang
b5d914134a move beats() out of #ifdef region 2015-11-03 20:56:37 +00:00
Hieu Hoang
c5c08993de Merge branch 'master' of github.com:moses-smt/mosesdecoder 2015-11-03 19:56:32 +00:00
Ulrich Germann
55f600531f Merge branch 'master' of https://github.com/moses-smt/mosesdecoder into mmt-dev 2015-11-03 19:36:56 +00:00
Ulrich Germann
d773ad428e More options cleanup. 2015-11-03 19:36:43 +00:00
Ulrich Germann
876fe6a412 Added some deterministic tie-breaking to CompareHypothesisTotalScore(). 2015-11-03 19:01:20 +00:00
Hieu Hoang
9b56e63d51 eclipse. And more #ifdef HAVE_XMLRPC_C 2015-11-03 19:00:58 +00:00
Hieu Hoang
6be932c1f7 consistent naming of future scores, estimated scores 2015-11-03 09:41:59 +00:00
Hieu Hoang
ee5b190d43 consistent naming of future scores, estimated scores 2015-11-03 05:55:26 +00:00
MosesAdmin
ad009e575f daily automatic beautifier 2015-11-03 00:00:58 +00:00
Ulrich Germann
9dc31e197b Merge branch 'master' of https://github.com/moses-smt/mosesdecoder 2015-11-02 21:25:48 +00:00
Ulrich Germann
f02c7caa18 Bug fix: yet another reference to StaticData that needed to go. 2015-11-02 18:19:55 +00:00
Hieu Hoang
273ad667c2 Move square matrix init into class 2015-11-02 14:35:16 +00:00
Ulrich Germann
840d28b735 Formatting. 2015-11-02 14:29:50 +00:00
Ulrich Germann
2d5b98c3a8 Forking caused problems ...
... because parent wouldn't wait for children to finish. Since indexing is
multi-threaded now anyway, I removed the forking.
2015-11-02 14:28:05 +00:00
MosesAdmin
f38976aba0 daily automatic beautifier 2015-11-02 00:00:37 +00:00
Ulrich Germann
8424fb6e2a Merge branch 'master' of https://github.com/moses-smt/mosesdecoder
Conflicts:
	moses/LM/IRST.cpp
2015-11-01 15:37:36 +00:00
Ulrich Germann
e9b1c6019b Improved reporting of nbest scores via server interface. 2015-11-01 14:53:16 +00:00
MosesAdmin
4168429aac daily automatic beautifier 2015-10-31 17:14:47 +00:00
Ulrich Germann
ff1977c29e Merge branch 'mmt-dev' 2015-10-31 13:36:40 +00:00
Ulrich Germann
d6df7f4a16 Merge branch 'master' of https://github.com/moses-smt/mosesdecoder 2015-10-31 13:15:08 +00:00
Ulrich Germann
87822499c0 Merge branch 'mmt-dev' of https://github.com/ModernMT/mosesdecoder into mmt-dev 2015-10-31 12:53:43 +00:00
Ulrich Germann
324c378f7f Options refactoring. Moses crashed in server mode when asked to provide n-best translations with scores. 2015-10-31 12:50:52 +00:00
Jun-ya Norimatsu
690a948e9e test chart passed. 2015-10-31 19:23:59 +09:00
Jun-ya Norimatsu
b0bc978325 Phrase based model passes. 2015-10-31 18:51:48 +09:00
Ulrich Germann
dc8ad89945 More analysis tools; work in progress. 2015-10-30 14:32:12 +00:00
Ulrich Germann
b40bc81811 Made a few things compile with Makefile outside of the bjam compile. 2015-10-30 14:31:24 +00:00
nicolabertoldi
c8cc11dbd3 restored the not-adaptive version of moses 2015-10-28 23:22:08 +01:00
nicolabertoldi
c013dbbabe changes to resolve compilation issue with g++.4.4.7 2015-10-28 22:26:18 +01:00
Ulrich Germann
07c8614877 Once set, context weights are now always const on the ContextScope. 2015-10-28 13:01:11 +00:00
Ulrich Germann
e3d5c477df Minor code cleanup. 2015-10-28 13:00:21 +00:00
Ulrich Germann
1b8fc53174 Bug fix. 2015-10-28 12:59:35 +00:00
Hieu Hoang
617f331833 note to self in case i forget again in future 2015-10-28 12:45:50 +00:00
Ulrich Germann
34762f8c17 1. Bug fix: DocumentBias didn't store the map from doc names to doc weights in m_bias_map;
2. getBiasMap() now returns a shared pointer to the context weights / bias map
   instead of a reference.
2015-10-28 12:37:52 +00:00
Ulrich Germann
9db9492294 Bug fix related to where context weights live. 2015-10-28 11:18:06 +00:00