summary refs log tree commit diff stats
path: root/generator/vn.diff
diff options
context:
space:
mode:
authorKelly Rauchenberger <fefferburbia@gmail.com>2016-03-24 23:16:07 -0400
committerKelly Rauchenberger <fefferburbia@gmail.com>2016-03-24 23:16:07 -0400
commiteef5de613c75661e5d94baa086f6f2ddc26c7ed0 (patch)
tree180230f6a245c5bca94d894273f5d2b93ded3f04 /generator/vn.diff
parentd5ee4e39e5b5b3b8daa85cd972802195ad35e965 (diff)
downloadverbly-eef5de613c75661e5d94baa086f6f2ddc26c7ed0.tar.gz
verbly-eef5de613c75661e5d94baa086f6f2ddc26c7ed0.tar.bz2
verbly-eef5de613c75661e5d94baa086f6f2ddc26c7ed0.zip
Added verb frames
In addition:
- Added prepositions.
- Rewrote a lot of the query interface. It now, for a lot of relationships, supports nested AND, OR, and NOT logic.
- Rewrote the token class. It is now a union-like class instead of being polymorphic, which means smart pointers are no longer necessary.
- Querying with regards to word derivation has been temporarily removed.
- Sentinel values are now supported for all word types.
- The VerbNet data retrieved from http://verbs.colorado.edu/~mpalmer/projects/verbnet/downloads.html was found to not be perfectly satisfactory in some regards, especially regarding adjective phrases. A patch file is now included in the repository describing the changes made to the VerbNet v3.2 download for the canonical verbly datafile.
Diffstat (limited to 'generator/vn.diff')
-rw-r--r--generator/vn.diff482
1 files changed, 482 insertions, 0 deletions
diff --git a/generator/vn.diff b/generator/vn.diff new file mode 100644 index 0000000..f636d28 --- /dev/null +++ b/generator/vn.diff
@@ -0,0 +1,482 @@
1diff /Users/hatkirby/Downloads/new_vn 2/admit-65.xml datadir/vn/admit-65.xml
2104c104
3< <SELRESTRS logic="or">
4---
5> <SELRESTRS>
6diff /Users/hatkirby/Downloads/new_vn 2/amuse-31.1.xml datadir/vn/amuse-31.1.xml
7270a271,273
8> <THEMROLE type="Cause">
9> <SELRESTRS/>
10> </THEMROLE>
11368c371,373
12< <LEX value="'s"/>
13---
14> <NP value="Cause">
15> <SYNRESTRS/>
16> </NP>
17404c409,411
18< <SYNRESTRS/>
19---
20> <SYNRESTRS>
21> <SYNRESTR Value="+" type="adjp"/>
22> </SYNRESTRS>
23diff /Users/hatkirby/Downloads/new_vn 2/animal_sounds-38.xml datadir/vn/animal_sounds-38.xml
24186a187,191
25> <PREP>
26> <SELRESTRS>
27> <SELRESTR Value="+" type="loc" />
28> </SELRESTRS>
29> </PREP>
30diff /Users/hatkirby/Downloads/new_vn 2/assessment-34.1.xml datadir/vn/assessment-34.1.xml
31103d102
32< <LEX value="'s"/>
33diff /Users/hatkirby/Downloads/new_vn 2/battle-36.4.xml datadir/vn/battle-36.4.xml
3496c96
35< <SYNRESTR Value="+" type="what_extract"/>
36---
37> <SYNRESTR Value="+" type="wh_comp"/>
38diff /Users/hatkirby/Downloads/new_vn 2/become-109.1.xml datadir/vn/become-109.1.xml
3934c34,36
40< <SYNRESTRS/>
41---
42> <SYNRESTRS>
43> <SYNRESTR Value="+" type="adjp"/>
44> </SYNRESTRS>
45diff /Users/hatkirby/Downloads/new_vn 2/beg-58.2.xml datadir/vn/beg-58.2.xml
4641c41
47< <SYNRESTR Value="-" type="for_comp"/>
48---
49> <SYNRESTR Value="+" type="for_comp"/>
50diff /Users/hatkirby/Downloads/new_vn 2/bend-45.2.xml datadir/vn/bend-45.2.xml
5147c47,49
52< <SELRESTRS/>
53---
54> <SELRESTRS>
55> <SELRESTR Value="+" type="state"/>
56> </SELRESTRS>
57230c232,234
58< <SYNRESTRS/>
59---
60> <SYNRESTRS>
61> <SYNRESTR Value="+" type="adjp"/>
62> </SYNRESTRS>
63280,282c284
64< <SELRESTRS>
65< <SELRESTR Value="+" type="state"/>
66< </SELRESTRS>
67---
68> <SELRESTRS/>
69332,334c334
70< <SELRESTRS>
71< <SELRESTR Value="+" type="state"/>
72< </SELRESTRS>
73---
74> <SELRESTRS/>
75diff /Users/hatkirby/Downloads/new_vn 2/break-45.1.xml datadir/vn/break-45.1.xml
76255c255,257
77< <SYNRESTRS/>
78---
79> <SYNRESTRS>
80> <SYNRESTR Value="+" type="adjp"/>
81> </SYNRESTRS>
82307c309,311
83< <SYNRESTRS/>
84---
85> <SYNRESTRS>
86> <SYNRESTR Value="+" type="adjp"/>
87> </SYNRESTRS>
88diff /Users/hatkirby/Downloads/new_vn 2/characterize-29.2.xml datadir/vn/characterize-29.2.xml
89107c107
90< <LEX value="as"/>
91---
92> <LEX value="to be"/>
93109,111c109,111
94< <SYNRESTRS>
95< <SYNRESTR Value="+" type="small_clause"/>
96< </SYNRESTRS>
97---
98> <SYNRESTRS>
99> <SYNRESTR Value="+" type="adjp"/>
100> </SYNRESTRS>
101386a387,391
102> <NP value="Attribute">
103> <SYNRESTRS>
104> <SYNRESTR Value="+" type="adjp"/>
105> </SYNRESTRS>
106> </NP>
107diff /Users/hatkirby/Downloads/new_vn 2/coloring-24.xml datadir/vn/coloring-24.xml
10889c89,91
109< <SYNRESTRS/>
110---
111> <SYNRESTRS>
112> <SYNRESTR Value="+" type="adjp"/>
113> </SYNRESTRS>
114diff /Users/hatkirby/Downloads/new_vn 2/confess-37.10.xml datadir/vn/confess-37.10.xml
115110a111,115
116> <NP value="Attribute">
117> <SYNRESTRS>
118> <SYNRESTR Value="+" type="adjp"/>
119> </SYNRESTRS>
120> </NP>
121diff /Users/hatkirby/Downloads/new_vn 2/consider-29.9.xml datadir/vn/consider-29.9.xml
122191,193c191,193
123< <SYNRESTRS>
124< <SYNRESTR Value="-" type="sentential"/>
125< </SYNRESTRS>
126---
127> <SYNRESTRS>
128> <SYNRESTR Value="+" type="adjp"/>
129> </SYNRESTRS>
130334,336c334,336
131< <SYNRESTRS>
132< <SYNRESTR Value="-" type="sentential"/>
133< </SYNRESTRS>
134---
135> <SYNRESTRS>
136> <SYNRESTR Value="+" type="adjp"/>
137> </SYNRESTRS>
138468,470c468,470
139< <SYNRESTRS>
140< <SYNRESTR Value="-" type="sentential"/>
141< </SYNRESTRS>
142---
143> <SYNRESTRS>
144> <SYNRESTR Value="+" type="adjp"/>
145> </SYNRESTRS>
146554,556c554,556
147< <SYNRESTRS>
148< <SYNRESTR Value="-" type="sentential"/>
149< </SYNRESTRS>
150---
151> <SYNRESTRS>
152> <SYNRESTR Value="+" type="adjp"/>
153> </SYNRESTRS>
154diff /Users/hatkirby/Downloads/new_vn 2/cut-21.1.xml datadir/vn/cut-21.1.xml
155316c316,318
156< <SYNRESTRS/>
157---
158> <SYNRESTRS>
159> <SYNRESTR Value="+" type="adjp"/>
160> </SYNRESTRS>
161368c370,372
162< <SYNRESTRS/>
163---
164> <SYNRESTRS>
165> <SYNRESTR Value="+" type="adjp"/>
166> </SYNRESTRS>
167560c564,566
168< <SYNRESTRS/>
169---
170> <SYNRESTRS>
171> <SYNRESTR Value="+" type="adjp"/>
172> </SYNRESTRS>
173diff /Users/hatkirby/Downloads/new_vn 2/declare-29.4.xml datadir/vn/declare-29.4.xml
17433,35c33,35
175< <SYNRESTRS>
176< <SYNRESTR Value="-" type="sentential"/>
177< </SYNRESTRS>
178---
179> <SYNRESTRS>
180> <SYNRESTR Value="+" type="adjp"/>
181> </SYNRESTRS>
182122,124c122,124
183< <SYNRESTRS>
184< <SYNRESTR Value="-" type="sentential"/>
185< </SYNRESTRS>
186---
187> <SYNRESTRS>
188> <SYNRESTR Value="+" type="adjp"/>
189> </SYNRESTRS>
190244,246c244,246
191< <SYNRESTRS>
192< <SYNRESTR Value="-" type="sentential"/>
193< </SYNRESTRS>
194---
195> <SYNRESTRS>
196> <SYNRESTR Value="+" type="adjp"/>
197> </SYNRESTRS>
198diff /Users/hatkirby/Downloads/new_vn 2/estimate-34.2.xml datadir/vn/estimate-34.2.xml
199123a124
200> <LEX value="to be"/>
201125,127c126,128
202< <SYNRESTRS>
203< <SYNRESTR Value="+" type="to_be"/>
204< </SYNRESTRS>
205---
206> <SYNRESTRS>
207> <SYNRESTR Value="+" type="adjp"/>
208> </SYNRESTRS>
209diff /Users/hatkirby/Downloads/new_vn 2/get-13.5.1.xml datadir/vn/get-13.5.1.xml
21055,56c55
211< <SELRESTR Value="-" type="location"/>
212< <SELRESTR Value="-" type="region"/>
213---
214> <SELRESTR Value="+" type="currency"/>
215diff /Users/hatkirby/Downloads/new_vn 2/hit-18.1.xml datadir/vn/hit-18.1.xml
216234c234,236
217< <SYNRESTRS/>
218---
219> <SYNRESTRS>
220> <SYNRESTR Value="+" type="adjp"/>
221> </SYNRESTRS>
222294c296,298
223< <SYNRESTRS/>
224---
225> <SYNRESTRS>
226> <SYNRESTR Value="+" type="adjp"/>
227> </SYNRESTRS>
228619c623,625
229< <SYNRESTRS/>
230---
231> <SYNRESTRS>
232> <SYNRESTR Value="+" type="adjp"/>
233> </SYNRESTRS>
234diff /Users/hatkirby/Downloads/new_vn 2/instr_communication-37.4.xml datadir/vn/instr_communication-37.4.xml
235195c195,197
236< <SYNRESTRS/>
237---
238> <SYNRESTRS>
239> <SYNRESTR Value="+" type="quotation"/>
240> </SYNRESTRS>
241233c235,237
242< <SYNRESTRS/>
243---
244> <SYNRESTRS>
245> <SYNRESTR Value="+" type="quotation"/>
246> </SYNRESTRS>
247diff /Users/hatkirby/Downloads/new_vn 2/judgment-33.xml datadir/vn/judgment-33.xml
248187a188,190
249> <NP value="Attribute">
250> <SYNRESTRS/>
251> </NP>
252243a247
253> <LEX value="to be"/>
254245,247c249
255< <SYNRESTRS>
256< <SYNRESTR Value="+" type="small_clause"/>
257< </SYNRESTRS>
258---
259> <SYNRESTRS/>
260diff /Users/hatkirby/Downloads/new_vn 2/manner_speaking-37.3.xml datadir/vn/manner_speaking-37.3.xml
261264c264,266
262< <SYNRESTRS/>
263---
264> <SYNRESTRS>
265> <SYNRESTR Value="+" type="quotation"/>
266> </SYNRESTRS>
267603c605,607
268< <SYNRESTRS/>
269---
270> <SYNRESTRS>
271> <SYNRESTR Value="+" type="quotation"/>
272> </SYNRESTRS>
273diff /Users/hatkirby/Downloads/new_vn 2/other_cos-45.4.xml datadir/vn/other_cos-45.4.xml
274534c534,536
275< <SYNRESTRS/>
276---
277> <SYNRESTRS>
278> <SYNRESTR Value="+" type="adjp"/>
279> </SYNRESTRS>
280diff /Users/hatkirby/Downloads/new_vn 2/pocket-9.10.xml datadir/vn/pocket-9.10.xml
281256c256,258
282< <SYNRESTRS/>
283---
284> <SYNRESTRS>
285> <SYNRESTR Value="+" type="adv-loc"/>
286> </SYNRESTRS>
287diff /Users/hatkirby/Downloads/new_vn 2/poison-42.2.xml datadir/vn/poison-42.2.xml
28893c93,95
289< <SYNRESTRS/>
290---
291> <SYNRESTRS>
292> <SYNRESTR Value="+" type="adjp"/>
293> </SYNRESTRS>
294diff /Users/hatkirby/Downloads/new_vn 2/pour-9.5.xml datadir/vn/pour-9.5.xml
29559,61c59,62
296< <SELRESTRS>
297< <SELRESTR Value="+" type="path"/>
298< <SELRESTR Value="-" type="dest_dir"/>
299---
300> <SELRESTRS logic="or">
301> <SELRESTR Value="+" type="dir"/>
302> <SELRESTR Value="+" type="src"/>
303> <SELRESTR Value="+" type="dest_conf"/>
304157,160c158,162
305< <SELRESTRS>
306< <SELRESTR Value="+" type="path"/>
307< <SELRESTR Value="-" type="dest_dir"/>
308< </SELRESTRS>
309---
310> <SELRESTRS logic="or">
311> <SELRESTR Value="+" type="dir"/>
312> <SELRESTR Value="+" type="src"/>
313> <SELRESTR Value="+" type="dest_conf"/>
314> </SELRESTRS>
315diff /Users/hatkirby/Downloads/new_vn 2/push-12.xml datadir/vn/push-12.xml
31690c90,92
317< <SYNRESTRS/>
318---
319> <SYNRESTRS>
320> <SYNRESTR Value="+" type="adjp"/>
321> </SYNRESTRS>
322diff /Users/hatkirby/Downloads/new_vn 2/roll-51.3.1.xml datadir/vn/roll-51.3.1.xml
323190c190,192
324< <SYNRESTRS/>
325---
326> <SYNRESTRS>
327> <SYNRESTR Value="+" type="adjp"/>
328> </SYNRESTRS>
329256c258,260
330< <SYNRESTRS/>
331---
332> <SYNRESTRS>
333> <SYNRESTR Value="+" type="adjp"/>
334> </SYNRESTRS>
335diff /Users/hatkirby/Downloads/new_vn 2/see-30.1.xml datadir/vn/see-30.1.xml
33616a17,19
337> <THEMROLE type="Patient">
338> <SELRESTRS/>
339> </THEMROLE>
34093a97,102
341> <PREP value="in">
342> <SELRESTRS/>
343> </PREP>
344> <NP value="Patient">
345> <SYNRESTRS/>
346> </NP>
347231a241,243
348> <NP value="Patient">
349> <SYNRESTRS/>
350> </NP>
351diff /Users/hatkirby/Downloads/new_vn 2/seem-109.xml datadir/vn/seem-109.xml
35230,32c30,32
353< <SYNRESTRS>
354< <SYNRESTR Value="-" type="sentential"/>
355< </SYNRESTRS>
356---
357> <SYNRESTRS>
358> <SYNRESTR Value="+" type="adjp"/>
359> </SYNRESTRS>
360diff /Users/hatkirby/Downloads/new_vn 2/slide-11.2.xml datadir/vn/slide-11.2.xml
36169,72c69,73
362< <SELRESTRS>
363< <SELRESTR Value="+" type="path"/>
364< <SELRESTR Value="-" type="dest_dir"/>
365< </SELRESTRS>
366---
367> <SELRESTRS logic="or">
368> <SELRESTR Value="+" type="dir"/>
369> <SELRESTR Value="+" type="src"/>
370> <SELRESTR Value="+" type="dest_conf"/>
371> </SELRESTRS>
372218,221c219,223
373< <SELRESTRS>
374< <SELRESTR Value="+" type="path"/>
375< <SELRESTR Value="-" type="dest_dir"/>
376< </SELRESTRS>
377---
378> <SELRESTRS logic="or">
379> <SELRESTR Value="+" type="dir"/>
380> <SELRESTR Value="+" type="src"/>
381> <SELRESTR Value="+" type="dest_conf"/>
382> </SELRESTRS>
383diff /Users/hatkirby/Downloads/new_vn 2/spank-18.3.xml datadir/vn/spank-18.3.xml
38469a70,72
385> <THEMROLE type="Recipient">
386> <SELRESTRS/>
387> </THEMROLE>
388201c204,206
389< <SYNRESTRS/>
390---
391> <SYNRESTRS>
392> <SYNRESTR Value="+" type="adjp"/>
393> </SYNRESTRS>
394529,532c534,541
395< <SYNRESTRS>
396< <SYNRESTR Value="+" type="genitive"/>
397< <SYNRESTR Value="+" type="body_part"/>
398< </SYNRESTRS>
399---
400> <SYNRESTRS>
401> <SYNRESTR Value="+" type="genitive"/>
402> </SYNRESTRS>
403> </NP>
404> <NP value="Recipient">
405> <SYNRESTRS>
406> <SYNRESTR Value="+" type="body_part"/>
407> </SYNRESTRS>
408diff /Users/hatkirby/Downloads/new_vn 2/swat-18.2.xml datadir/vn/swat-18.2.xml
409264c264,266
410< <SYNRESTRS/>
411---
412> <SYNRESTRS>
413> <SYNRESTR Value="+" type="adjp"/>
414> </SYNRESTRS>
415324c326,328
416< <SYNRESTRS/>
417---
418> <SYNRESTRS>
419> <SYNRESTR Value="+" type="adjp"/>
420> </SYNRESTRS>
421diff /Users/hatkirby/Downloads/new_vn 2/tape-22.4.xml datadir/vn/tape-22.4.xml
422364c364,366
423< <SYNRESTRS/>
424---
425> <SYNRESTRS>
426> <SYNRESTR Value="+" type="adjp"/>
427> </SYNRESTRS>
428diff /Users/hatkirby/Downloads/new_vn 2/vehicle-51.4.1.xml datadir/vn/vehicle-51.4.1.xml
429227c227,229
430< <SYNRESTRS/>
431---
432> <SYNRESTRS>
433> <SYNRESTR Value="+" type="adjp"/>
434> </SYNRESTRS>
435diff /Users/hatkirby/Downloads/new_vn 2/waltz-51.5.xml datadir/vn/waltz-51.5.xml
436181c181,183
437< <SYNRESTRS/>
438---
439> <SYNRESTRS>
440> <SYNRESTR Value="+" type="adjp"/>
441> </SYNRESTRS>
442diff /Users/hatkirby/Downloads/new_vn 2/want-32.1.xml datadir/vn/want-32.1.xml
443142a143
444> <ADV/>
445194a196
446> <ADJ/>
447305a308
448> <LEX value="to be"/>
449307,309c310,312
450< <SYNRESTRS>
451< <SYNRESTR Value="+" type="to_be"/>
452< </SYNRESTRS>
453---
454> <SYNRESTRS>
455> <SYNRESTR Value="+" type="adjp"/>
456> </SYNRESTRS>
457diff /Users/hatkirby/Downloads/new_vn 2/wipe_instr-10.4.2.xml datadir/vn/wipe_instr-10.4.2.xml
458178c178,180
459< <SYNRESTRS/>
460---
461> <SYNRESTRS>
462> <SYNRESTR Value="+" type="adjp"/>
463> </SYNRESTRS>
464diff /Users/hatkirby/Downloads/new_vn 2/wipe_manner-10.4.1.xml datadir/vn/wipe_manner-10.4.1.xml
465198c198,199
466< <SELRESTR Value="-" type="region"/>
467---
468> <SELRESTR Value="+" type="location"/>
469> <SELRESTR Value="-" type="region"/>
470diff /Users/hatkirby/Downloads/new_vn 2/wish-62.xml datadir/vn/wish-62.xml
47191a92
472> <LEX value="to be"/>
47393,95c94,96
474< <SYNRESTRS>
475< <SYNRESTR Value="+" type="to_be"/>
476< </SYNRESTRS>
477---
478> <SYNRESTRS>
479> <SYNRESTR Value="+" type="adjp"/>
480> </SYNRESTRS>
481122a124
482> <ADJ/>