Mercurial > hg > amuse

changeset 297:6be947d9e7c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add composition slot to event (amuse base) Ignore-this: ef4ef09ad8e7c134e7e3cb5b70345b34 darcs-hash:20090828163617-16a00-eb532b34b175c446e804d90785ef18367ae85971.gz
author j.forth <j.forth@gold.ac.uk>
date Fri, 28 Aug 2009 17:36:17 +0100
parents 68aadc4eb96d
children 204d6d1f4f6a
files base/classes.lisp base/package.lisp
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/base/classes.lisp	Fri Aug 28 15:52:17 2009 +0100
+++ b/base/classes.lisp	Fri Aug 28 17:36:17 2009 +0100
@@ -80,6 +80,11 @@
 
 (defclass event (anchored-period) ()
   (:documentation "Notelike object"))
+(defclass linked-event (amuse-object)
+  ((composition :reader composition
+		:writer %set-composition
+		:initarg :composition))
+  (:documentation "This provides a composition slot for events."))
 (defclass pitched-event (event pitch) ()
   (:documentation "Event with pitch information"))
 (defclass standard-pitched-event (pitched-event
--- a/base/package.lisp	Fri Aug 28 15:52:17 2009 +0100
+++ b/base/package.lisp	Fri Aug 28 17:36:17 2009 +0100
@@ -8,6 +8,8 @@
 	   #:monody
            #:standard-monody
 	   #:identifier
+	   #:composition
+	   #:%set-composition
 	   #:composition-identifier
 	   #:constituent-identifier
 	   #:moment
@@ -23,6 +25,7 @@
 	   #:diatonic-pitch   
 	   #:chromatic-pitch-interval
            #:diatonic-pitch-interval
+	   #:linked-event
 	   #:pitched-event
 	   #:standard-pitched-event
 	   #:chromatic-pitched-event