[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.18 and 1.19

version 1.18, 2003/09/12 02:52:50 version 1.19, 2003/09/20 09:57:29
Line 1 
Line 1 
 /* $OpenXM: OpenXM/src/kan96xx/Kan/ecart.c,v 1.17 2003/09/10 07:41:25 takayama Exp $ */  /* $OpenXM: OpenXM/src/kan96xx/Kan/ecart.c,v 1.18 2003/09/12 02:52:50 takayama Exp $ */
 #include <stdio.h>  #include <stdio.h>
 #include "datatype.h"  #include "datatype.h"
 #include "extern2.h"  #include "extern2.h"
Line 45  struct ring *TraceLift_ringmod;
Line 45  struct ring *TraceLift_ringmod;
 extern DoCancel;  extern DoCancel;
 int DebugReductionEcart = 0;  int DebugReductionEcart = 0;
 extern DebugContentReduction;  extern DebugContentReduction;
   extern int Sugar;
   
 /* This is used for goHomogenization */  /* This is used for goHomogenization */
 extern int DegreeShifto_size;  extern int DegreeShifto_size;
 extern int *DegreeShifto_vec;  extern int *DegreeShifto_vec;
   int Ecart_sugarGrade;
   
 /* It is used reduction_ecart() and ecartFindReducer()  /* It is used reduction_ecart() and ecartFindReducer()
    to determine if we homogenize in this function */     to determine if we homogenize in this function */
Line 211  static struct ecartReducer ecartFindReducer(POLY r,str
Line 213  static struct ecartReducer ecartFindReducer(POLY r,str
   if ((DebugReductionRed&1) || (DebugReductionEcart&1)) {    if ((DebugReductionRed&1) || (DebugReductionEcart&1)) {
     printf("ecartFindReducer(): ell1=%d, ell2=%d, minGrade=%d, minGseti=%d, minGgi=%d\n",ell1,ell2,minGrade,minGseti,minGgi);      printf("ecartFindReducer(): ell1=%d, ell2=%d, minGrade=%d, minGseti=%d, minGgi=%d\n",ell1,ell2,minGrade,minGseti,minGgi);
   }    }
     if (Sugar) {  /* experimental */
           if (ell1 <= ell2) {
             if (ell1 == LARGE) {
                   er.ell = -1;
                   return er;
             }else{
                   int new_s;
                   er.ell = ell1;
                   er.first = 1;
                   er.grade = minGrade;
                   er.gseti = minGseti;
                   /* reduce if and only if Ecart_sugarGrade does not increase. */
                   new_s = grade_gen(r)-grade_gen(gset->polys[minGrade]->gh[minGseti]);
                   if (new_s + minGrade <= Ecart_sugarGrade) {
                     return er;
                   }else{
                     printf("new_s=%d, minGrade=%d, sugarGrade=%d\n",new_s,minGrade,
                                    Ecart_sugarGrade);
                     er.ell = -1;
                     return er;
                   }
             }
           }else{
         er.ell = ell2;
         er.first = 0;
         er.ggi = minGgi;
             return er;
           }
     }
   
   if (ell1 <= ell2) {    if (ell1 <= ell2) {
     if (ell1 == LARGE) {      if (ell1 == LARGE) {
       er.ell = -1;        er.ell = -1;

Legend:
Removed from v.1.18  
changed lines
  Added in v.1.19

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>