removed some nonsense-producing variants from Query

This commit is contained in:
aarne
2011-01-31 10:03:59 +00:00
parent ab93051b25
commit a710e3fdee
2 changed files with 20 additions and 16 deletions

View File

@@ -23,7 +23,8 @@ lin
In = relVP UseCopula in_Prep ; In = relVP UseCopula in_Prep ;
Employed = Employed =
relAP (mkAP (mkA "employed")) by8agent_Prep relAP (mkAP (mkA "employed")) at_Prep
-- | relAP (mkAP (mkA "employed")) by8agent_Prep
| relAP (mkAP (mkA "paid")) by8agent_Prep | relAP (mkAP (mkA "paid")) by8agent_Prep
| relAP (mkAP (mkA "active")) at_Prep | relAP (mkAP (mkA "active")) at_Prep
| relAP (mkAP (mkA "professionally active")) at_Prep | relAP (mkAP (mkA "professionally active")) at_Prep
@@ -33,23 +34,23 @@ lin
HaveTitle = HaveTitle =
relAP (mkAP (mkA "employed")) as_Prep relAP (mkAP (mkA "employed")) as_Prep
| relVP UseCopula noPrep -- | relVP UseCopula noPrep
| relVP (mkVP (mkV "work")) as_Prep | relVP (mkVP (mkV "work")) as_Prep
| relVP (mkVP have_V2 (mkNP the_Det (mkCN (mkN2 (mkN "title"))))) possess_Prep -- | relVP (mkVP have_V2 (mkNP the_Det (mkCN (mkN2 (mkN "title"))))) possess_Prep
; ;
EmployedAt s = EmployedAt s =
relAP (mkAP (mkA2 (mkA "employed") at_Prep) s) as_Prep relAP (mkAP (mkA2 (mkA "employed") at_Prep) s) as_Prep
| relAP (mkAP (mkA2 (mkA "employed") by8agent_Prep) s) as_Prep -- | relAP (mkAP (mkA2 (mkA "employed") by8agent_Prep) s) as_Prep
| relVP (mkVP (mkV2 (mkV "work") at_Prep) s) as_Prep | relVP (mkVP (mkV2 (mkV "work") at_Prep) s) as_Prep
; ;
HaveTitleAt t = HaveTitleAt t =
relAP (mkAP (mkA2 (mkA "employed") as_Prep) (mkNP t)) at_Prep relAP (mkAP (mkA2 (mkA "employed") as_Prep) (mkNP t)) at_Prep
| relAP (mkAP (mkA2 (mkA "employed") as_Prep) (mkNP t)) by8agent_Prep -- | relAP (mkAP (mkA2 (mkA "employed") as_Prep) (mkNP t)) by8agent_Prep
| relVP (mkVP (mkNP a_Det t)) at_Prep | relVP (mkVP (mkNP a_Det t)) at_Prep
| relVP (mkVP (mkV2 (mkV "work") as_Prep) (mkNP t)) at_Prep | relVP (mkVP (mkV2 (mkV "work") as_Prep) (mkNP t)) at_Prep
| relVP (mkVP have_V2 (mkNP the_Det (mkCN (mkN2 (mkN "title")) (mkNP t)))) at_Prep -- | relVP (mkVP have_V2 (mkNP the_Det (mkCN (mkN2 (mkN "title")) (mkNP t)))) at_Prep
; ;
Named n = propAP (mkAP (mkA2 (mkA "named") []) n) ; Named n = propAP (mkAP (mkA2 (mkA "named") []) n) ;

View File

@@ -1,6 +1,6 @@
--# -path=.:present --# -path=.:present
concrete QuerySwe of Query = QueryI - [namePrep, propCalled] with concrete QuerySwe of Query = QueryI - [namePrep, propCalled, KFunPair] with
(Syntax = SyntaxSwe), (Syntax = SyntaxSwe),
(Lang = LangSwe), (Lang = LangSwe),
(LexQuery = LexQuerySwe) ** (LexQuery = LexQuerySwe) **
@@ -24,7 +24,11 @@ oper
propVP (mkVP (mkAdV "även") (mkVP (mkV2 (depV (mkV "kalla")) for_Prep) i)) propVP (mkVP (mkAdV "även") (mkVP (mkV2 (depV (mkV "kalla")) for_Prep) i))
| propVP (mkVP (mkAdV "även") (mkVP (mkV2 "heter") i)) ; | propVP (mkVP (mkAdV "även") (mkVP (mkV2 "heter") i)) ;
lin
KFunPair k r = mkCN k (mkAdv with_Prep (sina r.cn)) ;
oper
sina : CN -> NP = \cn -> mkNP (M.mkPredet "sin" "sitt" "sina") (mkNP a_Quant plNum cn) ; ---- should be in ExtraSwe
-- lexicon -- lexicon
@@ -34,8 +38,9 @@ lin
In = relVP UseCopula in_Prep ; In = relVP UseCopula in_Prep ;
Employed = Employed =
relAP (mkAP (mkA "anställd" "anställt")) by8agent_Prep relAP (mkAP (mkA "anställd" "anställt")) at_Prep
| relAP (mkAP (mkA "betald" "betalt")) by8agent_Prep -- | relAP (mkAP (mkA "anställd" "anställt")) by8agent_Prep
-- | relAP (mkAP (mkA "betald" "betalt")) by8agent_Prep
| relAP (mkAP (mkA "aktiv")) at_Prep | relAP (mkAP (mkA "aktiv")) at_Prep
| relAP (mkAP (mkA "professionellt aktiv")) at_Prep | relAP (mkAP (mkA "professionellt aktiv")) at_Prep
| relVP (mkVP (mkV "arbeta")) at_Prep | relVP (mkVP (mkV "arbeta")) at_Prep
@@ -45,28 +50,26 @@ lin
HaveTitle = HaveTitle =
relAP (mkAP (mkA "anställd" "anställt")) som_Prep relAP (mkAP (mkA "anställd" "anställt")) som_Prep
| relVP UseCopula noPrep -- | relVP UseCopula noPrep
| relVP (mkVP (mkV "arbeta")) som_Prep | relVP (mkVP (mkV "arbeta")) som_Prep
| relVP (mkVP (mkV "jobba")) som_Prep | relVP (mkVP (mkV "jobba")) som_Prep
| relVP (mkVP have_V2 (mkNP the_Det (mkCN (mkN2 (mkN "titel" "titlar") noPrep)))) -- | relVP (mkVP have_V2 (mkNP the_Det (mkCN (mkN2 (mkN "titel" "titlar") noPrep)))) possess_Prep
possess_Prep
; ;
EmployedAt s = EmployedAt s =
relAP (mkAP (mkA2 (mkA "anställd" "anställt") at_Prep) s) som_Prep relAP (mkAP (mkA2 (mkA "anställd" "anställt") at_Prep) s) som_Prep
| relAP (mkAP (mkA2 (mkA "anställd" "anställt") by8agent_Prep) s) som_Prep -- | relAP (mkAP (mkA2 (mkA "anställd" "anställt") by8agent_Prep) s) som_Prep
| relVP (mkVP (mkV2 (mkV "arbeta") at_Prep) s) som_Prep | relVP (mkVP (mkV2 (mkV "arbeta") at_Prep) s) som_Prep
| relVP (mkVP (mkV2 (mkV "jobba") at_Prep) s) som_Prep | relVP (mkVP (mkV2 (mkV "jobba") at_Prep) s) som_Prep
; ;
HaveTitleAt t = HaveTitleAt t =
relAP (mkAP (mkA2 (mkA "anställd" "anställt") som_Prep) (mkNP t)) at_Prep relAP (mkAP (mkA2 (mkA "anställd" "anställt") som_Prep) (mkNP t)) at_Prep
| relAP (mkAP (mkA2 (mkA "anställd" "anställt") som_Prep) (mkNP t)) by8agent_Prep -- | relAP (mkAP (mkA2 (mkA "anställd" "anställt") som_Prep) (mkNP t)) by8agent_Prep
| relVP (mkVP (mkNP a_Det t)) at_Prep | relVP (mkVP (mkNP a_Det t)) at_Prep
| relVP (mkVP (mkV2 (mkV "arbeta") som_Prep) (mkNP t)) at_Prep | relVP (mkVP (mkV2 (mkV "arbeta") som_Prep) (mkNP t)) at_Prep
| relVP (mkVP (mkV2 (mkV "jobba") som_Prep) (mkNP t)) at_Prep | relVP (mkVP (mkV2 (mkV "jobba") som_Prep) (mkNP t)) at_Prep
| relVP (mkVP have_V2 (mkNP the_Det (mkCN (mkN2 (mkN "titel" "titlar") noPrep) -- | relVP (mkVP have_V2 (mkNP the_Det (mkCN (mkN2 (mkN "titel" "titlar") noPrep) (mkNP t)))) at_Prep
(mkNP t)))) at_Prep
; ;
Named n = propAP (mkAP (mkA2 called_A (mkPrep [])) n) ; Named n = propAP (mkAP (mkA2 called_A (mkPrep [])) n) ;