From 425dc03d5ce47cffc04407cdee8b7865a3274577 Mon Sep 17 00:00:00 2001 From: krasimir Date: Sun, 22 May 2016 12:13:50 +0000 Subject: [PATCH] a few more fixes in the sense ids and rename subject_A2 to subject_to_A2 --- lib/src/translator/Dictionary.gf | 14 +++++++------- lib/src/translator/DictionaryBul.gf | 4 ++-- lib/src/translator/DictionaryChi.gf | 2 +- lib/src/translator/DictionaryEng.gf | 2 +- lib/src/translator/DictionaryFin.gf | 2 +- lib/src/translator/DictionaryGer.gf | 2 +- lib/src/translator/DictionarySpa.gf | 2 +- lib/src/translator/DictionarySwe.gf | 2 +- lib/src/translator/translate.probs | 2 +- 9 files changed, 16 insertions(+), 16 deletions(-) diff --git a/lib/src/translator/Dictionary.gf b/lib/src/translator/Dictionary.gf index ac72f825a..f60fe8a58 100644 --- a/lib/src/translator/Dictionary.gf +++ b/lib/src/translator/Dictionary.gf @@ -12555,7 +12555,7 @@ fun contemporary_A : A ; -- 01536094 characteristic of the present; "c fun contemporary_N : N ; -- 09960417 a person of nearly the same age as another fun contempt_N : N ; -- 07502980 lack of respect accompanied by a feeling of intense dislike; "he was held in contempt" fun contemptible_A : A ; -- 00904548 deserving of contempt or scorn -fun contemptuous_of_A2 : A2 ; +fun contemptuous_of_A2 : A2 ; -- 01995288 expressing extreme contempt fun contemptuousness_N : N ; -- 04888510 the manifestation of scorn and contempt; "every subordinate sensed his contemptuousness and hated him in return" fun contend_V : V ; -- 00756898 maintain or assert; "He contended that Communism had no future" fun contend_VS : VS ; -- 00756898 maintain or assert; "He contended that Communism had no future" @@ -22445,7 +22445,7 @@ fun freddie_PN : PN ; fun freddy_PN : PN ; fun frederick_PN : PN ; -- 09094791 a town in northern Maryland to the west of Baltimore fun frederiksberg_PN : PN ; -fun free_A : A ; -- 01061489 able to act at will; not hampered; not under compulsion or restraint; "free enterprise"; "a free port"; "a free country"; "I have an hour free"; "free will"; "free of racism"; "feel free to stay as long as you wish"; "a free choice" +fun free_A : A ; -- 01061489 able to act at will; not hampered; not under compulsion or restraint; "free enterprise"; "a free port"; "a free country"; "I have an hour free"; "free will"; "feel free to stay as long as you wish"; "a free choice" fun free_N : N ; -- 07947958 people who are free; "the home of the free and the brave" fun free_V2 : V2 ; -- 02421374 grant freedom to; free from confinement fun free_V2V : V2V ; -- 02421374 grant freedom to; free from confinement @@ -22455,7 +22455,7 @@ fun free_handed_A : A ; fun free_list_N : N ; -- 06491168 a list of commodities that are not subject to tariffs fun free_liver_N : N ; -- 10110731 someone who gratifies physical appetites (especially for food and drink) with more than the usual freedom fun free_living_N : N ; -fun free_of_A2 : A2 ; +fun free_of_A2 : A2 ; -- 00927978 completely lacking; "writing free of insight"; "free of literary merit" fun free_range_A : A ; -- 00559530 of livestock and domestic poultry; permitted to graze or forage rather than being confined to a feedlot fun free_spoken_A : A ; -- 00764484 characterized by directness in manner or speech; without subtlety or evasion fun free_standing_A : A ; -- 00160768 standing apart; not attached to or supported by anything; "a freestanding bell tower" @@ -55207,8 +55207,8 @@ fun subhuman_A : A ; -- 01261528 less than human or not worthy of fun subjacent_A : A ; -- 02349477 lying nearby but lower; "hills and subjacent valleys" fun subject_1_N : N ; -- 06599788 the subject matter of a conversation or discussion; "he didn't want to discuss that subject" fun subject_2_N : N ; -- 06309931 (grammar) one of the two main constituents of a sentence; the grammatical constituent about which something is predicated -fun subject_A : A ; -- 02361540 possibly accepting or permitting; "the time is fixed by the director and players and therefore subject to much variation" -fun subject_A2 : A2 ; +fun subject_A : A ; -- 02329864 being under the power or sovereignty of another or others; "subject peoples" +fun subject_to_A2 : A2 ; -- 02361540 possibly accepting or permitting; "the time is fixed by the director and players and therefore subject to much variation" fun subject_V2 : V2 ; -- 02110927 cause to experience or suffer or make liable or vulnerable to; "He subjected me to his awful poetry"; "The sergeant subjected the new recruits to many drills"; "People in Chernobyl were subjected to radiation" fun subject_to_Prep : Prep ; fun subjection_N : N ; -- 13996300 forced submission to control by others @@ -59937,8 +59937,8 @@ fun unavenged_A : A ; -- 03147408 for which vengeance has not been fun unavoidable_A : A ; -- 00343360 impossible to avoid or evade:"inescapable conclusion"; "an unavoidable accident" fun unavowed_A : A ; -- 02090228 not openly expressed fun unawakened_A : A ; -- 02014611 not aroused or activated; "unawakened emotions" -fun unaware_A : A ; -- 00191603 (often followed by `of') not aware; "seemed unaware of the scrutiny"; "unaware of the danger they were in"; "unaware of the newborn hope"; "the most unaware person I've known" -fun unaware_of_A2 : A2 ; +fun unaware_A : A ; -- 00191603 not aware; "the most unaware person I've known" +fun unaware_of_A2 : A2 ; -- 00191603 not aware; "seemed unaware of the scrutiny"; "unaware of the danger they were in"; "unaware of the newborn hope" fun unawares_Adv : Adv ; -- 00483850 without forethought or plan; inadvertently; "came upon the diamond unawares" fun unawed_A : A ; -- 02015055 not awed fun unbacked_A : A ; -- 02353488 unsupported by other people diff --git a/lib/src/translator/DictionaryBul.gf b/lib/src/translator/DictionaryBul.gf index 000e5678b..6d92a88dc 100644 --- a/lib/src/translator/DictionaryBul.gf +++ b/lib/src/translator/DictionaryBul.gf @@ -55252,8 +55252,8 @@ lin subhuman_A = mkA078 "нечовешки" ; ---- lin subjacent_A = variants {} ; lin subject_1_N = dualN (mkN041 "тема") (mkA079 "тематичен") ; lin subject_2_N = mkN015 "подлог" ; -lin subject_A = variants {mkA079 "подвластен"; mkA076 "подлежащ"; mkA076 "подчинен"; mkA079 "сюжетен"; mkA079 "тематичен"} ; ---- -lin subject_A2 = variants {} ; +lin subject_A = variants {mkA079 "подвластен"; mkA076 "подлежащ"; mkA076 "подчинен"} ; ---- +lin subject_to_A2 = variants {} ; lin subject_V2 = dirV2 (dualV (mkV186 "подлагам") (mkV176 "подложа")) ; ---- lin subject_to_Prep = variants {} ; lin subjection_N = variants {mkN049 "зависимост"; mkN071 "подвъргване"; mkN072 "подчинение"; mkN049 "подчиненост"; mkN071 "подчиняване"; mkN071 "покоряване"} ; ---- diff --git a/lib/src/translator/DictionaryChi.gf b/lib/src/translator/DictionaryChi.gf index c33acbf18..d6e09f50a 100644 --- a/lib/src/translator/DictionaryChi.gf +++ b/lib/src/translator/DictionaryChi.gf @@ -31708,7 +31708,7 @@ lin subjacent_A = mkA "在下方" ; -- open-multilingual-wordnet lin subject_1_N = mkN "主题" ; lin subject_2_N = mkN "主题" ; lin subject_A = mkA "服从" | {-HSK-} mkA "课" | mkA "题" | mkA "题目" ; -lin subject_A2 = mkA2 "受制于" ; +lin subject_to_A2 = mkA2 "受制于" ; lin subject_N = mkN "主题" ; lin subject_V2 = mkV2 "主题" ; lin subjective_A = mkA "主观" ; diff --git a/lib/src/translator/DictionaryEng.gf b/lib/src/translator/DictionaryEng.gf index fbf38b842..5fd556f4d 100644 --- a/lib/src/translator/DictionaryEng.gf +++ b/lib/src/translator/DictionaryEng.gf @@ -55461,7 +55461,7 @@ lin subjacent_A = mkA "subjacent" ; lin subject_1_N = mkN "subject" "subjects"; lin subject_2_N = mkN "subject" "subjects"; lin subject_A = mkA "subject" ; -lin subject_A2 = mkA2 (compoundA (mkA "subject")) to_Prep; +lin subject_to_A2 = mkA2 (compoundA (mkA "subject")) to_Prep; lin subject_V2 = mkV2 (mkV "subject" "subjects" "subjected" "subjected" "subjecting"); lin subject_to_Prep = mkPrep "subject to"; lin subjection_N = mkN "subjection" ; diff --git a/lib/src/translator/DictionaryFin.gf b/lib/src/translator/DictionaryFin.gf index 8b764b5b0..ea37eaa96 100644 --- a/lib/src/translator/DictionaryFin.gf +++ b/lib/src/translator/DictionaryFin.gf @@ -50957,7 +50957,7 @@ lin subjacent_A = mkWA (compoundA "ala" (k38 "puolinen")) ; --UNCHK lin subject_1_N = mkN "aihe" ; lin subject_2_N = mkN "subjekti" ; lin subject_A = mkWA (k41A "altis") ; --UNCHK -lin subject_A2 = mkA2 (mkWA (k41A "altis")) (casePrep allative) ; +lin subject_to_A2 = mkA2 (mkWA (k41A "altis")) (casePrep allative) ; lin subject_N = mkWN (k48 "aihe") ; lin subject_V2 = mkV2 "altistaa" ; ---ARB --mkWV2 (k56A "antaa") "arvioitavaksi" ; lin subject_to_Prep = mkPrep "alttiina" allative ; ---- sense diff --git a/lib/src/translator/DictionaryGer.gf b/lib/src/translator/DictionaryGer.gf index b1fccc262..7feeb37cb 100644 --- a/lib/src/translator/DictionaryGer.gf +++ b/lib/src/translator/DictionaryGer.gf @@ -55181,7 +55181,7 @@ lin subjacent_A = variants {} ; lin subject_1_N = mkN "Gegenstand" "Gegenstand" "Gegenstand" "Gegenstands" "Gegenstände" "Gegenständen" masculine ; --- note: "subject matter" is not sufficiently clear for disambiguating meanings ; interpreted as physical matter of a subject lin subject_2_N = mkN "Subjekt" "Subjekt" "Subjekt" "Subjekts" "Subjekte" "Subjekten" neuter | mkN "Thema" "Thema" "Thema" "Themas" "Themen" "Themen" neuter | mkN "Fach" "Fach" "Fach" "Fachs" "Fächer" "Fächern" neuter ; --- split further: subject and object / the subject of this talk / maths is my fav subject lin subject_A = variants {} ; -- -lin subject_A2 = variants {} ; +lin subject_to_A2 = variants {} ; lin subject_V2 = mkV2 (mkV "unterwerfen") ; -- status=guess, src=wikt lin subject_to_Prep = variants {} ; lin subjection_N = variants {} ; diff --git a/lib/src/translator/DictionarySpa.gf b/lib/src/translator/DictionarySpa.gf index 63c66d977..f1f251024 100644 --- a/lib/src/translator/DictionarySpa.gf +++ b/lib/src/translator/DictionarySpa.gf @@ -28562,7 +28562,7 @@ lin subjacent_A = mkA "subyacente" ; --UWN lin subject_1_N = mkN "asunto" | mkN "tema" masculine ; lin subject_2_N = mkN "sujeto" ; lin subject_A = mkA "sujeto" ; -- status=guess -lin subject_A2 = mkA2 (mkA "sujeto") ParadigmsSpa.dative ; -- status=guess +lin subject_to_A2 = mkA2 (mkA "sujeto") ParadigmsSpa.dative ; -- status=guess lin subject_N = mkN "sujeto" ; lin subject_V2 = mkV2 (mkV "someter") ; -- status=guess lin subjection_N = mkN "conquista" | mkN "sometimiento" ; --UWN diff --git a/lib/src/translator/DictionarySwe.gf b/lib/src/translator/DictionarySwe.gf index 7a1fc06eb..66ba98d3b 100644 --- a/lib/src/translator/DictionarySwe.gf +++ b/lib/src/translator/DictionarySwe.gf @@ -54809,7 +54809,7 @@ lin subjacent_A = variants {} ; -- status=guess lin subject_1_N = mkN "ämne" ; lin subject_2_N = mkN "subjekt" "subjekter" ; lin subject_A = mkA "underlydande" ; -- comment=3 -lin subject_A2 = variants {} ; -- status=guess +lin subject_to_A2 = variants {} ; -- status=guess lin subject_N = mkN "ämne" ; --- lin subject_V2 = variants {} ; -- lin subject_to_Prep = variants {} ; -- status=guess diff --git a/lib/src/translator/translate.probs b/lib/src/translator/translate.probs index a18470e51..e6cf2e264 100644 --- a/lib/src/translator/translate.probs +++ b/lib/src/translator/translate.probs @@ -55216,7 +55216,7 @@ subheading_N 3.729715012475897e-6 subhuman_A 1.0773191989054437e-5 subjacent_A 1.0773191989054437e-5 subject_A 1.0773191989054437e-5 -subject_A2 6.329113924050633e-3 +subject_to_A2 6.329113924050633e-3 subject_N 2.53620620848361e-4 subject_V2 1.7708517797060386e-4 subject_to_Prep 9.978546125829467e-6