projects
/
u
/
mdw
/
catacomb
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
First glimmerings of binary polynomial arithmetic.
[u/mdw/catacomb]
/
pgen.c
diff --git
a/pgen.c
b/pgen.c
index
5b9fd9e
..
eebd966
100644
(file)
--- a/
pgen.c
+++ b/
pgen.c
@@
-1,6
+1,6
@@
/* -*-c-*-
*
/* -*-c-*-
*
- * $Id: pgen.c,v 1.
4 1999/12/22 16:01:11
mdw Exp $
+ * $Id: pgen.c,v 1.
6 2000/10/08 12:11:22
mdw Exp $
*
* Prime generation glue
*
*
* Prime generation glue
*
@@
-30,6
+30,12
@@
/*----- Revision history --------------------------------------------------*
*
* $Log: pgen.c,v $
/*----- 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.
* Revision 1.4 1999/12/22 16:01:11 mdw
* Same file, completely different code. Main interface for new prime-
* search system.
@@
-95,10
+101,17
@@
int pgen_jump(int rq, pgen_event *ev, void *p)
int rc = PGEN_ABORT;
switch (rq) {
int rc = PGEN_ABORT;
switch (rq) {
- case PGEN_BEGIN:
+ case PGEN_BEGIN: {
+ mp *g = MP_NEW;
+ mp_gcd(&g, 0, 0, ev->m, f->j->m);
+ if (MP_CMP(g, >, MP_ONE)) {
+ mp_drop(g);
+ return (PGEN_ABORT);
+ }
+ mp_drop(g);
rc = pfilt_create(&f->f, ev->m);
mp_drop(ev->m);
rc = pfilt_create(&f->f, ev->m);
mp_drop(ev->m);
-
break;
+
}
break;
case PGEN_TRY:
mp_drop(ev->m);
rc = pfilt_jump(&f->f, f->j);
case PGEN_TRY:
mp_drop(ev->m);
rc = pfilt_jump(&f->f, f->j);
@@
-329,7
+342,7
@@
static int verify(dstr *v)
pf.step = 2;
p = pgen("p", MP_NEW, m, pgen_evspin, 0, 0, pgen_filter, &pf,
rabin_iters(mp_bits(m)), pgen_test, &r);
pf.step = 2;
p = pgen("p", MP_NEW, m, pgen_evspin, 0, 0, pgen_filter, &pf,
rabin_iters(mp_bits(m)), pgen_test, &r);
- if (!p ||
MP_CMP(p, !=
, q)) {
+ if (!p ||
!MP_EQ(p
, q)) {
fputs("\n*** pgen failed", stderr);
fputs("\nm = ", stderr); mp_writefile(m, stderr, 10);
fputs("\np = ", stderr); mp_writefile(p, stderr, 10);
fputs("\n*** pgen failed", stderr);
fputs("\nm = ", stderr); mp_writefile(m, stderr, 10);
fputs("\np = ", stderr); mp_writefile(p, stderr, 10);