Commit Graph

47 Commits

Author SHA1 Message Date
=
48c424a5d6 Added *.d 2013-09-25 00:52:38 +01:00
Lane Schwartz
c0fe9bb4ea Updating XCode project 2013-08-29 12:56:25 -04:00
Lane Schwartz
406f3bdd0e Tell gitignore about Mac OS X hidden files 2013-08-28 13:57:06 -04:00
amittai
85b17db8e6 updated Windows instructions slightly; also .gitignore should ignore the sentence-bleu binary. 2013-01-15 18:34:33 -08:00
Barry Haddow
0a950ee9f4 Merge remote branch 'github/master' into miramerge
Compiles, but not tested. Had to disable relent filter. Strangely, it seems to contain the
whole of moses-cmd.

Conflicts:
	Jamroot
	OnDiskPt/TargetPhrase.cpp
	moses-cmd/src/Main.cpp
	moses/src/AlignmentInfo.cpp
	moses/src/AlignmentInfo.h
	moses/src/ChartTranslationOptionCollection.cpp
	moses/src/ChartTranslationOptionCollection.h
	moses/src/GenerationDictionary.cpp
	moses/src/Jamfile
	moses/src/Parameter.cpp
	moses/src/PhraseDictionary.cpp
	moses/src/StaticData.cpp
	moses/src/StaticData.h
	moses/src/TargetPhrase.h
	moses/src/TranslationSystem.cpp
	moses/src/TranslationSystem.h
	moses/src/Word.cpp
	phrase-extract/score.cpp
	regression-testing/Jamfile
	scripts/ems/experiment.meta
	scripts/ems/experiment.perl
	scripts/training/train-model.perl
2012-09-26 22:49:33 +01:00
Jacob Dlougach
4ec7b56a16 Remove unneeded pattern from ignore 2012-09-21 17:38:19 +04:00
Jacob Dlougach
183b630d66 Ignores for xcode user data 2012-09-21 17:36:43 +04:00
Eva Hasler
e1c1a5343c merge 2012-06-07 11:16:52 +01:00
Eva Hasler
6a6a35c65e fix start weights in experiment.perl, add hypothesis queue for picking hope and fear translations, add variations to 1slack formulation 2012-06-01 01:49:42 +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
Eva Hasler
30deedde9f changed permission, everything changed.. 2012-05-10 18:54:24 +01:00
Kenneth Heafield
a54f7f855f Save bjam arguments to previous.sh. 2012-03-30 19:57:05 -04:00
Kenneth Heafield
40c5888723 Save bjam arguments to previous.sh. 2012-03-30 19:57:05 -04:00
Tetsuo Kiso
ba55a5a345 Ignore *.gch files.
This commit might help someone who use on-the-fly syntax
checking tools such as 'Flymake' in Emacs.
2012-02-03 14:01:52 +09:00
Tetsuo Kiso
2317bf0917 Ignore *.gch files.
This commit might help someone who use on-the-fly syntax
checking tools such as 'Flymake' in Emacs.
2012-02-03 14:01:52 +09:00
Rico Sennrich
8ee3ed6d64 tmcombine (translation model combination) 2012-01-31 10:50:20 +01:00
Rico Sennrich
1b229137fa tmcombine (translation model combination) 2012-01-31 10:50:20 +01:00
Barry Haddow
072848a4df Merge branch 'master' into bjam. Doesn't compile.
Conflicts:
	.gitignore
	Makefile.am
	config.h.in
	configure.in
	m4/boost.m4
	moses/src/LM/Factory.cpp
	moses/src/LM/ParallelBackoff.h
	moses/src/LM/RandLM.h
	moses/src/Makefile.am
	moses/src/PDTAimp.h
	moses/src/Phrase.h
	moses/src/PhraseDictionaryTree.cpp
	moses/src/ScoreComponentCollection.h
	moses/src/ScoreIndexManager.cpp
	moses/src/StaticData.cpp
	moses/src/TargetPhrase.cpp
	moses/src/TranslationOptionCollection.cpp
	moses/src/TranslationSystem.cpp
	scripts/Makefile
	scripts/released-files
2011-12-08 23:17:30 +00:00
Kenneth Heafield
d3dd1ae7c5 Script to delete files that autotools left behind 2011-12-01 18:47:05 +00:00
Kenneth Heafield
e544b04e08 Script to delete files that autotools left behind 2011-12-01 18:47:05 +00:00
Kenneth Heafield
c53453b266 No more autotools (with bhaddow in the room) 2011-12-01 17:17:28 +00:00
Kenneth Heafield
42975b0635 No more autotools (with bhaddow in the room) 2011-12-01 17:17:28 +00:00
Kenneth Heafield
e1ed3b9d9a Ignore .so built files 2011-11-28 12:02:13 +00:00
Kenneth Heafield
378a1c63fd Ignore .so built files 2011-11-28 12:02:13 +00:00
Kenneth Heafield
cc440592f2 Ignore generated train-model.perl 2011-11-25 15:54:09 +00:00
Kenneth Heafield
01986f9b83 Ignore generated train-model.perl 2011-11-25 15:54:09 +00:00
Barry Haddow
713f2327f3 Some more ignores 2011-11-23 12:29:40 +00:00
Barry Haddow
1248bdfdbb Some more ignores 2011-11-23 12:29:40 +00:00
Phil Williams
ee0a6dbd5c extract-ghkm: add the features required for use as a drop-in replacement
for extract-rules: composed rules, unaligned source word attachment,
non-lexical unary rule elimination, glue rule generation, unknown word
label generation, and EMS integration.
2011-11-21 16:21:04 +00:00
Kenneth Heafield
9102477a07 bjam for people who don't have it 2011-11-18 13:14:09 -05:00
Kenneth Heafield
5c9b28c55a Introducing Jamfiles
Currently supports kenlm, irstlm, and srilm options.

bjam [--with-srilm=/path/to/sri] [--with-irstlm=/path/to/irst] -j8
Places binaries in dist/ that pass regression tests.
2011-11-18 14:37:01 +00:00
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
492fe6d97a gitignore 2011-11-17 13:07:06 +00:00
Barry Haddow
6890472ba1 Merge branch 'master' into miramerge
Conflicts:
	.gitignore
	config.h.in
	moses/src/ChartTrellisPath.cpp
	moses/src/Makefile.am
2011-11-11 08:25:13 +00:00
Phil Williams
abfa7a4ccc Add more files to .gitignore 2011-11-08 14:50:35 +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
Kenneth Heafield
7ead8ecaf9 Add more build products to .gitignore 2011-10-19 10:08:04 +01:00
bhaddow
c07932cc9c new ignores 2011-08-22 15:07:35 +01: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
4150ceb2c4 New ignores 2011-08-19 12:25:21 +01:00
dowobeha
79812e789c Added files to .gitignore
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3977 1f5c12ca-751b-0410-a591-d2e778427230
2011-05-13 21:02:25 +00:00
dowobeha
c5ea64f69b Added files to .gitignore
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3975 1f5c12ca-751b-0410-a591-d2e778427230
2011-05-13 19:41:44 +00:00
dowobeha
9375aa8846 Reverting changes. Revision 3971 was a bad commit.
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3972 1f5c12ca-751b-0410-a591-d2e778427230
2011-05-13 18:27:30 +00:00
dowobeha
bb941c01f6 Merge branch 'master' into local-trunk
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3971 1f5c12ca-751b-0410-a591-d2e778427230
2011-05-13 18:07:21 +00:00
bojar
403bc99cfb Merge branch 'moses-svn' into temp3
git-svn-id: https://mosesdecoder.svn.sourceforge.net/svnroot/mosesdecoder/trunk@3148 1f5c12ca-751b-0410-a591-d2e778427230
2010-04-20 15:27:42 +00:00