# HG changeset patch
# User Jamie Forth <j.forth@gold.ac.uk>
# Date 1296038669 0
# Node ID 5ff310be494254300efcda8f07b22810d5c89adb
# Parent  3b36cf79b525d8a454ec26aaf51bf831cd9b6136
Fix bug in during method, and make it the same as Allen (1983).

diff -r 3b36cf79b525 -r 5ff310be4942 base/methods.lisp
--- 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))