From 421fa26c99c3f6d3cab87624e54fec2362119766 Mon Sep 17 00:00:00 2001
From: Franck Dary <franck.dary@lis-lab.fr>
Date: Fri, 8 May 2020 18:47:25 +0200
Subject: [PATCH] Added parserseg

---
 UD_any/parser/machine.rm    | 38 ++++++++++++++++++++-----------------
 UD_any/parserseg/machine.rm | 28 +++++++++++++++++++++++++++
 2 files changed, 49 insertions(+), 17 deletions(-)
 create mode 100644 UD_any/parserseg/machine.rm

diff --git a/UD_any/parser/machine.rm b/UD_any/parser/machine.rm
index 6813e09..4b60269 100644
--- a/UD_any/parser/machine.rm
+++ b/UD_any/parser/machine.rm
@@ -1,22 +1,26 @@
-Name : Parser Machine
+Name : Parser machine
 Classifier : parser
 {
-  Transitions : {parser,data/parser.ts}
+	Transitions : {parser,data/parser.ts}
 	Network type : Modular
-	Context : Buffer{-3 -2 -1 0 1 2} Stack{2 1 0} Columns{FORM UPOS} GRU{1 1 0.0 1} In{128} Out{128}
-	Focused : Column{ID} NbElem{1} Buffer{0} Stack{0} GRU{1 1 0.0 1} In{128} Out{128}
-	Focused : Column{EOS} NbElem{1} Buffer{-1} Stack{} GRU{1 1 0.0 1} In{128} Out{128}
-	Focused : Column{FORM} NbElem{10} Buffer{-1 0 1} Stack{2 1 0} GRU{1 1 0.0 1} In{128} Out{128}
-	Focused : Column{FEATS} NbElem{10} Buffer{-1 0 1} Stack{2 1 0} GRU{1 1 0.0 1} In{128} Out{128}
-	Focused : Column{DEPREL} NbElem{1} Buffer{} Stack{2 1 0} GRU{1 1 0.0 1} In{128} Out{128}
-	DepthLayerTree : Columns{DEPREL} Buffer{} Stack{2 1 0} LayerSizes{3} GRU{1 1 0.0 1} In{128} Out{128}
-	InputDropout : 0.3
-	MLP : {2048 0.3}
+	Context : Buffer{-3 -2 -1 0 1 2} Stack{2 1 0} Columns{FORM} LSTM{1 1 0 1} In{64} Out{64}
+	Context : Buffer{-3 -2 -1 0 1 2} Stack{2 1 0} Columns{UPOS} LSTM{1 1 0 1} In{64} Out{64}
+	Focused : Column{ID} NbElem{1} Buffer{0} Stack{0} LSTM{1 1 0 1} In{64} Out{64}
+	Focused : Column{FORM} NbElem{13} Buffer{-1 0 1 2} Stack{2 1 0} LSTM{1 1 0 1} In{64} Out{64}
+	Focused : Column{FEATS} NbElem{13} Buffer{-1 0 1 2} Stack{2 1 0} LSTM{1 1 0 1} In{64} Out{64}
+	Focused : Column{EOS} NbElem{1} Buffer{-1} Stack{} LSTM{1 1 0 1} In{64} Out{64}
+	Focused : Column{DEPREL} NbElem{1} Buffer{} Stack{2 1 0} LSTM{1 1 0 1} In{64} Out{64}
+	DepthLayerTree : Columns{DEPREL} Buffer{} Stack{2 1 0} LayerSizes{3} LSTM{1 1 0.0 1} In{64} Out{64}
+	InputDropout : 0.5
+	MLP : {2048 0.3 2048 0.3}
 	End
-	Optimizer : Adam {0.0005 0.9 0.999 0.00000001 0.00001 true}
+	Optimizer : Adam {0.0002 0.9 0.999 0.00000001 0.00001 true}
+}
+Predictions : HEAD DEPREL
+Strategy
+{
+	Block : End{cannotMove}
+	parser parser SHIFT 1
+	parser parser RIGHT 1
+	parser parser * 0
 }
-Predictions : HEAD DEPREL EOS
-Strategy : sequential
-  parser parser SHIFT 1
-  parser parser RIGHT 1
-  parser parser 0
diff --git a/UD_any/parserseg/machine.rm b/UD_any/parserseg/machine.rm
new file mode 100644
index 0000000..66542da
--- /dev/null
+++ b/UD_any/parserseg/machine.rm
@@ -0,0 +1,28 @@
+Name : Parser and Segmenter machine
+Classifier : parser
+{
+	Transitions : {parser,data/parser.ts segmenter,data/segmenter.ts}
+	Network type : Modular
+	StateName : Out{64}
+	Context : Buffer{-3 -2 -1 0 1 2} Stack{2 1 0} Columns{FORM} LSTM{1 1 0 1} In{64} Out{64}
+	Context : Buffer{-3 -2 -1 0 1 2} Stack{2 1 0} Columns{UPOS} LSTM{1 1 0 1} In{64} Out{64}
+	Focused : Column{ID} NbElem{1} Buffer{0} Stack{0} LSTM{1 1 0 1} In{64} Out{64}
+	Focused : Column{FORM} NbElem{13} Buffer{-1 0 1 2} Stack{2 1 0} LSTM{1 1 0 1} In{64} Out{64}
+	Focused : Column{FEATS} NbElem{13} Buffer{-1 0 1 2} Stack{2 1 0} LSTM{1 1 0 1} In{64} Out{64}
+	Focused : Column{EOS} NbElem{1} Buffer{-1} Stack{} LSTM{1 1 0 1} In{64} Out{64}
+	Focused : Column{DEPREL} NbElem{1} Buffer{} Stack{2 1 0} LSTM{1 1 0 1} In{64} Out{64}
+	DepthLayerTree : Columns{DEPREL} Buffer{} Stack{2 1 0} LayerSizes{3} LSTM{1 1 0.0 1} In{64} Out{64}
+	InputDropout : 0.5
+	MLP : {2048 0.3 2048 0.3}
+	End
+	Optimizer : Adam {0.0002 0.9 0.999 0.00000001 0.00001 true}
+}
+Predictions : HEAD DEPREL EOS
+Strategy
+{
+	Block : End{cannotMove}
+	parser segmenter SHIFT 0
+	parser segmenter RIGHT 0
+	parser parser * 0
+	segmenter parser * 1
+}
-- 
GitLab