===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v
retrieving revision 1.223
retrieving revision 1.230
diff -u -p -r1.223 -r1.230
--- OpenXM_contrib2/asir2000/engine/nd.c	2015/08/14 13:51:54	1.223
+++ OpenXM_contrib2/asir2000/engine/nd.c	2016/12/02 02:12:00	1.230
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.222 2015/08/08 14:19:41 fujimoto Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.229 2016/11/17 05:33:20 noro Exp $ */
 
 #include "nd.h"
 
@@ -56,6 +56,8 @@ static int nd_found,nd_create,nd_notfirst;
 static int nmv_adv;
 static int nd_demand;
 static int nd_module,nd_ispot,nd_mpos,nd_pot_nelim;
+static int nd_module_rank,nd_poly_weight_len;
+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;
@@ -91,7 +93,7 @@ ND ndgztond(ND p);
 void Pdp_set_weight(NODE,VECT *);
 void Pox_cmo_rpc(NODE,Obj *);
 
-extern int Denominator,DP_Multiple;
+extern int Denominator,DP_Multiple,MaxDeg;
 
 #define BLEN (8*sizeof(unsigned long))
 
@@ -171,6 +173,8 @@ INLINE int nd_length(ND p)
     }
 }
 
+extern int dp_negative_weight;
+
 INLINE int ndl_reducible(UINT *d1,UINT *d2)
 {
     UINT u1,u2;
@@ -178,7 +182,7 @@ INLINE int ndl_reducible(UINT *d1,UINT *d2)
 
     if ( nd_module && (MPOS(d1) != MPOS(d2)) ) return 0;
 
-    if ( TD(d1) < TD(d2) ) return 0;
+    if ( !dp_negative_weight && TD(d1) < TD(d2) ) return 0;
 #if USE_UNROLL
     switch ( nd_bpe ) {
         case 3:
@@ -647,10 +651,28 @@ int ndl_ww_lex_compare(UINT *d1,UINT *d2)
     return ndl_lex_compare(d1,d2);
 }
 
+int ndl_module_weight_compare(UINT *d1,UINT *d2)
+{
+  int s,j;
+
+  if ( nd_nvar != nd_poly_weight_len )
+    error("invalid module weight : the length of polynomial weight != the number of variables");
+  s = 0;
+  for ( j = 0; j < nd_nvar; j++ )
+     s += (GET_EXP(d1,j)-GET_EXP(d2,j))*nd_poly_weight[j];
+  if ( MPOS(d1) >= 1 && MPOS(d2) >= 1 ) {
+    s += nd_module_weight[MPOS(d1)-1]-nd_module_weight[MPOS(d2)-1];
+  }
+  if ( s > 0 ) return 1;
+  else if ( s < 0 ) return -1;
+  else return 0;
+}
+
 int ndl_module_grlex_compare(UINT *d1,UINT *d2)
 {
     int i,c;
 
+    if ( nd_module_rank && (c = ndl_module_weight_compare(d1,d2)) ) return c;
     if ( nd_ispot ) {
 		if ( nd_pot_nelim && MPOS(d1)>=nd_pot_nelim+1 && MPOS(d2) >= nd_pot_nelim+1 ) {
             if ( TD(d1) > TD(d2) ) return 1;
@@ -677,6 +699,7 @@ int ndl_module_glex_compare(UINT *d1,UINT *d2)
 {
     int i,c;
 
+    if ( nd_module_rank && (c = ndl_module_weight_compare(d1,d2)) ) return c;
     if ( nd_ispot ) {
         if ( MPOS(d1) < MPOS(d2) ) return 1;
         else if ( MPOS(d1) > MPOS(d2) ) return -1;
@@ -695,6 +718,7 @@ int ndl_module_lex_compare(UINT *d1,UINT *d2)
 {
     int i,c;
 
+    if ( nd_module_rank && (c = ndl_module_weight_compare(d1,d2)) ) return c;
     if ( nd_ispot ) {
         if ( MPOS(d1) < MPOS(d2) ) return 1;
         else if ( MPOS(d1) > MPOS(d2) ) return -1;
@@ -711,6 +735,7 @@ int ndl_module_block_compare(UINT *d1,UINT *d2)
 {
     int i,c;
 
+    if ( nd_module_rank && (c = ndl_module_weight_compare(d1,d2)) ) return c;
     if ( nd_ispot ) {
         if ( MPOS(d1) < MPOS(d2) ) return 1;
         else if ( MPOS(d1) > MPOS(d2) ) return -1;
@@ -727,6 +752,7 @@ int ndl_module_matrix_compare(UINT *d1,UINT *d2)
 {
     int i,c;
 
+    if ( nd_module_rank && (c = ndl_module_weight_compare(d1,d2)) ) return c;
     if ( nd_ispot ) {
         if ( MPOS(d1) < MPOS(d2) ) return 1;
         else if ( MPOS(d1) > MPOS(d2) ) return -1;
@@ -743,6 +769,7 @@ int ndl_module_composite_compare(UINT *d1,UINT *d2)
 {
     int i,c;
 
+    if ( nd_module_rank && (c = ndl_module_weight_compare(d1,d2)) ) return c;
     if ( nd_ispot ) {
         if ( MPOS(d1) > MPOS(d2) ) return 1;
         else if ( MPOS(d1) < MPOS(d2) ) return -1;
@@ -1980,6 +2007,7 @@ NODE nd_gb(int m,int ishomo,int checkonly,int gensyz,i
     while ( d ) {
 again:
         l = nd_minp(d,&d);
+        if ( MaxDeg > 0 && SG(l) > MaxDeg ) break;
         if ( SG(l) != sugar ) {
             if ( ishomo ) {
                 diag_count = 0;
@@ -2238,6 +2266,7 @@ NODE nd_gb_trace(int m,int ishomo,int **indp)
     while ( d ) {
 again:
         l = nd_minp(d,&d);
+        if ( MaxDeg > 0 && SG(l) > MaxDeg ) break;
         if ( SG(l) != sugar ) {
 #if 1
             if ( ishomo ) {
@@ -2335,9 +2364,11 @@ again:
         FREENDP(l);
     }
     if ( nd_nalg ) {
-        print_eg("monic",&eg_monic);
-        print_eg("invdalg",&eg_invdalg);
-        print_eg("le",&eg_le);
+        if ( DP_Print ) {
+          print_eg("monic",&eg_monic);
+          print_eg("invdalg",&eg_invdalg);
+          print_eg("le",&eg_le);
+        }
     }
 	conv_ilist(nd_demand,1,g,indp);
     if ( DP_Print ) { printf("nd_gb_trace done.\n"); fflush(stdout); }
@@ -3023,6 +3054,8 @@ void nd_gr(LIST f,LIST v,int m,int homo,int retdp,int 
     ndv_alloc = 0;
 #endif
     get_vars((Obj)f,&fv); pltovl(v,&vv); vlminus(fv,vv,&nd_vc);
+    if ( m && nd_vc )
+       error("nd_{gr,f4} : computation over Fp(X) is unsupported. Use dp_gr_mod_main().");
     for ( nvar = 0, tv = vv; tv; tv = NEXT(tv), nvar++ );
     switch ( ord->id ) {
         case 1:
@@ -3537,6 +3570,7 @@ void nd_gr_trace(LIST f,LIST v,int trace,int homo,int 
         for ( t = fd0; t; t = NEXT(t) )
             ndv_homogenize((NDV)BDY(t),obpe,oadv,oepos,ompos);
     }
+    if ( MaxDeg > 0 ) nocheck = 1;
     while ( 1 ) {
 		tl1 = tl2 = tl3 = tl4 = 0;
         if ( Demand )
@@ -5249,7 +5283,16 @@ NODE ndv_reducebase(NODE x,int *perm)
 
 void nd_init_ord(struct order_spec *ord)
 {
-    nd_module = (ord->id >= 256);
+  nd_module = (ord->id >= 256);
+  if ( nd_module ) {
+    nd_dcomp = -1;
+    nd_ispot = ord->ispot;
+    nd_pot_nelim = ord->pot_nelim;
+    nd_poly_weight_len = ord->nv;
+    nd_poly_weight = ord->top_weight;
+    nd_module_rank = ord->module_rank;
+    nd_module_weight = ord->module_top_weight;
+  }
 	nd_matrix = 0;
 	nd_matrix_len = 0;
     switch ( ord->id ) {
@@ -5305,9 +5348,6 @@ void nd_init_ord(struct order_spec *ord)
 
         /* module order */
         case 256:
-            nd_ispot = ord->ispot;
-            nd_pot_nelim = ord->pot_nelim;
-            nd_dcomp = -1;
             switch ( ord->ord.simple ) {
                 case 0:
                     nd_isrlex = 1;
@@ -5327,17 +5367,11 @@ void nd_init_ord(struct order_spec *ord)
             break;
         case 257:
             /* block order */
-            nd_ispot = ord->ispot;
-            nd_pot_nelim = ord->pot_nelim;
-            nd_dcomp = -1;
             nd_isrlex = 0;
             ndl_compare_function = ndl_module_block_compare;
             break;
         case 258:
             /* matrix order */
-            nd_ispot = ord->ispot;
-            nd_pot_nelim = ord->pot_nelim;
-            nd_dcomp = -1;
             nd_isrlex = 0;
             nd_matrix_len = ord->ord.matrix.row;
             nd_matrix = ord->ord.matrix.matrix;
@@ -5345,9 +5379,6 @@ void nd_init_ord(struct order_spec *ord)
             break;
         case 259:
             /* composite order */
-            nd_ispot = ord->ispot;
-            nd_pot_nelim = ord->pot_nelim;
-            nd_dcomp = -1;
             nd_isrlex = 0;
             nd_worb_len = ord->ord.composite.length;
             nd_worb = ord->ord.composite.w_or_b;
@@ -6179,12 +6210,14 @@ NODE nd_f4(int m,int **indp)
         get_eg(&eg0);
         l = nd_minsugarp(d,&d);
         sugar = SG(l);
+        if ( MaxDeg > 0 && sugar > MaxDeg ) break;
         if ( nd_nzlist ) {
             for ( tn = nd_nzlist; tn; tn = NEXT(tn) ) {
                 node = BDY((LIST)BDY(tn));
 			    if ( QTOS((Q)ARG0(node)) == sugar ) break;
             }
 			if ( tn ) {
+                nd_nzlist = NEXT(nd_nzlist);
 				for ( t = l, ll0 = 0; t; t = NEXT(t) ) {
                 	for ( tn = BDY((LIST)ARG1(node)); tn; tn = NEXT(tn) ) {
 				  	i1s = QTOS((Q)ARG0(BDY((LIST)BDY(tn))));
@@ -6291,6 +6324,7 @@ NODE nd_f4_trace(int m,int **indp)
         get_eg(&eg0);
         l = nd_minsugarp(d,&d);
         sugar = SG(l);
+        if ( MaxDeg > 0 && sugar > MaxDeg ) break;
         bucket = create_pbucket();
         stat = nd_sp_f4(m,0,l,bucket);
         if ( !stat ) {
@@ -6600,7 +6634,9 @@ init_eg(&eg_search);
 		}
 	}
 	mat->row = i;
-    fprintf(asir_out,"%dx%d,",mat->row,mat->col); fflush(asir_out);
+    if ( DP_Print ) {
+      fprintf(asir_out,"%dx%d,",mat->row,mat->col); fflush(asir_out);
+    }
 	size = ((col+BLEN-1)/BLEN)*sizeof(unsigned long);
 	v = CALLOC((col+BLEN-1)/BLEN,sizeof(unsigned long));
     for ( rp = rp0, i = 0; rp; rp = NEXT(rp), i++ ) {
@@ -6654,7 +6690,9 @@ init_eg(&eg_search);
     for ( i = 0; i < col; i++ ) rhead[i] = 0;
 
     /* construction of index arrays */
-	fprintf(stderr,"%dx%d,",nsp+nred,col);
+    if ( DP_Print ) {
+	  fprintf(stderr,"%dx%d,",nsp+nred,col);
+    }
     rvect = (NM_ind_pair *)ALLOCA(nred*sizeof(NM_ind_pair));
     s0hash = (int *)ALLOCA(col*sizeof(int));
     for ( i = 0, s = s0vect; i < col; i++, s += nd_wpd )
@@ -6668,7 +6706,7 @@ init_eg(&eg_search);
         r0 = nd_f4_red_main(m,sp0,nsp,s0vect,col,rvect,rhead,imat,nred,nz);
     else
         r0 = nd_f4_red_gz_main(sp0,nsp,trace,s0vect,col,rvect,rhead,imat,nred);
-print_eg("search",&eg_search);
+    if ( DP_Print ) print_eg("search",&eg_search);
     return r0;
 }