Mercurial > hg > amuse

changeset 128:46c2ea86650f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
implementations/mtp/: add mtp-music-object darcs-hash:20070730142311-c0ce4-739cab39d35e6b8e480c67aef8f9469727d089ab.gz
author Marcus Pearce <m.pearce@gold.ac.uk>
date Mon, 30 Jul 2007 15:23:11 +0100
parents dc862a0c7b9c
children e1afc3fef87b
files implementations/mtp/classes.lisp
diffstat 1 files changed, 13 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/implementations/mtp/classes.lisp	Mon Jul 30 15:21:06 2007 +0100
+++ b/implementations/mtp/classes.lisp	Mon Jul 30 15:23:11 2007 +0100
@@ -1,33 +1,38 @@
 (cl:in-package #:amuse-mtp) 
 
+;;; Top-level class 
+
+(defclass mtp-object (amuse:amuse-object) ())
+
 ;;; Segmenters 
 
-(defclass mtp-after-segmenter (ground-truth-segmenter after-segmenter)
+(defclass mtp-after-segmenter (ground-truth-segmenter after-segmenter mtp-object)
   ())
 
-(defclass mtp-before-segmenter (ground-truth-segmenter before-segmenter)
+(defclass mtp-before-segmenter (ground-truth-segmenter before-segmenter 
+                                                       mtp-object)
   ())
 
 ;;; Identifiers 
 
-(defclass mtp-dataset-identifier (identifier)
+(defclass mtp-dataset-identifier (identifier mtp-object)
   ((dataset-id :initarg :dataset-id :accessor dataset-id)))
    
-(defclass mtp-composition-identifier (identifier)
+(defclass mtp-composition-identifier (identifier mtp-object)
   ((dataset-id :initarg :dataset-id :accessor dataset-id)
    (composition-id :initarg :composition-id :accessor composition-id)))
 
 ;;; Music objects 
 
-(defclass mtp-object (amuse:amuse-object) ())
+(defclass mtp-music-object (mtp-object) ())
 
-(defclass mtp-dataset (amuse::list-slot-sequence mtp-object) 
+(defclass mtp-dataset (amuse::list-slot-sequence mtp-music-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 mtp-object)
+(defclass mtp-composition (amuse:composition mtp-music-object)
   ((dataset-id :initarg :dataset-id :accessor dataset-id)
    (composition-id :initarg :composition-id :accessor composition-id)
    (description :initarg :description :accessor description)))
@@ -35,7 +40,7 @@
 (defclass mtp-monody (amuse:monody mtp-composition) 
   ())
 
-(defclass mtp-event (amuse:pitched-event mtp-object)
+(defclass mtp-event (amuse:pitched-event mtp-music-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)