[BACK]Return to ecart.c CVS log [TXT][DIR] Up to [local] / OpenXM / src / kan96xx / Kan

Diff for /OpenXM/src/kan96xx/Kan/ecart.c between version 1.9 and 1.17

version 1.9, 2003/08/20 01:39:17 version 1.17, 2003/09/10 07:41:25
Line 1 
Line 1 
 /* $OpenXM: OpenXM/src/kan96xx/Kan/ecart.c,v 1.8 2003/08/19 08:02:09 takayama Exp $ */  /* $OpenXM: OpenXM/src/kan96xx/Kan/ecart.c,v 1.16 2003/08/27 03:11:12 takayama Exp $ */
 #include <stdio.h>  #include <stdio.h>
 #include "datatype.h"  #include "datatype.h"
 #include "extern2.h"  #include "extern2.h"
Line 36  static POLY reduction_ecart1(POLY r,struct gradedPolyS
Line 36  static POLY reduction_ecart1(POLY r,struct gradedPolyS
 static POLY reduction_ecart1_mod(POLY r,struct gradedPolySet *gset);  static POLY reduction_ecart1_mod(POLY r,struct gradedPolySet *gset);
 static POLY  ecartCheckSyz0(POLY cf,POLY r_0,POLY syz,  static POLY  ecartCheckSyz0(POLY cf,POLY r_0,POLY syz,
                             struct gradedPolySet *gg,POLY r);                              struct gradedPolySet *gg,POLY r);
   static void  ecartCheckSyz0_printinfo(POLY cf,POLY r_0,POLY syz,
                               struct gradedPolySet *gg,POLY r);
   
 extern int DebugReductionRed;  extern int DebugReductionRed;
 extern int TraceLift;  extern int TraceLift;
 struct ring *TraceLift_ringmod;  struct ring *TraceLift_ringmod;
 extern DoCancel;  extern DoCancel;
 int DebugReductionEcart = 0;  int DebugReductionEcart = 0;
   extern DebugContentReduction;
   
 /* This is used for goHomogenization */  /* This is used for goHomogenization */
 extern int DegreeShifto_size;  extern int DegreeShifto_size;
Line 66  static POLY ecartDivideSv(POLY r,int *d) {
Line 69  static POLY ecartDivideSv(POLY r,int *d) {
     }      }
     r = r->next;      r = r->next;
   }    }
   
   if (k > 0) {    if (k > 0) {
     *d = k;      *d = k;
           return ppMult(cxx(1,0,-k,f->m->ringp),f);
     }else{
           return f;
     }
   
     /* Do not do the below. It caused a bug. cf. misc-2003/07/ecart/b4.sm1 test2.
        Note. 2003.8.26
      */
     /*
     if (k > 0) {
       *d = k;
     f = r;      f = r;
     while (r != POLYNULL) {      while (r != POLYNULL) {
       r->m->e[0].x -= k;        r->m->e[0].x -= k;
Line 75  static POLY ecartDivideSv(POLY r,int *d) {
Line 90  static POLY ecartDivideSv(POLY r,int *d) {
     }      }
   }    }
   return f;    return f;
     */
 }  }
   
 static int ecartGetEll(POLY f,POLY g) {  static int ecartGetEll(POLY f,POLY g) {
Line 239  static POLY  ecartCheckSyz0(POLY cf,POLY r_0,POLY syz,
Line 255  static POLY  ecartCheckSyz0(POLY cf,POLY r_0,POLY syz,
   return f;    return f;
 }  }
   
   static void  ecartCheckSyz0_printinfo(POLY cf,POLY r_0,POLY syz,
                                         struct gradedPolySet *gg,POLY r)
   {
     POLY f;
     int grd,i;
     POLY q;
     struct coeff *c;
     fprintf(stderr,"cf=%s\n",POLYToString(cf,'*',1));
     fprintf(stderr,"r_0=%s\n",POLYToString(r_0,'*',1));
     fprintf(stderr,"syz=%s\n",POLYToString(syz,'*',1));
     fprintf(stderr,"r=%s\n",POLYToString(r,'*',1));
     f = ppMult(cf,r_0);
     while (syz != POLYNULL) {
       grd = syz->m->e[0].x;
       i = syz->m->e[0].D;
       c = syz->coeffp;
       if (c->tag == POLY_COEFF) {
         q = c->val.f;
       }else{
         q = POLYNULL;
       }
           fprintf(stderr,"[grd,idx]=[%d,%d], %s\n",grd,i,
                           POLYToString(((gg->polys[grd])->g)[i],'*',1));
       /* f = ppAdd(f,ppMult(q,((gg->polys[grd])->g)[i])); */
       syz = syz->next;
     }
     /* f = ppSub(f,r); */
   }
   
   
 POLY reduction_ecart(r,gset,needSyz,syzp)  POLY reduction_ecart(r,gset,needSyz,syzp)
      POLY r;       POLY r;
      struct gradedPolySet *gset;       struct gradedPolySet *gset;
Line 247  POLY reduction_ecart(r,gset,needSyz,syzp)
Line 292  POLY reduction_ecart(r,gset,needSyz,syzp)
      struct syz0 *syzp; /* set */       struct syz0 *syzp; /* set */
 {  {
   POLY rn;    POLY rn;
     if (TraceLift && needSyz) {
       warningGradedSet("TraceLift cannot be used to get syzygy. TraceLift is turned off.\n");
       TraceLift = 0;
     }
   if (TraceLift) {    if (TraceLift) {
         if (EcartAutomaticHomogenization) {          if (EcartAutomaticHomogenization) {
           if (TraceLift_ringmod == NULL) {            if (TraceLift_ringmod == NULL) {
                 warningPoly("reduction_ecart: TraceLift_ringmod is not set.\n");                  warningPoly("reduction_ecart: TraceLift_ringmod is not set.\n");
                 return reduction_ecart1(r,gset,needSyz,syzp);                  return reduction_ecart1(r,gset,needSyz,syzp);
           }            }
           rn = reduction_ecart1_mod(r,gset); /* BUG: syzygy is not obtained. */            rn = reduction_ecart1_mod(r,gset);
           if (rn == POLYNULL) return rn;            if (rn == POLYNULL) return rn;
           else return reduction_ecart1(r,gset,needSyz,syzp);            else return reduction_ecart1(r,gset,needSyz,syzp);
         }else{          }else{
Line 292  static POLY reduction_ecart0(r,gset,needSyz,syzp)
Line 341  static POLY reduction_ecart0(r,gset,needSyz,syzp)
   POLY cf_o;    POLY cf_o;
   POLY syz_o;    POLY syz_o;
   POLY r_0;    POLY r_0;
     int se;
     struct coeff *cont;
   
   extern struct ring *CurrentRingp;    extern struct ring *CurrentRingp;
   struct ring *rp;    struct ring *rp;
Line 311  static POLY reduction_ecart0(r,gset,needSyz,syzp)
Line 362  static POLY reduction_ecart0(r,gset,needSyz,syzp)
     }      }
   }    }
   
     if (DoCancel && (r != POLYNULL)) shouldReduceContent(r,1);
   
   if (DebugReductionEcart&1) printf("--------------------------------------\n");    if (DebugReductionEcart&1) printf("--------------------------------------\n");
   do {    do {
     if (DebugReductionRed) printf("r=%s\n",POLYToString(r,'*',1));      if (DebugReductionRed) printf("r=%s\n",POLYToString(r,'*',1));
Line 332  static POLY reduction_ecart0(r,gset,needSyz,syzp)
Line 385  static POLY reduction_ecart0(r,gset,needSyz,syzp)
         if (DebugReductionEcart & 4) printf("#");          if (DebugReductionEcart & 4) printf("#");
         pp = (gg->pa)[ells.ggi];          pp = (gg->pa)[ells.ggi];
       }        }
       if (ell > 0) r = mpMult(cxx(1,0,ell,rp),r); /* r = s^ell r */        if (ell > 0) r = ppMult(cxx(1,0,ell,rp),r); /* r = s^ell r */
       r = (*reduction1)(r,pp,needSyz,&cc,&cg);        r = (*reduction1)(r,pp,needSyz,&cc,&cg);
   
         if (DoCancel && (r != POLYNULL)) {
           if (shouldReduceContent(r,0)) {
             r = reduceContentOfPoly(r,&cont);
             shouldReduceContent(r,1);
             if (DebugReductionEcart || DebugReductionRed || DebugContentReduction) printf("CONT=%s ",coeffToString(cont));
           }
         }
   
   
       if (needSyz) {        if (needSyz) {
         if (ells.first) {          if (ells.first) {
           if (ell >0) cc = ppMult(cc,cxx(1,0,ell,rp));            if (ell >0) cc = ppMult(cc,cxx(1,0,ell,rp));
Line 355  static POLY reduction_ecart0(r,gset,needSyz,syzp)
Line 418  static POLY reduction_ecart0(r,gset,needSyz,syzp)
           tp = ecartCheckSyz0(cf,r_0,syz,gset,r);            tp = ecartCheckSyz0(cf,r_0,syz,gset,r);
           if (tp != POLYNULL) {            if (tp != POLYNULL) {
             fprintf(stderr,"reduction_ecart0(): sygyzy is broken. Return the Current values.\n");              fprintf(stderr,"reduction_ecart0(): sygyzy is broken. Return the Current values.\n");
             fprintf(stderr,"%s\n",POLYToString(tp,'*',1));              fprintf(stderr,"tp=%s\n",POLYToString(tp,'*',1));
                           ecartCheckSyz0_printinfo(cf,r_0,syz,gset,r);
             syzp->cf = cf;              syzp->cf = cf;
             syzp->syz = syz;              syzp->syz = syz;
             return r;              return r;
Line 363  static POLY reduction_ecart0(r,gset,needSyz,syzp)
Line 427  static POLY reduction_ecart0(r,gset,needSyz,syzp)
         }          }
       }        }
       if (r ISZERO) goto ss;        if (r ISZERO) goto ss;
       /*r = ecartDivideSv(r,&se); r = r/s^? Don't do this. */  
         /* r = r/s^? Don't do this?? */
         r = ecartDivideSv(r,&se);
             if (needSyz && (se > 0)) {
                   POLY tt;
                   tt = cxx(1,0,-se,rp);
                   cf = ppMult(tt,cf);
                   syz = cpMult(toSyzCoeff(tt),syz);
             }
   
     }      }
   }while (ell >= 0);    }while (ell >= 0);
   
  ss: ;   ss: ;
   if (needSyz) {    if (needSyz) {
     syzp->cf = cf;   /* cf is in the CurrentRingp */      syzp->cf = cf;   /* cf is in the ring of r */
     syzp->syz = syz; /* syz is in the SyzRingp */      syzp->syz = syz; /* syz is in the syzRing of r */
   }    }
   
     if (DoCancel && (r != POLYNULL)) {
       if (r->m->ringp->p == 0) {
             r = reduceContentOfPoly(r,&cont);
             if (DebugReductionEcart || DebugReductionRed || DebugContentReduction) printf("cont=%s ",coeffToString(cont));
       }
     }
   
   return(r);    return(r);
 }  }
   
Line 399  static POLY reduction_ecart1(r,gset,needSyz,syzp)
Line 479  static POLY reduction_ecart1(r,gset,needSyz,syzp)
   struct ecartPolyArray *gg;    struct ecartPolyArray *gg;
   POLY pp;    POLY pp;
   int ell;    int ell;
     POLY cf_o;
     POLY syz_o;
     POLY r_0;
   int se;    int se;
   struct coeff *cont;    struct coeff *cont;
   
Line 406  static POLY reduction_ecart1(r,gset,needSyz,syzp)
Line 489  static POLY reduction_ecart1(r,gset,needSyz,syzp)
   struct ring *rp;    struct ring *rp;
   extern struct ring *SmallRingp;    extern struct ring *SmallRingp;
   
     r_0 = r;
   gg = NULL;    gg = NULL;
   if (needSyz) {    if (needSyz) {
     if (r ISZERO) { rp = CurrentRingp; } else { rp = r->m->ringp; }      if (r ISZERO) { rp = CurrentRingp; } else { rp = r->m->ringp; }
Line 422  static POLY reduction_ecart1(r,gset,needSyz,syzp)
Line 506  static POLY reduction_ecart1(r,gset,needSyz,syzp)
   
   r = goHomogenize11(r,DegreeShifto_vec,DegreeShifto_size,-1,1);    r = goHomogenize11(r,DegreeShifto_vec,DegreeShifto_size,-1,1);
   /* 1 means homogenize only s */    /* 1 means homogenize only s */
     if (DoCancel && (r != POLYNULL)) shouldReduceContent(r,1);
   
   if (DebugReductionEcart&1) printf("=======================================\n");    if (DebugReductionEcart&1) printf("=======================================\n");
   do {    do {
Line 432  static POLY reduction_ecart1(r,gset,needSyz,syzp)
Line 517  static POLY reduction_ecart1(r,gset,needSyz,syzp)
     ell = ells.ell;      ell = ells.ell;
     if (ell > 0) {      if (ell > 0) {
       if (DebugReductionEcart & 2) printf("%");        if (DebugReductionEcart & 2) printf("%");
       gg = ecartPutPolyInG(r,gg,POLYNULL,POLYNULL);        if (needSyz) {
           gg = ecartPutPolyInG(r,gg,cf,syz);
         }else{
           gg = ecartPutPolyInG(r,gg,POLYNULL,POLYNULL);
         }
     }      }
     if (ell >= 0) {      if (ell >= 0) {
       if (ells.first) {        if (ells.first) {
Line 441  static POLY reduction_ecart1(r,gset,needSyz,syzp)
Line 530  static POLY reduction_ecart1(r,gset,needSyz,syzp)
         if (DebugReductionEcart & 4) {printf("+"); fflush(NULL);}          if (DebugReductionEcart & 4) {printf("+"); fflush(NULL);}
         pp = (gg->pa)[ells.ggi];          pp = (gg->pa)[ells.ggi];
       }        }
       if (ell > 0) r = mpMult(cxx(1,0,ell,rp),r); /* r = s^ell r */        if (ell > 0) r = ppMult(cxx(1,0,ell,rp),r); /* r = s^ell r */
       r = (*reduction1)(r,pp,needSyz,&cc,&cg);        r = (*reduction1)(r,pp,needSyz,&cc,&cg);
   
         if (DoCancel && (r != POLYNULL)) {
           if (shouldReduceContent(r,0)) {
             r = reduceContentOfPoly(r,&cont);
             shouldReduceContent(r,1);
             if (DebugReductionEcart || DebugReductionRed || DebugContentReduction) printf("CONT=%s ",coeffToString(cont));
           }
         }
   
       if (needSyz) {        if (needSyz) {
         if (ells.first) {          if (ells.first) {
             if (ell > 0) cc = ppMult(cc,cxx(1,0,ell,rp));
           cf = ppMult(cc,cf);            cf = ppMult(cc,cf);
           syz = cpMult(toSyzCoeff(cc),syz);            syz = cpMult(toSyzCoeff(cc),syz);
           syz = ppAddv(syz,toSyzPoly(cg,ells.grade,ells.gseti));            syz = ppAdd(syz,toSyzPoly(cg,ells.grade,ells.gseti));
         }else{          }else{
           fprintf(stderr,"It has not yet implemented.\n");            if (ell >0) cc = ppMult(cc,cxx(1,0,ell,rp));
           exit(10);            cf_o = (gg->cf)[ells.ggi];
           /* BUG: not yet */            syz_o = (gg->syz)[ells.ggi];
             cf = ppMult(cc,cf);
             cf = ppAdd(cf,ppMult(cg,cf_o));
             syz = cpMult(toSyzCoeff(cc),syz);
             syz = ppAdd(syz,cpMult(toSyzCoeff(cg),syz_o));
             /* Note. 2003.07.19 */
         }          }
       }        }
   
         if (DebugReductionRed) {
           POLY tp;
           tp = ecartCheckSyz0(cf,r_0,syz,gset,r);
           tp = goDeHomogenizeS(tp);
           if (tp != POLYNULL) {
             fprintf(stderr,"Error: reduction_ecart1(): sygyzy is broken. Return the Current values.\n");
             fprintf(stderr,"%s\n",POLYToString(tp,'*',1));
             syzp->cf = cf;
             syzp->syz = syz;
             return r;
           }
         }
   
       if (r ISZERO) goto ss1;        if (r ISZERO) goto ss1;
       r = ecartDivideSv(r,&se); /* r = r/s^? */        r = ecartDivideSv(r,&se); /* r = r/s^? */
   
         if (needSyz && (se > 0)) { /* It may not necessary because of dehomo*/
           POLY tt;
           /*printf("!1/H!"); fflush(NULL);*/ /* misc-2003/ecart/t1.sm1 foo4 */
           tt = cxx(1,0,-se,rp);
           cf = ppMult(tt,cf);
           syz = cpMult(toSyzCoeff(tt),syz);
         }
   
         /* For debug */
         if (DebugReductionRed && needSyz) {
           POLY tp;
           tp = ecartCheckSyz0(cf,r_0,syz,gset,r);
           tp = goDeHomogenizeS(tp);
           if (tp != POLYNULL) {
             fprintf(stderr,"Error: reduction_ecart1() after divide: sygyzy is broken. Return the Current values.\n");
             fprintf(stderr,"%s\n",POLYToString(tp,'*',1));
             syzp->cf = cf;
             syzp->syz = syz;
             return r;
           }
         }
   
     }      }
   }while (ell >= 0);    }while (ell >= 0);
   
  ss1: ;   ss1: ;
   if (needSyz) {    if (needSyz) {
       /* dehomogenize the syzygy. BUG, this may be inefficient.  */
       cf = goDeHomogenizeS(cf);
       syz = goDeHomogenizeS(syz);
       /*printf("cf=%s\n",POLYToString(cf,'*',1));
         printf("syz=%s\n",POLYToString(syz,'*',1));*/
     syzp->cf = cf;   /* cf is in the CurrentRingp */      syzp->cf = cf;   /* cf is in the CurrentRingp */
     syzp->syz = syz; /* syz is in the SyzRingp */      syzp->syz = syz; /* syz is in the SyzRingp */
     /* BUG: dehomogenize the syzygy */  
     fprintf(stderr,"It has not yet implemented.\n");  
     exit(10);  
   }    }
   
   r = goDeHomogenizeS(r);    r = goDeHomogenizeS(r);
   if (DoCancel && (r != POLYNULL)) { /* BUG: syzygy should be corrected. */    if (DoCancel && (r != POLYNULL)) {
         if (r->m->ringp->p == 0) {      if (r->m->ringp->p == 0) {
           if (coeffSizeMin(r) >= DoCancel) {        r = reduceContentOfPoly(r,&cont);
                 r = reduceContentOfPoly(r,&cont);        if (DebugReductionEcart || DebugReductionRed || DebugContentReduction) printf("cont=%s ",coeffToString(cont));
         if (DebugReductionEcart || DebugReductionRed) printf("cont=%d ",coeffToString(cont));      }
           }  
         }  
   }    }
   
     /* For debug */
     if (DebugReductionRed && needSyz) {
       POLY tp;
       tp = ecartCheckSyz0(cf,r_0,syz,gset,r);
       tp = goDeHomogenizeS(tp);
       if (tp != POLYNULL) {
         fprintf(stderr,"Error: reduction_ecart1() last step: sygyzy is broken. Return the Current values.\n");
         fprintf(stderr,"%s\n",POLYToString(tp,'*',1));
         syzp->cf = cf;
         syzp->syz = syz;
         return r;
       }
     }
   
   return(r);    return(r);
 }  }
   
Line 590  static POLY reduction_ecart1_mod(r,gset)
Line 745  static POLY reduction_ecart1_mod(r,gset)
         KshowRing(TraceLift_ringmod); **/          KshowRing(TraceLift_ringmod); **/
   
   r = modulop(r,TraceLift_ringmod);    r = modulop(r,TraceLift_ringmod);
   rp = r->m->ringp; /* reset rp */    if (r != POLYNULL) rp = r->m->ringp; /* reset rp */
   
   /* printf("r=%s (mod p)\n",POLYToString(head(r),'*',1)); **/    /* printf("r=%s (mod p)\n",POLYToString(head(r),'*',1)); **/
   
Line 612  static POLY reduction_ecart1_mod(r,gset)
Line 767  static POLY reduction_ecart1_mod(r,gset)
         if (DebugReductionEcart & 4) {printf("+"); fflush(NULL);}          if (DebugReductionEcart & 4) {printf("+"); fflush(NULL);}
         pp = (gg->pa)[ells.ggi];          pp = (gg->pa)[ells.ggi];
       }        }
       if (ell > 0) r = mpMult(cxx(1,0,ell,rp),r); /* r = s^ell r */        if (ell > 0) r = ppMult(cxx(1,0,ell,rp),r); /* r = s^ell r */
       r = (*reduction1)(r,pp,0,&cc,&cg);        r = (*reduction1)(r,pp,0,&cc,&cg);
       if (r ISZERO) goto ss1;        if (r ISZERO) goto ss1;
       r = ecartDivideSv(r,&se); /* r = r/s^? */        r = ecartDivideSv(r,&se); /* r = r/s^? */
Line 625  static POLY reduction_ecart1_mod(r,gset)
Line 780  static POLY reduction_ecart1_mod(r,gset)
   
   return(r);    return(r);
 }  }
   
Legend:
Removed from v.1.9  
changed lines
  Added in v.1.17
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>