Commit Graph

276 Commits

Author SHA1 Message Date
Barry Haddow
d57d0c0656 Merge branch 'master' into miramerge
Conflicts:
	Makefile.am
	config.h.in
	configure.in
	kenlm
	moses-chart-cmd/src/IOWrapper.cpp
	moses/src/Parameter.cpp
	scripts/Makefile
2011-11-17 17:46:17 +00:00
Kenneth Heafield
72a4c8a0d3 Move kenlm up one level, simplify compilation 2011-11-17 12:49:55 +00:00
Hieu Hoang
87500bc93d visual studio 2011-11-11 22:24:25 +00:00
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
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
bhaddow
cfec98197d Update binary phrase table to include sparse.
It does this by adding a minimum of an  extra uint_32 onto every
source/target record, but I couldn't see where else
to put it.
2011-09-29 21:35:52 +01: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
jhclark
da6e4935fd Return 0 on success and 1 on fail. Not the other way around.
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3954 1f5c12ca-751b-0410-a591-d2e778427230
2011-05-05 00:51:35 +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
hieuhoang1972
a3d97584a9 run beautify.perl. Consistent formatting for .h & .cpp files
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3902 1f5c12ca-751b-0410-a591-d2e778427230
2011-02-24 13:57:11 +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
hieuhoang1972
564a9ad371 word alignment info in binary pt, code provided by Christof Pintaske
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3637 1f5c12ca-751b-0410-a591-d2e778427230
2010-10-22 10:37:19 +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
c73dddfb5b delete eclipse build
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3423 1f5c12ca-751b-0410-a591-d2e778427230
2010-09-10 09:34:17 +00:00
hieuhoang1972
bdfa2beab8 delete eclipse build
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3422 1f5c12ca-751b-0410-a591-d2e778427230
2010-09-10 09:16:50 +00:00
hieuhoang1972
888cc09d34 xcode
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3411 1f5c12ca-751b-0410-a591-d2e778427230
2010-08-27 10:27:51 +00:00
hieuhoang1972
c9eb463fe6 vs.net
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3301 1f5c12ca-751b-0410-a591-d2e778427230
2010-06-05 13:10:26 +00:00
chardmeier
36cfac2eaa Added queryPhraseTable tool.
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3259 1f5c12ca-751b-0410-a591-d2e778427230
2010-05-16 20:32:08 +00:00
hieuhoang1972
c117ef7c17 Copy in changes from the chart_merge branch (doing it manually because the
server doesn't seem to support subversion's --reintegrate option).


git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3078 1f5c12ca-751b-0410-a591-d2e778427230
2010-04-08 17:16:10 +00:00
sanmarf
d30212f19d Simple program that illustrates how to access a phrase table on disk from an external program
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3063 1f5c12ca-751b-0410-a591-d2e778427230
2010-04-07 10:25:50 +00:00
hieuhoang1972
202bcf2911 eclipse build
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3015 1f5c12ca-751b-0410-a591-d2e778427230
2010-03-31 20:03:54 +00:00
bhaddow
795224736b Merge revisions 2670-2988 from track. Passes all regression except lexicalised
reordering


git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/branches/hierarchical-reo@2989 1f5c12ca-751b-0410-a591-d2e778427230
2010-03-19 17:52:51 +00:00
jfouet
7c1e287c71 Add configure options to link dynamically with libmoses
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@2932 1f5c12ca-751b-0410-a591-d2e778427230
2010-02-24 09:27:18 +00:00
sarst
4b40d26e0f updated quearyLexicalTable.cpp to fix compilation error
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/branches/hierarchical-reo@2715 1f5c12ca-751b-0410-a591-d2e778427230
2010-01-28 15:29:11 +00:00
hieuhoang1972
a042aad7f2 visual studio
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@2559 1f5c12ca-751b-0410-a591-d2e778427230
2009-10-02 09:54:10 +00:00
bhaddow
c5d39f039f Merge moses-server branch (includes mt moses) into trunk.
Plain (single-thread) moses should configure and build as before.
Multi-thread and server only available if appropriate options are selected
at configure/compile time.


git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@2477 1f5c12ca-751b-0410-a591-d2e778427230
2009-08-07 16:47:54 +00:00
hieuhoang1972
69b2dc441d eclipse files
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1954 1f5c12ca-751b-0410-a591-d2e778427230
2008-12-10 14:20:10 +00:00
hieuhoang1972
789d6d96d1 intergrate randlm
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1935 1f5c12ca-751b-0410-a591-d2e778427230
2008-11-04 18:03:03 +00:00
hieuhoang1972
c59b532df1 eclipse proj
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1927 1f5c12ca-751b-0410-a591-d2e778427230
2008-10-31 18:44:44 +00:00
hieuhoang1972
254005bcee unix build
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1900 1f5c12ca-751b-0410-a591-d2e778427230
2008-10-10 18:30:59 +00:00
hieuhoang1972
868428fe66 unix build
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1898 1f5c12ca-751b-0410-a591-d2e778427230
2008-10-09 00:20:39 +00:00
hieuhoang1972
928d771085 create namespace
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1897 1f5c12ca-751b-0410-a591-d2e778427230
2008-10-08 23:51:26 +00:00
nicolabertoldi
9cbde412e2 support for creating binary Phrase Tables including word-to-word alignments
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1887 1f5c12ca-751b-0410-a591-d2e778427230
2008-09-12 18:19:41 +00:00
hieuhoang1972
5dee5d04aa rename IOStream to IOWrapper.
move vs.net solution file to root folder

git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1872 1f5c12ca-751b-0410-a591-d2e778427230
2008-08-05 00:24:45 +00:00
hieuhoang1972
1792e14945 eclipse project
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1810 1f5c12ca-751b-0410-a591-d2e778427230
2008-06-02 21:23:33 +00:00
hieuhoang1972
4a2982cd34 build with SRILM in windows under different configuration
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1427 1f5c12ca-751b-0410-a591-d2e778427230
2007-07-17 20:45:51 +00:00
hieuhoang1972
4fbed2c983 update eclipse project file for irstlm change
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1408 1f5c12ca-751b-0410-a591-d2e778427230
2007-05-29 13:37:31 +00:00
hieuhoang1972
fcef0bb09f eclipse proj
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1350 1f5c12ca-751b-0410-a591-d2e778427230
2007-04-11 19:03:04 +00:00
hieuhoang1972
9394f571e6 eclipse project file
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1318 1f5c12ca-751b-0410-a591-d2e778427230
2007-03-17 14:26:53 +00:00
konrad_rawlik
710099be91 queryLexicalTable
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1314 1f5c12ca-751b-0410-a591-d2e778427230
2007-03-15 12:43:27 +00:00
hieuhoang1972
f57a36af1b add queryLexicalTable.cpp placeholder
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1313 1f5c12ca-751b-0410-a591-d2e778427230
2007-03-15 12:01:53 +00:00
hieuhoang1972
05a45bd0f9 lexicalised reodering working with visual studio
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1302 1f5c12ca-751b-0410-a591-d2e778427230
2007-03-14 13:02:00 +00:00
konrad_rawlik
770d8e08c3 Added lexical reordering changes
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1301 1f5c12ca-751b-0410-a591-d2e778427230
2007-03-14 12:42:35 +00:00
hieuhoang1972
f3cbacba3e code cleanup - make FactorCollection and StaticData totally accessible only globally
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1218 1f5c12ca-751b-0410-a591-d2e778427230
2007-02-16 18:08:37 +00:00
hieuhoang1972
4237cba9c3 check in eclipse proj to make bin table
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1212 1f5c12ca-751b-0410-a591-d2e778427230
2007-02-14 20:32:57 +00:00
hieuhoang1972
e247f1da6f fixed regression test failing. Number of features for generation models MUST be specified in ini file, no backward compatability hack
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1209 1f5c12ca-751b-0410-a591-d2e778427230
2007-02-13 19:15:34 +00:00
hieuhoang1972
1b2f95ad6a create eclipse project for processing bin phrase table
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1200 1f5c12ca-751b-0410-a591-d2e778427230
2007-02-09 19:32:53 +00:00
hieuhoang1972
b21188e26f visual studio projects
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@1130 1f5c12ca-751b-0410-a591-d2e778427230
2007-01-20 22:03:48 +00:00
hieuhoang1972
a1f39c3ce7 lots of small changes and code clean up:
error catching/fail more gracefully on tables/lm load error & consistent user output
consistent debugging output
cleaned up timing functions
cleaned up mose/moses-cmd api calls/interaction
split up loading of all data in StaticData into separate fns
got binary phrase table to work under WIN32 & passed regression !!
added more comments
deleted phrase table filtering code
deleted mysql support
change calls to ToString() which might affect decoding to a call to a non-debugging fn instead, eg GetString()


git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@988 1f5c12ca-751b-0410-a591-d2e778427230
2006-11-21 19:35:37 +00:00
redpony
1e7a253a43 Building misc/ along with the rest of the suite.
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@815 1f5c12ca-751b-0410-a591-d2e778427230
2006-09-15 21:32:48 +00:00
redpony
b7ffa5f8b9 make building moses/moses-cmd a single make command rather than two
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@794 1f5c12ca-751b-0410-a591-d2e778427230
2006-08-23 15:18:53 +00:00
hieuhoang1972
c1724ee9ef visual studio proj file
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@698 1f5c12ca-751b-0410-a591-d2e778427230
2006-08-14 00:04:45 +00:00
hieuhoang1972
e684352c62 improved tagging
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@678 1f5c12ca-751b-0410-a591-d2e778427230
2006-08-12 03:32:10 +00:00
hieuhoang1972
4d0922afab *** empty log message ***
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@677 1f5c12ca-751b-0410-a591-d2e778427230
2006-08-12 01:31:16 +00:00
hieuhoang1972
c239967840 improved tagging
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@664 1f5c12ca-751b-0410-a591-d2e778427230
2006-08-11 20:18:16 +00:00
hieuhoang1972
911cb09d6f improved tagging
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@640 1f5c12ca-751b-0410-a591-d2e778427230
2006-08-11 04:56:34 +00:00
hieuhoang1972
0fbd7735cc improved tagging
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@639 1f5c12ca-751b-0410-a591-d2e778427230
2006-08-11 04:05:20 +00:00
hieuhoang1972
36f9cd2fb9 change chunking extraction according to advice from phi
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@637 1f5c12ca-751b-0410-a591-d2e778427230
2006-08-11 02:10:51 +00:00
hieuhoang1972
c8d1576e6a change chunking extraction according to advice from phi
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@628 1f5c12ca-751b-0410-a591-d2e778427230
2006-08-10 22:08:10 +00:00
hieuhoang1972
f0dc2ffcf7 create data for chunking LM
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@553 1f5c12ca-751b-0410-a591-d2e778427230
2006-08-08 00:19:40 +00:00
hieuhoang1972
ce408f05f4 bug in shallow parsing class
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@542 1f5c12ca-751b-0410-a591-d2e778427230
2006-08-07 22:19:09 +00:00
zens
8bf9742655 move CreateTranslationOptionCollection call into Manager
some code cleaning


git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@534 1f5c12ca-751b-0410-a591-d2e778427230
2006-08-07 18:29:35 +00:00
hieuhoang1972
20efbe08ac parse tree filtering
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@522 1f5c12ca-751b-0410-a591-d2e778427230
2006-08-06 04:52:15 +00:00
hieuhoang1972
0db0be9287 added java utils in misc project
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@499 1f5c12ca-751b-0410-a591-d2e778427230
2006-08-04 20:55:34 +00:00
hieuhoang1972
82a0b5c4bf visual studio project for misc
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@494 1f5c12ca-751b-0410-a591-d2e778427230
2006-08-04 15:13:57 +00:00
zens
0e6517b428 - fixing already fixed bugs that have been re-introduced by someone
- moving some stuff from PhraseDictionaryTree to GenerateTuples
 - removing some obsolete code


git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@359 1f5c12ca-751b-0410-a591-d2e778427230
2006-07-28 18:14:20 +00:00
zens
422418008e - confusion net:
* more robust read functions
    * correct treatment of epsilons
    * code cleanup

 - parameter: fixed check for binary phrase table
 - staticData: do not read input phrases in case of binary phrase table


git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@260 1f5c12ca-751b-0410-a591-d2e778427230
2006-07-24 18:33:08 +00:00
zens
325353b0f4 - support for binary ttable in moses almost completed
- moved common part of CreateTranslationOptionCollection() for text and confusion net input
   to base class


git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@237 1f5c12ca-751b-0410-a591-d2e778427230
2006-07-21 13:22:00 +00:00
zens
648bd1dfcd - prepared confusion net input
-> new base class InputType is used throughout the decoder
      instead of Sentence
      Sentence and ConfusionNet derive from this class
   -> Manager etc. do not know if the input is a sentence or a
      confusion net (but could check if REALLY needed)
 - two separate classes derived from TranslationOptionCollection:
   one for text input and one for confusion net input
 - score computation in PhraseDictionaryTree.cpp and some optimizations


git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@183 1f5c12ca-751b-0410-a591-d2e778427230
2006-07-19 00:16:29 +00:00
zens
1286f53691 - added class for confusion net
- generation of target candidates for confusion net


git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@162 1f5c12ca-751b-0410-a591-d2e778427230
2006-07-18 00:12:51 +00:00
hieuhoang1972
d655816734 for miscellaneous scripts and programs stuff
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@136 1f5c12ca-751b-0410-a591-d2e778427230
2006-07-15 03:19:07 +00:00
hieuhoang1972
1798d8541e for miscellaneous scripts for stuff
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@135 1f5c12ca-751b-0410-a591-d2e778427230
2006-07-15 03:15:16 +00:00