decommented the compilation of the crf tagger

en/Makefile

@@ -7,14 +7,14 @@ compile:
 	$(MAKE) -C data/treebank compile
 	$(MAKE) -C maca_trans_parser compile
 	$(MAKE) -C maca_trans_tagger compile
-#	$(MAKE) -C maca_crf_tagger compile
+	$(MAKE) -C maca_crf_tagger compile
 
 install: 
 	-mkdir -p bin
 	$(MAKE) -C maca_trans_parser install
 	$(MAKE) -C maca_trans_tagger install
 	$(MAKE) -C maca_lemmatizer install
-#	$(MAKE) -C maca_crf_tagger install
+	$(MAKE) -C maca_crf_tagger install
 #	@tar -cvzf ./maca_datas.tgz bin
 
 evaluation:
@@ -25,5 +25,5 @@ clean:
 	$(MAKE) -C data/treebank clean
 	$(MAKE) -C maca_trans_parser clean
 	$(MAKE) -C maca_trans_tagger clean
-#	$(MAKE) -C maca_crf_tagger clean
+	$(MAKE) -C maca_crf_tagger clean
 	$(MAKE) -C eval clean

en/data/treebank/Makefile

@@ -7,16 +7,16 @@ DEV=$(PTB_DIR)/ptb.dev.conll09
 compile: dev.mcf  test.mcf  train.mcf
 
 dev.mcf: $(DEV)
-	$(TOOLS)/conll09_to_07.pl $< > tmp
-	$(TOOLS)/conll2mcf -f tmp -1W -2P -3L -4H -5D > $@
+	$(TOOLS)/conll09_to_07.pl $< > dev.conll
+	$(TOOLS)/conll2mcf -f dev.conll -1W -2P -3L -4H -5D > $@
 
 test.mcf: $(TEST)
-	$(TOOLS)/conll09_to_07.pl $< > tmp
-	$(TOOLS)/conll2mcf -f tmp -1W -2P -3L -4H -5D > $@
+	$(TOOLS)/conll09_to_07.pl $< > test.conll
+	$(TOOLS)/conll2mcf -f test.conll -1W -2P -3L -4H -5D > $@
 
 train.mcf: $(TRAIN)
-	$(TOOLS)/conll09_to_07.pl $< > tmp
-	$(TOOLS)/conll2mcf -f tmp -1W -2P -3L -4H -5D > $@
+	$(TOOLS)/conll09_to_07.pl $< > train.conll
+	$(TOOLS)/conll2mcf -f train.conll -1W -2P -3L -4H -5D > $@
 
 clean: 
-	- rm test.mcf train.mcf dev.mcf tmp
+	- rm test.mcf train.mcf dev.mcf dev.conll train.conll test.conll

en/maca_crf_tagger/Makefile

@@ -6,7 +6,7 @@ compile: $(ALL)
 
 bin: $(BIN)
 
-crf_tagger_model.txt: ../data/treebank/train.conll07 tagger-3gram.template
+crf_tagger_model.txt: ../data/treebank/train.conll tagger-3gram.template
 	$(TOOLS)train_crf_tagger.sh $^ $@
 
 crf_tagger_model.bin: crf_tagger_model.txt
@@ -15,7 +15,7 @@ crf_tagger_model.bin: crf_tagger_model.txt
 crf_tagger_wordtag_lexicon_external.txt: ../data/morpho-lexicon/fplm
 	$(TOOLS)create_crf_lexicon.py < $^ > $@ 
 
-crf_tagger_wordtag_lexicon_from_train.txt: ../data/treebank/train.conll07
+crf_tagger_wordtag_lexicon_from_train.txt: ../data/treebank/train.conll
 	$(TOOLS)extract_crf_lexicon.py < $< > $@ 
 
 crf_tagger_wordtag_lexicon.txt: crf_tagger_wordtag_lexicon_external.txt crf_tagger_wordtag_lexicon_from_train.txt

en/maca_trans_parser/maca_trans_parser.fm

@@ -5,12 +5,12 @@ s0g
 s0sf
 #s1g
 #s1sf
-s0l
+s0f
 s0p
 s1p
-b0l
+b0f
 b0p
-b1l
+b1f
 b1p
 b2p
 b3p
@@ -20,22 +20,22 @@ ldep_s1r
 rdep_s1r
 ldep_b0r
 rdep_b0r
-s0l b0l
+s0f b0f
 s0p b0p
-b0p b0l
+b0p b0f
 b0p ldep_b0r
 s1p b1p
 b1p b2p
-s0p b0p b0l
+s0p b0p b0f
 s0p ldep_s0r rdep_s0r
-s0p s0l b0p
+s0p s0f b0p
 s0p b0p dist_s0_b0
 s1p s0p b0p
 b0p b1p b2p
 b1p b2p b3p
 s0p b0p b1p
-b1p b1l b2p b3p
-b1p b1l b2p b2l b3p
+b1p b1f b2p b3p
+b1p b1f b2p b2f b3p
 t1
 t2
 t3
@@ -44,6 +44,6 @@ t2 t3
 t1 t2 t3
 
 #bm1p
-#bm1l
+#bm1f
 #bm2p
-#bm2l
+#bm2f
\ No newline at end of file

fr/Makefile

@@ -8,7 +8,7 @@ compile:
 	$(MAKE) -C maca_lexer compile
 	$(MAKE) -C maca_trans_parser compile
 	$(MAKE) -C maca_trans_tagger compile
-#	$(MAKE) -C maca_crf_tagger compile
+	$(MAKE) -C maca_crf_tagger compile
 
 install: 
 	-mkdir -p bin
@@ -16,7 +16,7 @@ install:
 	$(MAKE) -C maca_trans_tagger install
 	$(MAKE) -C maca_lemmatizer install
 	$(MAKE) -C maca_lexer install
-#	$(MAKE) -C maca_crf_tagger install
+	$(MAKE) -C maca_crf_tagger install
 #	@tar -cvzf ./maca_datas.tgz bin
 
 evaluation:
@@ -28,5 +28,5 @@ clean:
 	$(MAKE) -C maca_lexer clean
 	$(MAKE) -C maca_trans_parser clean
 	$(MAKE) -C maca_trans_tagger clean
-#	$(MAKE) -C maca_crf_tagger clean
+	$(MAKE) -C maca_crf_tagger clean
 	$(MAKE) -C eval clean

fr/maca_trans_parser/Makefile

@@ -7,6 +7,7 @@ CFF_CUTOFF_TRAIN=train.cutoff.cff
 PERCEPTRON_ITERATIONS=5
 CFF_CUTOFF=3
 FEATURES_MODEL_FILENAME=maca_trans_parser.fm
+#FEATURES_MODEL_FILENAME=dnn.fm
 VOCABS_FILENAME=maca_trans_parser.vocab 
 MODEL_FILENAME=maca_trans_parser.model 
 NUMBER_OF_SENTENCES=10000000