comparison utils/utils.lisp @ 132:bfe5afcad183

fix to monodiser

darcs-hash:20070820144432-f76cc-29675eafe225b078be656eef11a6bff9dba70b81.gz

 		(overlap (/ (duration (period-intersection event event-2))
 			    (min (duration event) (duration event-2)))))
 	    ;; only look at pairings for the shorter note. This can
 	    ;; have odd side effects, but means we never
 	    ;; under-represent an overlap (I think)
+	    (when (>= overlap 3/4)
+	      (return-from check-events-bag-for-polyphony T))
 	    (when (or (not (aref overlaps shorter))
 		      (>= overlap (aref overlaps shorter)))
 	      (setf (aref overlaps shorter) overlap)
 	      (when (and (= shorter i)
 			 (= overlap 1))

 		(return)))))))
     (let ((total 0) (overs 0))
       (loop for i from 0 to (1- (length events-bag))
 	 do (when (aref overlaps i)
 	      (incf total)
-	      (when (>= (aref overlaps i) 3/4)
+	      (when (>= (aref overlaps i) 1/2)
 		(incf overs))))
       (if (and (> total 0)
 	       (>= (/ overs total)
 		   1/4))
-	  'T
-	  'nil))))
+	  T
+	  nil))))
 
 (defgeneric inter-onset-intervals (composition &key rounding-divisor))
 (defmethod inter-onset-intervals ((composition composition) &key (rounding-divisor 1/4))
   ;; returns values - list inter-onset intervals in beats, modal i-o-i
   ;; and i-o-is in seconds.