===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2018/builtin/dp-supp.c,v
retrieving revision 1.13
retrieving revision 1.19
diff -u -p -r1.13 -r1.19
--- OpenXM_contrib2/asir2018/builtin/dp-supp.c	2019/12/27 08:13:59	1.13
+++ OpenXM_contrib2/asir2018/builtin/dp-supp.c	2022/09/10 05:41:43	1.19
@@ -45,7 +45,7 @@
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.
  *
- * $OpenXM: OpenXM_contrib2/asir2018/builtin/dp-supp.c,v 1.12 2019/12/12 04:44:59 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2018/builtin/dp-supp.c,v 1.18 2022/09/10 04:04:50 noro Exp $
 */
 #include "ca.h"
 #include "base.h"
@@ -96,6 +96,16 @@ LIST get_denomlist()
   return l;
 }
 
+int dp_iszp(DP p)
+{
+  MP m;
+
+  if ( !p ) return 1;
+  for ( m = BDY(p); m; m = NEXT(m))
+    if ( !INT(m->c) ) return 0;
+  return 1;
+}
+
 void dp_ptozp(DP p,DP *rp)
 {
   MP m,mr,mr0;
@@ -147,6 +157,16 @@ void dp_ptozp2(DP p0,DP p1,DP *hp,DP *rp)
   *hp = h; *rp = r;
 }
 
+int dpm_iszp(DPM p)
+{
+  DMM m;
+
+  if ( !p ) return 1;
+  for ( m = BDY(p); m; m = NEXT(m))
+    if ( !INT(m->c) ) return 0;
+  return 1;
+}
+
 void dpm_ptozp(DPM p,Z *cont,DPM *rp)
 {
   DMM m,mr,mr0;
@@ -315,6 +335,21 @@ int _dl_redble(DL d1,DL d2,int nvar)
     return 1;
 }
 
+int _dl_redble_ext(DL d1,DL d2,DL quo,int nvar)
+{
+  int i;
+
+  if ( (quo->td = d2->td-d1->td) < 0 )
+    return 0;
+  for ( i = 0; i < nvar; i++ )
+    if ( (quo->d[i] = d2->d[i]-d1->d[i]) < 0 )
+      break;
+  if ( i < nvar )
+    return 0;
+  else
+    return 1;
+}
+
 void insert_to_node(DL d,NODE *n,int nvar)
 {
   DL d1;
@@ -850,7 +885,7 @@ void dp_red(DP p0,DP p1,DP p2,DP *head,DP *rest,P *dnp
       divsz(c2,gn,&c); c2 = c;
     }
   } else {
-    ezgcdpz(CO,(P)c1,(P)c2,&g);
+    ezgcdp(CO,(P)c1,(P)c2,&g);
     divsp(CO,(P)c1,g,&a); c1 = (Z)a; divsp(CO,(P)c2,g,&a); c2 = (Z)a;
     add_denomlist(g);
   }
@@ -893,7 +928,7 @@ void dpm_red(DPM p0,DPM p1,DPM p2,DPM *head,DPM *rest,
       divsz(c2,gn,&c); c2 = c;
     }
   } else {
-    ezgcdpz(CO,(P)c1,(P)c2,&g);
+    ezgcdp(CO,(P)c1,(P)c2,&g);
     divsp(CO,(P)c1,g,&a); c1 = (Z)a; divsp(CO,(P)c2,g,&a); c2 = (Z)a;
     add_denomlist(g);
   }
@@ -935,7 +970,7 @@ void dpm_red2(DPM p1,DPM p2,DPM *rest,P *dnp,DP *multp
       divsz(c2,gn,&c); c2 = c;
     }
   } else {
-    ezgcdpz(CO,(P)c1,(P)c2,&g);
+    ezgcdp(CO,(P)c1,(P)c2,&g);
     divsp(CO,(P)c1,g,&a); c1 = (Z)a; divsp(CO,(P)c2,g,&a); c2 = (Z)a;
     add_denomlist(g);
   }
@@ -981,7 +1016,7 @@ void dp_red_marked(DP p0,DP p1,DP p2,DP hp2,DP *head,D
       divsz(c2,gn,&c); c2 = c;
     }
   } else {
-    ezgcdpz(CO,(P)c1,(P)c2,&g);
+    ezgcdp(CO,(P)c1,(P)c2,&g);
     divsp(CO,(P)c1,g,&a); c1 = (Z)a; divsp(CO,(P)c2,g,&a); c2 = (Z)a;
   }
   NEWMP(m); m->dl = d; m->c = (Obj)c1; NEXT(m) = 0; MKDP(n,m,s); s->sugar = d->td;
@@ -2747,7 +2782,7 @@ int create_order_spec(VL vl,Obj obj,struct order_spec 
             spec->pot_nelim = 0;
         break;
 
-      case 3: /* [n,[wv,wm],ord] */
+      case 3: /* [n,[mlist1,mlist2,...],ord] or [n,[wv,wm],ord] */
         spec->module_ordtype = ZTOS((Z)BDY(node));
         if ( spec->module_ordtype < 0  ) {
             spec->pot_nelim = -spec->module_ordtype;
@@ -3323,6 +3358,29 @@ void dp_mod(DP p,int mod,NODE subst,DP *rp)
   }
 }
 
+void dpm_mod(DPM p,int mod,DPM *rp)
+{
+  DMM m,mr,mr0;
+  P t;
+  V v;
+  NODE tn;
+
+  if ( !p )
+    *rp = 0;
+  else {
+    for ( mr0 = 0, m = BDY(p); m; m = NEXT(m) ) {
+      ptomp(mod,(P)m->c,&t);
+      if ( t ) {
+        NEXTDMM(mr0,mr); mr->c = (Obj)t; mr->dl = m->dl;
+      }
+    }
+    if ( mr0 ) {
+      NEXT(mr) = 0; MKDPM(p->nv,mr0,*rp); (*rp)->sugar = p->sugar;
+    } else
+      *rp = 0;
+  }
+}
+
 void dp_rat(DP p,DP *rp)
 {
   MP m,mr,mr0;
@@ -3622,6 +3680,23 @@ void dpm_rest(DPM p,DPM *rp)
     if ( *rp )
       (*rp)->sugar = p->sugar;
   }
+}
+
+int dp_getdeg(DP p)
+{
+  int max,n,i;
+  MP m;
+  int *d;
+
+  if ( !p ) return 0;
+  n = p->nv;
+  max = 0;
+  for ( m = BDY(p); m; m = NEXT(m) ) {
+    d = m->dl->d; 
+    for ( i = 0; i < n; i++ )
+      if ( d[i] > max ) max = d[i];
+  }
+  return max;
 }
 
 int dpm_getdeg(DPM p,int *r)