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

Diff for /OpenXM/src/kan96xx/Kan/red.c between version 1.5 and 1.6

version 1.5, 2003/07/30 09:00:52 version 1.6, 2003/08/21 02:30:23
Line 1 
Line 1 
 /* $OpenXM: OpenXM/src/kan96xx/Kan/red.c,v 1.4 2001/05/04 01:06:25 takayama Exp $ */  /* $OpenXM: OpenXM/src/kan96xx/Kan/red.c,v 1.5 2003/07/30 09:00:52 takayama Exp $ */
 #include <stdio.h>  #include <stdio.h>
 #include "datatype.h"  #include "datatype.h"
 #include "extern2.h"  #include "extern2.h"
Line 7 
Line 7 
 #define mymax(p,q) (p>q?p:q)  #define mymax(p,q) (p>q?p:q)
   
 int DebugReductionRed = 0;  int DebugReductionRed = 0;
   int DebugContentReduction = 0;
 extern int Sugar;  extern int Sugar;
   
 struct spValue sp_gen(f,g)  struct spValue sp_gen(f,g)
Line 325  POLY reduction_gen(f,gset,needSyz,syzp)
Line 326  POLY reduction_gen(f,gset,needSyz,syzp)
   
   extern struct ring *CurrentRingp;    extern struct ring *CurrentRingp;
   struct ring *rp;    struct ring *rp;
     extern DoCancel;
   
   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 */
   do {    do {
Line 347  POLY reduction_gen(f,gset,needSyz,syzp)
Line 354  POLY reduction_gen(f,gset,needSyz,syzp)
           if (f ISZERO) goto ss;            if (f ISZERO) goto ss;
           if ((*isReducible)(f,set->g[i])) {            if ((*isReducible)(f,set->g[i])) {
             f = (*reduction1)(f,set->g[i],needSyz,&cc,&cg);              f = (*reduction1)(f,set->g[i],needSyz,&cc,&cg);
   
               if (DoCancel && (f != POLYNULL)) {
                 if (shouldReduceContent(f,0)) {
                                   struct coeff *cont;
                   f = reduceContentOfPoly(f,&cont);
                   shouldReduceContent(f,1);
                   if (DebugContentReduction) printf("CONT=%s ",coeffToString(cont));
                             }
                           }
   
             if (needSyz) {              if (needSyz) {
               cf = ppMult(cc,cf);                cf = ppMult(cc,cf);
               syz = cpMult(toSyzCoeff(cc),syz);                syz = cpMult(toSyzCoeff(cc),syz);
Line 365  POLY reduction_gen(f,gset,needSyz,syzp)
Line 382  POLY reduction_gen(f,gset,needSyz,syzp)
     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);
 }  }
   
Legend:
Removed from v.1.5  
changed lines
  Added in v.1.6
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>