===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2018/engine/nd.c,v
retrieving revision 1.33
retrieving revision 1.36
diff -u -p -r1.33 -r1.36
--- OpenXM_contrib2/asir2018/engine/nd.c	2020/07/09 02:33:38	1.33
+++ OpenXM_contrib2/asir2018/engine/nd.c	2020/09/27 04:35:04	1.36
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2018/engine/nd.c,v 1.32 2020/07/07 08:08:26 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2018/engine/nd.c,v 1.35 2020/08/26 06:40:36 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;
 
@@ -1223,6 +1223,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 +1239,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];
@@ -2477,12 +2481,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);
@@ -2713,7 +2719,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);
@@ -3307,6 +3313,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;
@@ -4266,7 +4273,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);
@@ -4337,7 +4344,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);
@@ -10875,7 +10882,7 @@ int nd_symbolic_preproc_s(PGeoBucket bucket,int trace,
 
 NODE nd_sba_f4(int m,int **indp)
 {
-  int i,nh,stat,index,f4red;
+  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;
@@ -10899,10 +10906,11 @@ NODE nd_sba_f4(int m,int **indp)
   nd_nbase = nd_psn;
   f4red = 1;
   psugar = 0;
+  f4step = 0;
   while ( d ) {
     for ( t = d, ms = SG(d); t; t = NEXT(t) )
       if ( SG(t) < ms ) ms = SG(t);
-    if ( ms == psugar ) {
+    if ( ms == psugar && f4step >= 2 ) {
 again:
       l = d; d = d->next;
       if ( small_lcm(l) ) {
@@ -10952,8 +10960,9 @@ again:
         FREENDP(l);
       }
     } else {
+      if ( ms != psugar ) f4step = 1;
+      else f4step++;
 again2:
-      if ( DP_Print ) { printf("\n"); fflush(stdout); }
       psugar = ms;
       l = nd_minsugarp_s(d,&d);
       sugar = nd_sugarweight?d->sugar2:SG(d);
@@ -10973,7 +10982,7 @@ again2:
         d = nd_reconstruct(0,d);
         goto again2;
       }
-      if ( DP_Print ) fprintf(asir_out,"sugar=%d,",psugar);
+      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) ) {
@@ -10988,13 +10997,13 @@ again2:
             d = remove_spair_s(d,(SIG)BDY(r));
       d = remove_large_lcm(d);
       if ( DP_Print ) { 
-        fprintf(asir_out,"f4red=%d,gblen=%d\n",f4red,nd_psn); fflush(asir_out);
+        fprintf(asir_out,"f4red=%d,gblen=%d",f4red,nd_psn); fflush(asir_out);
       }
       f4red++;
     }
   }
   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;