OpenXM_contrib2/asir2000/builtin/gr.c - diff

Return to gr.c CVS log

Up to [local] / OpenXM_contrib2 / asir2000 / builtin

Diff for /OpenXM_contrib2/asir2000/builtin/gr.c between version 1.15 and 1.28

version 1.15, 2000/12/08 04:35:30

version 1.28, 2001/09/13 03:04:27

Line 45

* DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,

* PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.

* $OpenXM: OpenXM_contrib2/asir2000/builtin/gr.c,v 1.14 2000/12/08 02:39:05 noro Exp $

* $OpenXM: OpenXM_contrib2/asir2000/builtin/gr.c,v 1.27 2001/09/11 08:56:47 noro Exp $

#include "ca.h"

#include "parse.h"

#include "base.h"

#include "ox.h"

#if defined(__GNUC__)

#define INLINE inline

#elif defined(VISUAL)

#define INLINE __inline

#else

#define INLINE

#endif

#define ITOS(p) (((unsigned int)(p))&0x7fffffff)

#define STOI(i) ((P)((unsigned int)(i)|0x80000000))

Line 105 DP_pairs criterion_M(DP_pairs);

Line 113 DP_pairs criterion_M(DP_pairs);

DP_pairs criterion_B(DP_pairs,int);

DP_pairs newpairs(NODE,int);

DP_pairs updpairs(DP_pairs,NODE,int);

void _dp_nf(NODE,DP,DP *,int,int,DP *);

void _dp_nf(NODE,DP,DP *,int,DP *);

void _dp_nf_z(NODE,DP,DP *,int,int,DP *);

NODE gb_mod(NODE,int);

NODE gbd(NODE,int,NODE,NODE);

NODE gb(NODE,int,NODE);

Line 134 void pltovl(LIST,VL *);

Line 143 void pltovl(LIST,VL *);

void printdl(DL);

int DPPlength(DP_pairs);

void dp_gr_mod_main(LIST,LIST,Num,int,struct order_spec *,LIST *);

void dp_gr_main(LIST,LIST,Num,int,struct order_spec *,LIST *);

void dp_gr_main(LIST,LIST,Num,int,int,struct order_spec *,LIST *);

void dp_f4_main(LIST,LIST,struct order_spec *,LIST *);

void dp_f4_mod_main(LIST,LIST,int,struct order_spec *,LIST *);

double get_rtime();

void _dpmod_to_vect(DP,DL *,int *);

void dp_to_vect(DP,DL *,Q *);

NODE dp_dllist(DP f);

DLBUCKET dp_dllist_bucket(DP f);

NODE symb_merge(NODE,NODE,int),_symb_merge(NODE,NODE,int);

DLBUCKET symb_merge_bucket(DLBUCKET,DLBUCKET,int);

extern int dp_nelim;

extern int dp_fcoeffs;

static DP *ps,*psm;

Line 150 static P *psc;

Line 161 static P *psc;

static int *pss;

static int psn,pslen;

static int NVars,CNVars,PCoeffs;

static int NVars,CNVars;

static VL VC;

int PCoeffs;

int DP_Print = 0;

int DP_Multiple = 0;

int DP_NFStat = 0;

LIST Dist = 0;

int NoGCD = 0;

int GenTrace = 0;

int OXCheck = -1;

static DP_NFStat = 0;

static int NoSugar = 0;

static int NoCriB = 0;

static int NoGC = 0;

Line 178 static int PtozpRA = 0;

Line 190 static int PtozpRA = 0;

int doing_f4;

NODE TraceList;

NODE AllTraceList;

int eqdl(nv,dl1,dl2)

INLINE int eqdl(nv,dl1,dl2)

int nv;

DL dl1,dl2;

{

Line 214 int *b;

Line 227 int *b;

}

/* create compressed poly */

void _dpmod_to_vect_compress(f,at,b)

DP f;

DL *at;

CDP *b;

{

int i,j,nv,len;

MP m;

CDP r;

nv = f->nv;

for ( m = BDY(f), len = 0; m; m = NEXT(m), len++ );

r = (CDP)MALLOC(sizeof(struct oCDP));

r->len = len;

r->body = (CM)MALLOC(sizeof(struct oCM)*len);

for ( m = BDY(f), i = j = 0; m; m = NEXT(m), j++ ) {

for ( ; !eqdl(nv,m->dl,at[i]); i++ );

r->body[j].index = i;

r->body[j].c = ITOS(m->c);

}

*b = r;

}

/* dense vector -> CDP */

void compress_vect(a,n,rp)

int *a;

int n;

CDP *rp;

{

int i,j,nz;

CDP r;

for ( i = 0, nz = 0; i < n; i++ )

if ( a[i] ) nz++;

*rp = r = (CDP)MALLOC(sizeof(struct oCDP));

r->len = nz;

r->body = (CM)MALLOC(sizeof(struct oCM)*nz);

for ( i = 0, j = 0; i < n; i++ ) {

if ( a[i] ) {

r->body[j].index = i;

r->body[j].c = ITOS(a[i]);

j++;

}

void dp_to_vect(f,at,b)

DP f;

DL *at;

Line 245 DP f;

Line 306 DP f;

return mp0;

}

void print_dlbucket(d,nv)

DLBUCKET d;

int nv;

{

int i;

NODE n;

for ( ; d; d = NEXT(d) ) {

fprintf(stderr,"td = %d\n",d->td);

for ( n = BDY(d); n; n = NEXT(n) ) {

fprintf(stderr,"<");

for ( i = 0; i < nv; i++ ) {

fprintf(stderr,"%d",((DL)BDY(n))->d[i]);

if ( i != nv-1 )

fprintf(stderr," ");

}

fprintf(stderr,">");

}

fprintf(stderr,"\n");

}

DLBUCKET dp_dllist_bucket(f)

DP f;

{

MP m;

NODE n,n0;

DLBUCKET d,d0;

int td;

if ( !f )

return 0;

d0 = 0;

m = BDY(f);

do {

NEXTDLBUCKET(d0,d);

n0 = 0;

d->td = td = m->dl->td;

do {

NEXTNODE(n0,n);

BDY(n) = (pointer)m->dl;

m = NEXT(m);

} while ( m && m->dl->td == td );

NEXT(n) = 0;

BDY(d) = n0;

} while ( m );

NEXT(d) = 0;

return d0;

}

void pdl(f)

NODE f;

{

Line 255 NODE f;

Line 366 NODE f;

printf("\n");

}

void dp_gr_main(f,v,homo,modular,ord,rp)

void dp_gr_main(f,v,homo,modular,field,ord,rp)

LIST f,v;

Num homo;

int modular;

int modular,field;

struct order_spec *ord;

LIST *rp;

{

int i,mindex,m,nochk;

struct order_spec ord1;

Q q;

VL fv,vv,vc;

NODE fd,fd0,fi,fi0,r,r0,t,subst,x,s,xx;

NODE ind,ind0;

LIST trace,gbindex;

mindex = 0; nochk = 0; dp_fcoeffs = 0;

mindex = 0; nochk = 0; dp_fcoeffs = field;

get_vars((Obj)f,&fv); pltovl(v,&vv); vlminus(fv,vv,&vc);

NVars = length((NODE)vv); PCoeffs = vc ? 1 : 0; VC = vc;

CNVars = homo ? NVars+1 : NVars;

Line 294 LIST *rp;

Line 408 LIST *rp;

modular = -modular; nochk = 1;

}

if ( modular )

m = modular > 1 ? modular : lprime[mindex];

m = modular > 1 ? modular : get_lprime(mindex);

else

m = 0;

makesubst(vc,&subst);

Line 324 LIST *rp;

Line 438 LIST *rp;

if ( modular > 1 ) {

*rp = 0; return;

} else

m = lprime[++mindex];

m = get_lprime(++mindex);

makesubst(vc,&subst);

psn = length(s);

for ( i = psn; i < pslen; i++ ) {

pss[i] = 0; psh[i] = 0; psc[i] = 0; ps[i] = 0;

}

for ( r0 = 0; x; x = NEXT(x) ) {

for ( r0 = 0, ind0 = 0; x; x = NEXT(x) ) {

NEXTNODE(r0,r); dp_load((int)BDY(x),&ps[(int)BDY(x)]);

dtop(CO,vv,ps[(int)BDY(x)],(P *)&BDY(r));

NEXTNODE(ind0,ind);

STOQ((int)BDY(x),q); BDY(ind) = q;

}

if ( r0 ) NEXT(r) = 0;

if ( ind0 ) NEXT(ind) = 0;

MKLIST(*rp,r0);

MKLIST(gbindex,ind0);

if ( GenTrace && OXCheck < 0 ) {

x = AllTraceList;

for ( r = 0; x; x = NEXT(x) ) {

MKNODE(r0,BDY(x),r); r = r0;

}

MKLIST(trace,r);

r0 = mknode(3,*rp,gbindex,trace);

MKLIST(*rp,r0);

}

print_stat();

if ( ShowMag )

fprintf(asir_out,"\nMax_mag=%d\n",Max_mag);

Line 353 LIST *rp;

Line 482 LIST *rp;

VL fv,vv,vc;

NODE fd,fd0,r,r0,t,x,s,xx;

DP a,b,c;

extern struct oEGT eg_red_mod;

get_vars((Obj)f,&fv); pltovl(v,&vv); vlminus(fv,vv,&vc);

NVars = length((NODE)vv); PCoeffs = vc ? 1 : 0; VC = vc;

Line 390 LIST *rp;

Line 520 LIST *rp;

if ( homo ) {

initd(&ord1); CNVars = NVars+1;

}

/* init_eg(&eg_red_mod); */

x = gb_mod(s,m);

/* print_eg("Red_mod",&eg_red_mod); */

if ( homo ) {

reducebase_dehomo(x,&xx); x = xx;

initd(ord); CNVars = NVars;

Line 414 LIST f,v;

Line 546 LIST f,v;

struct order_spec *ord;

LIST *rp;

{

int i,mindex,m,nochk;

int i,mindex,m,nochk,homogen;

struct order_spec ord1;

VL fv,vv,vc;

NODE fd,fd0,fi,fi0,r,r0,t,subst,x,s,xx;

Line 426 LIST *rp;

Line 558 LIST *rp;

if ( ord->id && NVars != ord->nv )

error("dp_f4_main : invalid order specification");

initd(ord);

for ( fd0 = 0, t = BDY(f); t; t = NEXT(t) ) {

for ( fd0 = 0, t = BDY(f), homogen = 1; t; t = NEXT(t) ) {

NEXTNODE(fd0,fd); ptod(CO,vv,(P)BDY(t),(DP *)&BDY(fd));

if ( homogen )

homogen = dp_homogeneous(BDY(fd));

}

if ( fd0 ) NEXT(fd) = 0;

setup_arrays(fd0,0,&s);

x = gb_f4(s);

reduceall(x,&xx); x = xx;

if ( !homogen ) {

reduceall(x,&xx); x = xx;

}

for ( r0 = 0; x; x = NEXT(x) ) {

NEXTNODE(r0,r); dp_load((int)BDY(x),&ps[(int)BDY(x)]);

dtop(CO,vv,ps[(int)BDY(x)],(P *)&BDY(r));

Line 447 int m;

Line 583 int m;

struct order_spec *ord;

LIST *rp;

{

int i;

int i,homogen;

struct order_spec ord1;

VL fv,vv,vc;

DP b,c,c1;

Line 460 LIST *rp;

Line 596 LIST *rp;

if ( ord->id && NVars != ord->nv )

error("dp_f4_mod_main : invalid order specification");

initd(ord);

for ( fd0 = 0, t = BDY(f); t; t = NEXT(t) ) {

for ( fd0 = 0, t = BDY(f), homogen = 1; t; t = NEXT(t) ) {

ptod(CO,vv,(P)BDY(t),&b);

if ( homogen )

homogen = dp_homogeneous(b);

_dp_mod(b,m,0,&c);

_dp_monic(c,m,&c1);

if ( c ) {

Line 471 LIST *rp;

Line 609 LIST *rp;

if ( fd0 ) NEXT(fd) = 0;

setup_arrays(fd0,m,&s);

x = gb_f4_mod(s,m);

reduceall_mod(x,m,&xx); x = xx;

if ( !homogen ) {

reduceall_mod(x,m,&xx); x = xx;

}

for ( r0 = 0; x; x = NEXT(x) ) {

NEXTNODE(r0,r); _dtop_mod(CO,vv,ps[(int)BDY(x)],(P *)&BDY(r));

}

Line 606 int m;

Line 746 int m;

{

int i,j,k,nh,row,col,nv;

NODE r,g,gall;

NODE s,s0;

NODE sb;

DLBUCKET s,s0,s1;

DP_pairs d,dm,dr,t;

DP h,nf,f1,f2,f21,f21r,sp,sp1,sd,sdm,tdp;

MP mp,mp0;

NODE blist,bt,nt;

DL *ht,*at,*st;

int **spmat,**redmat;

int **spmat;

int *colstat,*w;

CDP *redmat;

int *colstat,*w,*w1;

int rank,nred,nsp,nonzero,spcol;

int *indred,*isred,*ri;

int *indred,*isred;

CDP ri;

struct oEGT tmp0,tmp1,tmp2,eg_split_symb,eg_split_elim1,eg_split_elim2;

extern struct oEGT eg_symb,eg_elim1,eg_elim2;

Line 639 int m;

Line 782 int m;

_dp_sp_mod(ps[t->dp1],ps[t->dp2],m,&sp);

if ( sp ) {

MKNODE(bt,sp,blist); blist = bt;

s0 = symb_merge(s0,dp_dllist(sp),nv);

s0 = symb_merge_bucket(s0,dp_dllist_bucket(sp),nv);

/* print_dlbucket(s0,nv); */

}

/* s0 : all the terms appeared in symbolic redunction */

/* s0 : all the terms appeared in symbolic reduction */

#if 0

for ( s = s0, nred = 0; s; s = NEXT(s) ) {

for ( r = gall; r; r = NEXT(r) )

sb = BDY(s);

if ( _dl_redble(BDY(ps[(int)BDY(r)])->dl,BDY(s),nv) )

for ( ; sb; sb = NEXT(sb) ) {

break;

for ( j = psn-1; j >= 0; j-- )

if ( r ) {

if ( _dl_redble(BDY(ps[j])->dl,BDY(sb),nv) )

dltod(BDY(s),nv,&tdp);

break;

dp_subd(tdp,ps[(int)BDY(r)],&sd);

if ( j >= 0 ) {

_dp_mod(sd,m,0,&sdm);

dltod(BDY(sb),nv,&tdp);

mulmd_dup(m,sdm,ps[(int)BDY(r)],&f2);

dp_subd(tdp,ps[j],&sd);

MKNODE(bt,f2,blist); blist = bt;

for ( k = 0, i = 0; k < nv; k++ )

s = symb_merge(s,dp_dllist(f2),nv);

if ( BDY(sd)->dl->d[k] )

nred++;

i++;

fprintf(stderr,"%c ",i<=1 ? 'o' : 'x');

_dp_mod(sd,m,0,&sdm);

mulmd_dup(m,sdm,ps[j],&f2);

MKNODE(bt,f2,blist); blist = bt;

/* merge the highest degree part into sb */

s1 = dp_dllist_bucket(f2);

symb_merge(sb,BDY(s1),nv);

/* merge the rest into s */

symb_merge_bucket(s,NEXT(s1),nv);

nred++;

}

#else

for ( s = s0, nred = 0; s; s = NEXT(s) ) {

sb = BDY(s);

for ( ; sb; sb = NEXT(sb) ) {

for ( r = gall; r; r = NEXT(r) )

if ( _dl_redble(BDY(ps[(int)BDY(r)])->dl,BDY(sb),nv) )

break;

if ( r ) {

dltod(BDY(sb),nv,&tdp);

dp_subd(tdp,ps[(int)BDY(r)],&sd);

_dp_mod(sd,m,0,&sdm);

mulmd_dup(m,sdm,ps[(int)BDY(r)],&f2);

MKNODE(bt,f2,blist); blist = bt;

/* merge the highest degree part into sb */

s1 = dp_dllist_bucket(f2);

symb_merge(sb,BDY(s1),nv);

/* merge the rest into s */

symb_merge_bucket(s,NEXT(s1),nv);

nred++;

}

#endif

get_eg(&tmp1); add_eg(&eg_symb,&tmp0,&tmp1);

init_eg(&eg_split_symb); add_eg(&eg_split_symb,&tmp0,&tmp1);

Line 671 int m;

Line 849 int m;

ht[i] = BDY((DP)BDY(r))->dl;

/* col = number of all terms */

for ( s = s0, col = 0; s; s = NEXT(s), col++ );

for ( s = s0, col = 0; s; s = NEXT(s) )

for ( sb = BDY(s); sb; sb = NEXT(sb) )

col++;

/* head terms of all terms */

at = (DL *)MALLOC(col*sizeof(DL));

for ( s = s0, i = 0; i < col; s = NEXT(s), i++ )

for ( s = s0, i = 0; i < col; s = NEXT(s) )

at[i] = (DL)BDY(s);

for ( sb = BDY(s); sb; sb = NEXT(sb), i++ )

at[i] = (DL)BDY(sb);

/* store coefficients separately in spmat and redmat */

nsp = row-nred;

/* reducer matrix */

redmat = (int **)almat(nred,col);

/* indred : register the position of the head term */

#if 0

reduce_reducers_mod_compress(blist,nred,at,col,m,&redmat,&indred);

isred = (int *)MALLOC(col*sizeof(int));

bzero(isred,col*sizeof(int));

for ( i = 0; i < nred; i++ )

isred[indred[i]] = 1;

#else

redmat = (CDP *)MALLOC(nred*sizeof(CDP));

for ( i = 0, r = blist; i < nred; r = NEXT(r), i++ )

_dpmod_to_vect(BDY(r),at,redmat[i]);

_dpmod_to_vect_compress(BDY(r),at,&redmat[i]);

/* XXX */

/* reduce_reducers_mod(redmat,nred,col,m); */

/* register the position of the head term */

Line 694 int m;

Line 883 int m;

bzero(isred,col*sizeof(int));

for ( i = 0; i < nred; i++ ) {

ri = redmat[i];

for ( j = 0; j < col && !ri[j]; j++ );

indred[i] = ri->body[0].index;

indred[i] = j;

isred[indred[i]] = 1;

isred[j] = 1;

}

#endif

spcol = col-nred;

/* head terms not in ht */

Line 706 int m;

Line 895 int m;

if ( !isred[j] )

st[k++] = at[j];

get_eg(&tmp1);

/* spoly matrix; stored in reduced form; terms in ht[] are omitted */

spmat = almat(nsp,spcol);

spmat = (int **)MALLOC(nsp*sizeof(int *));

w = (int *)MALLOC(col*sizeof(int));

for ( ; i < row; r = NEXT(r), i++ ) {

/* skip reducers in blist */

for ( i = 0, r = blist; i < nred; r = NEXT(r), i++ );

for ( i = 0; r; r = NEXT(r) ) {

bzero(w,col*sizeof(int));

_dpmod_to_vect(BDY(r),at,w);

reduce_sp_by_red_mod(w,redmat,indred,nred,col,m);

reduce_sp_by_red_mod_compress(w,redmat,indred,nred,col,m);

for ( j = 0, k = 0; j < col; j++ )

for ( j = 0; j < col; j++ )

if ( !isred[j] )

if ( w[j] )

spmat[i-nred][k++] = w[j];

break;

if ( j < col ) {

w1 = (int *)MALLOC_ATOMIC(spcol*sizeof(int));

for ( j = 0, k = 0; j < col; j++ )

if ( !isred[j] )

w1[k++] = w[j];

spmat[i] = w1;

i++;

}

/* update nsp */

nsp = i;

get_eg(&tmp0); add_eg(&eg_elim1,&tmp1,&tmp0);

init_eg(&eg_split_elim1); add_eg(&eg_split_elim1,&tmp1,&tmp0);

colstat = (int *)MALLOC_ATOMIC(spcol*sizeof(int));

bzero(colstat,spcol*sizeof(int));

for ( i = 0, nonzero=0; i < nsp; i++ )

for ( j = 0; j < spcol; j++ )

if ( spmat[i][j] )

nonzero++;

if ( DP_Print )

if ( DP_Print && nsp )

fprintf(asir_out,"spmat : %d x %d (nonzero=%f%%)...",

nsp,spcol,((double)nonzero*100)/(nsp*spcol));

rank = generic_gauss_elim_mod(spmat,nsp,spcol,m,colstat);

if ( nsp )

rank = generic_gauss_elim_mod(spmat,nsp,spcol,m,colstat);

else

rank = 0;

get_eg(&tmp1); add_eg(&eg_elim2,&tmp0,&tmp1);

init_eg(&eg_split_elim2); add_eg(&eg_split_elim2,&tmp0,&tmp1);

Line 741 int m;

Line 947 int m;

print_eg("Elim2",&eg_split_elim2);

fprintf(asir_out,"\n");

}

if ( !rank )

continue;

for ( j = 0, i = 0; j < spcol; j++ )

if ( colstat[j] ) {

mp0 = 0;

Line 895 int m;

Line 1105 int m;

int i;

NODE s,s0,f0;

#if 1

f0 = f = NODE_sortb(f,1);

#else

f0 = f;

#endif

psn = length(f); pslen = 2*psn;

ps = (DP *)MALLOC(pslen*sizeof(DP));

psh = (DL *)MALLOC(pslen*sizeof(DL));

Line 909 int m;

Line 1123 int m;

pss[i] = ps[i]->sugar;

psc[i] = BDY(ps[i])->c;

}

if ( GenTrace && (OXCheck >= 0) ) {

if ( GenTrace ) {

Q q;

STRING fname;

LIST input;

NODE arg;

NODE arg,t,t1;

Obj dmy;

t = 0;

for ( i = psn-1; i >= 0; i-- ) {

MKNODE(t1,ps[i],t);

t = t1;

}

MKLIST(input,t);

STOQ(OXCheck,q);

if ( OXCheck >= 0 ) {

MKSTR(fname,"register_input");

STOQ(OXCheck,q);

MKLIST(input,f0);

MKSTR(fname,"register_input");

arg = mknode(3,q,fname,input);

Pox_cmo_rpc(arg,&dmy);

} else if ( OXCheck < 0 ) {

MKNODE(AllTraceList,input,0);

}

for ( s0 = 0, i = 0; i < psn; i++ ) {

NEXTNODE(s0,s); BDY(s) = (pointer)i;

Line 948 int m;

Line 1172 int m;

else

dp_ptozp(f,r);

if ( GenTrace && TraceList ) {

/* adust the denominator according to the final

content reduction */

divsp(CO,BDY(f)->c,BDY(*r)->c,&d);

mulp(CO,(P)ARG3(BDY((LIST)BDY(TraceList))),d,&t);

ARG3(BDY((LIST)BDY(TraceList))) = t;

Line 1060 NODE *h;

Line 1286 NODE *h;

MKLIST(hist,node);

MKNODE(TraceList,hist,0);

}

_dp_nf(top,ps[w[i]],ps,1,PtozpRA?DP_Multiple:0,&g);

_dp_nf(top,ps[w[i]],ps,1,&g);

prim_part(g,0,&g1);

get_eg(&tmp1); add_eg(&eg_ra,&tmp0,&tmp1);

if ( DP_Print || DP_PrintShort ) {

Line 1155 NODE subst;

Line 1381 NODE subst;

_dp_mod(a,m,subst,&psm[psn]);

if ( GenTrace ) {

NODE tn,tr,tr1;

LIST trace;

LIST trace,trace1;

NODE arg;

Q q1,q2;

STRING fname;

Obj dmy;

/* reverse the TraceList */

tn = TraceList;

Line 1164 NODE subst;

Line 1394 NODE subst;

}

MKLIST(trace,tr);

if ( OXCheck >= 0 ) {

NODE arg;

Q q1,q2;

STRING fname;

Obj dmy;

STOQ(OXCheck,q1);

MKSTR(fname,"check_trace");

STOQ(psn,q2);

arg = mknode(5,q1,fname,a,q2,trace);

Pox_cmo_rpc(arg,&dmy);

} else if ( OXCheck < 0 ) {

STOQ(psn,q1);

tn = mknode(2,q1,trace);

MKLIST(trace1,tn);

MKNODE(tr,trace1,AllTraceList);

AllTraceList = tr;

} else

dp_save(psn,(Obj)trace,"t");

TraceList = 0;

Line 1405 NODE subst;

Line 1636 NODE subst;

new_sugar = h->sugar;

get_eg(&tnf0);

t_0 = get_rtime();

_dp_nf(gall,h,ps,!Top,DP_Multiple,&nf);

if ( PCoeffs || dp_fcoeffs )

_dp_nf(gall,h,ps,!Top,&nf);

else

_dp_nf_z(gall,h,ps,!Top,DP_Multiple,&nf);

if ( DP_Print )

fprintf(asir_out,"(%.3g)",get_rtime()-t_0);

get_eg(&tnf1); add_eg(&eg_nf,&tnf0,&tnf1);

Line 1803 NODE f;

Line 2037 NODE f;

while ( d ) {

l = d; d = NEXT(d);

get_eg(&tmp0);

dp_load(l->dp1,&dp1); dp_load(l->dp2,&dp2); dp_sp(dp1,dp2,&h);

dp_load(l->dp1,&dp1); dp_load(l->dp2,&dp2);

_dp_nf(gall,h,ps,1,0,&nf);

dp_sp(dp1,dp2,&h);

/* fprintf(stderr,"{%d,%d}",l->dp1,l->dp2); */

_dp_nf(gall,h,ps,1,&nf);

get_eg(&tmp1); add_eg(&eg_gc,&tmp0,&tmp1);

if ( DP_Print || DP_PrintShort ) {

fprintf(asir_out,"."); fflush(asir_out);

Line 1830 NODE f,x;

Line 2066 NODE f,x;

}

for ( ; f; f = NEXT(f) ) {

get_eg(&tmp0);

_dp_nf(x,(DP)BDY(f),ps,1,0,&g);

_dp_nf(x,(DP)BDY(f),ps,1,&g);

get_eg(&tmp1); add_eg(&eg_mc,&tmp0,&tmp1);

if ( DP_Print ) {

print_split_eg(&tmp0,&tmp1); fflush(asir_out);

Line 1914 LIST *list;

Line 2150 LIST *list;

STOQ(Reverse,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"Reverse"); MKNODE(n1,name,n); n = n1;

STOQ(Stat,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"Stat"); MKNODE(n1,name,n); n = n1;

STOQ(DP_Print,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"Print"); MKNODE(n1,name,n); n = n1;

STOQ(DP_PrintShort,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"PrintShort"); MKNODE(n1,name,n); n = n1;

STOQ(DP_NFStat,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"NFStat"); MKNODE(n1,name,n); n = n1;

STOQ(OXCheck,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"OXCheck"); MKNODE(n1,name,n); n = n1;

STOQ(GenTrace,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"GenTrace"); MKNODE(n1,name,n); n = n1;

Line 2028 DP *r;

Line 2265 DP *r;

}

void _dp_nf(b,g,ps,full,multiple,r)

void _dp_nf(b,g,ps,full,rp)

NODE b;

DP g;

DP *ps;

int full;

DP *rp;

{

DP u,p,d,s,t,mult;

P coef;

NODE l;

MP m,mr;

int sugar,psugar;

if ( !g ) {

*rp = 0; return;

}

sugar = g->sugar;

for ( d = 0; g; ) {

for ( u = 0, l = b; l; l = NEXT(l) ) {

if ( dl_redble(BDY(g)->dl,psh[(int)BDY(l)]) ) {

dp_load((int)BDY(l),&p);

/* t+u = coef*(d+g) - mult*p (t = coef*d) */

dp_red(d,g,p,&t,&u,&coef,&mult);

psugar = (BDY(g)->dl->td - BDY(p)->dl->td) + p->sugar;

sugar = MAX(sugar,psugar);

if ( GenTrace ) {

LIST hist;

Q cq;

NODE node,node0;

STOQ((int)BDY(l),cq);

node0 = mknode(4,coef,cq,mult,ONE);

MKLIST(hist,node0);

MKNODE(node,hist,TraceList); TraceList = node;

}

if ( !u ) {

if ( d )

d->sugar = sugar;

*rp = d; return;

}

d = t;

break;

}

if ( u )

g = u;

else if ( !full ) {

if ( g ) {

MKDP(g->nv,BDY(g),t); t->sugar = sugar; g = t;

}

*rp = g; return;

} else {

m = BDY(g); NEWMP(mr); mr->dl = m->dl; mr->c = m->c;

NEXT(mr) = 0; MKDP(g->nv,mr,t); t->sugar = mr->dl->td;

addd(CO,d,t,&s); d = s;

dp_rest(g,&t); g = t;

}

if ( d )

d->sugar = sugar;

*rp = d;

}

void _dp_nf_z(b,g,ps,full,multiple,r)

NODE b;

DP g;

DP *ps;

int full,multiple;

DP *r;

{

Line 2044 DP *r;

Line 2344 DP *r;

int sugar,psugar;

NODE dist;

STRING imul;

int ndist;

int kara_bit;

double get_rtime();

double t_0,t_00,tt,ttt,t_p,t_m,t_g,t_a;

Line 2060 DP *r;

Line 2359 DP *r;

denom = Denominator?Denominator:1;

hmag = multiple*HMAG(g)/denom;

if ( Dist ) {

dist = BDY(Dist);

ndist = length(dist);

}

sugar = g->sugar;

dc = 0; dp = 0; rc = ONE; rp = g;

Line 2116 DP *r;

Line 2411 DP *r;

if ( u ) {

if ( multiple && HMAG(u) > hmag ) {

t_0 = get_rtime();

if ( Dist && HMAG(u) > mpi_mag ) {

dp_ptozp_d(u,&rp);

if ( DP_NFStat )

fprintf(asir_out,"D");

dp_ptozp_d(dist,ndist,u,&rp);

} else {

if ( DP_NFStat )

fprintf(asir_out,"L");

dp_ptozp_d(0,0,u,&rp);

}

tt = get_rtime(); t_g += tt-t_0;

divsq((Q)BDY(u)->c,(Q)BDY(rp)->c,&cont);

Line 2200 DP *rp;

Line 2487 DP *rp;

NODE tn,dist,n0,n1,n2;

Obj dmy;

STRING imul;

extern LIST Dist;

if ( !p || !q ) {

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>