[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.2

version 1.1, 2003/07/17 09:10:54 version 1.2, 2003/07/17 12:11:09
Line 1 
Line 1 
 /* $OpenXM$ */  /* $OpenXM: OpenXM/src/kan96xx/Kan/ecart.c,v 1.1 2003/07/17 09:10:54 takayama Exp $ */
 #include <stdio.h>  #include <stdio.h>
 #include "datatype.h"  #include "datatype.h"
 #include "extern2.h"  #include "extern2.h"
Line 72  static int ecartGetEll(POLY f,POLY g) {
Line 72  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 131  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 ((ell>=0) && (ell < ell1)) {  
         ell1 = ell;  
         minGrade = grd; minGseti=i;  
       }  
       if (set->gh[i] == POLYNULL) {        if (set->gh[i] == POLYNULL) {
         /* goHomogenize set->gh[i] */          /* goHomogenize set->gh[i] */
         set->gh[i] = goHomogenize11(set->g[i],DegreeShifto_vec,DegreeShifto_size,-1,1);          set->gh[i] = goHomogenize11(set->g[i],DegreeShifto_vec,DegreeShifto_size,-1,1);
       }        }
         ell = ecartGetEll(r,set->gh[i]);
         if ((ell>=0) && (ell < ell1)) {
           ell1 = ell;
           minGrade = grd; minGseti=i;
         }
     }      }
     grd++;      grd++;
   }    }
Line 207  POLY reduction_ecart(r,gset,needSyz,syzp)
Line 207  POLY reduction_ecart(r,gset,needSyz,syzp)
   }    }
   
   if (r != POLYNULL) {    if (r != POLYNULL) {
         if (! r->m->ringp->weightedHomogenization) {          rp = r->m->ringp;
           if (! rp->weightedHomogenization) {
           errorKan1("%s\n","ecart.c: the given ring must be declared with [(weightedHomogenization) 1]");            errorKan1("%s\n","ecart.c: the given ring must be declared with [(weightedHomogenization) 1]");
         }          }
   }    }
Line 250  POLY reduction_ecart(r,gset,needSyz,syzp)
Line 251  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.2
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>