comparison base/generics.lisp @ 33:d1010755f507

Large upload of local changes. Many additions, such as harmony and piece-level objects

darcs-hash:20070413100909-f76cc-a8aa8dfc07f438dc0c1a7c45cee7ace2ecc1e6a5.gz

 (cl:in-package #:amuse) 
 
 ;;; Pulling compositions from the database 
 
 (defgeneric get-composition (identifier))
+
+;;; Getting constituents from compositions
+;; IS this the mechanism we want to use
+(defgeneric time-signatures (composition))
+(defgeneric (setf time-signatures) (sequence composition))
+(defgeneric tempi (composition))
+(defgeneric (setf tempi) (sequence composition))
+(defgeneric key-signatures (composition))
+(defgeneric (setf key-signatures) (sequence composition))
 
 ;;; Simple Accessors
 
 ;; pitch-based
 

 (defgeneric time-signature-numerator (time-signature)
   (:method (ts) (beat-units-per-bar ts)))
 (defgeneric beat-units (time-signature))
 (defgeneric time-signature-denominator (time-signature)
   (:method (ts) (beat-units ts)))
+(defgeneric tactus-duration (time-signature)
+  ;; basic, but should do?
+  (:method (ts)
+    (cond
+      ((and (not (= (beat-units-per-bar ts) 3))
+	    (= (rem (beat-units-per-bar ts) 3) 0))
+       ;; compound time
+       (* (/ 4 (beat-units ts))
+	  3))
+      (t (/ 4 (beat-units ts))))))
 
 (defgeneric key-signature-sharps (key-signature))
 
 (defgeneric bpm (tempo)) ;; in bpm
 (defgeneric microseconds-per-crotchet (tempo)

 (defgeneric disjoint (object1 object2)
   (:method (o1 o2) 
     (or (before o1 o2) (meets o1 o2) (meets o2 o1) (before o2 o1))))
 
 ;;; More time-based functions
+
+(defgeneric period= (object1 object2)
+  (:method (x y) nil))
+
+(defgeneric find-overlapping (anchored-period sequence)
+  ;; Returns all members of a sequence of period signifiers that overlap
+  ;; with the supplied period
+  (:method (ap s) (remove-if #'(lambda (x) (amuse:disjoint ap x)) s)))
+
 ;; Return the anchored-period representing the intersection of two
 ;; anchored-period-specifiers.
 (defgeneric period-intersection (anchored-period-specifier1
 				 anchored-period-specifier2))
 

   (:method (md1 md2) (time- (moment md2) (moment md1))))
 
 
 ;;; Time Signature 
 
-(defgeneric get-applicable-time-signatures (object1 object2))
+(defgeneric get-applicable-time-signatures (anchored-period composition)
+  (:method (ap c) (find-overlapping ap (time-signatures c))))
 
 ;;; Tempo 
 
-(defgeneric get-applicable-tempi (object1 object2))
+(defgeneric get-applicable-tempi  (anchored-period composition)
+  (:method (ap c) (find-overlapping ap (tempi c))))
 
 ;;; Tonality (Key Signature / Mode) 
 
 (defgeneric get-applicable-key-signatures (object1 object2))