===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/nd.c,v
retrieving revision 1.227
retrieving revision 1.230
diff -u -p -r1.227 -r1.230
--- OpenXM_contrib2/asir2000/engine/nd.c	2016/07/11 08:00:30	1.227
+++ 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.226 2016/04/05 04:21:18 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2000/engine/nd.c,v 1.229 2016/11/17 05:33:20 noro Exp $ */
 
 #include "nd.h"
 
@@ -93,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))
 
@@ -173,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;
@@ -180,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:
@@ -2005,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;
@@ -2263,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 ) {
@@ -3050,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:
@@ -3564,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 )
@@ -6203,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))));
@@ -6315,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 ) {