comparison 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

 (defgeneric time+ (object1 object2))
 (defgeneric time- (object1 object2))
 
 (defgeneric time> (object1 object2))
 (defgeneric time< (object1 object2))
-(defgeneric time>= (object1 object2)) 
-(defgeneric time<= (object1 object2))
 (defgeneric time= (object1 object2)) 
-(defgeneric time/= (object1 object2)) 
+(defgeneric time>= (object1 object2)
+  (:method (o1 o2) (or (time> o1 o2) (time= o1 o2))))
+(defgeneric time<= (object1 object2)
+  (:method (o1 o2) (or (time< o1 o2) (time= o1 o2))))
+(defgeneric time/= (object1 object2)
+  (:method (o1 o2) (not (time= o1 o2))))
+
 
 ;;; Duration protocol 
 
 (defgeneric duration> (object1 object2))
 (defgeneric duration< (object1 object2))
-(defgeneric duration>= (object1 object2)) 
-(defgeneric duration<= (object1 object2))
 (defgeneric duration= (object1 object2)) 
-(defgeneric duration/= (object1 object2)) 
+(defgeneric duration>= (object1 object2) 
+  (:method (o1 o2) (or (duration> o1 o2) (duration= o1 o2))))
+(defgeneric duration<= (object1 object2)
+  (:method (o1 o2) (or (duration< o1 o2) (duration= o1 o2))))
+(defgeneric duration/= (object1 object2) 
+  (:method (o1 o2) (not (duration= o1 o2))))
 
 
 ;;; Pitch protocol 
 
 ;; pitch+: <pitch>    <pitch>     -> <pitch> 

 (defgeneric pitch+ (object1 object2))
 (defgeneric pitch- (object1 object2))
 
 (defgeneric pitch> (object1 object2))
 (defgeneric pitch< (object1 object2))
-(defgeneric pitch>= (object1 object2)) 
-(defgeneric pitch<= (object1 object2))
 (defgeneric pitch= (object1 object2)) 
-(defgeneric pitch/= (object1 object2)) 
+(defgeneric pitch>= (object1 object2) 
+  (:method (o1 o2) (or (pitch> o1 o2) (pitch= o1 o2))))
+(defgeneric pitch<= (object1 object2)
+  (:method (o1 o2) (or (pitch< o1 o2) (pitch= o1 o2))))
+(defgeneric pitch/= (object1 object2) 
+  (:method (o1 o2) (not (pitch= o1 o2))))
 
 ;;; Interval protocol (emphasise _pitch_ not _time_ interval?) 
 
 (defgeneric interval> (object1 object2))
 (defgeneric interval< (object1 object2))
-(defgeneric interval>= (object1 object2)) 
-(defgeneric interval<= (object1 object2))
 (defgeneric interval= (object1 object2)) 
-(defgeneric interval/= (object1 object2)) 
+(defgeneric interval>= (object1 object2) 
+  (:method (o1 o2) (or (interval> o1 o2) (interval= o1 o2))))
+(defgeneric interval<= (object1 object2)
+  (:method (o1 o2) (or (interval< o1 o2) (interval= o1 o2))))
+(defgeneric interval/= (object1 object2) 
+  (:method (o1 o2) (not (interval= o1 o2))))
 
 ;;; Allen's (1984) interval relations 
 ;;;  . equals already defined as INTERVAL= above 
-;;;  . can all be defined in terms of MEETS
+;;;  . inverses ommitted for now (just use CL:NOT) 
+;;;  . can all be defined in terms of MEETS (apparently)
 
 (defgeneric meets (object1 object2))
 (defgeneric before (object1 object2))
 (defgeneric overlaps (object1 object2))
 (defgeneric during (object1 object2))
 (defgeneric starts (object1 object2))
 (defgeneric ends (object1 object2))
 
-;;; and extensions ... 
+;;; and extensions thereof ...
 
-;;; i subinterval j if i starts j or i during j or i ends j
-(defgeneric subinterval (object1 object2))
-;;; i disjoint j if i before j or i meets j or j meets i or j before i
-(defgeneric disjoint (object1 object2))
+(defgeneric subinterval (object1 object2)
+  (:method (o1 o2) (or (starts o1 o2) (during o1 o2) (ends o1 o2))))
+
+(defgeneric disjoint (object1 object2)
+  (:method (o1 o2) 
+    (or (before o1 o2) (meets o1 o2) (meets o2 o1) (before o2 o1))))
 
 
 ;;; Time Signature 
 ;;; Tempo 
 ;;; Tonality (Key Signature / Mode)