Mercurial > hg > amuse
changeset 143:b753a56c373b
base/: add standard-monody
darcs-hash:20070911103904-c0ce4-972b12d9521d0c75143ef9d81fdb7f33dbc3e8e4.gz
| author | Marcus Pearce <m.pearce@gold.ac.uk> |
|---|---|
| date | Tue, 11 Sep 2007 11:39:04 +0100 |
| parents | 7ed6a263f844 |
| children | 70c716a6eb72 |
| files | base/classes.lisp base/methods.lisp base/package.lisp implementations/mtp/classes.lisp |
| diffstat | 4 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/base/classes.lisp Tue Sep 11 11:17:57 2007 +0100 +++ b/base/classes.lisp Tue Sep 11 11:39:04 2007 +0100 @@ -179,4 +179,4 @@ (defclass standard-composition (composition standard-time-ordered-constituent) ()) (defclass monody (composition) ()) - +(defclass standard-monody (monody standard-composition) ())
--- a/base/methods.lisp Tue Sep 11 11:17:57 2007 +0100 +++ b/base/methods.lisp Tue Sep 11 11:39:04 2007 +0100 @@ -2,7 +2,7 @@ ;;; monody -(defmethod ensure-monody ((m monody)) +(defmethod ensure-monody ((m standard-monody)) (let ((result t)) (dotimes (i (1- (length m)) result) ;; assumes the events are time ordered which (since monody is a @@ -453,4 +453,4 @@ (make-standard-period duration-value)) (defmethod make-anchored-period ((onset-value real) (duration-value real)) "Returns STANDARD-ANCHORED-PERIOD given a real" - (make-standard-anchored-period onset-value duration-value)) \ No newline at end of file + (make-standard-anchored-period onset-value duration-value))
--- a/base/package.lisp Tue Sep 11 11:17:57 2007 +0100 +++ b/base/package.lisp Tue Sep 11 11:39:04 2007 +0100 @@ -6,6 +6,7 @@ #:standard-constituent #:standard-composition #:monody + #:standard-monody #:identifier #:moment #:period
--- a/implementations/mtp/classes.lisp Tue Sep 11 11:17:57 2007 +0100 +++ b/implementations/mtp/classes.lisp Tue Sep 11 11:39:04 2007 +0100 @@ -37,7 +37,7 @@ (composition-id :initarg :composition-id :accessor composition-id) (description :initarg :description :accessor description))) -(defclass mtp-monody (amuse:monody mtp-composition) +(defclass mtp-monody (amuse:standard-monody mtp-composition) ()) (defclass mtp-event (amuse:standard-pitched-event mtp-music-object)