===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2018/builtin/dp.c,v
retrieving revision 1.4
retrieving revision 1.9
diff -u -p -r1.4 -r1.9
--- OpenXM_contrib2/asir2018/builtin/dp.c	2018/11/12 07:59:33	1.4
+++ OpenXM_contrib2/asir2018/builtin/dp.c	2019/08/21 00:37:47	1.9
@@ -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.c,v 1.3 2018/11/12 04:25:13 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2018/builtin/dp.c,v 1.8 2019/03/18 10:30:41 noro Exp $
 */
 #include "ca.h"
 #include "base.h"
@@ -89,8 +89,8 @@ void Pdp_vtoe(), Pdp_etov(), Pdp_dtov(), Pdp_idiv(), P
 void Pdp_cont();
 void Pdp_gr_checklist();
 void Pdp_ltod(),Pdpv_ord(),Pdpv_ht(),Pdpv_hm(),Pdpv_hc();
-void Pdpm_ltod(),Pdpm_dtol(),Pdpm_ord(),Pdpm_nf(),Pdpm_weyl_nf(),Pdpm_sp(),Pdpm_weyl_sp();
-void Pdpm_hm(),Pdpm_ht(),Pdpm_hc();
+void Pdpm_ltod(),Pdpm_dtol(),Pdpm_set_schreyer(),Pdpm_nf(),Pdpm_weyl_nf(),Pdpm_sp(),Pdpm_weyl_sp(),Pdpm_nf_and_quotient();
+void Pdpm_hm(),Pdpm_ht(),Pdpm_hc(),Pdpm_shift(),Pdpm_split(),Pdpm_sort(),Pdpm_dptodpm(),Pdpm_redble();
 
 void Pdp_weyl_red();
 void Pdp_weyl_sp();
@@ -157,6 +157,7 @@ struct ftab dp_tab[] = {
   {"dp_nf",Pdp_nf,4},
   {"dp_nf_mod",Pdp_nf_mod,5},
   {"dp_nf_f",Pdp_nf_f,4},
+  {"dpm_nf_and_quotient",Pdpm_nf_and_quotient,-3},
   {"dpm_nf_f",Pdpm_nf_f,4},
   {"dpm_weyl_nf_f",Pdpm_weyl_nf_f,4},
   {"dpm_nf",Pdpm_nf,4},
@@ -252,7 +253,7 @@ struct ftab dp_supp_tab[] = {
   /* setting flags */
   {"dp_sort",Pdp_sort,1},
   {"dp_ord",Pdp_ord,-1},
-  {"dpm_ord",Pdpm_ord,-1},
+  {"dpm_set_schreyer",Pdpm_set_schreyer,-1},
   {"dpv_ord",Pdpv_ord,-2},
   {"dp_set_kara",Pdp_set_kara,-1},
   {"dp_nelim",Pdp_nelim,-1},
@@ -274,6 +275,7 @@ struct ftab dp_supp_tab[] = {
   {"dp_ltod",Pdp_ltod,-2},
 
   {"dpm_ltod",Pdpm_ltod,2},
+  {"dpm_dptodpm",Pdpm_dptodpm,2},
   {"dpm_dtol",Pdpm_dtol,3},
 
   /* criteria */
@@ -293,6 +295,9 @@ struct ftab dp_supp_tab[] = {
   {"dpm_hm",Pdpm_hm,1},
   {"dpm_ht",Pdpm_ht,1},
   {"dpm_hc",Pdpm_hc,1},
+  {"dpm_shift",Pdpm_shift,2},
+  {"dpm_split",Pdpm_split,2},
+  {"dpm_sort",Pdpm_sort,1},
   {"dp_rest",Pdp_rest,1},
   {"dp_initial_term",Pdp_initial_term,1},
   {"dp_order",Pdp_order,1},
@@ -307,6 +312,7 @@ struct ftab dp_supp_tab[] = {
   /* misc */
   {"dp_mbase",Pdp_mbase,1},
   {"dp_redble",Pdp_redble,2},
+  {"dpm_redble",Pdpm_redble,2},
   {"dp_sep",Pdp_sep,2},
   {"dp_idiv",Pdp_idiv,2},
   {"dp_tdiv",Pdp_tdiv,2},
@@ -338,171 +344,6 @@ int comp_by_tdeg(DP *a,DP *b)
   else return 0;
 }
 
-#if 0
-void make_reduced(VECT b)
-{
-  int n,i,j;
-  DP *p;
-  DP pi;
-
-  n = b->len;
-  p = (DP *)BDY(b);
-  if ( BDY(p[0])->dl->td == 0 ) {
-    b->len = 1;
-    return;
-  }
-  for ( i = 0; i < n; i++ ) {
-    pi = p[i];
-    if ( !pi ) continue;
-    for ( j = 0; j < n; j++ )
-      if ( i != j && p[j] && dp_redble(p[j],pi) ) p[j] = 0;
-  }
-  for ( i = j = 0; i < n; i++ )
-    if ( p[i] ) p[j++] = p[i];
-  b->len = j;
-}
-
-void make_reduced2(VECT b,int k)
-{
-  int n,i,j,l;
-  DP *p;
-  DP pi;
-
-  n = b->len;
-  p = (DP *)BDY(b);
-  for ( i = l = k; i < n; i++ ) {
-    pi = p[i];
-    for ( j = 0; j < k; j++ )
-      if ( dp_redble(pi,p[j]) ) break;
-    if ( j == k )
-     p[l++] = pi;
-  }
-  b->len = l;
-}
-
-struct oEGT eg_comp;
-
-void mhp_rec(VECT b,VECT x,P t,P *r)
-{
-  int n,i,j,k,l,i2,y,len;
-  int *d;
-  Z mone,z;
-  DCP dc,dc1;
-  P s;
-  P *r2;
-  DP *p,*q;
-  DP pi,xj;
-  VECT c;
-  struct oEGT eg0,eg1;
-
-  n = b->len;
-  y = x->len;
-  p = (DP *)BDY(b);
-  if ( !n ) {
-    r[0] = (P)ONE;
-    return;
-  }
-  if ( n == 1 && BDY(p[0])->dl->td == 0 ) {
-    return;
-  }
-  for ( i = 0; i < n; i++ )
-    if ( BDY(p[i])->dl->td > 1 ) break;
-  if ( i == n ) {
-    r[n] = (P)ONE;
-    return;
-  }
-  get_eg(&eg0);
-  pi = p[i];
-  d = BDY(pi)->dl->d;
-  for ( j = 0; j < y; j++ )
-    if ( d[j] ) break;
-  xj = BDY(x)[j];
-
-  MKVECT(c,n); q = (DP *)BDY(c);
-  for ( i = k = l = 0; i < n; i++ )
-    if ( BDY(p[i])->dl->d[j] ) 
-      dp_subd(p[i],xj,&p[k++]);
-    else
-      q[l++] = p[i];
-  for ( i = k, i2 = 0; i2 < l; i++, i2++ ) 
-    p[i] = q[i2];
-  /* b=(b[0]/xj,...,b[k-1]/xj,b[k],...b[n-1]) where
-    b[0],...,b[k-1] are divisible by k */
-  make_reduced2(b,k);
-  get_eg(&eg1); add_eg(&eg_comp,&eg0,&eg1);
-  mhp_rec(b,x,t,r);
-  /* c = (b[0],...,b[l-1],xj) */
-  q[l] = xj; c->len = l+1;
-  r2 = (P *)CALLOC(y+1,sizeof(P));
-  mhp_rec(c,x,t,r2);
-  get_eg(&eg0);
-  for ( i = 0; i <= y; i++ ) {
-    mulp(CO,r[i],t,&s); addp(CO,s,r2[i],&r[i]);
-  }
-  get_eg(&eg1); add_eg(&eg_comp,&eg0,&eg1);
-}
-
-void Pdp_monomial_hilbert_poincare(NODE arg,LIST *rp)
-{
-  LIST g,v;
-  VL vl;
-  int m,n,i;
-  VECT b,x;
-  NODE t,nd;
-  Z z;
-  P hp,tv,mt,t1,u,w;
-  DP *p;
-  P *plist,*r;
-  struct order_spec *spec;
-  struct oEGT eg0,eg1;
-
-  if ( get_opt("hf",&val) && val ) hf = 1;
-  else hf = 0;
-  g = (LIST)ARG0(arg); v = (LIST)ARG1(arg);
-  pltovl(v,&vl);
-  m = length(BDY(g)); MKVECT(b,m); p = (DP *)BDY(b);
-  for ( t = BDY(g), i = 0; t; t = NEXT(t), i++ )
-    ptod(CO,vl,(P)BDY(t),&p[i]);
-  n = length(BDY(v)); MKVECT(x,n); p = (DP *)BDY(x);
-  for ( t = BDY(v), i = 0; t; t = NEXT(t), i++ )
-    ptod(CO,vl,(P)BDY(t),&p[i]);
-  create_order_spec(0,0,&spec); initd(spec);
-  /* create (1,1-t,...,(1-t)^n) */
-  plist = (P *)MALLOC((n+1)*sizeof(P));
-  /* t1 = 1-t */
-  makevar("t",&tv); chsgnp(tv,&mt); addp(CO,mt,(P)ONE,&t1);
-  for ( plist[0] = (P)ONE, i = 1; i <= n; i++ )
-    mulp(CO,plist[i-1],t1,&plist[i]);
-  r = (P *)CALLOC(n+1,sizeof(P));
-  make_reduced(b);
-  mhp_rec(b,x,tv,r);
-  for ( hp = 0, i = 0; i <= n; i++ ) {
-    mulp(CO,plist[i],r[i],&u); addp(CO,u,hp,&w); hp = w;
-  }
-  UTOZ(n,z); 
-  if ( !hf ) {
-    nd = mknode(2,hp,z);
-    MKLIST(*rp,nd);
-  } else {
-    P gcd,q;
-    int s;
-    Z qd;
-    ezgcdp(CO,hp,plist[n],&gcd);
-    if ( NUM(gcd) ) {
-      s = n;
-      q = hp;
-    } else {
-      s = n-ZTOS(DC(gcd));
-      sdivp(CO,hp,plist[n-s],&q);
-    }
-    if ( NUM(q) ) qd = 0;
-    else qd = DEG(DC(q));
-    nd = mknode(4,hp,z,q,qd);
-    MKLIST(*rp,nd);
-  }
-}
-#else
-
 void dl_print(DL d,int n)
 {
   int i;
@@ -536,10 +377,6 @@ void make_reduced(VECT b,int nv)
 
   n = b->len;
   p = (DL *)BDY(b);
-  if ( p[0]->td == 0 ) {
-    b->len = 1;
-    return;
-  }
   for ( i = 0; i < n; i++ ) {
     pi = p[i];
     if ( !pi ) continue;
@@ -672,95 +509,144 @@ P binpoly(P n,int a,int b)
   return r;
 }
 
+void ibin(unsigned long int n,unsigned long int k,Z *r);
+
+void mhp_to_hf(VL vl,P hp,int n,P *plist,VECT *head,P *hf)
+{
+  P tv,gcd,q,h,hphead,tt,ai,hpoly,nv,bp,w;
+  Z d,z;
+  DCP dc,topdc;
+  VECT hfhead;
+  int i,s,qd;
+
+  if ( !hp ) {
+    MKVECT(hfhead,0); *head = hfhead;
+    *hf = 0;
+  } else {
+    makevar("t",&tv);
+    ezgcdp(CO,hp,plist[n],&gcd);
+    if ( NUM(gcd) ) {
+      s = n;
+      q = hp;
+    } else {
+      s = n-ZTOS(DEG(DC(gcd)));
+      divsp(CO,hp,plist[n-s],&q);
+    }
+    if ( NUM(q) ) qd = 0;
+    else qd = ZTOS(DEG(DC(q)));
+    if ( s == 0 ) {
+      MKVECT(hfhead,qd+1);
+      for ( i = 0; i <= qd; i++ ) {
+        coefp(q,i,(P *)&BDY(hfhead)[i]);
+      }
+      *head = hfhead;
+      *hf = 0;
+    } else {
+      if ( qd ) { 
+        topdc = 0;
+        for ( i = 0; i < qd; i++ ) {
+          NEWDC(dc); NEXT(dc) = topdc;
+          ibin(i+s-1,s-1,(Z *)&COEF(dc));
+          STOZ(i,d); DEG(dc) = d;
+          topdc = dc;
+        }
+        MKP(VR(tv),topdc,h);
+        mulp(CO,h,q,&hphead);
+      }
+      MKVECT(hfhead,qd); 
+      for ( i = 0; i < qd; i++ )
+        coefp(hphead,i,(P *)&BDY(hfhead)[i]);
+      *head = hfhead;
+      hpoly = 0;
+      makevar("n",&nv);
+      for ( i = 0; i <= qd; i++ ) {
+        coefp(q,i,&ai);
+        bp = binpoly(nv,s-i-1,s-1);
+        mulp(CO,ai,bp,&tt);
+        addp(CO,hpoly,tt,&w);
+        hpoly = w;
+      }
+      if ( s > 2 ) {
+        factorialz(s-1,&z);
+        divsp(CO,hpoly,(P)z,&tt); hpoly = tt;
+      }
+      *hf = hpoly;
+      for ( i = qd-1; i >= 0; i-- ) {
+        UTOZ(i,z);
+        substp(CO,hpoly,VR(nv),(P)z,&tt);
+        if ( cmpz((Z)tt,(Z)BDY(hfhead)[i]) ) break;
+      }
+      hfhead->len = i+1;
+    }
+  }
+}
+
+/* create (1,1-t,...,(1-t)^n) */
+
+P *mhp_prep(int n,P *tv) {
+  P *plist;
+  P mt,t1;
+  int i;
+
+  plist = (P *)MALLOC((n+1)*sizeof(P));
+  /* t1 = 1-t */
+  makevar("t",tv); chsgnp(*tv,&mt); addp(CO,mt,(P)ONE,&t1);
+  for ( plist[0] = (P)ONE, i = 1; i <= n; i++ )
+    mulp(CO,plist[i-1],t1,&plist[i]);
+  return plist;
+}
+
+P mhp_ctop(P *r,P *plist,int n)
+{
+  int i;
+  P hp,u,w;
+
+  for ( hp = 0, i = 0; i <= n; i++ ) {
+    mulp(CO,plist[i],r[i],&u); addp(CO,u,hp,&w); hp = w;
+  }
+  return hp;
+}
+
 void Pdp_monomial_hilbert_poincare(NODE arg,LIST *rp)
 {
   LIST g,v;
   VL vl;
-  int m,n,i,hf;
-  VECT b,x;
+  int m,n,i;
+  VECT b,x,hfhead;
   NODE t,nd;
-  Z z;
-  P hp,tv,mt,t1,u,w;
+  Z z,den;
+  P hp,tv,mt,t1,u,w,hpoly;
   DP a;
   DL *p;
   P *plist,*r;
   Obj val;
 
-// init_eg(&eg_comp);
-  if ( get_opt("hf",&val) && val ) hf = 1;
-  else hf = 0;
   i_simple = i_all = 0;
   g = (LIST)ARG0(arg); v = (LIST)ARG1(arg);
   pltovl(v,&vl);
   m = length(BDY(g)); MKVECT(b,m); p = (DL *)BDY(b);
   for ( t = BDY(g), i = 0; t; t = NEXT(t), i++ ) {
-    ptod(CO,vl,(P)BDY(t),&a); p[i] = BDY(a)->dl;
+    if ( !BDY(t) )
+      p[i] = 0;
+    else {
+      ptod(CO,vl,(P)BDY(t),&a); p[i] = BDY(a)->dl;
+    }
   }
   n = length(BDY(v)); MKVECT(x,n); p = (DL *)BDY(x);
   for ( t = BDY(v), i = 0; t; t = NEXT(t), i++ ) {
     ptod(CO,vl,(P)BDY(t),&a); p[i] = BDY(a)->dl;
   }
-  /* create (1,1-t,...,(1-t)^n) */
-  plist = (P *)MALLOC((n+1)*sizeof(P));
-  /* t1 = 1-t */
-  makevar("t",&tv); chsgnp(tv,&mt); addp(CO,mt,(P)ONE,&t1);
-  for ( plist[0] = (P)ONE, i = 1; i <= n; i++ )
-    mulp(CO,plist[i-1],t1,&plist[i]);
+  
   r = (P *)CALLOC(n+1,sizeof(P));
+  plist = mhp_prep(n,&tv);
   make_reduced(b,n);
   mhp_rec(b,x,tv,r);
-  for ( hp = 0, i = 0; i <= n; i++ ) {
-    mulp(CO,plist[i],r[i],&u); addp(CO,u,hp,&w); hp = w;
-  }
-//   printf("all=%d,simple=%d,comp=%.3fsec\n",i_all,i_simple,eg_comp.exectime);
+  hp = mhp_ctop(r,plist,n);
+  mhp_to_hf(CO,hp,n,plist,&hfhead,&hpoly);
   UTOZ(n,z);
-  if ( !hf ) {
-    nd = mknode(2,hp,z);
-    MKLIST(*rp,nd);
-  } else {
-    P gcd,q,head,hphead,t,w,ai,hpoly,nv,bp;
-    Z den,d;
-    DCP dc,topdc;
-    VECT hfhead;
-    int s,qd,i;
-    
-    ezgcdp(CO,hp,plist[n],&gcd);
-    if ( NUM(gcd) ) {
-      s = n;
-      q = hp;
-    } else {
-      s = n-ZTOS(DEG(DC(gcd)));
-      divsp(CO,hp,plist[n-s],&q);
-    }
-    if ( NUM(q) ) qd = 0;
-    else qd = ZTOS(DEG(DC(q)));
-    topdc = 0;
-    for ( i = 0; i < qd; i++ ) {
-      NEWDC(dc); NEXT(dc) = topdc;
-      ibin(i+s-1,s-1,&COEF(dc));
-      STOZ(i,d); DEG(dc) = d;
-      topdc = dc;
-    }
-    MKP(VR(tv),topdc,head);
-    mulp(CO,head,q,&hphead);
-    MKVECT(hfhead,qd);
-    for ( i = 0; i < qd; i++ )
-      coefp(hphead,i,(P *)&BDY(hfhead)[i]);
-    hpoly = 0;
-    makevar("n",&nv);
-    for ( i = 0; i <= qd; i++ ) {
-      coefp(q,i,&ai);
-      bp = binpoly(nv,s-i-1,s-1);
-      mulp(CO,ai,bp,&t);
-      addp(CO,hpoly,t,&w);
-      hpoly = w;
-    }
-    factorialz(s-1,&den);
-    nd = mknode(5,hp,z,hfhead,hpoly,den);
-    MKLIST(*rp,nd);
-  }
+  nd = mknode(4,hp,z,hfhead,hpoly);
+  MKLIST(*rp,nd);
 }
-#endif
 
 void Pdp_compute_last_t(NODE arg,LIST *rp)
 {
@@ -1019,6 +905,8 @@ void Pdp_nf_tab_f(NODE arg,DP *rp)
   dp_nf_tab_f((DP)ARG0(arg),(LIST *)BDY((VECT)ARG1(arg)),rp);
 }
 
+extern int dpm_ordtype;
+
 void Pdp_ord(NODE arg,Obj *rp)
 {
   struct order_spec *spec;
@@ -1036,6 +924,7 @@ void Pdp_ord(NODE arg,Obj *rp)
     else if ( !create_order_spec(0,(Obj)ARG0(arg),&spec) )
       error("dp_ord : invalid order specification");
     initd(spec); *rp = spec->obj;
+    if ( spec->id >= 256 ) dpm_ordtype = spec->ispot; 
   }
 }
 
@@ -1186,7 +1075,7 @@ void Pdpm_ltod(NODE arg,DPM *rp)
 
   nd = BDY(f);
   len = length(nd);
-  for ( i = 0, t = nd, s = 0; i < len; i++, t = NEXT(t) ) {
+  for ( i = 1, t = nd, s = 0; i <= len; i++, t = NEXT(t) ) {
     ptod(CO,vl,(P)BDY(t),&d);
     dtodpm(d,i,&u);
     adddpm(CO,s,u,&w); s = w;
@@ -1194,6 +1083,28 @@ void Pdpm_ltod(NODE arg,DPM *rp)
   *rp = s;
 }
 
+// c*[monomial,i]+... -> c*<<monomial:i>>+...
+
+void Pdpm_dptodpm(NODE arg,DPM *rp)
+{
+  DP p;
+  MP mp;
+  int pos;
+  DMM m0,m;
+
+  p = (DP)ARG0(arg);
+  pos = ZTOS((Z)ARG1(arg));
+  if ( pos <= 0 )
+    error("dpm_mtod : position must be positive");
+  if ( !p ) *rp = 0;
+  else {
+    for ( m0 = 0, mp = BDY(p); mp; mp = NEXT(mp) ) {
+      NEXTDMM(m0,m); m->dl = mp->dl; m->c = mp->c; m->pos = pos;
+    }
+    MKDPM(p->nv,m0,*rp); (*rp)->sugar = p->sugar;
+  }
+}
+
 void Pdpm_dtol(NODE arg,LIST *rp)
 {
   DPM a;
@@ -1404,6 +1315,41 @@ void Pdpm_nf(NODE arg,DPM *rp)
   dpm_nf_z(b,g,ps,full,DP_Multiple,rp);
 }
 
+DP *dpm_nf_and_quotient(NODE b,DPM g,VECT ps,DPM *rp,P *dnp);
+
+void Pdpm_nf_and_quotient(NODE arg,LIST *rp)
+{
+  NODE b;
+  VECT ps;
+  DPM g,nm;
+  P dn;
+  VECT quo;
+  NODE n;
+  int ac;
+
+  do_weyl = 0; dp_fcoeffs = 0;
+  ac = argc(arg);
+  if ( ac < 2 )
+    error("dpm_nf_and_quotient : invalid arguments");
+  else if ( ac == 2 ) {
+    asir_assert(ARG0(arg),O_DPM,"dpm_nf");
+    asir_assert(ARG1(arg),O_VECT,"dpm_nf");
+    b = 0; g = (DPM)ARG0(arg); ps = (VECT)ARG1(arg);
+  } else if ( ac == 3 ) {
+    asir_assert(ARG0(arg),O_LIST,"dpm_nf");
+    asir_assert(ARG1(arg),O_DPM,"dpm_nf");
+    asir_assert(ARG2(arg),O_VECT,"dpm_nf");
+    b = BDY((LIST)ARG0(arg)); g = (DPM)ARG1(arg); ps = (VECT)ARG2(arg);
+  }
+  if ( !g ) {
+    *rp = 0; return;
+  }
+  NEWVECT(quo); quo->len = ps->len;
+  quo->body = (pointer *)dpm_nf_and_quotient(b,g,ps,&nm,&dn);
+  n = mknode(3,nm,dn,quo);
+  MKLIST(*rp,n);
+}
+
 void Pdpm_weyl_nf(NODE arg,DPM *rp)
 {
   NODE b;
@@ -1885,6 +1831,16 @@ void Pdp_redble(NODE arg,Z *rp)
     *rp = 0;
 }
 
+void Pdpm_redble(NODE arg,Z *rp)
+{
+  asir_assert(ARG0(arg),O_DPM,"dpm_redble");
+  asir_assert(ARG1(arg),O_DPM,"dpm_redble");
+  if ( dpm_redble((DPM)ARG0(arg),(DPM)ARG1(arg)) )
+    *rp = ONE;
+  else
+    *rp = 0;
+}
+
 void Pdp_red_mod(NODE arg,LIST *rp)
 {
   DP h,r;
@@ -2047,25 +2003,47 @@ void Pdp_weyl_sp(NODE arg,DP *rp)
   do_weyl = 0;
 }
 
-void Pdpm_sp(NODE arg,DPM *rp)
+void Pdpm_sp(NODE arg,Obj *rp)
 {
-  DPM  p1,p2;
+  DPM  p1,p2,sp;
+  DP mul1,mul2;
+  Obj val;
+  NODE nd;
+  LIST l;
 
   do_weyl = 0;
   p1 = (DPM)ARG0(arg); p2 = (DPM)ARG1(arg);
   asir_assert(p1,O_DPM,"dpm_sp"); asir_assert(p2,O_DPM,"dpm_sp");
-  dpm_sp(p1,p2,rp);
+  dpm_sp(p1,p2,&sp,&mul1,&mul2);
+  if ( get_opt("coef",&val) && val ) {
+    nd = mknode(3,sp,mul1,mul2);
+    MKLIST(l,nd);
+    *rp = (Obj)l;
+  } else {
+    *rp = (Obj)sp;
+  }
 }
 
-void Pdpm_weyl_sp(NODE arg,DPM *rp)
+void Pdpm_weyl_sp(NODE arg,Obj *rp)
 {
-  DPM p1,p2;
+  DPM  p1,p2,sp;
+  DP mul1,mul2;
+  Obj val;
+  NODE nd;
+  LIST l;
 
   p1 = (DPM)ARG0(arg); p2 = (DPM)ARG1(arg);
   asir_assert(p1,O_DPM,"dpm_weyl_sp"); asir_assert(p2,O_DPM,"dpm_weyl_sp");
   do_weyl = 1;
-  dpm_sp(p1,p2,rp);
+  dpm_sp(p1,p2,&sp,&mul1,&mul2);
   do_weyl = 0;
+  if ( get_opt("coef",&val) && val ) {
+    nd = mknode(3,sp,mul1,mul2);
+    MKLIST(l,nd);
+    *rp = (Obj)l;
+  } else {
+    *rp = (Obj)sp;
+  }
 }
 
 void Pdp_sp_mod(NODE arg,DP *rp)
@@ -2935,6 +2913,8 @@ void Pnd_gr_trace(NODE arg,LIST *rp)
 {
   LIST f,v;
   int m,homo,ac;
+  Obj val;
+  int retdp;
   Num nhomo;
   struct order_spec *ord;
 
@@ -2958,13 +2938,17 @@ void Pnd_gr_trace(NODE arg,LIST *rp)
     homo = ZTOS((Q)nhomo);
   } else
     error("nd_gr_trace : invalid argument");
-  nd_gr_trace(f,v,m,homo,0,ord,rp);
+  retdp = 0;
+  if ( get_opt("dp",&val) && val ) retdp = 1;
+  nd_gr_trace(f,v,m,homo,retdp,0,ord,rp);
 }
 
 void Pnd_f4_trace(NODE arg,LIST *rp)
 {
   LIST f,v;
   int m,homo,ac;
+  int retdp;
+  Obj val;
   Num nhomo;
   struct order_spec *ord;
 
@@ -2988,7 +2972,9 @@ void Pnd_f4_trace(NODE arg,LIST *rp)
     homo = ZTOS((Q)nhomo);
   } else
     error("nd_gr_trace : invalid argument");
-  nd_gr_trace(f,v,m,homo,1,ord,rp);
+  retdp = 0;
+  if ( get_opt("dp",&val) && val ) retdp = 1;
+  nd_gr_trace(f,v,m,homo,retdp,1,ord,rp);
 }
 
 void Pnd_weyl_gr(NODE arg,LIST *rp)
@@ -3029,7 +3015,8 @@ void Pnd_weyl_gr(NODE arg,LIST *rp)
 void Pnd_weyl_gr_trace(NODE arg,LIST *rp)
 {
   LIST f,v;
-  int m,homo,ac;
+  int m,homo,ac,retdp;
+  Obj val;
   Num nhomo;
   struct order_spec *ord;
 
@@ -3053,7 +3040,9 @@ void Pnd_weyl_gr_trace(NODE arg,LIST *rp)
     homo = ZTOS((Q)nhomo);
   } else
     error("nd_weyl_gr_trace : invalid argument");
-  nd_gr_trace(f,v,m,homo,0,ord,rp);
+  retdp = 0;
+  if ( get_opt("dp",&val) && val ) retdp = 1;
+  nd_gr_trace(f,v,m,homo,retdp,0,ord,rp);
   do_weyl = 0;
 }
 
@@ -3872,23 +3861,19 @@ void Pdpv_ord(NODE arg,Obj *rp)
   *rp = dp_current_modspec->obj;
 }
 
-extern int dpm_ispot;
+extern int dpm_ordtype;
 
-void Pdpm_ord(NODE arg,LIST *rp)
+void set_schreyer_order(NODE n);
+
+LIST schreyer_obj;
+
+void Pdpm_set_schreyer(NODE arg,Z *rp)
 {
-  Z q;
-  NODE nd;
-  struct order_spec *spec;
-  
-  if ( arg ) {
-    nd = BDY((LIST)ARG0(arg));
-    if ( !create_order_spec(0,(Obj)ARG1(nd),&spec) )
-      error("dpm_ord : invalid order specification");
-    initdpm(spec,ZTOS((Q)ARG0(nd)));
+  if ( argc(arg) ) {
+    schreyer_obj = (LIST)ARG0(arg);
+    set_schreyer_order(schreyer_obj?BDY(schreyer_obj):0);
   }
-  STOZ(dpm_ispot,q);
-  nd = mknode(2,q,dp_current_spec->obj);
-  MKLIST(*rp,nd);
+  *rp = schreyer_obj;
 }
 
 void Pdpm_hm(NODE arg,DPM *rp)
@@ -3903,10 +3888,49 @@ void Pdpm_ht(NODE arg,DPM *rp)
 {
   DPM p;
 
-  p = (DPM)ARG0(arg); asir_assert(p,O_DPM,"dp_ht");
+  p = (DPM)ARG0(arg); asir_assert(p,O_DPM,"dpm_ht");
   dpm_ht(p,rp);
 }
 
+void dpm_shift(DPM p,int s,DPM *rp);
+
+void Pdpm_shift(NODE arg,DPM *rp)
+{
+  DPM p;
+  int s;
+
+  p = (DPM)ARG0(arg); asir_assert(p,O_DPM,"dpm_shift");
+  s = ZTOS((Z)ARG1(arg));
+  dpm_shift(p,s,rp);
+}
+
+void dpm_sort(DPM p,DPM *rp);
+
+void Pdpm_sort(NODE arg,DPM *rp)
+{
+  DPM p;
+  int s;
+
+  p = (DPM)ARG0(arg); asir_assert(p,O_DPM,"dpm_shift");
+  dpm_sort(p,rp);
+}
+
+void dpm_split(DPM p,int s,DPM *up,DPM *lo);
+
+void Pdpm_split(NODE arg,LIST *rp)
+{
+  DPM p,up,lo;
+  int s;
+  NODE nd;
+
+  p = (DPM)ARG0(arg); asir_assert(p,O_DPM,"dpm_split");
+  s = ZTOS((Z)ARG1(arg));
+  dpm_split(p,s,&up,&lo);
+  nd = mknode(2,up,lo);
+  MKLIST(*rp,nd);
+}
+
+
 void Pdpm_hc(NODE arg,Obj *rp)
 {
   asir_assert(ARG0(arg),O_DPM,"dpm_hc");
@@ -4016,6 +4040,10 @@ int dpv_hp(DPV p)
     case ORD_LEX:
       for ( i = 0; i < len; i++ )
         if ( e[i] ) return i;
+      return -1;
+      break;
+    default:
+      error("dpv_hp : unsupported term ordering");
       return -1;
       break;
   }