#25 #59 #67 #68

LR-POR · Jan 28, 2022 · dd21486 · dd21486
1 parent d794bb0
commit dd21486
Show file tree

Hide file tree

Showing 12 changed files with 1,008 additions and 998 deletions.
diff --git a/lexicon.tdl b/lexicon.tdl
@@ -750,9 +750,9 @@ insistir_3 := em-que-cl-verb-lex &
   [ STEM < "insistir" >,
     SYNSEM.LKEYS.KEYREL.PRED "_insistir_v_3_rel" ].
 
-obedecer := dat-obj-verb-lex &
-  [ STEM < "obedecer" >,
-    SYNSEM.LKEYS.KEYREL.PRED "_obedecer_v_rel" ].
+;obedecer := dat-obj-verb-lex &
+;  [ STEM < "obedecer" >,
+;    SYNSEM.LKEYS.KEYREL.PRED "_obedecer_v_rel" ].
 
 dizer_2 := dir-verb-lex &
   [ STEM < "dizer" >,

diff --git a/my-adpositions.tdl b/my-adpositions.tdl
@@ -22,12 +22,12 @@ gen-marker_de := obl-case-marking-adp-lex &
                    CAT.HEAD [ CASE gen ] ] ].
 
 
-all-marker_de := obl-case-marking-adp-lex &
+sup-marker_de := obl-case-marking-adp-lex &
   [ STEM < "sobre" >,
     SYNSEM.LOCAL [ CONT [ HOOK [ ICONS-KEY.IARG1 #clause,
                                  CLAUSE-KEY #clause ],
                           ICONS.LIST < > ],
-                   CAT.HEAD [ CASE all ] ] ].
+                   CAT.HEAD [ CASE sup ] ] ].
 
 ine-marker_de := obl-case-marking-adp-lex &
   [ STEM < "em" >,

diff --git a/my-auxiliaries.tdl b/my-auxiliaries.tdl
@@ -1,4 +1,4 @@
-começar_2 := a-compl-subj-raise-aux-with-pred &
+começar_1 := a-compl-subj-raise-aux-with-pred &
   [ STEM < "começar" >,
     SYNSEM.LKEYS.KEYREL.PRED "_começar_v_rel" ].
 

diff --git a/my-nouns.tdl b/my-nouns.tdl
@@ -2,6 +2,18 @@ bola := fem-noun-lex &
   [ STEM < "bola" >,
     SYNSEM.LKEYS.KEYREL.PRED "_bola_n_rel" ].
 
+renda := fem-noun-lex &
+  [ STEM < "renda" >,
+    SYNSEM.LKEYS.KEYREL.PRED "_renda_n_rel" ].
+
+imposto := masc-noun-lex &
+  [ STEM < "imposto" >,
+    SYNSEM.LKEYS.KEYREL.PRED "_imposto_n_rel" ].
+
+consumo := masc-noun-lex &
+  [ STEM < "consumo" >,
+    SYNSEM.LKEYS.KEYREL.PRED "_consumo_n_rel" ].
+
 aluno := masc-noun-lex &
   [ STEM < "aluno" >,
     SYNSEM.LKEYS.KEYREL.PRED "_aluno_n_rel" ].

diff --git a/my-portuguese.tdl b/my-portuguese.tdl
@@ -32,7 +32,7 @@ goa := rec. ; goal
 gen := case. ; genitive
 obl := case. ; oblique
 ine := case. ; inessive ("em")
-all := case. ; allative ("sobre")
+sup := case. ; superessive ("sobre")
 com := case. ; commitative ("com")
 per := case. ; perlative ("por")
 
@@ -425,8 +425,8 @@ goa-obj-verb-lex := prep-obj-verb-lex &
 ine-obj-verb-lex := prep-obj-verb-lex &
   [ SYNSEM.LOCAL.CAT.VAL.COMPS.FIRST.LOCAL.CAT.HEAD.CASE ine ].
 
-all-obj-verb-lex := prep-obj-verb-lex &
-  [ SYNSEM.LOCAL.CAT.VAL.COMPS.FIRST.LOCAL.CAT.HEAD.CASE all ].
+sup-obj-verb-lex := prep-obj-verb-lex &
+  [ SYNSEM.LOCAL.CAT.VAL.COMPS.FIRST.LOCAL.CAT.HEAD.CASE sup ].
 
 com-obj-verb-lex := prep-obj-verb-lex &
   [ SYNSEM.LOCAL.CAT.VAL.COMPS.FIRST.LOCAL.CAT.HEAD.CASE com ].
@@ -438,15 +438,15 @@ refl-goa-obj-verb-lex := inh-refl-verb-lex & goa-obj-verb-lex.
 
 refl-ine-obj-verb-lex := inh-refl-verb-lex & ine-obj-verb-lex.
 
-refl-sup-obj-verb-lex := inh-refl-verb-lex & all-obj-verb-lex. 
+refl-sup-obj-verb-lex := inh-refl-verb-lex & sup-obj-verb-lex. 
 
 refl-per-obj-verb-lex := inh-refl-verb-lex & per-obj-verb-lex.
 
 refl-com-obj-verb-lex := inh-refl-verb-lex & com-obj-verb-lex.
 
 nonrefl-ine-obj-verb-lex := noninh-refl-verb-lex & ine-obj-verb-lex.
 
-nonrefl-sup-obj-verb-lex := noninh-refl-verb-lex & all-obj-verb-lex.
+nonrefl-sup-obj-verb-lex := noninh-refl-verb-lex & sup-obj-verb-lex.
 
 nonrefl-per-obj-verb-lex := noninh-refl-verb-lex & per-obj-verb-lex.
 

diff --git a/my-test_sentences.txt b/my-test_sentences.txt
@@ -629,3 +629,5 @@ ele deixou os cachorros saírem
 ele deixou os cachorros sair
 ele deixou os cachorros perseguirem a ratazana
 ele deixou os cachorros perseguir a ratazana
+esse imposto incide sobre a renda
+aqueles impostos incidiam sobre o consumo
diff --git a/out.stats b/out.stats
@@ -1,4 +1,4 @@
-TN=130
-TP=480
-FP=9
-FN=12
+TN=128
+TP=484
+FP=11
+FN=10