annotate generics.lisp @ 10:356ee92313be

Move default methods from default-methods.lisp to generics.lisp and remove default-methods.lisp. darcs-hash:20061113192940-aa3d6-c5c255e9aa6486b360e1ac1393910ba3c783f4b8.gz
author m.pearce <m.pearce@gold.ac.uk>
date Mon, 13 Nov 2006 19:29:40 +0000
parents 22d090e96582
children 9f05ce23e71e
rev   line source
m@3 1 (cl:in-package #:amuse)
m@3 2
m@8 3 ;;; Pulling compositions from the database
m@8 4
m@8 5 (defgeneric get-composition (identifier))
m@8 6
m@0 7 ;;; Accessors (do we need the get- prefix?)
m@0 8
m@0 9 (defgeneric get-pitch (object &key kind)) ; ?
m@0 10 (defgeneric get-chromatic-pitch (object))
m@0 11 (defgeneric get-diatonic-pitch (object))
m@0 12 (defgeneric get-frequency (object))
m@0 13
m@0 14 (defgeneric get-duration (object))
m@0 15
m@0 16 (defgeneric get-onset (object)) ; get-time?
m@0 17
m@0 18
m@0 19 ;;; Time Protocol (or moments?)
m@0 20
m@0 21 ;; negative times/durations -> ERROR?
m@0 22
m@0 23 ;; time+: <time> <duration> -> <time>
m@0 24 ;; <duration> <time> -> <time> (same as previous?)
m@0 25 ;; <duration> <duration> -> <duration> (or a distinct duration+?)
m@0 26 ;; <time> <time> -> ERROR?
m@0 27 ;;
m@0 28 ;; time-: <time> <time> -> <duration>
m@0 29 ;; <time> <duration> -> <time>
m@0 30 ;; <duration> <duration> -> <duration> (or a distinct duration-?)
m@0 31 ;; <duration> <time> -> ERROR?
m@0 32
m@0 33 (defgeneric time+ (object1 object2))
m@0 34 (defgeneric time- (object1 object2))
m@0 35
m@0 36 (defgeneric time> (object1 object2))
m@0 37 (defgeneric time< (object1 object2))
m@0 38 (defgeneric time= (object1 object2))
m@10 39 (defgeneric time>= (object1 object2)
m@10 40 (:method (o1 o2) (or (time> o1 o2) (time= o1 o2))))
m@10 41 (defgeneric time<= (object1 object2)
m@10 42 (:method (o1 o2) (or (time< o1 o2) (time= o1 o2))))
m@10 43 (defgeneric time/= (object1 object2)
m@10 44 (:method (o1 o2) (not (time= o1 o2))))
m@10 45
m@0 46
m@0 47 ;;; Duration protocol
m@0 48
m@0 49 (defgeneric duration> (object1 object2))
m@0 50 (defgeneric duration< (object1 object2))
m@0 51 (defgeneric duration= (object1 object2))
m@10 52 (defgeneric duration>= (object1 object2)
m@10 53 (:method (o1 o2) (or (duration> o1 o2) (duration= o1 o2))))
m@10 54 (defgeneric duration<= (object1 object2)
m@10 55 (:method (o1 o2) (or (duration< o1 o2) (duration= o1 o2))))
m@10 56 (defgeneric duration/= (object1 object2)
m@10 57 (:method (o1 o2) (not (duration= o1 o2))))
m@0 58
m@0 59
m@0 60 ;;; Pitch protocol
m@0 61
m@0 62 ;; pitch+: <pitch> <pitch> -> <pitch>
m@0 63 ;; <pitch> <interval> -> <pitch>
m@0 64 ;; <interval> <pitch> -> <pitch> (same as previous?)
m@0 65 ;; <interval> <interval> -> <interval> (or a distinct interval+?)
m@0 66 ;;
m@0 67 ;; pitch-: <pitch> <pitch> -> <interval>
m@0 68 ;; <pitch> <interval> -> <pitch>
m@0 69 ;; <interval> <interval> -> <interval> (or a distinct interval-?
m@0 70 ;; <interval> <pitch> -> ERROR?
m@0 71
m@0 72 (defgeneric pitch+ (object1 object2))
m@0 73 (defgeneric pitch- (object1 object2))
m@0 74
m@0 75 (defgeneric pitch> (object1 object2))
m@0 76 (defgeneric pitch< (object1 object2))
m@0 77 (defgeneric pitch= (object1 object2))
m@10 78 (defgeneric pitch>= (object1 object2)
m@10 79 (:method (o1 o2) (or (pitch> o1 o2) (pitch= o1 o2))))
m@10 80 (defgeneric pitch<= (object1 object2)
m@10 81 (:method (o1 o2) (or (pitch< o1 o2) (pitch= o1 o2))))
m@10 82 (defgeneric pitch/= (object1 object2)
m@10 83 (:method (o1 o2) (not (pitch= o1 o2))))
m@0 84
m@0 85 ;;; Interval protocol (emphasise _pitch_ not _time_ interval?)
m@0 86
m@0 87 (defgeneric interval> (object1 object2))
m@0 88 (defgeneric interval< (object1 object2))
m@0 89 (defgeneric interval= (object1 object2))
m@10 90 (defgeneric interval>= (object1 object2)
m@10 91 (:method (o1 o2) (or (interval> o1 o2) (interval= o1 o2))))
m@10 92 (defgeneric interval<= (object1 object2)
m@10 93 (:method (o1 o2) (or (interval< o1 o2) (interval= o1 o2))))
m@10 94 (defgeneric interval/= (object1 object2)
m@10 95 (:method (o1 o2) (not (interval= o1 o2))))
m@0 96
m@9 97 ;;; Allen's (1984) interval relations
m@9 98 ;;; . equals already defined as INTERVAL= above
m@10 99 ;;; . inverses ommitted for now (just use CL:NOT)
m@10 100 ;;; . can all be defined in terms of MEETS (apparently)
m@9 101
m@9 102 (defgeneric meets (object1 object2))
m@9 103 (defgeneric before (object1 object2))
m@9 104 (defgeneric overlaps (object1 object2))
m@9 105 (defgeneric during (object1 object2))
m@9 106 (defgeneric starts (object1 object2))
m@9 107 (defgeneric ends (object1 object2))
m@9 108
m@10 109 ;;; and extensions thereof ...
m@9 110
m@10 111 (defgeneric subinterval (object1 object2)
m@10 112 (:method (o1 o2) (or (starts o1 o2) (during o1 o2) (ends o1 o2))))
m@10 113
m@10 114 (defgeneric disjoint (object1 object2)
m@10 115 (:method (o1 o2)
m@10 116 (or (before o1 o2) (meets o1 o2) (meets o2 o1) (before o2 o1))))
m@9 117
m@9 118
m@0 119 ;;; Time Signature
m@0 120 ;;; Tempo
m@0 121 ;;; Tonality (Key Signature / Mode)
m@0 122 ;;; Dynamics
m@0 123 ;;; Voice
m@0 124 ;;; Boundary Strength (phrasing)