Mercurial > hg > amuse
changeset 205:5ff310be4942
Fix bug in during method, and make it the same as Allen (1983).
| author | Jamie Forth <j.forth@gold.ac.uk> |
|---|---|
| date | Wed, 26 Jan 2011 10:44:29 +0000 |
| parents | 3b36cf79b525 |
| children | 1f3873585a5d |
| files | base/methods.lisp |
| diffstat | 1 files changed, 4 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/base/methods.lisp Thu Jul 23 11:31:19 2009 +0100 +++ b/base/methods.lisp Wed Jan 26 10:44:29 2011 +0000 @@ -407,8 +407,10 @@ (defmethod during ((object1 anchored-period) (object2 anchored-period)) - (and (time> object1 object2) - (time< (cut-off object2) (cut-off object2)))) + (or (and (time> object1 object2) + (time<= (cut-off object1) (cut-off object2))) + (and (time>= object1 object2) + (time< (cut-off object1) (cut-off object2))))) (defmethod starts ((object1 anchored-period) (object2 anchored-period))