From a506573f867cd271aca6874e28c82a2c1be322ef Mon Sep 17 00:00:00 2001 From: planggard <63806188+planggard@users.noreply.github.com> Date: Wed, 20 Sep 2023 09:21:17 +0200 Subject: [PATCH] En regel i functions, der er ude af sync med dep --- src/cg3/dep_KalEng.cg3 | 9 ++++++++- src/cg3/disambiguator.cg3 | 2 +- src/cg3/functions.cg3 | 10 +++++++--- src/fst/stems/nouns.lexc | 4 ++-- 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/cg3/dep_KalEng.cg3 b/src/cg3/dep_KalEng.cg3 index e11769650..2c8d0606a 100644 --- a/src/cg3/dep_KalEng.cg3 +++ b/src/cg3/dep_KalEng.cg3 @@ -7949,8 +7949,15 @@ SETPARENT:M0990AI @i-ADVL> + OBLIQUE - POSSESSUM3UdenMWE IF (NOT p (*)) (NEGATE 1 LIK + N - ADVERBIEL - NUM)#skal nemlig være i-ADVL>N (NEGATE *1 TITEL OR INSTITUTION BARRIER (*) - KOMMA - Rel - Trm) #klares af faste0560 -(*-1C @POSS> BARRIER POSSESSUM3) +#(*-1C @POSS> BARRIER POSSESSUM3) +(*-1C Rel + &&POSS34_POSS& BARRIER POSSESSUM3 LINK *1 _TARGET_ LINK *1 &&POSS34_POSS&) (NEGATE 1 TUQ + Rel) #Angerlamut apuuttorlu ”...arpaqattaarnak annertunngooqinaatit. Eqqissillutit iPaderniarit...”, ineeqqamini pinnguarpassuami PUJORALANNIK poorneqalersut akorninut pilluni iPadileruni, ullorsuaq ualersuarlu naasaraaq, kakkilertalluni tangajullattaajutigaluni. +(NEGATE *1 TIMENOUN + Rel LINK 1 OTHERTIME + POSSESSUM3 LINK NEGATE *1 POSSESSUM3UdenMWE BARRIER V)#Taassuma maanna pisortaq Brian Buus Pedersen pisortatut taarsissavaa, PISORTATULLU ukioq manna novembarip aallaqqaataani atorfinissalluni. +(NEGATE 0 Abl LINK *1 PASSIV BARRIER V)#Oqaasileriffiup ARCTIC FOUNDERSIMIT, Nunani Issittuni aningaasaliisartunit, aningaasaliiffigineqarnermigut kalaallisut ordbogit 1871-ip 2018-illu akornanni saqqummersinneqarsimasut nittartakkaminiilersissavai. +(NEGATE 0 TIMENOUN LINK *1 Aeq BARRIER (*) - Rel LINK 1 V)#- Tassaana taassuma karsip tunniussavit iluaqutigigaa UNNUAKKUT savap illuatut atorneqarsinnaagami. +(NEGATE 0 Sem/Geo + Lok LINK *1 SPATIAL + Lok BARRIER (*) - Rel)#Canadamiut aatsitassarsioqatigiiffiata Quadra Miningip siulersuisuisa qanittukkut aalajangissavaat, TUNUMI Illoqqortoormiut kangerlussuata avannaani ukiualunnguit qaangiuppata saviminermik piiaaffiliornissaq. +(NEGATE *1 POSSESSUM3UdenMWE + ("akunneq") LINK -1 TIMENOUN + Rel)#Oqaasileriffiup Arctic Foundersimit, Nunani Issittuni aningaasaliisartunit, ANINGAASALIIFFIGINEQARNERMIGUT kalaallisut ordbogit 1871-ip 2018-illu akornanni saqqummersinneqarsimasut nittartakkaminiilersissavai. + TO (*1 POSSESSUM3UdenMWE BARRIER V); SETPARENT:M0990AJ @i-ADVL> + OBLIQUE - POSSESSUM - ADVERBIEL - OTHERTIME IF diff --git a/src/cg3/disambiguator.cg3 b/src/cg3/disambiguator.cg3 index 53656d629..e60ed1568 100644 --- a/src/cg3/disambiguator.cg3 +++ b/src/cg3/disambiguator.cg3 @@ -15423,7 +15423,7 @@ REMOVE:5845 ("anna") + Pron IF (0 ("Anna") + Prop);#(NEGATE 0 @N<) ; #X@X1 REMOVE:5846A ("aak") + 4SgPoss IF (0 ("Aani") + Prop)(NEGATE *1 (/"aki"\ GE\ Der/nv\ Gram/TV\ V/l)); #aani akigalugu eneste dokumenterede form i corpus REMOVE:5846B (/"naaq"\ LIR\ Der/nv/l) IF (0 (/"naa"\ Gram/IV\ LIR\ Der/vv/l)) ; #uden betingelse, da 'mavetildeling' vistnok helt utænkelig -REMOVE:5846C ("pilersuisoq") + N OR (/"pilersor"\ Gram/TV\ HTR\ Der/vv\ Gram/IV\ TUQ/l) + N IF (0 ("Pilersuisoq") + Prop); +REMOVE:5846C (/"pilersor"\ Gram/TV\ HTR\ Der/vv\ Gram/IV\ TUQ/l) + N IF (0 ("Pilersuisoq") + Prop); REMOVE:5846D ("Anore") + Sem/Mask IF (0 ("anori") OR ("anorersuaq")); REMOVE:5846E (/"ilisimatusar"\ Gram/IV\ VIK/l) IF (0 ("Ilisimatusarfik") + Prop); REMOVE:5846F ("manu") + N IF (0 ("Manu") + Sem/Hum); #skal nok have nogle betingelser diff --git a/src/cg3/functions.cg3 b/src/cg3/functions.cg3 index da9f20409..bd04f15ad 100644 --- a/src/cg3/functions.cg3 +++ b/src/cg3/functions.cg3 @@ -7090,12 +7090,16 @@ MAP:M0990AE @i-ADVL>N TARGET ORGANISATION + OBLIQUE IF (*1 TITEL BARRIER (*) - O MAP:M0990AG @i-ADVL> TARGET ("nuna") IF (0 Abl OR Lok)(1 ("tamaq") + iOBLIQUE) ; MAP:M0990AH @i-ADVL> TARGET Lok IF (1 QATE + N OR QATIGIIP + N) ; #Uagut TELE-POST-imi suleqatigiit katilluta 460-iuvugut. #Nunatsinni timersoqatigiiffiit... -MAP:M0990AI @i-ADVL> TARGET OBLIQUE - POSSESSUM3UdenMWE IF (*1 POSSESSUM3UdenMWE BARRIER V)(*-1C @POSS> BARRIER POSSESSUM3) -#MAP:M0990AI @i-ADVL> TARGET OBLIQUE - POSSESSUM3UdenMWE IF (*1 POSSESSUM3UdenMWE BARRIER V)(*-1C Rel + &&POSS34_POSS& BARRIER POSSESSUM3 LINK *1 _TARGET_ LINK *1 &&POSS34_POSS&) +#MAP:M0990AI @i-ADVL> TARGET OBLIQUE - POSSESSUM3UdenMWE IF (*1 POSSESSUM3UdenMWE BARRIER V)(*-1C @POSS> BARRIER POSSESSUM3) +MAP:M0990AI @i-ADVL> TARGET OBLIQUE - POSSESSUM3UdenMWE IF (*1 POSSESSUM3UdenMWE BARRIER V)(*-1C Rel + &&POSS34_POSS& BARRIER POSSESSUM3 LINK *1 _TARGET_ LINK *1 &&POSS34_POSS&) (NEGATE 1 LIK + N - ADVERBIEL - NUM)#skal nemlig være i-ADVL>N (NEGATE *1 TITEL OR INSTITUTION BARRIER (*) - KOMMA - Rel - Trm) #klares af faste0560 (NEGATE 1 TUQ + Rel) #Angerlamut apuuttorlu ”...arpaqattaarnak annertunngooqinaatit. Eqqissillutit iPaderniarit...”, ineeqqamini pinnguarpassuami PUJORALANNIK poorneqalersut akorninut pilluni iPadileruni, ullorsuaq ualersuarlu naasaraaq, kakkilertalluni tangajullattaajutigaluni. - +(NEGATE *1 TIMENOUN + Rel LINK 1 OTHERTIME + POSSESSUM3 LINK NEGATE *1 POSSESSUM3UdenMWE BARRIER V)#Taassuma maanna pisortaq Brian Buus Pedersen pisortatut taarsissavaa, PISORTATULLU ukioq manna novembarip aallaqqaataani atorfinissalluni. +(NEGATE 0 Abl LINK *1 PASSIV BARRIER V)#Oqaasileriffiup ARCTIC FOUNDERSIMIT, Nunani Issittuni aningaasaliisartunit, aningaasaliiffigineqarnermigut kalaallisut ordbogit 1871-ip 2018-illu akornanni saqqummersinneqarsimasut nittartakkaminiilersissavai. +(NEGATE 0 TIMENOUN LINK *1 Aeq BARRIER (*) - Rel LINK 1 V)#- Tassaana taassuma karsip tunniussavit iluaqutigigaa UNNUAKKUT savap illuatut atorneqarsinnaagami. +(NEGATE 0 Sem/Geo + Lok LINK *1 SPATIAL + Lok BARRIER (*) - Rel)#Canadamiut aatsitassarsioqatigiiffiata Quadra Miningip siulersuisuisa qanittukkut aalajangissavaat, TUNUMI Illoqqortoormiut kangerlussuata avannaani ukiualunnguit qaangiuppata saviminermik piiaaffiliornissaq. +(NEGATE *1 POSSESSUM3UdenMWE + ("akunneq") LINK -1 TIMENOUN + Rel)#Oqaasileriffiup Arctic Foundersimit, Nunani Issittuni aningaasaliisartunit, ANINGAASALIIFFIGINEQARNERMIGUT kalaallisut ordbogit 1871-ip 2018-illu akornanni saqqummersinneqarsimasut nittartakkaminiilersissavai. ; MAP:M0990AJ @i-ADVL> TARGET OBLIQUE - POSSESSUM - ADVERBIEL - OTHERTIME IF (1 TITEL + Der/vn) diff --git a/src/fst/stems/nouns.lexc b/src/fst/stems/nouns.lexc index d9779c294..4abf149ba 100644 --- a/src/fst/stems/nouns.lexc +++ b/src/fst/stems/nouns.lexc @@ -23986,8 +23986,8 @@ pilersaarutipiluk Z2-Zmorf ; pilersartoq Z1Zmorf ; pilersugaaneq Z2Zmorf ; pilersuiffik Z2-Zmorf ; -pilersuineq Z2Zmorf ; -pilersuisoq Z1Zmorf ; +!pilersuineq Z2Zmorf ; +!pilersuisoq Z1Zmorf ; pilersuussisoq Z1Zmorf ; pilersuut tptmorf ; pilersuutaaruttoq Z1Zmorf ;