Mercurial > hg > amuse

changeset 127:dc862a0c7b9c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
implementations/mtp/: add mtp-object darcs-hash:20070730142106-c0ce4-1db39f1d64c3b0f779dacf3474d1385e12b2d1cc.gz
author Marcus Pearce <m.pearce@gold.ac.uk>
date Mon, 30 Jul 2007 15:21:06 +0100
parents efaa02d21690
children 46c2ea86650f
files implementations/mtp/classes.lisp
diffstat 1 files changed, 13 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/implementations/mtp/classes.lisp	Mon Jul 30 15:09:00 2007 +0100
+++ b/implementations/mtp/classes.lisp	Mon Jul 30 15:21:06 2007 +0100
@@ -1,11 +1,15 @@
 (cl:in-package #:amuse-mtp) 
 
+;;; Segmenters 
+
 (defclass mtp-after-segmenter (ground-truth-segmenter after-segmenter)
   ())
 
 (defclass mtp-before-segmenter (ground-truth-segmenter before-segmenter)
   ())
 
+;;; Identifiers 
+
 (defclass mtp-dataset-identifier (identifier)
   ((dataset-id :initarg :dataset-id :accessor dataset-id)))
    
@@ -13,13 +17,17 @@
   ((dataset-id :initarg :dataset-id :accessor dataset-id)
    (composition-id :initarg :composition-id :accessor composition-id)))
 
-(defclass mtp-dataset (amuse::list-slot-sequence) 
+;;; Music objects 
+
+(defclass mtp-object (amuse:amuse-object) ())
+
+(defclass mtp-dataset (amuse::list-slot-sequence mtp-object) 
   ((dataset-id :initarg :dataset-id :accessor dataset-id)
    (description :initarg :description :accessor description)
    (timebase :initarg :timebase :accessor dataset-timebase)
    (midc :initarg :midc :accessor dataset-midc)))
 
-(defclass mtp-composition (amuse:composition)
+(defclass mtp-composition (amuse:composition mtp-object)
   ((dataset-id :initarg :dataset-id :accessor dataset-id)
    (composition-id :initarg :composition-id :accessor composition-id)
    (description :initarg :description :accessor description)))
@@ -27,12 +35,12 @@
 (defclass mtp-monody (amuse:monody mtp-composition) 
   ())
 
-(defclass mtp-event (amuse:pitched-event)
+(defclass mtp-event (amuse:pitched-event mtp-object)
   ((dataset-id :initarg :dataset-id :accessor dataset-id)
    (composition-id :initarg :composition-id :accessor composition-id)
    (event-id :initarg :event-id :accessor event-id)
-   ;;(onset :initarg :onset :accessor %mtp-onset)  - (amuse:timepoint ...)
-   ;;(dur :initarg :dur :accessor %mtp-accidental) - (amuse:duration  ...)
+   ;;(onset :initarg :onset :accessor %mtp-onset)  onset / (amuse:timepoint ...)
+   ;;(dur :initarg :dur :accessor %mtp-accidental) interval / (amuse:duration  ...)
    (deltast :initarg :deltast :accessor %mtp-deltast)
    (cpitch :initarg :cpitch :accessor %mtp-cpitch)
    (mpitch :initarg :mpitch :accessor %mtp-mpitch)