From dae5fbc5f74f6dbd16d40835730b1b0ca600652b Mon Sep 17 00:00:00 2001
From: Franck Dary <franck.dary@lis-lab.fr>
Date: Mon, 19 Aug 2019 13:15:26 +0200
Subject: [PATCH] Update

---
 UD_fr-GSD/morpho/error_morpho.cla         |  4 +--
 UD_fr-GSD/morpho/machine.tm               | 10 +++++--
 UD_fr-GSD/morpho/morpho.fm                |  8 ++---
 UD_fr-GSD/tagparser_systematic/machine.tm | 32 ++++++--------------
 UD_fr-GSD/tagparser_systematic/morpho.fm  | 36 +++++++++++------------
 UD_fr-GSD/tagparser_systematic/parser.fm  | 18 ++++++------
 UD_fr-GSD/tagparser_systematic/tagger.fm  | 32 ++++++++++----------
 7 files changed, 65 insertions(+), 75 deletions(-)

diff --git a/UD_fr-GSD/morpho/error_morpho.cla b/UD_fr-GSD/morpho/error_morpho.cla
index 0042b16..a618cfb 100644
--- a/UD_fr-GSD/morpho/error_morpho.cla
+++ b/UD_fr-GSD/morpho/error_morpho.cla
@@ -3,5 +3,5 @@ Type : Prediction
 Oracle : none
 Feature Model : error_morpho.fm
 Action Set : error_morpho.as
-Topology : R(500,RELU,0.3)
-Batchsize : 50
+Topology : M(500,RELU,0.3)
+Batchsize : 1
diff --git a/UD_fr-GSD/morpho/machine.tm b/UD_fr-GSD/morpho/machine.tm
index 530fada..7af2217 100644
--- a/UD_fr-GSD/morpho/machine.tm
+++ b/UD_fr-GSD/morpho/machine.tm
@@ -1,8 +1,12 @@
-Name : Morpho Machine
+Name : Morpho with error correction
 Dicts : morpho.dicts
 %CLASSIFIERS
 morpho morpho.cla
+error_morpho error_morpho.cla
 %STATES
-morpho1 morpho
+morpho morpho
+error_morpho error_morpho
 %TRANSITIONS
-morpho1 morpho1 +1 *
+morpho error_morpho 0 *
+error_morpho morpho 0 BACK
+error_morpho morpho 1 *
diff --git a/UD_fr-GSD/morpho/morpho.fm b/UD_fr-GSD/morpho/morpho.fm
index 3e542b8..d52d03c 100644
--- a/UD_fr-GSD/morpho/morpho.fm
+++ b/UD_fr-GSD/morpho/morpho.fm
@@ -29,10 +29,10 @@ b.0#FORM.PART.2.2
 b.0#FORM.PART.3.3
 # ERROR CORRECTION
 b.1#POS
-#b.1#MORPHO
+b.1#MORPHO
 b.2#POS
-#b.2#MORPHO
+b.2#MORPHO
 b.3#POS
-#b.3#MORPHO
+b.3#MORPHO
 b.4#POS
-#b.4#MORPHO
+b.4#MORPHO
diff --git a/UD_fr-GSD/tagparser_systematic/machine.tm b/UD_fr-GSD/tagparser_systematic/machine.tm
index c2065c1..e30fc75 100644
--- a/UD_fr-GSD/tagparser_systematic/machine.tm
+++ b/UD_fr-GSD/tagparser_systematic/machine.tm
@@ -1,4 +1,4 @@
-Name : Tagger, Morpho, Lemmatizer, Parser with error correction
+Name : Tagger, Morpho, Lemma and Parser Machine
 Dicts : tagparser.dicts
 %CLASSIFIERS
 tagger tagger.cla
@@ -7,37 +7,23 @@ signature signature.cla
 lemma_lookup lemmatizer_lookup.cla
 lemma_rules lemmatizer_rules.cla
 parser parser.cla
-error_tagger error_tagger.cla
-error_morpho error_morpho.cla
-error_parser error_parser.cla
 %STATES
 signature signature
 tagger tagger
-error_tagger error_tagger
 morpho morpho
-error_morpho error_morpho
 lemma_lookup lemma_lookup
 lemma_rules lemma_rules
 parser parser
-error_parser_stay error_parser
-error_parser_move error_parser
 %TRANSITIONS
 signature tagger 0 *
-tagger error_tagger 0 *
-error_tagger tagger 0 BACK
-error_tagger morpho 0 *
-morpho error_morpho 0 *
-error_morpho morpho 0 BACK
-error_morpho lemma_lookup 0 *
+tagger morpho 0 *
+morpho lemma_lookup 0 *
 lemma_lookup parser 0 *
 lemma_lookup lemma_rules 0 NOTFOUND
 lemma_rules parser 0 *
-parser error_parser_stay 0 LEFT
-parser error_parser_stay 0 EOS
-parser error_parser_stay 0 REDUCE
-parser error_parser_stay 0 ROOT
-parser error_parser_move 0 SHIFT
-parser error_parser_move 0 RIGHT
-error_parser_stay parser 0 *
-error_parser_move parser +1 BACK
-error_parser_move signature +1 *
+parser parser 0 LEFT
+parser parser 0 EOS
+parser parser 0 REDUCE
+parser parser 0 ROOT
+parser signature +1 SHIFT
+parser signature +1 RIGHT
diff --git a/UD_fr-GSD/tagparser_systematic/morpho.fm b/UD_fr-GSD/tagparser_systematic/morpho.fm
index 28cb3ec..6293938 100644
--- a/UD_fr-GSD/tagparser_systematic/morpho.fm
+++ b/UD_fr-GSD/tagparser_systematic/morpho.fm
@@ -30,24 +30,24 @@ b.0#FORM.PART.1.1
 b.0#FORM.PART.2.2
 b.0#FORM.PART.3.3
 # ERROR CORRECTION
-b.1.ldep#FORM.fasttext
-b.1.ldep#POS
-b.1.ldep#MORPHO
-b.1.ldep#LABEL
-b.1#LABEL
-b.1.gov#POS
-b.1.gov#MORPHO
-b.1#POS
-b.1#MORPHO
-b.2.ldep#FORM.fasttext
-b.2.ldep#POS
-b.2.ldep#MORPHO
-b.2.ldep#LABEL
-b.2#LABEL
-b.2.gov#POS
-b.2.gov#MORPHO
-b.2#POS
-b.2#MORPHO
+#b.1.ldep#FORM.fasttext
+#b.1.ldep#POS
+#b.1.ldep#MORPHO
+#b.1.ldep#LABEL
+#b.1#LABEL
+#b.1.gov#POS
+#b.1.gov#MORPHO
+#b.1#POS
+#b.1#MORPHO
+#b.2.ldep#FORM.fasttext
+#b.2.ldep#POS
+#b.2.ldep#MORPHO
+#b.2.ldep#LABEL
+#b.2#LABEL
+#b.2.gov#POS
+#b.2.gov#MORPHO
+#b.2#POS
+#b.2#MORPHO
 # Features methode incrementale
 #s.0#FORM.fasttext
 #s.1#FORM.fasttext
diff --git a/UD_fr-GSD/tagparser_systematic/parser.fm b/UD_fr-GSD/tagparser_systematic/parser.fm
index 6067bc6..9543033 100644
--- a/UD_fr-GSD/tagparser_systematic/parser.fm
+++ b/UD_fr-GSD/tagparser_systematic/parser.fm
@@ -96,15 +96,15 @@ tc.2
 tc.3
 tc.4
 # ERROR CORRECTION
-b.1.ldep#LEMMA.fasttext
-b.1.ldep#POS
-b.1.ldep#MORPHO
-b.1.ldep#LABEL
-b.1#LABEL
-b.1.gov#POS
-b.1.gov#MORPHO
-b.1#POS
-b.1#MORPHO
+#b.1.ldep#LEMMA.fasttext
+#b.1.ldep#POS
+#b.1.ldep#MORPHO
+#b.1.ldep#LABEL
+#b.1#LABEL
+#b.1.gov#POS
+#b.1.gov#MORPHO
+#b.1#POS
+#b.1#MORPHO
 # More feats
 b.-2#LABEL
 b.-1#LABEL
diff --git a/UD_fr-GSD/tagparser_systematic/tagger.fm b/UD_fr-GSD/tagparser_systematic/tagger.fm
index 5259dc2..f61729c 100644
--- a/UD_fr-GSD/tagparser_systematic/tagger.fm
+++ b/UD_fr-GSD/tagparser_systematic/tagger.fm
@@ -31,22 +31,22 @@ b.0#FORM.PART.1.1
 b.0#FORM.PART.2.2
 b.0#FORM.PART.3.3
 # ERROR CORRECTION
-b.1.ldep#FORM.fasttext
-b.1.ldep#POS
-b.1.ldep#MORPHO
-b.1.ldep#LABEL
-b.1#LABEL
-b.1.gov#POS
-b.1.gov#MORPHO
-b.1#POS
-b.2.ldep#FORM.fasttext
-b.2.ldep#POS
-b.2.ldep#MORPHO
-b.2.ldep#LABEL
-b.2#LABEL
-b.2.gov#POS
-b.2.gov#MORPHO
-b.2#POS
+#b.1.ldep#FORM.fasttext
+#b.1.ldep#POS
+#b.1.ldep#MORPHO
+#b.1.ldep#LABEL
+#b.1#LABEL
+#b.1.gov#POS
+#b.1.gov#MORPHO
+#b.1#POS
+#b.2.ldep#FORM.fasttext
+#b.2.ldep#POS
+#b.2.ldep#MORPHO
+#b.2.ldep#LABEL
+#b.2#LABEL
+#b.2.gov#POS
+#b.2.gov#MORPHO
+#b.2#POS
 # Features methode incrementale
 #s.0#FORM.fasttext
 #s.1#FORM.fasttext
-- 
GitLab