From 10903afb7f3c25bc38268d88f7036a6fdee9b50a Mon Sep 17 00:00:00 2001
From: Franck Dary <franck.dary@lis-lab.fr>
Date: Tue, 8 Oct 2019 17:44:06 +0200
Subject: [PATCH] Updated fr gsd parser

---
 UD_fr-GSD/eval/experiences.txt | 14 ++++++++++++++
 UD_fr-GSD/parser/parser.as     |  4 ++--
 UD_fr-GSD/parser/parser.cla    |  1 +
 UD_fr-GSD/parser/test.bd       | 21 +++++++++++----------
 UD_fr-GSD/parser/train.bd      | 21 +++++++++++----------
 UD_fr-GSD/tagger/tagger.cla    |  1 +
 UD_fr-GSD/tagger/test.bd       | 14 +++++++-------
 UD_fr-GSD/tagger/tokenizer.as  |  2 +-
 UD_fr-GSD/tagger/tokenizer.cla |  1 +
 UD_fr-GSD/tagger/train.bd      | 15 +++++++--------
 10 files changed, 56 insertions(+), 38 deletions(-)

diff --git a/UD_fr-GSD/eval/experiences.txt b/UD_fr-GSD/eval/experiences.txt
index fea15a3..b79a2d7 100644
--- a/UD_fr-GSD/eval/experiences.txt
+++ b/UD_fr-GSD/eval/experiences.txt
@@ -88,3 +88,17 @@ parser_test          100.00%    100.00%    100.00%    90.60%     87.28%     99.7
 parser_test          100.00%    100.00%    100.00%    90.89%     87.30%     99.82%     
 2 iter :
 parser_test          100.00%    100.00%    100.00%    89.80%     86.16%     99.74%
+
+
+Tiny 30iter dynamic
+Metric     | Precision |    Recall |  F1 Score | AligndAcc
+-----------+-----------+-----------+-----------+-----------
+Tokens     |     98.19 |     98.25 |     98.22 |
+UPOS       |     90.17 |     87.71 |     88.92 |     94.59
+
+Big 30iter dynamic
+Metric     | Precision |    Recall |  F1 Score | AligndAcc
+-----------+-----------+-----------+-----------+-----------
+Tokens     |     99.65 |     99.68 |     99.67 |
+UPOS       |     93.78 |     91.20 |     92.47 |     96.89
+
diff --git a/UD_fr-GSD/parser/parser.as b/UD_fr-GSD/parser/parser.as
index 31374c8..114b9ff 100644
--- a/UD_fr-GSD/parser/parser.as
+++ b/UD_fr-GSD/parser/parser.as
@@ -1,6 +1,4 @@
-Default : SHIFT
 REDUCE
-EOS
 LEFT acl
 LEFT acl:relcl
 LEFT advcl
@@ -101,3 +99,5 @@ RIGHT reparandum
 RIGHT root
 RIGHT vocative
 RIGHT xcomp
+EOS
+Default : SHIFT
diff --git a/UD_fr-GSD/parser/parser.cla b/UD_fr-GSD/parser/parser.cla
index 9291d35..b792a39 100644
--- a/UD_fr-GSD/parser/parser.cla
+++ b/UD_fr-GSD/parser/parser.cla
@@ -4,3 +4,4 @@ Oracle : parser
 Feature Model : parser.fm
 Action Set : parser.as
 Topology : (500,RELU,0.3)
+Dynamic : yes
diff --git a/UD_fr-GSD/parser/test.bd b/UD_fr-GSD/parser/test.bd
index 40586b6..20f3950 100644
--- a/UD_fr-GSD/parser/test.bd
+++ b/UD_fr-GSD/parser/test.bd
@@ -1,10 +1,11 @@
-#Name  ref/hyp dict    Policy   Must print?#
-############################################
-FORM   ref     form    Final    1
-POS    ref     pos     Final    1
-MORPHO ref     morpho  Final    1
-SGN    hyp     sgn     Final    0
-LEMMA  ref     form   Final    1
-GOV    hyp     gov     Final    1
-LABEL  hyp     labels  Final    1
-EOS    hyp     eos     Final    1
+#Index Name   ref/hyp dict    Policy   Must print?#
+###################################################
+0      ID     hyp     none    Final    1
+1      FORM   ref     form    Final    1
+3      POS    ref     pos     Final    1
+5      MORPHO ref     morpho  Final    1
+0      SGN    hyp     sgn     Final    0
+2      LEMMA  ref     form    Final    1
+6      GOV    hyp     gov     Final    1
+7      LABEL  hyp     labels  Final    1
+0      EOS    hyp     eos     Final    0
diff --git a/UD_fr-GSD/parser/train.bd b/UD_fr-GSD/parser/train.bd
index bcfdb46..97c5f02 100644
--- a/UD_fr-GSD/parser/train.bd
+++ b/UD_fr-GSD/parser/train.bd
@@ -1,10 +1,11 @@
-#Name  ref/hyp dict    Policy   Must print?#
-############################################
-FORM   ref     form    FromZero 1
-POS    ref     pos     FromZero 1
-MORPHO ref     morpho  FromZero 1
-SGN    hyp     sgn     FromZero 1
-LEMMA  ref     form    FromZero 1
-GOV    hyp     gov     FromZero 1
-LABEL  hyp     labels  FromZero 1
-EOS    hyp     eos     FromZero 1
+#Index Name   ref/hyp dict    Policy   Must print?#
+###################################################
+0      ID     hyp     none    FromZero 1
+1      FORM   ref     form    FromZero 1
+3      POS    ref     pos     FromZero 1
+5      MORPHO ref     morpho  FromZero 1
+0      SGN    hyp     sgn     FromZero 0
+2      LEMMA  ref     form    FromZero 1
+6      GOV    hyp     ref     FromZero 1
+7      LABEL  hyp     labels  FromZero 1
+0      EOS    hyp     eos     FromZero 0
diff --git a/UD_fr-GSD/tagger/tagger.cla b/UD_fr-GSD/tagger/tagger.cla
index 05a7754..42926b4 100644
--- a/UD_fr-GSD/tagger/tagger.cla
+++ b/UD_fr-GSD/tagger/tagger.cla
@@ -4,3 +4,4 @@ Oracle : tagger
 Feature Model : tagger.fm
 Action Set : tagger.as
 Topology : (500,RELU,0.3)
+Dynamic : yes
diff --git a/UD_fr-GSD/tagger/test.bd b/UD_fr-GSD/tagger/test.bd
index 11f50fa..4378043 100644
--- a/UD_fr-GSD/tagger/test.bd
+++ b/UD_fr-GSD/tagger/test.bd
@@ -1,7 +1,7 @@
-#Name  ref/hyp dict    Policy   Must print?#
-############################################
-ID     hyp     none    FromZero 1
-FORM   hyp     form    Final    1
-POS    hyp     pos     Final    1
-SGN    hyp     sgn     Final    0
-TEXT   ref     none    Final    0
+#Index Name  ref/hyp dict    Policy   Must print?#
+##################################################
+0      ID     hyp     none    Final   1
+1      FORM   hyp     form    Final   1
+3      POS    hyp     pos     Final   1
+0      SGN    hyp     sgn     Final   0
+0      EOS    hyp     none    Final   0
diff --git a/UD_fr-GSD/tagger/tokenizer.as b/UD_fr-GSD/tagger/tokenizer.as
index eb13755..c0ca5d0 100644
--- a/UD_fr-GSD/tagger/tokenizer.as
+++ b/UD_fr-GSD/tagger/tokenizer.as
@@ -12,5 +12,5 @@ SPLITWORD Aux@à@les
 SPLITWORD duquel@de@lequel
 SPLITWORD auxquels@à@lesquels
 SPLITWORD desquelles@de@lesquelles
-ADDCHARTOWORD
 ENDWORD
+ADDCHARTOWORD
diff --git a/UD_fr-GSD/tagger/tokenizer.cla b/UD_fr-GSD/tagger/tokenizer.cla
index e0a1578..939a606 100644
--- a/UD_fr-GSD/tagger/tokenizer.cla
+++ b/UD_fr-GSD/tagger/tokenizer.cla
@@ -4,3 +4,4 @@ Oracle : tokenizer
 Feature Model : tokenizer.fm
 Action Set : tokenizer.as
 Topology : (500,RELU,0.3)
+Dynamic : no
diff --git a/UD_fr-GSD/tagger/train.bd b/UD_fr-GSD/tagger/train.bd
index f8765fa..002b475 100644
--- a/UD_fr-GSD/tagger/train.bd
+++ b/UD_fr-GSD/tagger/train.bd
@@ -1,8 +1,7 @@
-#Name  ref/hyp dict    Policy   Must print?#
-############################################
-ID     hyp     none    FromZero 1
-FORM   hyp     form    FromZero 1
-POS    hyp     pos     FromZero 1
-SGN    hyp     sgn     FromZero 1
-EOS    ref     int     FromZero 1
-TEXT   ref     none    Final    0
+#Index Name  ref/hyp dict    Policy   Must print?#
+##################################################
+0      ID     hyp     none    FromZero 1
+1      FORM   hyp     form    FromZero 1
+3      POS    hyp     pos     FromZero 1
+0      SGN    hyp     sgn     FromZero 0
+0      EOS    hyp     none    FromZero 0
-- 
GitLab