comparison base/methods.lisp @ 83:ae06767e84c5

base/: pitch

darcs-hash:20070717153457-c0ce4-cd5350c65ee8414bda17d40eb0e149063f2c22d7.gz

 (cl:in-package #:amuse) 
 
 ;;; diatonic pitch 
+
+(defmethod pitch= ((p1 diatonic-pitch) (p2 diatonic-pitch))
+  (let ((n1 (%diatonic-pitch-name p1))
+        (a1 (%diatonic-pitch-accidental p1))
+        (o1 (%diatonic-pitch-accidental p1))
+        (n2 (%diatonic-pitch-name p2))
+        (a2 (%diatonic-pitch-accidental p2))
+        (o2 (%diatonic-pitch-accidental p2)))
+    (and n1 n2 (= n1 n2)
+         a1 a2 (= a1 a2)
+         o1 o2 (= o1 o2))))
 
 (defmethod middle-c ((dp diatonic-pitch))
   (make-diatonic-pitch 2 0 4))
 
 (defmethod diatonic-pitch ((dp diatonic-pitch))

   (meredith-chromatic-pitch-number (mips-pitch dp)))
 (defmethod meredith-morphetic-pitch-number ((dp diatonic-pitch))
   (meredith-morphetic-pitch-number (mips-pitch dp)))
 
 ;;; MIPS pitch 
+
+(defmethod pitch= ((p1 mips-pitch) (p2 mips-pitch))
+  (let ((c1 (meredith-chromatic-pitch-number p1))
+        (m1 (meredith-morphetic-pitch-number p1))
+        (c2 (meredith-chromatic-pitch-number p2))
+        (m2 (meredith-morphetic-pitch-number p2)))
+    (and c1 c2 (= c1 c2)
+         m1 m2 (= m1 m2))))
 
 (defmethod middle-c ((mp mips-pitch))
   (make-mips-pitch 39 23))
 
 (defmethod mips-pitch ((mp mips-pitch))