Mercurial > hg > amuse

changeset 137:ee9dd7148eab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bug fixes from class changes darcs-hash:20070903105727-f76cc-34a2defdf8503bb63c452d3c29c72ae2a42d4753.gz
author David Lewis <d.lewis@gold.ac.uk>
date Mon, 03 Sep 2007 11:57:27 +0100
parents fd85f52d9f9d
children b3537f75c1c6
files base/constructors.lisp base/methods.lisp
diffstat 2 files changed, 6 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/base/constructors.lisp	Fri Aug 31 15:29:43 2007 +0100
+++ b/base/constructors.lisp	Mon Sep 03 11:57:27 2007 +0100
@@ -102,9 +102,7 @@
 
 (defun make-standard-tempo (bpm)
   (make-instance 'standard-tempo
-		 :bpm bpm
-		 :time onset
-		 :interval duration))
+		 :bpm bpm))
 
 (defun make-standard-tempo-period (bpm onset duration)
   (make-instance 'standard-tempo-period
--- a/base/methods.lisp	Fri Aug 31 15:29:43 2007 +0100
+++ b/base/methods.lisp	Mon Sep 03 11:57:27 2007 +0100
@@ -183,7 +183,7 @@
 (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))
@@ -196,7 +196,7 @@
   "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
@@ -215,7 +215,7 @@
 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
@@ -253,13 +253,13 @@
   (= (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