[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.1 and 1.4

version 1.1, 2003/07/17 09:10:54 version 1.4, 2003/07/17 23:47:44
Line 1 
Line 1 
 /* $OpenXM$ */  /* $OpenXM: OpenXM/src/kan96xx/Kan/ecart.c,v 1.3 2003/07/17 23:37:01 takayama Exp $ */
 #include <stdio.h>  #include <stdio.h>
 #include "datatype.h"  #include "datatype.h"
 #include "extern2.h"  #include "extern2.h"
Line 31  extern int DebugReductionRed; 
Line 31  extern int DebugReductionRed; 
 extern int DegreeShifto_size;  extern int DegreeShifto_size;
 extern int *DegreeShifto_vec;  extern int *DegreeShifto_vec;
   
   /* It is used reduction_ecart() and ecartFindReducer()
      to determine if we homogenize in this function */
   extern int EcartAutomaticHomogenization;
   
 #define LARGE 0x7fffffff  #define LARGE 0x7fffffff
   
   
Line 72  static int ecartGetEll(POLY f,POLY g) {
Line 76  static int ecartGetEll(POLY f,POLY g) {
     if (tf->e[i].D < tg->e[i].D) return(-1);      if (tf->e[i].D < tg->e[i].D) return(-1);
   }    }
   if (tf->e[0].D < tg->e[0].D) return(-1);  /*  h  */    if (tf->e[0].D < tg->e[0].D) return(-1);  /*  h  */
   p = tf->e[i].x - tg->e[i].x;  /* H,  s */    p = tf->e[0].x - tg->e[0].x;  /* H,  s */
   if (p >=0 ) return 0;    if (p >=0 ) return 0;
   else return(-p);    else return(-p);
 }  }
Line 131  static struct ecartReducer ecartFindReducer(POLY r,str
Line 135  static struct ecartReducer ecartFindReducer(POLY r,str
   while (grd < gset->maxGrade) {    while (grd < gset->maxGrade) {
     set = gset->polys[grd];      set = gset->polys[grd];
     for (i=0; i<set->size; i++) {      for (i=0; i<set->size; i++) {
       ell = ecartGetEll(r,set->g[i]);        if (set->gh[i] == POLYNULL) {
           /* goHomogenize set->gh[i] */
             if (EcartAutomaticHomogenization) {
                 set->gh[i] = goHomogenize11(set->g[i],DegreeShifto_vec,DegreeShifto_size,-1,1);
             }else{
                 set->gh[i] = set->g[i];
             }
         }
         ell = ecartGetEll(r,set->gh[i]);
       if ((ell>=0) && (ell < ell1)) {        if ((ell>=0) && (ell < ell1)) {
         ell1 = ell;          ell1 = ell;
         minGrade = grd; minGseti=i;          minGrade = grd; minGseti=i;
       }        }
       if (set->gh[i] == POLYNULL) {  
         /* goHomogenize set->gh[i] */  
         set->gh[i] = goHomogenize11(set->g[i],DegreeShifto_vec,DegreeShifto_size,-1,1);  
       }  
     }      }
     grd++;      grd++;
   }    }
Line 178  static struct ecartReducer ecartFindReducer(POLY r,str
Line 186  static struct ecartReducer ecartFindReducer(POLY r,str
   
 /*  /*
   r and gset are assumed to be (0,1)-homogenized (h-homogenized)    r and gset are assumed to be (0,1)-homogenized (h-homogenized)
     If EcartAutomaticHomogenization == 0, then r and gset are assumed
     to be double homogenized (h-homogenized and s(H)-homogenized)
  */   */
 POLY reduction_ecart(r,gset,needSyz,syzp)  POLY reduction_ecart(r,gset,needSyz,syzp)
      POLY r;       POLY r;
Line 207  POLY reduction_ecart(r,gset,needSyz,syzp)
Line 217  POLY reduction_ecart(r,gset,needSyz,syzp)
   }    }
   
   if (r != POLYNULL) {    if (r != POLYNULL) {
         if (! r->m->ringp->weightedHomogenization) {      rp = r->m->ringp;
           errorKan1("%s\n","ecart.c: the given ring must be declared with [(weightedHomogenization) 1]");      if (! rp->weightedHomogenization) {
         }        errorKan1("%s\n","ecart.c: the given ring must be declared with [(weightedHomogenization) 1]");
       }
   }    }
   
   r = goHomogenize11(r,DegreeShifto_vec,DegreeShifto_size,-1,1);    if (EcartAutomaticHomogenization) {
         r = goHomogenize11(r,DegreeShifto_vec,DegreeShifto_size,-1,1);
     }
   /* 1 means homogenize only s */    /* 1 means homogenize only s */
   
   do {    do {
Line 250  POLY reduction_ecart(r,gset,needSyz,syzp)
Line 263  POLY reduction_ecart(r,gset,needSyz,syzp)
     syzp->syz = syz; /* syz is in the SyzRingp */      syzp->syz = syz; /* syz is in the SyzRingp */
     /* BUG: dehomogenize the syzygy */      /* BUG: dehomogenize the syzygy */
   }    }
     /*
   r = goDeHomogenizeS(r);    r = goDeHomogenizeS(r);
     */
   return(r);    return(r);
 }  }
Legend:
Removed from v.1.1  
changed lines
  Added in v.1.4
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>