/* -*-c-*-
*
- * $Id: pgen.c,v 1.6 2000/10/08 12:11:22 mdw Exp $
+ * $Id: pgen.c,v 1.10 2004/04/08 01:36:15 mdw Exp $
*
* Prime generation glue
*
* MA 02111-1307, USA.
*/
-/*----- Revision history --------------------------------------------------*
- *
- * $Log: pgen.c,v $
- * Revision 1.6 2000/10/08 12:11:22 mdw
- * Use @MP_EQ@ instead of @MP_CMP@.
- *
- * Revision 1.5 2000/06/17 11:52:36 mdw
- * Signal a pgen abort if the jump and base share a common factor.
- *
- * Revision 1.4 1999/12/22 16:01:11 mdw
- * Same file, completely different code. Main interface for new prime-
- * search system.
- *
- */
-
/*----- Header files ------------------------------------------------------*/
#include <assert.h>
rabin_create(r, ev->m);
rc = PGEN_TRY;
break;
- case PGEN_TRY: {
- mp *a = mprand_range(MP_NEW, ev->m, ev->r, 0);
- rc = rabin_test(r, a);
- mp_drop(a);
- } break;
+ case PGEN_TRY:
+ if (!ev->tests)
+ rc = rabin_rtest(r, MP_TWO);
+ else {
+ mp *a = mprand_range(MP_NEW, ev->m, ev->r, 0);
+ rc = rabin_rtest(r, a);
+ mp_drop(a);
+ }
+ break;
case PGEN_DONE:
rabin_destroy(r);
rc = PGEN_DONE;
ev.m = MP_COPY(m);
else
ev.m = 0;
- ev.steps = steps;
- ev.tests = tests;
+ ev.steps = 0;
+ ev.tests = 0;
ev.r = fibrand_create(0);
/* --- Tell the event handler we're under way --- */
/* --- If decrementing counters is requested, do that --- */
if ((act & A_STEP) && steps) {
- ev.steps--;
- if (!ev.steps) {
+ ev.steps++;
+ if (ev.steps == steps) {
act |= A_EVENT | A_ENDSTEP | A_DONE;
rc = PGEN_ABORT;
}
- ev.tests = tests;
+ ev.tests = 0;
}
if ((act & A_TEST) && tests) {
- ev.tests--;
- if (!ev.tests) {
+ ev.tests++;
+ if (ev.tests == tests) {
act |= A_ENDTEST | A_ENDSTEP | A_DONE;
rc = PGEN_DONE;
}
ev.m = 0;
}
ev.r->ops->destroy(ev.r);
- if (d != MP_NEW)
- mp_drop(d);
+ mp_drop(d);
return (ev.m);
}
+/* --- @pgen_primep@ --- *
+ *
+ * Arguments: @mp *p@ = a number to check
+ * @grand *gr@ = a random number source
+ *
+ * Returns: Nonzero if @p@ is really prime.
+ */
+
+int pgen_primep(mp *p, grand *gr)
+{
+ int i = rabin_iters(mp_bits(p));
+ rabin r;
+ mp *x = MP_NEW;
+
+ if (MP_ISNEG(p)) return (0);
+ switch (pfilt_smallfactor(p)) {
+ case PGEN_DONE: return (1);
+ case PGEN_FAIL: return (0);
+ }
+ rabin_create(&r, p);
+ while (i) {
+ x = mprand_range(x, p, gr, 0);
+ if (rabin_rtest(&r, x) == PGEN_FAIL)
+ break;
+ i--;
+ }
+ MP_DROP(x);
+ rabin_destroy(&r);
+ return (!i);
+}
+
/*----- Test rig ----------------------------------------------------------*/
#ifdef TEST_RIG
mp_drop(m);
mp_drop(q);
- if (p)
- mp_drop(p);
+ mp_drop(p);
assert(mparena_count(MPARENA_GLOBAL) == 0);
return (ok);
}