Fcalva/chibi-scheme
1
0
Fork 0
mirror of https://github.com/ashinn/chibi-scheme.git synced 2025-07-08 13:37:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixing over-optimistic shortcut in factor.

Browse source
This commit is contained in:
Alex Shinn 2014-06-10 19:57:52 +09:00
parent 347db3fb7d
commit 3ff62dc355
2 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/chibi/math/prime.scm
View file

@ -181,10 +181,12 @@
(else (else
(let lp ((i 3) (n n) (limit limit) (res res)) (let lp ((i 3) (n n) (limit limit) (res res))
(cond (cond
((= n 1)
(reverse res))
((> i limit) ((> i limit)
(reverse (cons n res))) (reverse (cons n res)))
((zero? (remainder n i)) ((zero? (remainder n i))
(lp i (quotient n i) (quotient limit i) (cons i res))) (lp i (quotient n i) limit (cons i res)))
(else (else
(lp (+ i 2) n limit res)))))))))) (lp (+ i 2) n limit res))))))))))

1
tests/prime-tests.scm
View file

@ -68,6 +68,7 @@
(test '(2 5) (factor 10)) (test '(2 5) (factor 10))
(test '(11) (factor 11)) (test '(11) (factor 11))
(test '(2 2 3) (factor 12)) (test '(2 2 3) (factor 12))
(test '(3 3 3 5 7) (factor 945))
(do ((i 3 (+ i 2))) (do ((i 3 (+ i 2)))
((>= i 101)) ((>= i 101))