Mercurial > hg > amuse
changeset 135:188fe5ea837f
Miscellaneous patching. Fixing exports, etc.
darcs-hash:20070828101727-f76cc-9e3b1f75cff6f43212f8862153db9ca806f606b8.gz
| author | David Lewis <d.lewis@gold.ac.uk> |
|---|---|
| date | Tue, 28 Aug 2007 11:17:27 +0100 |
| parents | 5e362d998f29 |
| children | fd85f52d9f9d |
| files | implementations/geerdes/methods.lisp implementations/geerdes/package.lisp tools/package.lisp |
| diffstat | 3 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/implementations/geerdes/methods.lisp Tue Aug 28 11:15:24 2007 +0100 +++ b/implementations/geerdes/methods.lisp Tue Aug 28 11:17:27 2007 +0100 @@ -157,11 +157,13 @@ (defmethod get-applicable-key-signatures ((anchored-period anchored-period) (composition midi-composition)) (%find-overlapping anchored-period (key-signatures composition))) +(defparameter *stuff* nil) (defun %find-overlapping (period1 period-list) (let ((result-list)) + (setf *stuff* (cons period1 period-list)) (dolist (period2 period-list result-list) (cond - ((before period1 period2) + ((time>= period2 (cut-off period1)) (return-from %find-overlapping (reverse result-list))) - ((not (before period2 period1)) + ((time> (cut-off period2) period1) (push period2 result-list)))))) \ No newline at end of file
--- a/implementations/geerdes/package.lisp Tue Aug 28 11:15:24 2007 +0100 +++ b/implementations/geerdes/package.lisp Tue Aug 28 11:17:27 2007 +0100 @@ -4,6 +4,8 @@ ;; classes #:geerdes-composition #:geerdes-monody + #:geerdes-pitched-event + #:geerdes-percussive-event ;; identifier constructors #:g-id #:g-id-file-id