(+small-primes+): define with DEFCONST

(GENERATE-SMALL-PRIMES): don't need IRONCLAD package for symbols
froydnj · Apr 27, 2012 · 70849b4 · 70849b4
1 parent 62b09e5
commit 70849b4
Showing 1 changed file with 18 additions and 19 deletions.
diff --git a/src/math.lisp b/src/math.lisp
@@ -18,30 +18,29 @@ denominator."
      for q = (floor d c)
      finally (return (values d u_d v_d))))
 
-(eval-when (:compile-toplevel :load-toplevel :execute)
+(defconst +small-primes+
-  (defconstant +small-primes+
+  (make-array 269
-    (make-array 269
+              :element-type 'fixnum
-                :element-type 'fixnum
+              :initial-contents '(2 3 5 7 11 13 17 19 23 29 31 37 41 43
-                :initial-contents '(2 3 5 7 11 13 17 19 23 29 31 37 41
+          47 53 59 61 67 71 73 79 83 89 97 101 103 107 109 113 127 131
-          43 47 53 59 61 67 71 73 79 83 89 97 101 103 107 109 113 127
+          137 139 149 151 157 163 167 173 179 181 191 193 197 199 211
-          131 137 139 149 151 157 163 167 173 179 181 191 193 197 199
+          223 227 229 233 239 241 251 257 263 269 271 277 281 283 293
-          211 223 227 229 233 239 241 251 257 263 269 271 277 281 283
+          307 311 313 317 331 337 347 349 353 359 367 373 379 383 389
-          293 307 311 313 317 331 337 347 349 353 359 367 373 379 383
+          397 401 409 419 421 431 433 439 443 449 457 461 463 467 479
-          389 397 401 409 419 421 431 433 439 443 449 457 461 463 467
+          487 491 499 503 509 521 523 541 547 557 563 569 571 577 587
-          479 487 491 499 503 509 521 523 541 547 557 563 569 571 577
+          593 599 601 607 613 617 619 631 641 643 647 653 659 661 673
-          587 593 599 601 607 613 617 619 631 641 643 647 653 659 661
+          677 683 691 701 709 719 727 733 739 743 751 757 761 769 773
-          673 677 683 691 701 709 719 727 733 739 743 751 757 761 769
+          787 797 809 811 821 823 827 829 839 853 857 859 863 877 881
-          773 787 797 809 811 821 823 827 829 839 853 857 859 863 877
+          883 887 907 911 919 929 937 941 947 953 967 971 977 983 991
-          881 883 887 907 911 919 929 937 941 947 953 967 971 977 983
+          997 1009 1013 1019 1021 1031 1033 1039 1049 1051 1061 1063
-          991 997 1009 1013 1019 1021 1031 1033 1039 1049 1051 1061 1063
           1069 1087 1091 1093 1097 1103 1109 1117 1123 1129 1151 1153
           1163 1171 1181 1187 1193 1201 1213 1217 1223 1229 1231 1237
           1249 1259 1277 1279 1283 1289 1291 1297 1301 1303 1307 1319
           1321 1327 1361 1367 1373 1381 1399 1409 1423 1427 1429 1433
           1439 1447 1451 1453 1459 1471 1481 1483 1487 1489 1493 1499
           1511 1523 1531 1543 1549 1553 1559 1567 1571 1579 1583 1597
           1601 1607 1609 1613 1619 1621 1627 1637 1657 1663 1667 1669
-          1693 1697 1699 1709 1721 1723)) "The primes from 2 to 12^3"))
+          1693 1697 1699 1709 1721 1723)))
 
 (defun generate-small-primes (n)
   "Generates a list of all primes up to N using the Sieve of
@@ -83,14 +82,14 @@ using this test."
      finally (return
                (loop for k from 0 to 128 by 2
                   for a = (+ 2 (strong-random (- n 2) prng))
-                  for v = (ironclad:expt-mod a s n)
+                  for v = (expt-mod a s n)
                   if (not (= v 1))
                   do (loop for i = 0 then (1+ i)
                         while (not (= v (1- n)))
                         if (= i (1- tt))
                         do (return-from rabin-miller)
                         else
-                        do (setf v (ironclad:expt-mod v 2 n)))
+                        do (setf v (expt-mod v 2 n)))
                   finally (return t)))))
 
 (defun generate-prime-in-range (lower-limit upper-limit &optional (prng *prng*))