# HG changeset patch # User David Lewis # Date 1184062136 -3600 # Node ID c9b0739d8dd6ca2880a0da690d539515df09aab7 # Parent 9960645779f00ce73449da29eb424c3ede39d1c2 A few small changes, mostly for speed darcs-hash:20070710100856-f76cc-7977785c9dbc9e1edf86ebdbfe6e82b9176d7372.gz diff -r 9960645779f0 -r c9b0739d8dd6 amuse.asd --- a/amuse.asd Wed Jul 04 15:20:05 2007 +0100 +++ b/amuse.asd Tue Jul 10 11:08:56 2007 +0100 @@ -11,8 +11,8 @@ (:file "extended-sequence" :depends-on ("package")) (:file "classes" :depends-on ("package")) (:file "constructors" :depends-on ("package")) - (:file "generics" :depends-on ("package")) - (:file "methods" :depends-on ("package")))) + (:file "generics" :depends-on ("package" "classes")) + (:file "methods" :depends-on ("package" "generics" "classes")))) (:module utils :components ((:file "package") diff -r 9960645779f0 -r c9b0739d8dd6 base/methods.lisp --- a/base/methods.lisp Wed Jul 04 15:20:05 2007 +0100 +++ b/base/methods.lisp Tue Jul 10 11:08:56 2007 +0100 @@ -24,6 +24,11 @@ (defmethod (setf timepoint) ((value real) (moment-designator moment)) (setf (%moment-time moment-designator) value)) +(defmethod cut-off ((anchored-period-designator anchored-period)) + (make-instance 'moment + :time (+ (%moment-time anchored-period-designator) + (%period-interval anchored-period-designator)))) + (defmethod beat-units-per-bar ((time-signature basic-time-signature)) (%basic-time-signature-numerator time-signature)) @@ -116,6 +121,9 @@ (defmethod time> ((object1 moment) (object2 moment)) (> (timepoint object1) (timepoint object2))) +(defmethod time< ((object1 moment) (object2 moment)) + (< (timepoint object1) (timepoint object2))) + (defmethod time= ((object1 moment) (object2 moment)) (= (timepoint object1) (timepoint object2)))