=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/dalg.c,v retrieving revision 1.10 retrieving revision 1.12 diff -u -p -r1.10 -r1.12 --- OpenXM_contrib2/asir2000/engine/dalg.c 2005/08/02 07:16:42 1.10 +++ OpenXM_contrib2/asir2000/engine/dalg.c 2005/10/12 14:43:36 1.12 @@ -1,5 +1,5 @@ /* - * $OpenXM: OpenXM_contrib2/asir2000/engine/dalg.c,v 1.9 2005/07/11 00:24:02 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/engine/dalg.c,v 1.11 2005/08/24 06:28:39 noro Exp $ */ #include "ca.h" @@ -651,6 +651,7 @@ NODE inv_or_split_dalg(DAlg a,DAlg *c) struct order_spec *current_spec; struct oEGT eg0,eg1; extern struct oEGT eg_le; + extern int DP_Print; if ( !(nf=current_numberfield) ) error("invdalg : current_numberfield is not set"); @@ -669,21 +670,27 @@ NODE inv_or_split_dalg(DAlg a,DAlg *c) simp = (DAlg *)ALLOCA(dim*sizeof(DAlg)); current_spec = dp_current_spec; initd(nf->spec); for ( i = 0; i < dim; i++ ) { + if ( DP_Print ) { fprintf(asir_out,"."); fflush(asir_out); } m = mb[i]; for ( j = i-1; j >= 0; j-- ) if ( dp_redble(m,mb[j]) ) break; if ( j >= 0 ) { dp_subd(m,mb[j],&d); - muld(CO,d,simp[j]->nm,&u); - MKDAlg(u,simp[j]->dn,t); - simpdalg(t,&simp[i]); + if ( simp[j] ) { + muld(CO,d,simp[j]->nm,&u); + MKDAlg(u,simp[j]->dn,t); + simpdalg(t,&simp[i]); + } else + simp[i] = 0; } else { MKDAlg(m,ONE,t); muldalg(t,a0,&simp[i]); } - gcdn(NM(simp[i]->dn),ln,&gn); divsn(ln,gn,&qn); - muln(NM(simp[i]->dn),qn,&ln); + if ( simp[i] ) { + gcdn(NM(simp[i]->dn),ln,&gn); divsn(ln,gn,&qn); + muln(NM(simp[i]->dn),qn,&ln); + } } initd(current_spec); NTOQ(ln,1,dn); @@ -691,12 +698,14 @@ NODE inv_or_split_dalg(DAlg a,DAlg *c) mat = (Q **)BDY(mobj); mulq(dn,a->dn,&mat[0][dim]); for ( j = 0; j < dim; j++ ) { - divq(dn,simp[j]->dn,&mul); - for ( i = dim-1, mp = BDY(simp[j]->nm); mp && i >= 0; i-- ) - if ( dl_equal(n,BDY(mb[i])->dl,mp->dl) ) { - mulq(mul,(Q)mp->c,&mat[i][j]); - mp = NEXT(mp); - } + if ( simp[j] ) { + divq(dn,simp[j]->dn,&mul); + for ( i = dim-1, mp = BDY(simp[j]->nm); mp && i >= 0; i-- ) + if ( dl_equal(n,BDY(mb[i])->dl,mp->dl) ) { + mulq(mul,(Q)mp->c,&mat[i][j]); + mp = NEXT(mp); + } + } } get_eg(&eg0); rank = generic_gauss_elim_hensel(mobj,&sol,&dnsol,&rinfo,&cinfo);