===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2018/builtin/gr.c,v
retrieving revision 1.2
retrieving revision 1.5
diff -u -p -r1.2 -r1.5
--- OpenXM_contrib2/asir2018/builtin/gr.c	2018/09/28 08:20:27	1.2
+++ OpenXM_contrib2/asir2018/builtin/gr.c	2020/10/06 06:31:19	1.5
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2018/builtin/gr.c,v 1.1 2018/09/19 05:45:06 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2018/builtin/gr.c,v 1.4 2020/02/22 06:23:35 noro Exp $
 */
 #include "ca.h"
 #include "parse.h"
@@ -99,6 +99,7 @@ int GenSyz = 0;
 int OXCheck = -1;
 int OneZeroHomo = 0;
 int MaxDeg = 0;
+int NaiveSchreyer = 0;
 
 int NoSugar = 0;
 static int NoCriB = 0;
@@ -303,6 +304,8 @@ void dp_gr_main(LIST f,LIST v,Num homo,int modular,int
   int i,mindex,m,nochk;
   struct order_spec *ord1;
   Z q;
+  Q cont;
+  P pp;
   VL fv,vv,vc;
   NODE fd,fd0,fi,fi0,r,r0,t,subst,x,s,xx;
   NODE ind,ind0;
@@ -316,6 +319,13 @@ void dp_gr_main(LIST f,LIST v,Num homo,int modular,int
   if ( ord->id && NVars != ord->nv )
     error("dp_gr_main : invalid order specification");
   initd(ord);
+  // clear denominators
+  for ( r0 = 0, t = BDY(f); t; t = NEXT(t) ) {
+    ptozp((P)BDY(t),1,&cont,&pp);
+    NEXTNODE(r0,r); BDY(r) = (pointer)pp;
+  }
+  if ( r0 ) NEXT(r) = 0;
+  MKLIST(f,r0);
   if ( homo ) {
     homogenize_order(ord,NVars,&ord1);
     for ( fd0 = fi0 = 0, t = BDY(f); t; t = NEXT(t) ) {
@@ -370,11 +380,12 @@ void dp_gr_main(LIST f,LIST v,Num homo,int modular,int
       } else
         break;
     }
-    if ( modular )
+    if ( modular ) {
       if ( modular > 1 ) {
         *rp = 0; return;
       } else
         m = get_lprime(++mindex);
+    }
     makesubst(vc,&subst);
     psn = length(s);
     for ( i = psn; i < pslen; i++ ) {
@@ -711,7 +722,7 @@ NODE gb_f4(NODE f)
     rank = generic_gauss_elim(mat,&nm,&dn,&rind,&cind);
 #endif
     if ( DP_Print )
-      fprintf(asir_out,"done rank = %d\n",rank,row,col);
+      fprintf(asir_out,"done rank = %d\n",rank);
     for ( i = 0; i < rank; i++ ) {
       for ( k = 0; k < nred; k++ )
         if ( !cmpdl(nv,at[rind[i]],ht[k]) )
@@ -936,7 +947,7 @@ NODE gb_f4_mod(NODE f,int m)
     init_eg(&eg_split_elim2); add_eg(&eg_split_elim2,&tmp0,&tmp1);
 
     if ( DP_Print ) {
-      fprintf(asir_out,"done rank = %d\n",rank,row,col);
+      fprintf(asir_out,"done rank = %d\n",rank);
       print_eg("Symb",&eg_split_symb);
       print_eg("Conv",&eg_split_conv);
       print_eg("Elim1",&eg_split_elim1);
@@ -1124,7 +1135,7 @@ NODE gb_f4_mod_old(NODE f,int m)
     init_eg(&eg_split_elim2); add_eg(&eg_split_elim2,&tmp0,&tmp1);
 
     if ( DP_Print ) {
-      fprintf(asir_out,"done rank = %d\n",rank,row,col);
+      fprintf(asir_out,"done rank = %d\n",rank);
       print_eg("Symb",&eg_split_symb);
       print_eg("Elim1",&eg_split_elim1);
       print_eg("Elim2",&eg_split_elim2);
@@ -1226,7 +1237,7 @@ void printsubst(NODE s)
   fputc('[',asir_out);
   while ( s ) {
     printv(CO,(V)BDY(s)); s = NEXT(s);
-    fprintf(asir_out,"->%d",ZTOS((Q)BDY(s)));
+    fprintf(asir_out,"->%ld",ZTOS((Q)BDY(s)));
     if ( NEXT(s) ) {
       fputc(',',asir_out); s = NEXT(s);
     } else
@@ -1369,7 +1380,7 @@ NODE /* of DP */ NODE_sortb_insert( DP newdp, NODE /* 
     NEXT(newnd) = last;
     return newnd;
   }
-  for ( ; p = NEXT(last); last = p )
+  for ( ; (p = NEXT(last)) != 0; last = p )
     if ( sgn*(*cmpfun)( nv, newdl, BDY((DP) BDY(p))->dl ) > 0 ) break;
   if ( p ) NEXT(NEXT(last) = newnd) = p;
   else NEXT(last) = newnd;
@@ -1397,7 +1408,7 @@ NODE /* of index */ NODE_sortbi_insert( int newdpi, NO
     NEXT(newnd) = last;
     return newnd;
   }
-  for ( ; p = NEXT(last); last = p )
+  for ( ; (p = NEXT(last)) != 0; last = p )
     if ( sgn*(*cmpfun)( nv, newdl, psh[(long)BDY(p)] ) > 0 ) break;
   if ( p ) NEXT(NEXT(last) = newnd) = p;
   else NEXT(last) = newnd;
@@ -1695,7 +1706,7 @@ DP_pairs minp( DP_pairs d, DP_pairs *prest )
   }
   for ( lcm = m->lcm, s = m->sugar, ml = 0, l = m; p; p = NEXT(l = p) )
     if ( NoSugar ? (*cmpfun)( nv, lcm, p->lcm ) >= 0 :
-         (s > p->sugar || s == p->sugar && (*cmpfun)( nv, lcm, p->lcm ) >= 0) )
+         (s > p->sugar || (s == p->sugar && (*cmpfun)( nv, lcm, p->lcm ) >= 0)) )
       ml = l,  lcm = (m = p)->lcm,  s = p->sugar;
   if ( !ml ) *prest = NEXT(m);
   else {
@@ -1959,7 +1970,7 @@ DP_pairs updpairs( DP_pairs d, NODE /* of index */ g, 
     dd = d1;
   dl1 = DPPlength(dd); NDP += (dl-dl1);
   if ( !(nd = d) ) return dd;
-  while ( nd = NEXT(d1 = nd) ) ;
+  while ( (nd = NEXT(d1 = nd)) != 0 ) ;
   NEXT(d1) = dd;
   return d;
 }
@@ -2097,7 +2108,7 @@ DP_pairs criterion_F( DP_pairs d1 )
 
   for ( head = last = 0, p = d1; NEXT(p); ) {
     s = (r = w = collect_pairs_of_hdlcm( p, &rest ))->sugar;
-    while ( w = NEXT(w) )
+    while ( (w = NEXT(w)) != 0 )
       if ( !do_weyl && criterion_2( w->dp1, w->dp2 ) ) {
         r = w;
         break;
@@ -2333,6 +2344,8 @@ void dp_set_flag(Obj name,Obj value)
     OneZeroHomo = v;
   else if ( !strcmp(n,"MaxDeg") )
     MaxDeg = v;
+  else if ( !strcmp(n,"NaiveSchreyer") )
+    NaiveSchreyer = v;
 }
 
 void dp_make_flaglist(LIST *list)
@@ -2361,6 +2374,7 @@ void dp_make_flaglist(LIST *list)
   STOZ(OXCheck,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"OXCheck"); MKNODE(n1,name,n); n = n1;
   STOZ(GenTrace,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"GenTrace"); MKNODE(n1,name,n); n = n1;
   STOZ(GenSyz,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"GenSyz"); MKNODE(n1,name,n); n = n1;
+  STOZ(NaiveSchreyer,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"NaiveSchreyer"); MKNODE(n1,name,n); n = n1;
   STOZ(MaxDeg,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"MaxDeg"); MKNODE(n1,name,n); n = n1;
   STOZ(OneZeroHomo,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"OneZeroHomo"); MKNODE(n1,name,n); n = n1;
   STOZ(PtozpRA,v); MKNODE(n1,v,n); n = n1; MKSTR(name,"PtozpRA"); MKNODE(n1,name,n); n = n1;