Mercurial > hg > amuse
comparison base/generics.lisp @ 261:8e5f306b7e47
add 'onset-within' generics - does Allen say anything about this?
| author | Jamie Forth <j.forth@gold.ac.uk> |
|---|---|
| date | Mon, 28 Mar 2011 21:40:37 +0100 |
| parents | f5836b2bf334 |
| children |
comparison
equal
deleted
inserted
replaced
| 260:f5836b2bf334 | 261:8e5f306b7e47 |
|---|---|
| 339 (defgeneric overlaps (object1 object2)) | 339 (defgeneric overlaps (object1 object2)) |
| 340 (defgeneric during (object1 object2)) | 340 (defgeneric during (object1 object2)) |
| 341 (defgeneric starts (object1 object2)) | 341 (defgeneric starts (object1 object2)) |
| 342 (defgeneric ends (object1 object2)) | 342 (defgeneric ends (object1 object2)) |
| 343 | 343 |
| 344 ;;; Does Allen cover this? Like during, except don't consider cut-off. | |
| 345 (defgeneric onset-within (object1 object2)) | |
| 346 (defgeneric onset-within-fuzzy (object1 object2 period)) | |
| 347 | |
| 344 ;;; and extensions thereof ... | 348 ;;; and extensions thereof ... |
| 345 | 349 |
| 346 (defgeneric subinterval (object1 object2) | 350 (defgeneric subinterval (object1 object2) |
| 347 (:method (o1 o2) (or (starts o1 o2) (during o1 o2) (ends o1 o2)))) | 351 (:method (o1 o2) (or (starts o1 o2) (during o1 o2) (ends o1 o2)))) |
| 348 | 352 |