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

Diff for /OpenXM/src/kan96xx/Kan/sugar.c between version 1.2 and 1.6

version 1.2, 2000/01/16 07:55:41 version 1.6, 2003/09/12 02:52:50
Line 1 
Line 1 
 /* $OpenXM$ */  /* $OpenXM: OpenXM/src/kan96xx/Kan/sugar.c,v 1.5 2003/08/21 02:30:23 takayama Exp $ */
 #include <stdio.h>  #include <stdio.h>
 #include "datatype.h"  #include "datatype.h"
 #include "extern2.h"  #include "extern2.h"
Line 6 
Line 6 
   
 #define mymax(p,q) (p>q?p:q)  #define mymax(p,q) (p>q?p:q)
   
 static int DebugReduction = 0;  /* static int DebugReduction = 0;
   */
   extern DebugReductionRed;
   extern DebugContentReduction;
   extern Ecart;
   
 POLY reduction_sugar(POLY f,struct gradedPolySet *gset,int needSyz,  POLY reduction_sugar(POLY f,struct gradedPolySet *gset,int needSyz,
                      struct syz0 *syzp,int sugarGrade)                       struct syz0 *syzp,int sugarGrade)
 {  {
   int reduced,reduced1,reduced2;    int reduced,reduced1,reduced2;
   int grd;    int grd;
Line 22  POLY reduction_sugar(POLY f,struct gradedPolySet *gset
Line 26  POLY reduction_sugar(POLY f,struct gradedPolySet *gset
   
   extern struct ring *CurrentRingp;    extern struct ring *CurrentRingp;
   struct ring *rp;    struct ring *rp;
     extern DoCancel;
   
     if (Ecart) return reduction_ecart(f,gset,needSyz,syzp);
   if (needSyz) {    if (needSyz) {
     if (f ISZERO) { rp = CurrentRingp; } else { rp = f->m->ringp; }      if (f ISZERO) { rp = CurrentRingp; } else { rp = f->m->ringp; }
     cf = cxx(1,0,0,rp);      cf = cxx(1,0,0,rp);
     syz = ZERO;      syz = ZERO;
   }    }
   
     if (needSyz && DoCancel) {
           warningGradedSet("needSyz is not supported when DoCancel is turned on. DoCancel is set to 0.\n");
           DoCancel = 0;
     }
     if (DoCancel && (f != POLYNULL)) shouldReduceContent(f,1);
   
   reduced = 0; /* no */    reduced = 0; /* no */
   /* Take minimum */    /* Take minimum */
   gradelimit = (gset->maxGrade < sugarGrade+1 ?gset->maxGrade: sugarGrade+1);    gradelimit = (gset->maxGrade < sugarGrade+1 ?gset->maxGrade: sugarGrade+1);
Line 38  POLY reduction_sugar(POLY f,struct gradedPolySet *gset
Line 50  POLY reduction_sugar(POLY f,struct gradedPolySet *gset
     while (grd < gset->maxGrade) {      while (grd < gset->maxGrade) {
       set = gset->polys[grd];        set = gset->polys[grd];
       do {        do {
         reduced2 = 0; /* no */          reduced2 = 0; /* no */
         for (i=0; i<set->size; i++) {          for (i=0; i<set->size; i++) {
           if (f ISZERO) goto ss;            if (f ISZERO) goto ss;
           if ((*isReducible)(f,set->g[i])) {            if ((*isReducible)(f,set->g[i])) {
             tdegm = grade_gen(f) - grade_gen(set->g[i]);              tdegm = grade_gen(f) - grade_gen(set->g[i]);
             /* Reduce if and only if sugarGrade does not increase. */              /* Reduce if and only if sugarGrade does not increase. */
             if (tdegm+grd <= sugarGrade) {              if (tdegm+grd <= sugarGrade) {
               f = reduction1_sugar(f,set->g[i],needSyz,&cc,&cg,sugarGrade);                f = reduction1_sugar(f,set->g[i],needSyz,&cc,&cg,sugarGrade);
               if (needSyz) {  
                 cf = ppMult(cc,cf);                if (DoCancel && (f != POLYNULL)) {
                 syz = cpMult(toSyzCoeff(cc),syz);                  if (shouldReduceContent(f,0)) {
                 syz = ppAddv(syz,toSyzPoly(cg,grd,i));                    struct coeff *cont;
               }                    f = reduceContentOfPoly(f,&cont);
               reduced = reduced1 = reduced2 = 1; /* yes */                    shouldReduceContent(f,1);
             }                    if (DebugContentReduction) printf("CONT=%s ",coeffToString(cont));
           }                  }
         }                }
   
                 if (needSyz) {
                   cf = ppMult(cc,cf);
                   syz = cpMult(toSyzCoeff(cc),syz);
                   syz = ppAddv(syz,toSyzPoly(cg,grd,i));
                 }
                 reduced = reduced1 = reduced2 = 1; /* yes */
               }
             }
           }
       } while (reduced2 != 0);        } while (reduced2 != 0);
       grd++;        grd++;
     }      }
   }while (reduced1 != 0);    }while (reduced1 != 0);
   
   ss: ;   ss: ;
   if (needSyz) {    if (needSyz) {
     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 */
   }    }
   
     if (DoCancel && (f != POLYNULL)) {
       if (f->m->ringp->p == 0) {
             struct coeff *cont;
             f = reduceContentOfPoly(f,&cont);
             if (DebugContentReduction) printf("cont=%s ",coeffToString(cont));
       }
     }
   
   return(f);    return(f);
 }  }
   
 POLY reduction1_sugar(f,g,needSyz,c,h,sugarGrade)  POLY reduction1_sugar(f,g,needSyz,c,h,sugarGrade)
 POLY f;       POLY f;
 POLY g;       POLY g;
 int needSyz;       int needSyz;
 POLY *c; /* set */       POLY *c; /* set */
 POLY *h; /* set */       POLY *h; /* set */
 int sugarGrade;       int sugarGrade;
 /* f must be reducible by g.  r = c*f + h*g */       /* f must be reducible by g.  r = c*f + h*g */
 {  {
   extern struct ring *CurrentRingp;    extern struct ring *CurrentRingp;
   struct ring *rp;    struct ring *rp;
Line 92  int sugarGrade;
Line 123  int sugarGrade;
   
   sv = (*sp)(f,g);    sv = (*sp)(f,g);
   f2 = ppAddv(cpMult((sv.a)->coeffp,f),ppMult(sv.b,g));    f2 = ppAddv(cpMult((sv.a)->coeffp,f),ppMult(sv.b,g));
   if (DebugReduction) {    if (DebugReductionRed) {
     printf("c=%s, d=%s, g=%s:  f --> c*f + d*g.\n",      printf("c=%s, d=%s, g=%s:  f --> c*f + d*g.\n",
            POLYToString(sv.a,'*',1),POLYToString(sv.b,'*',1),POLYToString(g,'*',1));             POLYToString(sv.a,'*',1),POLYToString(sv.b,'*',1),POLYToString(g,'*',1));
     printf("%s --> %s\n",POLYToString(f,'*',1),POLYToString(f2,'*',1));      printf("%s --> %s\n",POLYToString(f,'*',1),POLYToString(f2,'*',1));
   }    }
   f = f2;    f = f2;
Line 110  int sugarGrade;
Line 141  int sugarGrade;
     if (tdegm+grd <= sugarGrade) {      if (tdegm+grd <= sugarGrade) {
       sv = (*sp)(f,g);        sv = (*sp)(f,g);
       f2 = ppAddv(cpMult((sv.a)->coeffp,f),ppMult(sv.b,g));        f2 = ppAddv(cpMult((sv.a)->coeffp,f),ppMult(sv.b,g));
       if (DebugReduction) {        if (DebugReductionRed) {
         printf("! c=%s, d=%s, g=%s:  f --> c*f + d*g.\n",          printf("! c=%s, d=%s, g=%s:  f --> c*f + d*g.\n",
                POLYToString(sv.a,'*',1),POLYToString(sv.b,'*',1),POLYToString(g,'*',1));                 POLYToString(sv.a,'*',1),POLYToString(sv.b,'*',1),POLYToString(g,'*',1));
         printf("%s --> %s\n",POLYToString(f,'*',1),POLYToString(f2,'*',1));          printf("%s --> %s\n",POLYToString(f,'*',1),POLYToString(f2,'*',1));
       }        }
       f = f2;        f = f2;
       if (needSyz) {        if (needSyz) {
         *c = ppMult(sv.a,*c);          *c = ppMult(sv.a,*c);
         *h = ppAdd(ppMult(sv.a,*h),sv.b);          *h = ppAdd(ppMult(sv.a,*h),sv.b);
       }        }
     }else{      }else{
       break;        break;
Line 128  int sugarGrade;
Line 159  int sugarGrade;
 }  }
   
 int grade_sugar(f)  int grade_sugar(f)
 POLY f;       POLY f;
 {  {
   int r;    int r;
   int i,ans;    int i,ans;
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.6
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>