Commit 0634ad3f authored by Vanja Sophie Cangalovic's avatar Vanja Sophie Cangalovic

Merge branch 'master' into deploy-litmus

parents bb0f4371 ecaeb0ba
Pipeline #104647 passed with stage
in 8 seconds
......@@ -103,7 +103,7 @@
{:id (uuid)
:form "lid"
:pos "N"
:type :instrument
:type "Instrument"
:numerus "Singular"}
{:id (uuid)
:form "table"
......@@ -750,32 +750,25 @@
[(? :tl-schema) :trajector (? :trajector)]
[(? :tl-schema) :landmark (? :goal)]
]}
{:id :contained-PP-process ; "Whisk with a spoon", "Cover with care."
:match [[(? :clause) :subunit (? :vp)]
[(? :vp) :head (? :verb)]
[(? :verb) :evokes (? :verb-schema)]
[(? :vp) :isa "VP"]
[(? :pp) :isa "PP"]
{:id :contained-PP ; "with a spoon", "with care.", "with the hoodie"
:match [[(? :pp) :isa "PP"]
[(? :pp) :subunit (? :p)]
[(? :p) :word (? :p-word)]
[(? :p-word) :form "with"]
[(? :pp) :subunit (? :np)]
[(? :np) :isa "NP"]
[(? :np) :referent (? :anything)]
[(? :trans) :is-expressed-by (? :clause)]
[(? :trans) :isa "StateTransition"]
[(? :np) :referent (? :entity)]
]
:call (introduce (? :link-schema))
:merge [[(? :clause) :subunit (? :pp)]
[(? :trans) :satisfies (? :link-schema)]
[(? :link-schema) :isa "LinkSchema"]
:call (introduce (? :link-schema) (? :linked-1) (? :linked-2))
:merge [[(? :pp) :evokes (? :link-schema)]
[(? :link-schema) :isa "LinkSchema"]
[(? :link-schema) :tag "semantic"]
[(? :link-schema) :has-constituent (? :linked-1)]
[(? :linked-1) :classifies (? :verb-schema)]
[(? :linked-1) :classifies (? :something)]
[(? :linked-1) :isa "Linked-1"]
[(? :linked-1) :tag "semantic"]
[(? :link-schema) :has-constituent (? :linked-2)]
[(? :linked-2) :classifies (? :anything)]
[(? :linked-2) :classifies (? :entity)]
[(? :linked-2) :isa "Linked-2"]
[(? :linked-2) :tag "semantic"]
]}
......@@ -786,29 +779,31 @@
[(? :verb) :evokes (? :verb-schema)]
[(? :pp) :isa "PP"]
[(? :pp) :subunit (? :p)]
[(? :p) :isa "PREP"]
[(? :p) :word (? :p-word)]
[(? :p-word) :form "with"]
[(? :pp) :subunit (? :np)]
[(? :np) :isa "NP"]
[(? :np) :referent (? :instrument)]
[(? :instrument) :type "Instrument"]
[(? :trans) :is-expressed-by (? :clause)]
[(? :trans) :isa "StateTransition"]
[(? :trans) :satisfies (? :link-schema)]
[(? :link-schema) :isa "LinkSchema"]
[(? :link-schema) :has-constituent (? :linked-1)]
[(? :linked-1) :classifies (? :verb-schema)]
[(? :linked-1) :isa "Linked-1"]
[(? :link-schema) :has-constituent (? :linked-2)]
[(? :linked-2) :classifies (? :anything)]
[(? :linked-2) :classifies (? :instrument)]
[(? :linked-2) :isa "Linked-2"]
]
; :call ;TODO check for semantic-category of (? :instrument) -- should be a tool/instrument
:call (introduce (? :instrument-role))
:merge [[(? :clause) :subunit (? :pp)]
[(? :trans) :satisfies (? :link-schema)]
[(? :trans) :satisfies (? :verb-schema)]
[(? :verb-schema) :has-constituent (? :instrument-role)]
[(? :instrument-role) :isa "Instrument"]
[(? :instrument-role) :tag "semantic"]
[(? :instrument-role) :classifies (? :anything)]
[(? :instrument-role) :classifies (? :instrument)]
]}
{:id :covering
:match [[(? :vp) :sem-valence (? :sem-val)]
......@@ -842,6 +837,10 @@
[(? :coverage-schema) :tag "semantic"]
[(? :coverage-schema) :isa "Coverage"]
[(? :agent-role) :tag "semantic"]
[(? :verb-schema) :has-constituent (? :instrument-role)] ; Don't introduce, should merge with existing role.
[(? :instrument-role) :isa "Instrument"]
[(? :instrument-role) :tag "semantic"]
[(? :instrument-role) :classifies (? :coverer)]
]}
{:id :until-adj-phrase ; Common recipe ellipsis, e.g. "Whisk until smooth."
:match [[(? :p) :isa "PREP"]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment