[BACK]Return to Hgfs.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2000 / engine

Diff for /OpenXM_contrib2/asir2000/engine/Hgfs.c between version 1.11 and 1.12

version 1.11, 2001/06/26 09:47:05 version 1.12, 2001/06/27 04:07:57
Line 1 
Line 1 
 /* $OpenXM: OpenXM_contrib2/asir2000/engine/Hgfs.c,v 1.10 2001/06/26 08:52:59 noro Exp $ */  /* $OpenXM: OpenXM_contrib2/asir2000/engine/Hgfs.c,v 1.11 2001/06/26 09:47:05 noro Exp $ */
   
 #include "ca.h"  #include "ca.h"
   
Line 19  void sfcsump(VL,P,P *);
Line 19  void sfcsump(VL,P,P *);
 void mulsfbmarray(int,BM,ML,int,int *,V,V,P *);  void mulsfbmarray(int,BM,ML,int,int *,V,V,P *);
 void const_term(P,UM);  void const_term(P,UM);
   
   int comp_dum(a,b)
   DUM a,b;
   {
           if ( DEG(a->f) > DEG(b->f) )
                   return -1;
           else if ( DEG(a->f) < DEG(b->f) )
                   return 1;
           else
                   return 0;
   }
   
 void fctrsf(p,dcp)  void fctrsf(p,dcp)
 P p;  P p;
 DCP *dcp;  DCP *dcp;
Line 66  DCP *dcp;
Line 77  DCP *dcp;
                         }                          }
                 }                  }
         udc = udc1;          udc = udc1;
           for ( i = 0; udc[i].f; i++ );
           qsort(udc,i,sizeof(struct oDUM),
                   (int (*)(const void *,const void *))comp_dum);
   
         NEWDC(dc0); COEF(dc0) = lc; DEG(dc0) = ONE; dc = dc0;          NEWDC(dc0); COEF(dc0) = lc; DEG(dc0) = ONE; dc = dc0;
         for ( n = 0; udc[n].f; n++ ) {          for ( n = 0; udc[n].f; n++ ) {
                 NEWDC(NEXT(dc)); dc = NEXT(dc);                  NEWDC(NEXT(dc)); dc = NEXT(dc);
Line 564  ML *listp;
Line 579  ML *listp;
         DCP dc;          DCP dc;
         UM w,w1,q,fm,hm;          UM w,w1,q,fm,hm;
         UM *gm;          UM *gm;
           struct oEGT tmp0,tmp1,eg_hensel,eg_hensel_t;
   
         clctv(CO,f,&vl);          clctv(CO,f,&vl);
         if ( vl->v != x ) {          if ( vl->v != x ) {
Line 610  ML *listp;
Line 626  ML *listp;
   
         q = W_UMALLOC(dx);          q = W_UMALLOC(dx);
         rlist = MLALLOC(fn); rlist->n = fn; rlist->bound = bound;          rlist = MLALLOC(fn); rlist->n = fn; rlist->bound = bound;
           fprintf(asir_out,"%d candidates\n",fn);
           init_eg(&eg_hensel);
         for ( i = 0; i < fn-1; i++ ) {          for ( i = 0; i < fn-1; i++ ) {
                 fprintf(stderr,"%d\n",i);                  fprintf(asir_out,"deg(fm) = %d, deg(gm[%d]) = %d\n",
                           DEG(fm),i,DEG(gm[i]));
                   init_eg(&eg_hensel_t);
                   get_eg(&tmp0);
                 /* fl = gm[i]*hm mod y */                  /* fl = gm[i]*hm mod y */
                 divsfum(fm,gm[i],hm);                  divsfum(fm,gm[i],hm);
                 /* fl is replaced by the cofactor of gk mod y^bound */                  /* fl is replaced by the cofactor of gk mod y^bound */
                 /* rlist->c[i] = gk */                  /* rlist->c[i] = gk */
                 sfhenmain2(fl,gm[i],hm,bound,(BM *)&rlist->c[i]);                  sfhenmain2(fl,gm[i],hm,bound,(BM *)&rlist->c[i]);
                 cpyum(hm,fm);                  cpyum(hm,fm);
                   get_eg(&tmp1); add_eg(&eg_hensel_t,&tmp0,&tmp1);
                   add_eg(&eg_hensel,&tmp0,&tmp1);
                   print_eg("Hensel",&eg_hensel_t);
                   fprintf(asir_out,"\n");
         }          }
           print_eg("Hensel total",&eg_hensel);
           fprintf(asir_out,"\n");
         /* finally, fl must be the lift of gm[fn-1] */          /* finally, fl must be the lift of gm[fn-1] */
         rlist->c[i] = fl;          rlist->c[i] = fl;
   
Legend:
Removed from v.1.11  
changed lines
  Added in v.1.12
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>