===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2018/engine/nd.c,v
retrieving revision 1.16
retrieving revision 1.18
diff -u -p -r1.16 -r1.18
--- OpenXM_contrib2/asir2018/engine/nd.c	2019/08/21 00:37:47	1.16
+++ OpenXM_contrib2/asir2018/engine/nd.c	2019/09/04 01:12:02	1.18
@@ -1,4 +1,4 @@
-/* $OpenXM: OpenXM_contrib2/asir2018/engine/nd.c,v 1.15 2019/04/20 06:04:18 noro Exp $ */
+/* $OpenXM: OpenXM_contrib2/asir2018/engine/nd.c,v 1.17 2019/08/28 23:27:34 noro Exp $ */
 
 #include "nd.h"
 
@@ -2611,7 +2611,7 @@ ND_pairs nd_newpairs( NODE g, int t )
 
   dl = DL(nd_psh[t]);
   ts = SG(nd_psh[t]) - TD(dl);
-  if ( nd_module && nd_intersect && (MPOS(dl) > 1) ) return 0;
+  if ( nd_module && nd_intersect && (MPOS(dl) > nd_intersect) ) return 0;
   for ( r0 = 0, h = g; h; h = NEXT(h) ) {
     if ( nd_module && (MPOS(DL(nd_psh[(long)BDY(h)])) != MPOS(dl)) )
       continue;
@@ -3370,7 +3370,7 @@ void nd_gr(LIST f,LIST v,int m,int homo,int retdp,int 
     nd_demand = 0;
   if ( nd_module && nd_intersect ) {
     for ( j = nd_psn-1, x = 0; j >= 0; j-- )
-      if ( MPOS(DL(nd_psh[j])) > 1 ) { 
+      if ( MPOS(DL(nd_psh[j])) > nd_intersect ) { 
         MKNODE(xx,(pointer)((unsigned long)j),x); x = xx; 
       }
     conv_ilist(nd_demand,0,x,0);
@@ -3778,7 +3778,7 @@ void nd_gr_trace(LIST f,LIST v,int trace,int homo,int 
             Z cont;
             DPM zdpm;
 
-            if ( !m && !nd_gentrace ) dpm_ptozp((DPM)BDY(t),&cont,&zdpm);
+            if ( !nd_gentrace ) dpm_ptozp((DPM)BDY(t),&cont,&zdpm);
             else zdpm = (DPM)BDY(t);
             c = (pointer)dpmtondv(m,zdpm);
           } else {
@@ -3887,10 +3887,10 @@ void nd_gr_trace(LIST f,LIST v,int trace,int homo,int 
     nd_setup_parameters(nd_nvar,0);
     for ( r = cand; r; r = NEXT(r) ) {
       if ( nd_module ) {
-        if ( retdp ) BDY(r) = ndvtodpm(0,BDY(t));
+        if ( retdp ) BDY(r) = ndvtodpm(0,BDY(r));
         else BDY(r) = ndvtopl(0,CO,vv,BDY(r),mrank);
-      } else if ( retdp ) BDY(r) = ndvtodp(0,BDY(t));
-      else BDY(r) = (pointer)ndvtop(0,CO,vv,BDY(t));
+      } else if ( retdp ) BDY(r) = ndvtodp(0,BDY(r));
+      else BDY(r) = (pointer)ndvtop(0,CO,vv,BDY(r));
     }
     if ( nd_nalg )
         cand = postprocess_algcoef(av,alist,cand);
@@ -5514,6 +5514,28 @@ void dpm_sort(DPM p,DPM *rp)
   *rp = d;
 }
 
+int dpm_comp(DPM *a,DPM *b)
+{
+  return compdpm(CO,*a,*b);
+}
+
+NODE dpm_sort_list(NODE l)
+{
+  int i,len;
+  NODE t,t1;
+  DPM *a;
+  
+  len = length(l);
+  a = (DPM *)MALLOC(len*sizeof(DPM));
+  for ( t = l, i = 0; i < len; i++, t = NEXT(t) ) a[i] = (DPM)BDY(t);
+  qsort(a,len,sizeof(DPM),(int (*)(const void *,const void *))dpm_comp);
+  t = 0;
+  for ( i = len-1; i >= 0; i-- ) {
+    MKNODE(t1,(pointer)a[i],t); t = t1;
+  }
+  return t;
+}
+
 NDV dpmtondv(int mod,DPM p)
 {
   NDV d;
@@ -8491,6 +8513,8 @@ void parse_nd_option(NODE opt)
             nd_newelim = value?1:0;
     else if ( !strcmp(key,"intersect") )
             nd_intersect = value?1:0;
+    else if ( !strcmp(key,"syzgen") )
+            nd_intersect = ZTOS((Q)value);
     else if ( !strcmp(key,"lf") )
             nd_lf = value?1:0;
     else if ( !strcmp(key,"trace") ) {