Commit Graph

73 Commits

Author SHA1 Message Date
Barry Haddow
90820ad0c5 Merge branch 'master' into miramerge.
Also fix mert-moses.pl to use correct flag for specifying
weights of non-core features.

Conflicts:
	.gitignore
	configure.in
	ltmain.sh
	moses/src/LM/Factory.cpp
	moses/src/LMList.cpp
	moses/src/LMList.h
	moses/src/LanguageModel.cpp
	moses/src/LanguageModel.h
	moses/src/LanguageModelKen.h
	moses/src/Makefile.am
	moses/src/Manager.cpp
	moses/src/PhraseDictionaryMemory.cpp
	moses/src/PhraseDictionaryTree.cpp
	moses/src/StaticData.cpp
	moses/src/TargetPhrase.h
2011-10-28 15:54:23 +01:00
Hieu Hoang
cb87f251b2 xcode 2011-10-24 14:44:36 +07:00
Hieu Hoang
a93f4691f6 win32 2011-10-23 09:37:47 +07:00
hieuhoang1972
897fe0f88b visual studio
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4356 1f5c12ca-751b-0410-a591-d2e778427230
2011-10-14 10:50:08 +00:00
Barry Haddow
c83166087e Merge branch 'master' into miramerge
Conflicts:
	moses/src/LanguageModel.cpp
	moses/src/TargetPhrase.h
	moses/src/TrellisPath.h
	moses/src/Util.h
	scripts/training/train-model.perl
2011-10-12 17:14:23 +01:00
nicolabertoldi
23d9a9b55e normalization of output spaces before and after field separator
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4293 1f5c12ca-751b-0410-a591-d2e778427230
2011-10-03 16:11:39 +00:00
hieuhoang1972
9762a65bd8 xcode
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4264 1f5c12ca-751b-0410-a591-d2e778427230
2011-09-25 10:44:47 +00:00
heafield
d40ba48da3 Replace hypothesis ids with pointers to ChartHypothesis. This avoids locking.
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4261 1f5c12ca-751b-0410-a591-d2e778427230
2011-09-24 14:48:52 +00:00
heafield
19879a8b1e -threads all option
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4252 1f5c12ca-751b-0410-a591-d2e778427230
2011-09-22 22:29:56 +00:00
bhaddow
5b7c5ebdb5 Merge branch 'master' into miramerge
Conflicts:
	moses-chart-cmd/src/Main.cpp
	moses-cmd/src/IOWrapper.cpp
	moses-cmd/src/Main.cpp
	moses/src/DummyScoreProducers.cpp
	moses/src/DummyScoreProducers.h
	moses/src/GenerationDictionary.cpp
	moses/src/GenerationDictionary.h
	moses/src/GlobalLexicalModel.h
	moses/src/LMList.h
	moses/src/LanguageModel.cpp
	moses/src/LanguageModel.h
	moses/src/LanguageModelImplementation.h
	moses/src/LanguageModelKen.h
	moses/src/LanguageModelMultiFactor.cpp
	moses/src/LanguageModelMultiFactor.h
	moses/src/LanguageModelSingleFactor.cpp
	moses/src/LanguageModelSingleFactor.h
	moses/src/LexicalReordering.h
	moses/src/PhraseDictionary.cpp
	moses/src/PhraseDictionary.h
	moses/src/ScoreIndexManager.cpp
	moses/src/ScoreProducer.h
	moses/src/StaticData.cpp
	moses/src/StaticData.h
	moses/src/TranslationSystem.cpp
2011-09-20 11:23:38 +01:00
hieuhoang1972
661544109c fix n-best label for word penalty
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4209 1f5c12ca-751b-0410-a591-d2e778427230
2011-09-09 15:27:54 +00:00
hieuhoang1972
dca2b72a1c xcode macros for large file support
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4174 1f5c12ca-751b-0410-a591-d2e778427230
2011-09-06 09:44:34 +00:00
nicolabertoldi
75edc2eddd change to print the corrett name of the features with InputScores
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4168 1f5c12ca-751b-0410-a591-d2e778427230
2011-08-30 12:25:50 +00:00
bhaddow
1f3c11b441 Merge branch 'master' into miramerge
Passes all regression except for the score tests, as I still have to merge
in the missing files for these tests.

Conflicts:
	.gitignore
	Makefile.am
	configure.in
	moses-chart/moses-chart.xcodeproj/project.pbxproj
	moses/src/ChartHypothesis.cpp
	moses/src/ChartTranslationOptionCollection.cpp
	moses/src/ChartTrellisPath.cpp
	moses/src/DotChart.cpp
	moses/src/LMList.h
	moses/src/LanguageModel.cpp
	moses/src/LanguageModel.h
	moses/src/LanguageModelFactory.cpp
	moses/src/LanguageModelRemote.h
	moses/src/LexicalReordering.h
	moses/src/Makefile.am
	moses/src/Manager.cpp
	moses/src/Parameter.cpp
	moses/src/RuleCubeQueue.h
	moses/src/ScoreIndexManager.cpp
	moses/src/StaticData.cpp
	moses/src/StaticData.h
	moses/src/TargetPhrase.cpp
	moses/src/TargetPhrase.h
	moses/src/TranslationOptionCollection.cpp
2011-08-22 14:52:02 +01:00
bhaddow
762c59eddb forgot to beautify 2011-08-19 15:14:32 +01:00
bhaddow
918d692753 Merge commit 'a59ad11b58acf5dd64ec6f5990bb4ef5b74ebf28' into miramerge
Conflicts:
	moses-chart-cmd/src/Main.cpp
2011-08-19 15:13:14 +01:00
bhaddow
cf81f9188f Merged up to 3895 from trunk
git-svn-id: http://svn.statmt.org/repository/mira@3934 cc96ff50-19ce-11e0-b349-13d7f0bd23df
2011-08-18 12:59:38 +02:00
bhaddow
e664b4a4b3 Merge 3791-3842 from trunk
git-svn-id: http://svn.statmt.org/repository/mira@3873 cc96ff50-19ce-11e0-b349-13d7f0bd23df
2011-08-18 12:59:36 +02:00
hieuhoang1972
b0ec298ce2 vs.net build
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4088 1f5c12ca-751b-0410-a591-d2e778427230
2011-07-23 23:52:34 +00:00
hieuhoang1972
9c0d725cde visual studio 2010
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4079 1f5c12ca-751b-0410-a591-d2e778427230
2011-07-19 03:07:15 +00:00
pjwilliams
beba4b475f moses_chart: merge DottedRule and CoveredChartSpan classes. This saves
some memory for models that require a lot of lookup state (generally
grammars with lots of target categories).

git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4078 1f5c12ca-751b-0410-a591-d2e778427230
2011-07-18 21:44:27 +00:00
pjwilliams
2451371ca2 Changes to chart decoder cube pruning: create one cube per dotted rule
instead of one per translation and do 'non-lazy' scoring, i.e. fully
score the corner and neighbor hypotheses inside the rule cube instead
of waiting until an item is popped.  The old behaviour -- faster but
with more search errors -- is available via the
cube-pruning-lazy-scoring option.

git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@4039 1f5c12ca-751b-0410-a591-d2e778427230
2011-06-27 15:13:15 +00:00
hieuhoang1972
6cb1993541 xcode
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3932 1f5c12ca-751b-0410-a591-d2e778427230
2011-03-21 06:32:06 +00:00
hieuhoang1972
a4d22f7714 vs.net
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3928 1f5c12ca-751b-0410-a591-d2e778427230
2011-03-11 19:26:01 +00:00
hieuhoang1972
77c7a27f13 xcode
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3926 1f5c12ca-751b-0410-a591-d2e778427230
2011-03-11 17:05:05 +00:00
phkoehn
1cbe245919 re-organized syntax code for clarity - part I
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3924 1f5c12ca-751b-0410-a591-d2e778427230
2011-03-11 13:08:43 +00:00
pjwilliams
75709a6c87 Memory efficiency: make the reserveSize argument non-optional in
Moses::Phrase's constructor.  The default used to be ARRAY_SIZE_INCR = 10,
which will be excessive in many cases.  Where the default was used, I've
set the exact size where that was obvious and explicitly used ARRAY_SIZE_INCR 
otherwise.  If you know the code involved, it's probably worth reviewing.



git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3908 1f5c12ca-751b-0410-a591-d2e778427230
2011-02-28 11:41:08 +00:00
phkoehn
93ed0ca1a9 get rid of "unused variable" warnings
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3903 1f5c12ca-751b-0410-a591-d2e778427230
2011-02-24 16:17:38 +00:00
hieuhoang1972
a59ad11b58 run beautify.perl. Consistent formatting for .h & .cpp files
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3898 1f5c12ca-751b-0410-a591-d2e778427230
2011-02-24 12:40:21 +00:00
pjwilliams
967b7be213 Support for multithreading in moses_chart (-threads option). This hasn't
been thoroughly tested yet, so don't be surprised if it breaks.  Verbose
output will be scrambled.



git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3853 1f5c12ca-751b-0410-a591-d2e778427230
2011-01-26 13:15:13 +00:00
pjwilliams
8051c5ad35 Use TranslationTask objects to perform sentence decoding in moses-chart.
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3846 1f5c12ca-751b-0410-a591-d2e778427230
2011-01-25 17:15:30 +00:00
pjwilliams
99bbfe938b Use OutputCollector to write moses-chart output.
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3843 1f5c12ca-751b-0410-a591-d2e778427230
2011-01-25 15:17:17 +00:00
bhaddow
a2bde7a16e Make sure internal libraries and paths go before boost.
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3800 1f5c12ca-751b-0410-a591-d2e778427230
2011-01-15 22:41:24 +00:00
bhaddow
a9cd71628a Change of boost macros - please make sure you favourite configuration still works
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3799 1f5c12ca-751b-0410-a591-d2e778427230
2011-01-13 23:38:48 +00:00
heafield
a596b48971 Fix --enable-shared compilation.
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3796 1f5c12ca-751b-0410-a591-d2e778427230
2011-01-11 19:32:59 +00:00
bhaddow
a2730c445d Merge up to 3791 from trunk.
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/branches/mira-mtm5@3792 1f5c12ca-751b-0410-a591-d2e778427230
2011-01-05 13:49:44 +00:00
hieuhoang1972
41c5b3a1c2 xcode
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3769 1f5c12ca-751b-0410-a591-d2e778427230
2010-12-10 13:04:06 +00:00
bhaddow
0e5fbcdb4a Add show-weights for moses_chart
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3745 1f5c12ca-751b-0410-a591-d2e778427230
2010-11-29 17:05:16 +00:00
hieuhoang1972
34e7c43114 xcode
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3664 1f5c12ca-751b-0410-a591-d2e778427230
2010-10-27 03:14:11 +00:00
hieuhoang1972
5f6baa9021 xcode
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3627 1f5c12ca-751b-0410-a591-d2e778427230
2010-10-18 05:47:07 +00:00
bhaddow
7e72ceea22 Goodbye ScoreIndexManager.
Compiles ok, but haven't dared to run regression yet.


git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/branches/mira-mtm5@3608 1f5c12ca-751b-0410-a591-d2e778427230
2010-10-06 22:06:49 +00:00
bhaddow
82dba81917 Merged out from trunk to revision 3604
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/branches/mira-mtm5@3605 1f5c12ca-751b-0410-a591-d2e778427230
2010-10-05 16:02:25 +00:00
hieuhoang1972
e504b797b2 xcode
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3599 1f5c12ca-751b-0410-a591-d2e778427230
2010-10-01 00:21:27 +00:00
hieuhoang1972
559a5e3ece ken lm integration
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3570 1f5c12ca-751b-0410-a591-d2e778427230
2010-09-26 22:29:01 +00:00
hieuhoang1972
1920fc007c makefile for ken lm
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3556 1f5c12ca-751b-0410-a591-d2e778427230
2010-09-23 14:37:06 +00:00
hieuhoang1972
9f5d530910 make class name consistent for chart & pb decoders
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3552 1f5c12ca-751b-0410-a591-d2e778427230
2010-09-23 10:43:31 +00:00
hieuhoang1972
52c823fec4 ken lm integration
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3551 1f5c12ca-751b-0410-a591-d2e778427230
2010-09-23 10:21:29 +00:00
hieuhoang1972
32d3565b04 ken lm integration
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3543 1f5c12ca-751b-0410-a591-d2e778427230
2010-09-21 22:43:29 +00:00
hieuhoang1972
19ab98040d return weights as score component collection
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/branches/mira-mtm5@3521 1f5c12ca-751b-0410-a591-d2e778427230
2010-09-17 14:25:08 +00:00
hieuhoang1972
597eb24d40 sparse vectors work
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/branches/mira-mtm5@3474 1f5c12ca-751b-0410-a591-d2e778427230
2010-09-16 07:06:42 +00:00