Hieu Hoang
0fb8e65fa7
compile error on eclipse
2014-08-01 22:44:35 +01:00
Barry Haddow
efee2695c3
Merge 08811deb17337356cd8dae9c59c0160590679a35 from joshua
2014-07-21 11:04:43 +01:00
Hieu Hoang
6249432407
beautify
2013-05-29 18:16:15 +01:00
Barry Haddow
2b4e61d826
Merge branch 'trunk' into miramerge
...
Compiles, not tested.
Conflicts:
Jamroot
OnDiskPt/PhraseNode.h
OnDiskPt/TargetPhrase.cpp
OnDiskPt/TargetPhrase.h
OnDiskPt/TargetPhraseCollection.cpp
mert/BleuScorer.cpp
mert/Data.cpp
mert/FeatureData.cpp
moses-chart-cmd/src/Main.cpp
moses/src/AlignmentInfo.h
moses/src/ChartManager.cpp
moses/src/LM/Ken.cpp
moses/src/LM/Ken.h
moses/src/LMList.h
moses/src/LexicalReordering.h
moses/src/PhraseDictionaryTree.h
moses/src/ScoreIndexManager.h
moses/src/StaticData.h
moses/src/TargetPhrase.h
moses/src/Word.cpp
scripts/ems/experiment.meta
scripts/ems/experiment.perl
scripts/training/train-model.perl
2012-07-17 13:36:50 +01:00
Hieu Hoang
e3dd3a8d2c
namespace all classes in mert directory
2012-06-30 20:23:45 +01:00
Colin Cherry
3c44d04baf
Merge branch 'master' into miramerge
...
Conflicts:
Jamroot
mert/FeatureStats.cpp
moses-cmd/src/IOWrapper.h
scripts/training/mert-moses.pl
scripts/training/train-model.perl.missing_bin_dir
2012-05-30 12:39:53 -04:00
Colin Cherry
fd577d7a65
Batch k-best MIRA is written and integrated into mert-moses.pl
...
Regression tests all check out, and kbmira seems to work fine
on a Hansard French->English task.
HypPackEnumerator class may be of interest to pro.cpp and future
optimizers, as it abstracts a lot of the boilerplate involved in
enumerating multiple k-best lists.
MiraWeightVector is not really mira-specific - just a weight vector
that enables efficient averaging. Could be useful to a perceptron
as well. Same goes for MiraFeatureVector.
Interaction with sparse features is written, but untested.
2012-05-29 13:38:57 -04:00
Barry Haddow
c397d2068b
Merge branch 'trunk' into miramerge. Still to fix build.
...
Conflicts:
Jamroot
mert/Data.cpp
mert/Data.h
mert/FeatureArray.cpp
mert/FeatureArray.h
mert/FeatureData.cpp
mert/FeatureData.h
mert/FeatureStats.cpp
mert/FeatureStats.h
mert/mert.cpp
moses-chart-cmd/src/IOWrapper.h
moses-chart-cmd/src/Main.cpp
moses-cmd/src/IOWrapper.cpp
moses-cmd/src/IOWrapper.h
moses-cmd/src/Main.cpp
moses/src/GlobalLexicalModel.cpp
moses/src/Jamfile
moses/src/Parameter.cpp
moses/src/PhraseDictionary.cpp
moses/src/ScoreIndexManager.h
moses/src/TargetPhrase.h
regression-testing/tests/phrase.lexicalized-reordering-bin/truth/results.txt
regression-testing/tests/phrase.lexicalized-reordering-cn/truth/results.txt
regression-testing/tests/phrase.lexicalized-reordering/truth/results.txt
regression-testing/tests/phrase.multiple-translation-system-lr/truth/results.txt
regression-testing/tests/phrase.show-weights.lex-reorder/truth/results.txt
regression-testing/tests/phrase.show-weights/truth/results.txt
scripts/ems/experiment.meta
scripts/ems/experiment.perl
scripts/training/filter-model-given-input.pl
scripts/training/mert-moses.pl
2012-05-24 21:11:35 +01:00
Tetsuo Kiso
9c9d88a78a
Avoid "using namespace std" in headers.
2012-05-10 07:51:05 +09:00
Tetsuo Kiso
7bd6243c7f
Avoid "using namespace std" in headers.
2012-05-10 07:51:05 +09:00
Tetsuo Kiso
b354da4c65
Clean up accessors and mutators.
2012-03-10 19:27:52 +09:00
Tetsuo Kiso
0c88a1ec2e
Clean up accessors and mutators.
2012-03-10 19:27:52 +09:00
Tetsuo Kiso
5d600f2b50
Remove hard-coded "/dev/stdout".
...
This will improve the portability.
We also change the interface of I/O functions for ease of the
development unit tests.
2012-03-10 19:04:43 +09:00
Tetsuo Kiso
3f8d8d7842
Remove hard-coded "/dev/stdout".
...
This will improve the portability.
We also change the interface of I/O functions for ease of the
development unit tests.
2012-03-10 19:04:43 +09:00
Tetsuo Kiso
e7a2483b22
mert: Prefix private members with "m_" except TER.
...
Squashed commit of the following:
- Clean up PRO.
- Clean up ScoreStats.
- Clean up ScoreData.
- Clean up ScoreArray.
- Remove unnecessary headers.
- Clean up ScopedVector.
- Clean up Point.
- Clean up PerScorer.
- Clean up Optimizer.
- Clean up MergeScorer.
- Clean up InterpolatedScorer.
- Clean up FileStream.
- Clean up FeatureStats.
- Remove inefficient string concatenation.
- Clean up FeatureData.
- Clean up FeatureArray.
- Clean up Data.
2012-03-10 17:12:34 +09:00
Tetsuo Kiso
eb2c9ee5e3
mert: Prefix private members with "m_" except TER.
...
Squashed commit of the following:
- Clean up PRO.
- Clean up ScoreStats.
- Clean up ScoreData.
- Clean up ScoreArray.
- Remove unnecessary headers.
- Clean up ScopedVector.
- Clean up Point.
- Clean up PerScorer.
- Clean up Optimizer.
- Clean up MergeScorer.
- Clean up InterpolatedScorer.
- Clean up FileStream.
- Clean up FeatureStats.
- Remove inefficient string concatenation.
- Clean up FeatureData.
- Clean up FeatureArray.
- Clean up Data.
2012-03-10 17:12:34 +09:00
Tetsuo Kiso
47ac8a474d
Change the naming conventions for the guard macros; Rename TER directory.
...
This change might be useful to avoid duplicating the names.
The reason is that although MERT programs are standalone
applications, some header files such as data.h and
point.h have common guard macro names like "DATA_H" and
"POINT_H", and this is not good naming conventions
when you want to include external headers.
Some files actually include headers in Moses and KenLM's util.
2012-02-20 09:46:08 +09:00
Tetsuo Kiso
8c3b82e596
Change the naming conventions for the guard macros; Rename TER directory.
...
This change might be useful to avoid duplicating the names.
The reason is that although MERT programs are standalone
applications, some header files such as data.h and
point.h have common guard macro names like "DATA_H" and
"POINT_H", and this is not good naming conventions
when you want to include external headers.
Some files actually include headers in Moses and KenLM's util.
2012-02-20 09:46:08 +09:00
Tetsuo Kiso
82da44b030
Fix typo.
2012-02-20 08:29:53 +09:00
Tetsuo Kiso
94888b258d
Fix typo.
2012-02-20 08:29:53 +09:00
Barry Haddow
ced24a881d
Implementation of feature-merging for pro-mert
2012-01-13 16:52:15 +00:00
Hieu Hoang
753eebd959
revert
2011-12-12 20:48:42 +07:00
Hieu Hoang
21009b5d1e
revert
2011-12-12 20:48:42 +07:00
Tetsuo Kiso
2fde1cab0e
Add missing headers.
2011-11-14 19:52:21 +09:00
Tetsuo Kiso
29c16d252a
Minimize using #include headers in headers.
...
Should use it in .cpp files.
2011-11-14 15:15:30 +09:00
Tetsuo Kiso
be1506e759
Use passing objects by const references not passing by their values.
2011-11-14 14:00:47 +09:00
Tetsuo Kiso
3d70b2e1a5
Small change: modify initialization of the Data class.
2011-11-12 22:04:22 +09:00
Tetsuo Kiso
20e27aab92
Refactoring: constructors and copying objects.
2011-11-12 18:12:07 +09:00
Tetsuo Kiso
87a5c16b55
Replace macros with const variables and inline functions.
2011-11-12 17:30:33 +09:00
Tetsuo Kiso
dfb714296f
Add 'explicit' for constructors with one argument.
2011-11-12 09:51:27 +09:00
Tetsuo Kiso
664ffe0130
Fix indentation.
2011-11-12 09:24:19 +09:00
Tetsuo Kiso
68315d6407
Fix class, function, and implementation comments format.
...
Functions comments should be placed in their declarations.
2011-11-12 08:58:23 +09:00
Tetsuo Kiso
4f6d022fe7
Add comments to mark the end of #define guards.
2011-11-12 07:59:50 +09:00
bhaddow
7c0d9c34da
Fix formatting of pro input file
...
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4360 1f5c12ca-751b-0410-a591-d2e778427230
2011-10-14 14:01:15 +00:00
bhaddow
718c55d3aa
Reducing memory usage for sparse features
...
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4355 1f5c12ca-751b-0410-a591-d2e778427230
2011-10-14 07:40:53 +00:00
phkoehn
41a1849437
support for sparse feature functions (mert support only when using PRO)
...
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4184 1f5c12ca-751b-0410-a591-d2e778427230
2011-09-07 16:37:33 +00:00
hieuhoang1972
148c1e8305
run beautify.perl. Consistent formatting for .h & .cpp files
...
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3899 1f5c12ca-751b-0410-a591-d2e778427230
2011-02-24 12:42:19 +00:00
nicolabertoldi
e94834012d
added facilities to read and write score statistics in binary format
...
moved facilities for feature names in FeatureData object
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1824 1f5c12ca-751b-0410-a591-d2e778427230
2008-06-05 17:03:54 +00:00
nicolabertoldi
8e96e68476
overall change of a variable name: array_ instead of array2_
...
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1823 1f5c12ca-751b-0410-a591-d2e778427230
2008-06-05 11:42:00 +00:00
nicolabertoldi
281bf610b8
added binary read/load facility for feature data
...
added names of features in the header
added methods to access the features by name
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1819 1f5c12ca-751b-0410-a591-d2e778427230
2008-06-05 07:23:34 +00:00
nicolabertoldi
1402f3036b
added ScorerFactory.h
...
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1811 1f5c12ca-751b-0410-a591-d2e778427230
2008-06-03 08:56:37 +00:00
nicolabertoldi
291260abf7
- made output more compliant with old version
...
- added PerSCorer.h and BleuScorer.h
- stored feature names
- fixed bug about output of best Point
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1796 1f5c12ca-751b-0410-a591-d2e778427230
2008-05-27 16:50:52 +00:00
bhaddow
1a6dcf5e36
remove buffers
...
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1715 1f5c12ca-751b-0410-a591-d2e778427230
2008-05-15 20:32:37 +00:00
jfouet
bfe3661110
implementation of optimization on a subset of the parameters + debug mode in the makefile
...
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1695 1f5c12ca-751b-0410-a591-d2e778427230
2008-05-15 10:57:20 +00:00
bhaddow
1f84c9eab7
Get rid of warnings about lack of newlines
...
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1691 1f5c12ca-751b-0410-a591-d2e778427230
2008-05-15 06:44:36 +00:00
nicolabertoldi
49891adeed
I am starting the improvement of Minimum Error Training scritps
...
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1632 1f5c12ca-751b-0410-a591-d2e778427230
2008-05-14 07:57:45 +00:00