===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2018/engine/nd.c,v
retrieving revision 1.36
retrieving revision 1.39
diff -u -p -r1.36 -r1.39
--- OpenXM_contrib2/asir2018/engine/nd.c	2020/09/27 04:35:04	1.36
+++ OpenXM_contrib2/asir2018/engine/nd.c	2020/10/29 01:50:35	1.39
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2018/engine/nd.c,v 1.35 2020/08/26 06:40:36 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2018/engine/nd.c,v 1.38 2020/10/26 02:41:05 noro Exp $ */
 
 #include "nd.h"
 
@@ -66,6 +66,8 @@ static int *nd_poly_weight,*nd_module_weight;
 static NODE nd_tracelist;
 static NODE nd_alltracelist;
 static int nd_gentrace,nd_gensyz,nd_nora,nd_newelim,nd_intersect,nd_lf;
+static int nd_f4_td,nd_sba_f4step,nd_sba_pot,nd_sba_largelcm,nd_sba_dontsort;
+static int nd_top;
 static int *nd_gbblock;
 static NODE nd_nzlist,nd_check_splist;
 static int nd_splist;
@@ -1256,7 +1258,7 @@ INLINE int ndl_find_reducer_s(UINT *dg,SIG sig)
       quo->pos = nd_psh[i]->sig->pos;
       ret = comp_sig(sig,quo);
       if ( ret > 0 ) { singular = 0; break; }
-      if ( ret == 0 ) { fprintf(asir_out,"s"); fflush(asir_out); singular = 1; }
+      if ( ret == 0 ) { /* fprintf(asir_out,"s"); fflush(asir_out); */ singular = 1; }
     }
   }
   if ( singular ) return -1;
@@ -2028,6 +2030,7 @@ void free_pbucket(PGeoBucket b) {
     GCFREE(b);
 }
 
+#if 0
 void add_pbucket_symbolic(PGeoBucket g,ND d)
 {
     int l,i,k,m;
@@ -2045,7 +2048,32 @@ void add_pbucket_symbolic(PGeoBucket g,ND d)
     g->body[k] = d;
     g->m = MAX(g->m,k);
 }
+#else
+void add_pbucket_symbolic(PGeoBucket g,ND d)
+{
+  int l,i,k,m,m0;
 
+  if ( !d )
+    return;
+  m0 = g->m;
+  while ( 1 ) {
+    l = LEN(d);
+    for ( k = 0, m = 1; l > m; k++, m <<= 1 );
+    /* 2^(k-1) < l <= 2^k (=m) */
+    if ( g->body[k] == 0 ) {
+      g->body[k] = d;
+      m0 = MAX(k,m0);
+      break;
+    } else { 
+      d = nd_merge(g->body[k],d);
+      g->body[k] = 0; 
+    }
+  }
+  g->m = m0;
+}
+#endif
+
+#if 0
 void add_pbucket(int mod,PGeoBucket g,ND d)
 {
     int l,i,k,m;
@@ -2063,7 +2091,29 @@ void add_pbucket(int mod,PGeoBucket g,ND d)
     g->body[k] = d;
     g->m = MAX(g->m,k);
 }
+#else
+void add_pbucket(int mod,PGeoBucket g,ND d)
+{
+  int l,i,k,m,m0;
 
+  m0 = g->m;
+  while ( d != 0 ) {
+    l = LEN(d);
+    for ( k = 0, m = 1; l > m; k++, m <<= 1 );
+    /* 2^(k-1) < l <= 2^k (=m) */
+    if ( g->body[k] == 0 ) {
+      g->body[k] = d;
+      m0 = MAX(k,m0);
+      break;
+    } else { 
+      d = nd_add(mod,g->body[k],d);
+      g->body[k] = 0; 
+    }
+  }
+  g->m = m0;
+}
+#endif
+
 void mulq_pbucket(PGeoBucket g,Z c)
 {
     int k;
@@ -2423,10 +2473,10 @@ again:
       goto again;
     }
 #if USE_GEOBUCKET
-    stat = (m&&!nd_gentrace)?nd_nf_pbucket(m,h,nd_ps,!Top,&nf)
-      :nd_nf(m,0,h,nd_ps,!Top,&nf);
+    stat = (m&&!nd_gentrace)?nd_nf_pbucket(m,h,nd_ps,!nd_top&&!Top,&nf)
+      :nd_nf(m,0,h,nd_ps,!nd_top&&!Top,&nf);
 #else
-    stat = nd_nf(m,0,h,nd_ps,!Top,&nf);
+    stat = nd_nf(m,0,h,nd_ps,!nd_top&&!Top,&nf);
 #endif
     if ( !stat ) {
       NEXT(l) = d; d = l;
@@ -2561,6 +2611,7 @@ int small_lcm(ND_pairs l)
   static DL lcm,mul,quo;
   static int nvar;
 
+  if ( nd_sba_largelcm ) return 0;
   if ( nvar < nd_nvar ) {
     nvar = nd_nvar; NEWDL(lcm,nvar); NEWDL(quo,nvar); NEWDL(mul,nvar);
   }
@@ -2617,7 +2668,7 @@ NODE conv_ilist_s(int demand,int trace,int **indp);
 
 NODE nd_sba_buch(int m,int ishomo,int **indp)
 {
-  int i,j,nh,sugar,stat;
+  int i,j,nh,sugar,stat,pos;
   NODE r,t,g;
   ND_pairs d;
   ND_pairs l;
@@ -2649,6 +2700,7 @@ init_eg(&eg_remove);
       syzlist[sig->pos] = insert_sig(syzlist[sig->pos],sig);
     }
   sugar = 0;
+  pos = 0;
   NEWDL(lcm,nd_nvar); NEWDL(quo,nd_nvar); NEWDL(mul,nd_nvar);
 init_eg(&eg_create);
 init_eg(&eg_merge);
@@ -2675,6 +2727,12 @@ again:
       if ( DP_Print ) fprintf(asir_out,"%d",sugar);
     }
     sig = l->sig;
+    if ( DP_Print && nd_sba_pot ) {
+      if ( sig->pos != pos ) {
+        fprintf(asir_out,"[%d]",sig->pos);
+        pos = sig->pos;
+      }
+    }
     stat = nd_sp(m,0,l,&h);
     if ( !stat ) {
       NEXT(l) = d; d = l;
@@ -2683,9 +2741,9 @@ again:
     }
 get_eg(&eg1);
 #if USE_GEOBUCKET
-    stat = m?nd_nf_pbucket_s(m,h,nd_ps,!Top,&nf):nd_nf_s(m,0,h,nd_ps,!Top,&nf);
+    stat = m?nd_nf_pbucket_s(m,h,nd_ps,!nd_top&&!Top,&nf):nd_nf_s(m,0,h,nd_ps,!nd_top&&!Top,&nf);
 #else
-    stat = nd_nf_s(m,0,h,nd_ps,!Top,&nf);
+    stat = nd_nf_s(m,0,h,nd_ps,!nd_top&&!Top,&nf);
 #endif
 get_eg(&eg2); 
     if ( !stat ) {
@@ -2758,7 +2816,7 @@ again:
       d = nd_reconstruct(0,d);
       goto again;
     }
-    stat = nd_nf(m,0,h,nd_ps,!Top,&nf);
+    stat = nd_nf(m,0,h,nd_ps,!nd_top&&!Top,&nf);
     if ( !stat ) {
       NEXT(l) = d; d = l;
       d = nd_reconstruct(0,d);
@@ -2933,9 +2991,9 @@ again:
       goto again;
     }
 #if USE_GEOBUCKET
-    stat = nd_nf_pbucket(m,h,nd_ps,!Top,&nf);
+    stat = nd_nf_pbucket(m,h,nd_ps,!nd_top&&!Top,&nf);
 #else
-    stat = nd_nf(m,0,h,nd_ps,!Top,&nf);
+    stat = nd_nf(m,0,h,nd_ps,!nd_top&&!Top,&nf);
 #endif
     if ( !stat ) {
       NEXT(l) = d; d = l;
@@ -2948,7 +3006,7 @@ again:
       } else
         nfq = 0;
       if ( !nfq ) {
-        if ( !nd_sp(0,1,l,&h) || !nd_nf(0,0,h,nd_ps_trace,!Top,&nfq) ) {
+        if ( !nd_sp(0,1,l,&h) || !nd_nf(0,0,h,nd_ps_trace,!nd_top&&!Top,&nfq) ) {
           NEXT(l) = d; d = l;
           d = nd_reconstruct(1,d);
           goto again;
@@ -3203,33 +3261,26 @@ ND_pairs nd_newpairs( NODE g, int t )
 
 int comp_sig(SIG s1,SIG s2)
 {
-#if 0
-  if ( s1->pos > s2->pos ) return 1;
-  else if ( s1->pos < s2->pos ) return -1;
-  else return (*cmpdl)(nd_nvar,s1->dl,s2->dl);
-#else
-  static DL m1,m2;
-  static int nvar;
-  int ret;
-
-  if ( nvar != nd_nvar ) {
-    nvar = nd_nvar; NEWDL(m1,nvar); NEWDL(m2,nvar);
+  if ( nd_sba_pot ) {
+    if ( s1->pos > s2->pos ) return 1;
+    else if ( s1->pos < s2->pos ) return -1;
+    else return (*cmpdl)(nd_nvar,s1->dl,s2->dl);
+  } else {
+    static DL m1,m2;
+    static int nvar;
+    int ret;
+  
+    if ( nvar != nd_nvar ) {
+      nvar = nd_nvar; NEWDL(m1,nvar); NEWDL(m2,nvar);
+    }
+    _adddl(nd_nvar,s1->dl,nd_sba_hm[s1->pos],m1);
+    _adddl(nd_nvar,s2->dl,nd_sba_hm[s2->pos],m2);
+    ret = (*cmpdl)(nd_nvar,m1,m2);
+    if ( ret != 0 ) return ret;
+    else if ( s1->pos > s2->pos ) return 1;
+    else if ( s1->pos < s2->pos ) return -1;
+    else return 0;
   }
-#if 0
-  _copydl(nd_nvar,nd_sba_hm[s1->pos],m1);
-  _copydl(nd_nvar,nd_sba_hm[s2->pos],m2);
-  _addtodl(nd_nvar,s1->dl,m1);
-  _addtodl(nd_nvar,s2->dl,m2);
-#else
-  _adddl(nd_nvar,s1->dl,nd_sba_hm[s1->pos],m1);
-  _adddl(nd_nvar,s2->dl,nd_sba_hm[s2->pos],m2);
-#endif
-  ret = (*cmpdl)(nd_nvar,m1,m2);
-  if ( ret != 0 ) return ret;
-  else if ( s1->pos > s2->pos ) return 1;
-  else if ( s1->pos < s2->pos ) return -1;
-  else return 0;
-#endif
 }
 
 int _create_spair_s(int i1,int i2,ND_pairs sp,SIG sig1,SIG sig2)
@@ -4325,7 +4376,7 @@ void nd_sba(LIST f,LIST v,int m,int homo,int retdp,int
         ndv_homogenize((NDV)BDY(t),obpe,oadv,oepos,ompos);
   }
 
-  ndv_setup(m,0,fd0,0,0,1);
+  ndv_setup(m,0,fd0,nd_sba_dontsort,0,1);
   x = f4 ? nd_sba_f4(m,&perm) : nd_sba_buch(m,ishomo || homo,&perm);
   if ( !x ) {
     *rp = 0; return;
@@ -7999,6 +8050,7 @@ NODE nd_f4(int m,int checkonly,int **indp)
         if ( nflist ) nd_last_nonzero = f4red;
         for ( r = nflist; r; r = NEXT(r) ) {
             nf = (NDV)BDY(r);
+            if ( nd_f4_td ) SG(nf) = nd_tdeg(nf);
             ndv_removecont(m,nf);
             if ( !m && nd_nalg ) {
                 ND nf1;
@@ -9568,39 +9620,40 @@ NODE conv_ilist_s(int demand,int trace,int **indp)
 
 void parse_nd_option(NODE opt)
 {
-    NODE t,p,u;
+  NODE t,p,u;
   int i,s,n;
-    char *key;
-    Obj value;
+  char *key;
+  Obj value;
 
-    nd_gentrace = 0; nd_gensyz = 0; nd_nora = 0; nd_gbblock = 0;
+  nd_gentrace = 0; nd_gensyz = 0; nd_nora = 0; nd_gbblock = 0;
   nd_newelim = 0; nd_intersect = 0; nd_nzlist = 0;
   nd_splist = 0; nd_check_splist = 0;
-    nd_sugarweight = 0;
-    nd_f4red =0;
-    nd_rank0 = 0;
-    for ( t = opt; t; t = NEXT(t) ) {
-        p = BDY((LIST)BDY(t));
-        key = BDY((STRING)BDY(p));
-        value = (Obj)BDY(NEXT(p));
-        if ( !strcmp(key,"gentrace") )
-            nd_gentrace = value?1:0;
-        else if ( !strcmp(key,"gensyz") )
-            nd_gensyz = value?1:0;
-        else if ( !strcmp(key,"nora") )
-            nd_nora = value?1:0;
-        else if ( !strcmp(key,"gbblock") ) {
-            if ( value && OID(value) == O_LIST ) {
+  nd_sugarweight = 0; nd_f4red =0; nd_rank0 = 0;
+  nd_f4_td = 0; nd_sba_f4step = 2; nd_sba_pot = 0; nd_sba_largelcm = 0;
+  nd_sba_dontsort = 0; nd_top = 0;
+
+  for ( t = opt; t; t = NEXT(t) ) {
+    p = BDY((LIST)BDY(t));
+    key = BDY((STRING)BDY(p));
+    value = (Obj)BDY(NEXT(p));
+    if ( !strcmp(key,"gentrace") )
+      nd_gentrace = value?1:0;
+    else if ( !strcmp(key,"gensyz") )
+      nd_gensyz = value?1:0;
+    else if ( !strcmp(key,"nora") )
+      nd_nora = value?1:0;
+    else if ( !strcmp(key,"gbblock") ) {
+      if ( value && OID(value) == O_LIST ) {
         u = BDY((LIST)value);
-              nd_gbblock = MALLOC((2*length(u)+1)*sizeof(int));
+        nd_gbblock = MALLOC((2*length(u)+1)*sizeof(int));
         for ( i = 0; u; u = NEXT(u) ) {
           p = BDY((LIST)BDY(u));
           s = nd_gbblock[i++] = ZTOS((Q)BDY(p));
           nd_gbblock[i++] = s+ZTOS((Q)BDY(NEXT(p)))-1;
         }
         nd_gbblock[i] = -1;
-            } else
-              nd_gbblock = 0;
+      } else
+        nd_gbblock = 0;
     } else if ( !strcmp(key,"newelim") )
             nd_newelim = value?1:0;
     else if ( !strcmp(key,"intersect") )
@@ -9610,27 +9663,39 @@ void parse_nd_option(NODE opt)
     else if ( !strcmp(key,"lf") )
             nd_lf = value?1:0;
     else if ( !strcmp(key,"trace") ) {
-           if ( value ) {
-               u = BDY((LIST)value);
-           nd_nzlist = BDY((LIST)ARG2(u));
-           nd_bpe = ZTOS((Q)ARG3(u));
-           }
+      if ( value ) {
+        u = BDY((LIST)value);
+        nd_nzlist = BDY((LIST)ARG2(u));
+        nd_bpe = ZTOS((Q)ARG3(u));
+      }
     } else if ( !strcmp(key,"f4red") ) {
-       nd_f4red = ZTOS((Q)value);
+      nd_f4red = ZTOS((Q)value);
     } else if ( !strcmp(key,"rank0") ) {
-            nd_rank0 = value?1:0;
+      nd_rank0 = value?1:0;
     } else if ( !strcmp(key,"splist") ) {
-            nd_splist = value?1:0;
+      nd_splist = value?1:0;
     } else if ( !strcmp(key,"check_splist") ) {
       nd_check_splist = BDY((LIST)value);
     } else if ( !strcmp(key,"sugarweight") ) {
       u = BDY((LIST)value);
-            n = length(u);
-            nd_sugarweight = MALLOC(n*sizeof(int));
+      n = length(u);
+      nd_sugarweight = MALLOC(n*sizeof(int));
       for ( i = 0; i < n; i++, u = NEXT(u) ) 
-                nd_sugarweight[i] = ZTOS((Q)BDY(u));
+        nd_sugarweight[i] = ZTOS((Q)BDY(u));
+    } else if ( !strcmp(key,"f4_td") ) {
+      nd_f4_td = value?1:0;
+    } else if ( !strcmp(key,"sba_f4step") ) {
+      nd_sba_f4step = value?ZTOS((Q)value):0;
+    } else if ( !strcmp(key,"sba_pot") ) {
+      nd_sba_pot = value?1:0;
+    } else if ( !strcmp(key,"sba_largelcm") ) {
+      nd_sba_largelcm = value?1:0;
+    } else if ( !strcmp(key,"sba_dontsort") ) {
+      nd_sba_dontsort = value?1:0;
+    } else if ( !strcmp(key,"top") ) {
+      nd_top = value?1:0;
     }
-    }
+  }
 }
 
 ND mdptond(DP d);
@@ -10910,7 +10975,7 @@ NODE nd_sba_f4(int m,int **indp)
   while ( d ) {
     for ( t = d, ms = SG(d); t; t = NEXT(t) )
       if ( SG(t) < ms ) ms = SG(t);
-    if ( ms == psugar && f4step >= 2 ) {
+    if ( ms == psugar && f4step >= nd_sba_f4step ) {
 again:
       l = d; d = d->next;
       if ( small_lcm(l) ) {
@@ -10926,9 +10991,9 @@ again:
       }
   get_eg(&eg1);
   #if USE_GEOBUCKET
-      stat = m?nd_nf_pbucket_s(m,h,nd_ps,!Top,&nf):nd_nf_s(m,0,h,nd_ps,!Top,&nf);
+      stat = m?nd_nf_pbucket_s(m,h,nd_ps,!nd_top&&!Top,&nf):nd_nf_s(m,0,h,nd_ps,!nd_top&&!Top,&nf);
   #else
-      stat = nd_nf_s(m,0,h,nd_ps,!Top,&nf);
+      stat = nd_nf_s(m,0,h,nd_ps,!nd_top&&!Top,&nf);
   #endif
   get_eg(&eg2); 
       if ( !stat ) {
@@ -10977,8 +11042,9 @@ again2:
       if ( bucket->m < 0 ) continue;
       col = nd_symbolic_preproc_s(bucket,0,&s0vect,&rp0);
       if ( !col ) {
-        for ( t = l; NEXT(t); t = NEXT(t) );
-          NEXT(t) = d; d = l;
+        for ( t = l; NEXT(t); t = NEXT(t) )
+          ;
+        NEXT(t) = d; d = l;
         d = nd_reconstruct(0,d);
         goto again2;
       }
@@ -10987,6 +11053,7 @@ again2:
       /* adding new bases */
       for ( r = nflist; r; r = NEXT(r) ) {
         nfv = (NDV)BDY(r);
+        if ( nd_f4_td ) SG(nfv) = nd_tdeg(nfv);
         ndv_removecont(m,nfv);
         nh = ndv_newps(m,nfv,0);
         d = update_pairs_s(d,nh,syzlist);