comparison base/methods.lisp @ 137:ee9dd7148eab

Bug fixes from class changes

darcs-hash:20070903105727-f76cc-34a2defdf8503bb63c452d3c29c72ae2a42d4753.gz

   (make-standard-moment (+ (timepoint moment) (duration period))))
 
 (defmethod time+ ((period standard-period) (moment standard-moment)) ;?
   "Returns a <standard-moment>. Implemented as a straightforward
 summation and defined by default as (time+ <moment> <period>)."
-  (time+ standard-moment period))
+  (time+ moment period))
 
 (defmethod time+ ((period1 standard-period)
 		  (period2 standard-period))
   "Returns a <standard-period>. Implemented as a straightforward
 summation."

 
 (defmethod time+ ((moment1 moment) (moment2 moment))
   "Returns <condition:undefined-action>. The question makes no
 sense."
   (error 'undefined-action :operation 'time+
-	 :datatype (list (class-of object1) (class-of object2))))
+	 :datatype (list (class-of moment1) (class-of moment2))))
 
 (defmethod time- ((moment1 standard-moment) (moment2 standard-moment))
   "Returns <standard-anchored-period> with an onset at moment2 and
   extending to moment1"
   (make-standard-anchored-period (timepoint moment2)

 (defmethod time- ((period period) (moment moment)) ;?
   "Returns <condition:undefined-action>. The question makes no
 sense"
   (error 'undefined-action
 	 :operation 'time-
-	 :datatype (list (class-of object1) (class-of object2))))
+	 :datatype (list (class-of period) (class-of moment))))
 
 (defmethod time- ((period1 standard-period) (period2 standard-period))
   "Returns <standard-period> spanning the difference of the
 periods"
   (make-standard-period (- (duration period2)

 
 (defmethod duration= ((period1 standard-period) (period2 standard-period))
   (= (duration period1) (duration period2)))
 
 (defmethod duration* ((period1 standard-period) (object2 number))
-  (make-floating-period (* (duration period1) object2)))
+  (make-standard-period (* (duration period1) object2)))
 
 (defmethod duration* ((object1 number) (period standard-period))
   (duration* period object1))
 
 (defmethod duration/ ((period standard-period) (object2 number))
-  (make-floating-period (/ (duration period) object2)))
+  (make-standard-period (/ (duration period) object2)))
 
 ;;;; Pitch protocol
 
 ;;; Some catch-all methods for undefined operations and cases where we
 ;;; don't have enough information: