From 66467b23cb38f001ade28aed6437b25a94ff7b67 Mon Sep 17 00:00:00 2001
From: Franck Dary <franck.dary@lis-lab.fr>
Date: Thu, 22 Aug 2019 14:09:52 +0200
Subject: [PATCH] Updated tagparser

---
 UD_fr-GSD/tagparser/error_morpho.cla |   4 +-
 UD_fr-GSD/tagparser/error_morpho.fm  |  98 ++++-----------------
 UD_fr-GSD/tagparser/error_parser.cla |   4 +-
 UD_fr-GSD/tagparser/error_parser.fm  |   9 +-
 UD_fr-GSD/tagparser/error_tagger.cla |   4 +-
 UD_fr-GSD/tagparser/error_tagger.fm  | 127 ++++++++++++++-------------
 UD_fr-GSD/tagparser/morpho.fm        |   6 +-
 UD_fr-GSD/tagparser/parser.fm        |   6 +-
 UD_fr-GSD/tagparser/tagger.fm        |  10 +--
 9 files changed, 105 insertions(+), 163 deletions(-)

diff --git a/UD_fr-GSD/tagparser/error_morpho.cla b/UD_fr-GSD/tagparser/error_morpho.cla
index fd22d1c..51d20a3 100644
--- a/UD_fr-GSD/tagparser/error_morpho.cla
+++ b/UD_fr-GSD/tagparser/error_morpho.cla
@@ -3,5 +3,5 @@ Type : Prediction
 Oracle : none
 Feature Model : error_morpho.fm
 Action Set : error_morpho.as
-Topology : (500,RELU,0.3)
-Batchsize : 1
+Topology : M(500,RELU,0.3)
+Batchsize : 10
diff --git a/UD_fr-GSD/tagparser/error_morpho.fm b/UD_fr-GSD/tagparser/error_morpho.fm
index 3669583..1822834 100644
--- a/UD_fr-GSD/tagparser/error_morpho.fm
+++ b/UD_fr-GSD/tagparser/error_morpho.fm
@@ -1,93 +1,31 @@
 # Features classiques
 # FORM
-b.0#FORM.fasttext
-b.1#FORM.fasttext
-b.2#FORM.fasttext
-b.-1#FORM.fasttext
-b.-2#FORM.fasttext
+#b.0#FORM.fasttext
+#b.1#FORM.fasttext
+#b.2#FORM.fasttext
+#b.-1#FORM.fasttext
+#b.-2#FORM.fasttext
 # POS
 b.0#POS
 b.-1#POS
 b.-2#POS
 b.-3#POS
+b.-4#POS
 # MORPHO
+b.0#MORPHO
 b.-1#MORPHO
 b.-2#MORPHO
+b.-3#MORPHO
+b.-4#MORPHO
 # UPPERCASE
 b.0#FORM.U
-b.1#FORM.U
-# UPPERCASE
+b.-1#FORM.U
+b.-2#FORM.U
+b.-3#FORM.U
+b.-4#FORM.U
+# LENGTH
 b.0#FORM.LEN
-# EOS
-b.-2#EOS
-# SUFFIXES
-b.0#FORM.PART.-4.-4
-b.0#FORM.PART.-3.-3
-b.0#FORM.PART.-2.-2
-b.0#FORM.PART.-1.-1
-b.0#FORM.PART.0.0
-b.0#FORM.PART.1.1
-b.0#FORM.PART.2.2
-b.0#FORM.PART.3.3
-# Features methode incrementale
-s.0#FORM.fasttext
-s.1#FORM.fasttext
-s.2#FORM.fasttext
-s.0.ldep#FORM.fasttext
-s.1.ldep#FORM.fasttext
-s.1.rdep#FORM.fasttext
-s.0.ldep.ldep#FORM.fasttext
-s.1.ldep.ldep#FORM.fasttext
-s.1.rdep.rdep#FORM.fasttext
-s.0.l2dep#FORM.fasttext
-s.1.l2dep#FORM.fasttext
-s.1.r2dep#FORM.fasttext
-s.0#POS
-s.1#POS
-s.2#POS
-s.0.ldep#POS
-s.1.ldep#POS
-s.1.rdep#POS
-s.0.ldep.ldep#POS
-s.1.ldep.ldep#POS
-s.1.rdep.rdep#POS
-s.0.l2dep#POS
-s.1.l2dep#POS
-s.1.r2dep#POS
-s.0#MORPHO
-s.1#MORPHO
-s.2#MORPHO
-s.0.ldep#MORPHO
-s.1.ldep#MORPHO
-s.1.rdep#MORPHO
-s.0.ldep.ldep#MORPHO
-s.1.ldep.ldep#MORPHO
-s.1.rdep.rdep#MORPHO
-s.0.l2dep#MORPHO
-s.1.l2dep#MORPHO
-s.1.r2dep#MORPHO
-s.0.ldep#LABEL
-s.1.ldep#LABEL
-s.1.rdep#LABEL
-s.0.ldep.ldep#LABEL
-s.1.ldep.ldep#LABEL
-s.1.rdep.rdep#LABEL
-s.0.l2dep#LABEL
-s.1.l2dep#LABEL
-s.1.r2dep#LABEL
-s.0#DIST.s.1
-s.1#nbr
-s.0#nbl
-s.1#nbl
-b.-1#MORPHO
-b.-2#MORPHO
-b.-2#LABEL
-b.-1#LABEL
-s.0#LABEL
-s.1#LABEL
-b.-1.gov#POS
-b.-1.gov#MORPHO
-s.0.gov#POS
-s.0.gov#MORPHO
-s.1.gov#POS
-s.1.gov#MORPHO
+b.-1#FORM.LEN
+b.-2#FORM.LEN
+b.-3#FORM.LEN
+b.-4#FORM.LEN
diff --git a/UD_fr-GSD/tagparser/error_parser.cla b/UD_fr-GSD/tagparser/error_parser.cla
index 239fceb..99c1b13 100644
--- a/UD_fr-GSD/tagparser/error_parser.cla
+++ b/UD_fr-GSD/tagparser/error_parser.cla
@@ -3,5 +3,5 @@ Type : Prediction
 Oracle : none
 Feature Model : error_parser.fm
 Action Set : error_parser.as
-Topology : (500,RELU,0.3)
-Batchsize : 1
+Topology : M(500,RELU,0.3)
+Batchsize : 10
diff --git a/UD_fr-GSD/tagparser/error_parser.fm b/UD_fr-GSD/tagparser/error_parser.fm
index fc3b226..c6681e9 100644
--- a/UD_fr-GSD/tagparser/error_parser.fm
+++ b/UD_fr-GSD/tagparser/error_parser.fm
@@ -82,11 +82,11 @@ s.1#nbr
 s.0#nbl
 s.1#nbl
 # SIGNATURES
-b.1#SGN
-b.2#SGN
+#b.1#SGN
+#b.2#SGN
 # UPPERCASE
 b.0#FORM.U
-b.1#FORM.U
+#b.1#FORM.U
 # EOS
 b.-1#EOS
 # HISTORY
@@ -98,11 +98,14 @@ tc.4
 # More feats
 b.-2#LABEL
 b.-1#LABEL
+b.0#LABEL
 s.0#LABEL
 s.1#LABEL
 # More feats
 b.-1.gov#POS
 b.-1.gov#MORPHO
+b.0.gov#POS
+b.0.gov#MORPHO
 s.0.gov#POS
 s.0.gov#MORPHO
 s.1.gov#POS
diff --git a/UD_fr-GSD/tagparser/error_tagger.cla b/UD_fr-GSD/tagparser/error_tagger.cla
index ef61c43..b3236e6 100644
--- a/UD_fr-GSD/tagparser/error_tagger.cla
+++ b/UD_fr-GSD/tagparser/error_tagger.cla
@@ -3,5 +3,5 @@ Type : Prediction
 Oracle : none
 Feature Model : error_tagger.fm
 Action Set : error_tagger.as
-Topology : (500,RELU,0.3)
-Batchsize : 1
+Topology : M(500,RELU,0.3)
+Batchsize : 10
diff --git a/UD_fr-GSD/tagparser/error_tagger.fm b/UD_fr-GSD/tagparser/error_tagger.fm
index ed6df78..0a130ef 100644
--- a/UD_fr-GSD/tagparser/error_tagger.fm
+++ b/UD_fr-GSD/tagparser/error_tagger.fm
@@ -6,17 +6,18 @@ b.2#FORM.fasttext
 b.-1#FORM.fasttext
 b.-2#FORM.fasttext
 # POS
+b.0#POS
 b.-1#POS
 b.-2#POS
 b.-3#POS
 # SIGNATURES
 b.-1#SGN
 b.0#SGN
-b.1#SGN
-b.2#SGN
+#b.1#SGN
+#b.2#SGN
 # UPPERCASE
 b.0#FORM.U
-b.1#FORM.U
+#b.1#FORM.U
 # UPPERCASE
 b.0#FORM.LEN
 # EOS
@@ -31,63 +32,63 @@ b.0#FORM.PART.1.1
 b.0#FORM.PART.2.2
 b.0#FORM.PART.3.3
 # Features methode incrementale
-s.0#FORM.fasttext
-s.1#FORM.fasttext
-s.2#FORM.fasttext
-s.0.ldep#FORM.fasttext
-s.1.ldep#FORM.fasttext
-s.1.rdep#FORM.fasttext
-s.0.ldep.ldep#FORM.fasttext
-s.1.ldep.ldep#FORM.fasttext
-s.1.rdep.rdep#FORM.fasttext
-s.0.l2dep#FORM.fasttext
-s.1.l2dep#FORM.fasttext
-s.1.r2dep#FORM.fasttext
-s.0#POS
-s.1#POS
-s.2#POS
-s.0.ldep#POS
-s.1.ldep#POS
-s.1.rdep#POS
-s.0.ldep.ldep#POS
-s.1.ldep.ldep#POS
-s.1.rdep.rdep#POS
-s.0.l2dep#POS
-s.1.l2dep#POS
-s.1.r2dep#POS
-s.0#MORPHO
-s.1#MORPHO
-s.2#MORPHO
-s.0.ldep#MORPHO
-s.1.ldep#MORPHO
-s.1.rdep#MORPHO
-s.0.ldep.ldep#MORPHO
-s.1.ldep.ldep#MORPHO
-s.0.l2dep#MORPHO
-s.1.l2dep#MORPHO
-s.1.r2dep#MORPHO
-s.0.ldep#LABEL
-s.1.ldep#LABEL
-s.1.rdep#LABEL
-s.0.ldep.ldep#LABEL
-s.1.ldep.ldep#LABEL
-s.1.rdep.rdep#LABEL
-s.0.l2dep#LABEL
-s.1.l2dep#LABEL
-s.1.r2dep#LABEL
-s.0#DIST.s.1
-s.1#nbr
-s.0#nbl
-s.1#nbl
-b.-1#MORPHO
-b.-2#MORPHO
-b.-2#LABEL
-b.-1#LABEL
-s.0#LABEL
-s.1#LABEL
-b.-1.gov#POS
-b.-1.gov#MORPHO
-s.0.gov#POS
-s.0.gov#MORPHO
-s.1.gov#POS
-s.1.gov#MORPHO
+#s.0#FORM.fasttext
+#s.1#FORM.fasttext
+#s.2#FORM.fasttext
+#s.0.ldep#FORM.fasttext
+#s.1.ldep#FORM.fasttext
+#s.1.rdep#FORM.fasttext
+#s.0.ldep.ldep#FORM.fasttext
+#s.1.ldep.ldep#FORM.fasttext
+#s.1.rdep.rdep#FORM.fasttext
+#s.0.l2dep#FORM.fasttext
+#s.1.l2dep#FORM.fasttext
+#s.1.r2dep#FORM.fasttext
+#s.0#POS
+#s.1#POS
+#s.2#POS
+#s.0.ldep#POS
+#s.1.ldep#POS
+#s.1.rdep#POS
+#s.0.ldep.ldep#POS
+#s.1.ldep.ldep#POS
+#s.1.rdep.rdep#POS
+#s.0.l2dep#POS
+#s.1.l2dep#POS
+#s.1.r2dep#POS
+#s.0#MORPHO
+#s.1#MORPHO
+#s.2#MORPHO
+#s.0.ldep#MORPHO
+#s.1.ldep#MORPHO
+#s.1.rdep#MORPHO
+#s.0.ldep.ldep#MORPHO
+#s.1.ldep.ldep#MORPHO
+#s.0.l2dep#MORPHO
+#s.1.l2dep#MORPHO
+#s.1.r2dep#MORPHO
+#s.0.ldep#LABEL
+#s.1.ldep#LABEL
+#s.1.rdep#LABEL
+#s.0.ldep.ldep#LABEL
+#s.1.ldep.ldep#LABEL
+#s.1.rdep.rdep#LABEL
+#s.0.l2dep#LABEL
+#s.1.l2dep#LABEL
+#s.1.r2dep#LABEL
+#s.0#DIST.s.1
+#s.1#nbr
+#s.0#nbl
+#s.1#nbl
+#b.-1#MORPHO
+#b.-2#MORPHO
+#b.-2#LABEL
+#b.-1#LABEL
+#s.0#LABEL
+#s.1#LABEL
+#b.-1.gov#POS
+#b.-1.gov#MORPHO
+#s.0.gov#POS
+#s.0.gov#MORPHO
+#s.1.gov#POS
+#s.1.gov#MORPHO
diff --git a/UD_fr-GSD/tagparser/morpho.fm b/UD_fr-GSD/tagparser/morpho.fm
index 1de4556..0f1d495 100644
--- a/UD_fr-GSD/tagparser/morpho.fm
+++ b/UD_fr-GSD/tagparser/morpho.fm
@@ -1,8 +1,8 @@
 # Features classiques
 # FORM
 b.0#FORM.fasttext
-b.1#FORM.fasttext
-b.2#FORM.fasttext
+#b.1#FORM.fasttext
+#b.2#FORM.fasttext
 b.-1#FORM.fasttext
 b.-2#FORM.fasttext
 # POS
@@ -15,7 +15,7 @@ b.-1#MORPHO
 b.-2#MORPHO
 # UPPERCASE
 b.0#FORM.U
-b.1#FORM.U
+#b.1#FORM.U
 # UPPERCASE
 b.0#FORM.LEN
 # EOS
diff --git a/UD_fr-GSD/tagparser/parser.fm b/UD_fr-GSD/tagparser/parser.fm
index b11515f..677a7c2 100644
--- a/UD_fr-GSD/tagparser/parser.fm
+++ b/UD_fr-GSD/tagparser/parser.fm
@@ -82,11 +82,11 @@ s.1#nbr
 s.0#nbl
 s.1#nbl
 # SIGNATURES
-b.1#SGN
-b.2#SGN
+#b.1#SGN
+#b.2#SGN
 # UPPERCASE
 b.0#FORM.U
-b.1#FORM.U
+#b.1#FORM.U
 # EOS
 b.-1#EOS
 # HISTORY
diff --git a/UD_fr-GSD/tagparser/tagger.fm b/UD_fr-GSD/tagparser/tagger.fm
index 9faed2d..e451137 100644
--- a/UD_fr-GSD/tagparser/tagger.fm
+++ b/UD_fr-GSD/tagparser/tagger.fm
@@ -1,8 +1,8 @@
 # Features classiques
 # FORM
 b.0#FORM.fasttext
-b.1#FORM.fasttext
-b.2#FORM.fasttext
+#b.1#FORM.fasttext
+#b.2#FORM.fasttext
 b.-1#FORM.fasttext
 b.-2#FORM.fasttext
 # POS
@@ -12,11 +12,11 @@ b.-3#POS
 # SIGNATURES
 b.-1#SGN
 b.0#SGN
-b.1#SGN
-b.2#SGN
+#b.1#SGN
+#b.2#SGN
 # UPPERCASE
 b.0#FORM.U
-b.1#FORM.U
+#b.1#FORM.U
 # UPPERCASE
 b.0#FORM.LEN
 # EOS
-- 
GitLab