Mercurial > hg > amuse

changeset 244:76a695fe294f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add floating constituent classes. Ignore-this: f3afc46c68f8ab3b1c9c482919a7378f darcs-hash:20100604153709-16a00-5ec4568ef64401cb0cc67a99246a125367ce4734.gz committer: Jamie Forth <j.forth@gold.ac.uk>
author j.forth <j.forth@gold.ac.uk>
date Thu, 24 Feb 2011 11:23:18 +0000
parents 93f8768b12dd
children 70969555ca07
files base/classes.lisp base/package.lisp
diffstat 2 files changed, 31 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/base/classes.lisp	Thu Feb 24 11:23:18 2011 +0000
+++ b/base/classes.lisp	Thu Feb 24 11:23:18 2011 +0000
@@ -208,8 +208,11 @@
 				 standard-anchored-period)
   ()
   (:documentation "Tempo associated with a standard-anchored-period"))
-   
-;; collections of more than one event
+
+
+;;;=====================================================================
+;;; Constituents: collections of more than one event
+;;;=====================================================================
 
 (defclass constituent (anchored-period) ()
   (:documentation "Base class for constituents"))
@@ -243,6 +246,28 @@
 
 (defclass standard-monody (monody standard-composition) ())
 
+;; Floating Constituents
+
+(defclass floating-constituent (period) ()
+  (:documentation "Base class for non-anchored constituents"))
+
+(defclass standard-floating-constituent (floating-constituent
+					 standard-period) ()
+  (:documentation "Base class for floating constituents using standard
+  time representation"))
+
+(defclass time-ordered-floating-constituent (floating-constituent
+					     list-slot-sequence)
+  ;; this won't work if lisp implementation doesn't support extensible
+  ;; sequences.
+  ())
+
+(defclass standard-time-ordered-floating-constituent
+    (time-ordered-floating-constituent standard-floating-constituent)
+  ;; this won't work if lisp implementation doesn't support extensible
+  ;; sequences.
+  ())
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; Experimental:
--- a/base/package.lisp	Thu Feb 24 11:23:18 2011 +0000
+++ b/base/package.lisp	Thu Feb 24 11:23:18 2011 +0000
@@ -5,6 +5,10 @@
 	   #:composition
            #:standard-constituent
 	   #:standard-composition
+	   #:floating-constituent
+	   #:standard-floating-constituent
+	   #:time-ordered-floating-constituent
+	   #:standard-time-ordered-floating-constituent
 	   #:monody
            #:standard-monody
 	   #:identifier