conservatory
/
ikarus
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixes bug 172933: min and max don't know flonums

This commit is contained in:
Abdulaziz Ghuloum 2007-11-30 06:01:44 -05:00
parent 28fcdd3df6
commit 5f638cc722
2 changed files with 67 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
scheme/ikarus.numerics.ss
View File

@ -1153,6 +1153,11 @@
(if ($fx> x y) x y)] (if ($fx> x y) x y)]
[(bignum? y) [(bignum? y)
(if (positive-bignum? y) y x)] (if (positive-bignum? y) y x)]
[(flonum? y)
(let ([x ($fixnum->flonum x)])
(if ($fl>= y x) y x))]
[(ratnum? y) ;;; FIXME: optimize
(if (>= x y) x y)]
[else (error 'max "not a number" y)])] [else (error 'max "not a number" y)])]
[(bignum? x) [(bignum? x)
(cond (cond
@ -1160,6 +1165,34 @@
(if (positive-bignum? x) x y)] (if (positive-bignum? x) x y)]
[(bignum? y) [(bignum? y)
(if (bnbn> x y) x y)] (if (bnbn> x y) x y)]
[(flonum? y)
(let ([x (bignum->flonum x)])
(if ($fl>= y x) y x))]
[(ratnum? y) ;;; FIXME: optimize
(if (>= x y) x y)]
[else (error 'max "not a number" y)])]
[(flonum? x)
(cond
[(flonum? y)
(if ($fl>= x y) x y)]
[(fixnum? y)
(let ([y ($fixnum->flonum y)])
(if ($fl>= y x) y x))]
[(bignum? y)
(let ([y (bignum->flonum y)])
(if ($fl>= y x) y x))]
[(ratnum? y)
;;; FIXME: may be incorrect
(let ([y (ratnum->flonum y)])
(if ($fl>= y x) y x))]
[else (error 'max "not a number" y)])]
[(ratnum? x)
(cond
[(or (fixnum? y) (bignum? y) (ratnum? y))
(if (>= x y) x y)]
[(flonum? y)
(let ([x (ratnum->flonum x)])
(if ($fl>= x y) x y))]
[else (error 'max "not a number" y)])] [else (error 'max "not a number" y)])]
[else (error 'max "not a number" x)])] [else (error 'max "not a number" x)])]
[(x y z . rest) [(x y z . rest)
@ -1183,6 +1216,11 @@
(if ($fx> x y) y x)] (if ($fx> x y) y x)]
[(bignum? y) [(bignum? y)
(if (positive-bignum? y) x y)] (if (positive-bignum? y) x y)]
[(flonum? y)
(let ([x ($fixnum->flonum x)])
(if ($fl>= y x) x y))]
[(ratnum? y) ;;; FIXME: optimize
(if (>= x y) y x)]
[else (error 'min "not a number" y)])] [else (error 'min "not a number" y)])]
[(bignum? x) [(bignum? x)
(cond (cond
@ -1190,6 +1228,34 @@
(if (positive-bignum? x) y x)] (if (positive-bignum? x) y x)]
[(bignum? y) [(bignum? y)
(if (bnbn> x y) y x)] (if (bnbn> x y) y x)]
[(flonum? y)
(let ([x (bignum->flonum x)])
(if ($fl>= y x) x y))]
[(ratnum? y) ;;; FIXME: optimize
(if (>= x y) y x)]
[else (error 'min "not a number" y)])]
[(flonum? x)
(cond
[(flonum? y)
(if ($fl>= x y) y x)]
[(fixnum? y)
(let ([y ($fixnum->flonum y)])
(if ($fl>= y x) x y))]
[(bignum? y)
(let ([y (bignum->flonum y)])
(if ($fl>= y x) x y))]
[(ratnum? y)
;;; FIXME: may be incorrect
(let ([y (ratnum->flonum y)])
(if ($fl>= y x) x y))]
[else (error 'min "not a number" y)])]
[(ratnum? x)
(cond
[(or (fixnum? y) (bignum? y) (ratnum? y))
(if (>= x y) y x)]
[(flonum? y)
(let ([x (ratnum->flonum x)])
(if ($fl>= x y) y x))]
[else (error 'min "not a number" y)])] [else (error 'min "not a number" y)])]
[else (error 'min "not a number" x)])] [else (error 'min "not a number" x)])]
[(x y z . rest) [(x y z . rest)

2
scheme/last-revision
View File

@ -1 +1 @@
1146 1147