===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2018/engine/nd.c,v
retrieving revision 1.32
retrieving revision 1.38
diff -u -p -r1.32 -r1.38
--- OpenXM_contrib2/asir2018/engine/nd.c	2020/07/07 08:08:26	1.32
+++ OpenXM_contrib2/asir2018/engine/nd.c	2020/10/26 02:41:05	1.38
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2018/engine/nd.c,v 1.31 2020/07/07 08:04:30 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2018/engine/nd.c,v 1.37 2020/10/06 06:31:19 noro Exp $ */
 
 #include "nd.h"
 
@@ -18,7 +18,7 @@ NM _nm_free_list;
 ND _nd_free_list;
 ND_pairs _ndp_free_list;
 NODE nd_hcf;
-int Nsyz;
+int Nsyz,Nsamesig;
 
 Obj nd_top_weight;
 
@@ -66,6 +66,7 @@ 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;
 static int *nd_gbblock;
 static NODE nd_nzlist,nd_check_splist;
 static int nd_splist;
@@ -1223,6 +1224,8 @@ void print_sig(SIG s)
   fprintf(asir_out,">>*e%d",s->pos);
 }
 
+// assuming increasing order wrt signature 
+
 INLINE int ndl_find_reducer_s(UINT *dg,SIG sig)
 {
   RHist r;
@@ -1237,11 +1240,13 @@ INLINE int ndl_find_reducer_s(UINT *dg,SIG sig)
     tmp = (UINT *)MALLOC(wpd*sizeof(UINT));
   }
   d = ndl_hash_value(dg);
+#if 1
   for ( r = nd_red[d], k = 0; r; r = NEXT(r), k++ ) {
     if ( ndl_equal(dg,DL(r)) ) {
       return r->index;
     }
   }
+#endif
   singular = 0;
   for ( i = 0; i < nd_psn; i++ ) {
     r = nd_psh[i];
@@ -1252,7 +1257,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;
@@ -2477,12 +2482,14 @@ get_eg(&eg2); add_eg(&eg_update,&eg1,&eg2);
      }
      if ( DP_Print ) { printf("."); fflush(stdout); }
        FREENDP(l);
-   }
- }
- conv_ilist(nd_demand,0,g,indp);
-    if ( !checkonly && DP_Print ) { printf("nd_gb done. Number of nd_add=%d\n",Nnd_add); fflush(stdout); }
-print_eg("update",&eg_update);
-    return g;
+     }
+  }
+  conv_ilist(nd_demand,0,g,indp);
+  if ( !checkonly && DP_Print ) { printf("nd_gb done. Number of nd_add=%d\n",Nnd_add); fflush(stdout); }
+ 
+  if ( DP_Print )
+    print_eg("update",&eg_update);
+  return g;
 }
 
 ND_pairs update_pairs_s(ND_pairs d,int t,NODE *syz);
@@ -2555,6 +2562,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);
   }
@@ -2713,7 +2721,7 @@ get_eg(&eg2); add_eg(&eg_remove,&eg1,&eg2);
  }
  g = conv_ilist_s(nd_demand,0,indp);
  if ( DP_Print ) { 
-   printf("\nnd_sba done. nd_add=%d,Nsyz=%d,Nredundant=%d\n",Nnd_add,Nsyz,Nredundant);
+   printf("\nnd_sba done. nd_add=%d,Nsyz=%d,Nsamesig=%d,Nredundant=%d\n",Nnd_add,Nsyz,Nsamesig,Nredundant);
    fflush(stdout); 
    print_eg("create",&eg_create);
    print_eg("merge",&eg_merge);
@@ -3197,33 +3205,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)
@@ -3307,6 +3308,7 @@ ND_pairs merge_pairs_s(ND_pairs p1,ND_pairs p2)
       r->next = q2; r = q2; q2 = q2->next;
     } else {
       ret = DL_COMPARE(q1->lcm,q2->lcm);
+      Nsamesig++;
       if ( ret < 0 ) {
         r->next = q1; r = q1; q1 = q1->next;
         q2 = q2->next;
@@ -3691,14 +3693,8 @@ ND_pairs nd_minsugarp_s( ND_pairs d, ND_pairs *prest )
   int msugar;
   ND_pairs t,last;
 
-#if 1
   for ( msugar = SG(d), t = d; t; t = NEXT(t) )
     if ( SG(t) == msugar ) last = t;
-#else
-  msugar = (d->sig->dl->td)+nd_sba_hm[d->sig->pos]->td;
-  for ( t = d; t; t = NEXT(t) )
-    if ( ((t->sig->dl->td)+nd_sba_hm[t->sig->pos]->td) == msugar ) last = t;
-#endif
   *prest = last->next;
   last->next = 0;
   return d;
@@ -4272,7 +4268,7 @@ void nd_sba(LIST f,LIST v,int m,int homo,int retdp,int
   nd_module = 0;
   nd_demand = 0;
   parse_nd_option(current_option);
-
+  Nsamesig = 0;
   if ( DP_Multiple )
     nd_scale = ((double)DP_Multiple)/(double)(Denominator?Denominator:1);
   get_vars((Obj)f,&fv); pltovl(v,&vv); vlminus(fv,vv,&nd_vc);
@@ -4343,7 +4339,7 @@ void nd_sba(LIST f,LIST v,int m,int homo,int retdp,int
   for ( r0 = 0, t = x; t; t = NEXT(t) ) {
     NEXTNODE(r0,r); 
     if ( retdp ) BDY(r) = ndvtodp(m,BDY(t));
-    BDY(r) = ndvtop(m,CO,vv,BDY(t));
+    else BDY(r) = ndvtop(m,CO,vv,BDY(t));
   }
   if ( r0 ) NEXT(r) = 0;
   MKLIST(*rp,r0);
@@ -4864,7 +4860,7 @@ DL ndltodl(int n,UINT *ndl)
     int i,j,l,s,ord_l;
     struct order_pair *op;
 
-    NEWDL(dl,n);
+    NEWDL_NOINIT(dl,n);
     dl->td = TD(ndl);
     d = dl->d;
     if ( nd_blockmask ) {
@@ -7998,6 +7994,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;
@@ -9567,39 +9564,38 @@ 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;
+  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") )
@@ -9609,27 +9605,35 @@ 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;
     }
-    }
+  }
 }
 
 ND mdptond(DP d);
@@ -10881,28 +10885,20 @@ int nd_symbolic_preproc_s(PGeoBucket bucket,int trace,
 
 NODE nd_sba_f4(int m,int **indp)
 {
-  int i,nh,stat,index,f4red;
-  NODE r,g,tn0,tn,node;
-  ND_pairs d,l,t,ll0,ll,lh;
-  LIST l0,l1;
-  ND spol,red;
-  NDV nf,redv;
-  NM s0,s;
-  NODE rp0,srp0,nflist;
-  int nsp,nred,col,rank,len,k,j,a,i1s,i2s;
+  int i,nh,stat,index,f4red,f4step;
+  int col,rank,len,k,j,a,sugar,nbase,psugar,ms;
+  NODE r,g,rp0,nflist;
+  ND_pairs d,l,t;
+  ND h,nf;
+  NDV nfv;
+  union oNDC hc;
+  UINT *s0vect;
   UINT c;
-  UINT **spmat;
-  UINT *s0vect,*svect,*p,*v;
-  int *colstat;
-  IndArray *imat;
-  int *rhead;
-  int spcol,sprow;
-  int sugar,sugarh;
-  int nbase;
   PGeoBucket bucket;
-  struct oEGT eg0,eg1,eg_f4;
-  Z i1,i2,sugarq;
   NODE *syzlist;
+  SIG sig;
+  struct oEGT eg0,eg1,eg_f4;
+  struct oEGT eg2,eg_update,eg_remove,eg_large,eg_nf,eg_nfzero;
 
   Nf4_red=0;
   d = 0;
@@ -10912,76 +10908,107 @@ NODE nd_sba_f4(int m,int **indp)
   }
   nd_nbase = nd_psn;
   f4red = 1;
+  psugar = 0;
+  f4step = 0;
   while ( d ) {
-    l = nd_minsugarp_s(d,&d);
-    if ( !l ) continue;
-    sugar = nd_sugarweight?l->sugar2:SG(l);
-    if ( MaxDeg > 0 && sugar > MaxDeg ) break;
-    bucket = create_pbucket();
-    stat = nd_sp_f4(m,0,l,bucket);
-    if ( !stat ) {
-      for ( t = l; NEXT(t); t = NEXT(t) );
-      NEXT(t) = d; d = l;
-      d = nd_reconstruct(0,d);
-      continue;
-    }
-    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;
-      d = nd_reconstruct(0,d);
-      continue;
-    }
-    if ( DP_Print ) fprintf(asir_out,"sugar=%d,",sugar);
-    l = remove_large_lcm(l);
-    nflist = nd_f4_red_s(m,l,0,s0vect,col,rp0,syzlist);
-    /* adding new bases */
-    for ( r = nflist; r; r = NEXT(r) ) {
-#if 0
-      ND tmp,tmpred;
-      SIG sig;
-
-      nf = (NDV)BDY(r);
-      sig = nf->sig;
-      tmp = ndvtond(m,nf);
-      stat = nd_nf_s(m,0,tmp,nd_ps,!Top,&tmpred);
-#if 0
-      if ( stat < 0 ) {
-        // top reducible
-        if ( DP_Print ) { fprintf(asir_out,"S"); fflush(asir_out); }
-      } else if ( tmpred ) {
-#else
-      if ( tmpred ) {
-#endif
-        nf = ndtondv(m,tmpred);
-        ndv_removecont(m,nf);
-        nh = ndv_newps(m,nf,0);
+    for ( t = d, ms = SG(d); t; t = NEXT(t) )
+      if ( SG(t) < ms ) ms = SG(t);
+    if ( ms == psugar && f4step >= nd_sba_f4step ) {
+again:
+      l = d; d = d->next;
+      if ( small_lcm(l) ) {
+        if ( DP_Print ) fprintf(asir_out,"M");
+        continue;
+      }
+      sig = l->sig;
+      stat = nd_sp(m,0,l,&h);
+      if ( !stat ) {
+        NEXT(l) = d; d = l;
+        d = nd_reconstruct(0,d);
+        goto 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);
+  #else
+      stat = nd_nf_s(m,0,h,nd_ps,!Top,&nf);
+  #endif
+  get_eg(&eg2); 
+      if ( !stat ) {
+        NEXT(l) = d; d = l;
+        d = nd_reconstruct(0,d);
+        goto again;
+      } else if ( stat == -1 ) {
+        if ( DP_Print ) { printf("S"); fflush(stdout); }
+        FREENDP(l);
+      } else if ( nf ) {
+        if ( DP_Print ) { printf("+"); fflush(stdout); }
+        add_eg(&eg_nf,&eg1,&eg2);
+        hc = HCU(nf);
+        nd_removecont(m,nf);
+        nfv = ndtondv(m,nf); nd_free(nf);
+        nh = ndv_newps(m,nfv,0);
+  
         d = update_pairs_s(d,nh,syzlist);
         nd_sba_pos[sig->pos] = append_one(nd_sba_pos[sig->pos],nh);
+        FREENDP(l);
       } else {
+        add_eg(&eg_nfzero,&eg1,&eg2);
+       // syzygy
+  get_eg(&eg1);
+        d = remove_spair_s(d,sig);
+  get_eg(&eg2); add_eg(&eg_remove,&eg1,&eg2);
         syzlist[sig->pos] = insert_sig(syzlist[sig->pos],sig);
-      } 
-#else
-      nf = (NDV)BDY(r);
-      ndv_removecont(m,nf);
-      nh = ndv_newps(m,nf,0);
-      d = update_pairs_s(d,nh,syzlist);
-      nd_sba_pos[nf->sig->pos] = append_one(nd_sba_pos[nf->sig->pos],nh);
-#endif
+        if ( DP_Print ) { printf("."); fflush(stdout); }
+        FREENDP(l);
+      }
+    } else {
+      if ( ms != psugar ) f4step = 1;
+      else f4step++;
+again2:
+      psugar = ms;
+      l = nd_minsugarp_s(d,&d);
+      sugar = nd_sugarweight?d->sugar2:SG(d);
+      bucket = create_pbucket();
+      stat = nd_sp_f4(m,0,l,bucket);
+      if ( !stat ) {
+        for ( t = l; NEXT(t); t = NEXT(t) );
+        NEXT(t) = d; d = l;
+        d = nd_reconstruct(0,d);
+        goto 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;
+        d = nd_reconstruct(0,d);
+        goto again2;
+      }
+      if ( DP_Print ) fprintf(asir_out,"\nsugar=%d,",psugar);
+      nflist = nd_f4_red_s(m,l,0,s0vect,col,rp0,syzlist);
+      /* 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);
+        nd_sba_pos[nfv->sig->pos] = append_one(nd_sba_pos[nfv->sig->pos],nh);
+      }
+      for ( i = 0; i < nd_nbase; i++ )
+        for ( r = syzlist[i]; r; r = NEXT(r) )
+            d = remove_spair_s(d,(SIG)BDY(r));
+      d = remove_large_lcm(d);
+      if ( DP_Print ) { 
+        fprintf(asir_out,"f4red=%d,gblen=%d",f4red,nd_psn); fflush(asir_out);
+      }
+      f4red++;
     }
-    for ( i = 0; i < nd_nbase; i++ )
-      for ( r = syzlist[i]; r; r = NEXT(r) )
-        d = remove_spair_s(d,(SIG)BDY(r));
-    if ( DP_Print ) { 
-      fprintf(asir_out,"f4red=%d,gblen=%d\n",f4red,nd_psn); fflush(asir_out);
-    }
-    f4red++;
-    if ( nd_f4red && f4red > nd_f4red ) break;
-    if ( nd_rank0 && !nflist ) break;
   }
   if ( DP_Print ) {
-    fprintf(asir_out,"number of red=%d,",Nf4_red);
+    fprintf(asir_out,"\nnumber of red=%d,",Nf4_red);
   }
   g = conv_ilist_s(nd_demand,0,indp);
   return g;