===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2018/builtin/dp.c,v
retrieving revision 1.10
retrieving revision 1.17
diff -u -p -r1.10 -r1.17
--- OpenXM_contrib2/asir2018/builtin/dp.c	2019/08/28 23:27:33	1.10
+++ OpenXM_contrib2/asir2018/builtin/dp.c	2019/11/12 07:47:45	1.17
@@ -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.9 2019/08/21 00:37:47 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2018/builtin/dp.c,v 1.16 2019/10/11 03:45:56 noro Exp $
 */
 #include "ca.h"
 #include "base.h"
@@ -79,6 +79,7 @@ void Pdp_nf_mod(),Pdp_true_nf_mod();
 void Pdp_criB(),Pdp_nelim();
 void Pdp_minp(),Pdp_sp_mod();
 void Pdp_homo(),Pdp_dehomo();
+void Pdpm_homo(),Pdpm_dehomo();
 void Pdp_gr_mod_main(),Pdp_gr_f_main();
 void Pdp_gr_main(),Pdp_gr_hm_main(),Pdp_gr_d_main(),Pdp_gr_flags();
 void Pdp_interreduce();
@@ -89,8 +90,9 @@ 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_set_schreyer(),Pdpm_nf(),Pdpm_weyl_nf(),Pdpm_sp(),Pdpm_weyl_sp(),Pdpm_nf_and_quotient();
+void Pdpm_ltod(),Pdpm_dtol(),Pdpm_set_schreyer(),Pdpm_nf(),Pdpm_weyl_nf(),Pdpm_sp(),Pdpm_weyl_sp(),Pdpm_nf_and_quotient(),Pdpm_nf_and_quotient2();
 void Pdpm_hm(),Pdpm_ht(),Pdpm_hc(),Pdpm_hp(),Pdpm_rest(),Pdpm_shift(),Pdpm_split(),Pdpm_sort(),Pdpm_dptodpm(),Pdpm_redble();
+void Pdpm_schreyer_base(),Pdpm_simplify_syz(),Pdpm_td();
 
 void Pdp_weyl_red();
 void Pdp_weyl_sp();
@@ -158,9 +160,10 @@ struct ftab dp_tab[] = {
   {"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},
+  {"dpm_nf_and_quotient2",Pdpm_nf_and_quotient2,-3},
+  {"dpm_nf_f",Pdpm_nf_f,-4},
+  {"dpm_weyl_nf_f",Pdpm_weyl_nf_f,-4},
+  {"dpm_nf",Pdpm_nf,-4},
   {"dpm_sp",Pdpm_sp,2},
   {"dpm_weyl_sp",Pdpm_weyl_sp,2},
 
@@ -216,7 +219,7 @@ struct ftab dp_tab[] = {
 
   /* normal form */
   {"dp_weyl_nf",Pdp_weyl_nf,4},
-  {"dpm_weyl_nf",Pdpm_weyl_nf,4},
+  {"dpm_weyl_nf",Pdpm_weyl_nf,-4},
   {"dp_weyl_nf_mod",Pdp_weyl_nf_mod,5},
   {"dp_weyl_nf_f",Pdp_weyl_nf_f,4},
 
@@ -276,7 +279,9 @@ struct ftab dp_supp_tab[] = {
 
   {"dpm_ltod",Pdpm_ltod,2},
   {"dpm_dptodpm",Pdpm_dptodpm,2},
-  {"dpm_dtol",Pdpm_dtol,3},
+  {"dpm_dtol",Pdpm_dtol,2},
+  {"dpm_homo",Pdpm_homo,1},
+  {"dpm_dehomo",Pdpm_dehomo,1},
 
   /* criteria */
   {"dp_cri1",Pdp_cri1,2},
@@ -310,6 +315,7 @@ struct ftab dp_supp_tab[] = {
   {"dp_mag",Pdp_mag,1},
   {"dp_sugar",Pdp_sugar,1},
   {"dp_set_sugar",Pdp_set_sugar,2},
+  {"dpm_td",Pdpm_td,1},
 
   /* misc */
   {"dp_mbase",Pdp_mbase,1},
@@ -324,6 +330,8 @@ struct ftab dp_supp_tab[] = {
   {"dp_compute_essential_df",Pdp_compute_essential_df,2},
   {"dp_mono_raddec",Pdp_mono_raddec,2},
   {"dp_mono_reduce",Pdp_mono_reduce,2},
+  {"dpm_schreyer_base",Pdpm_schreyer_base,1},
+  {"dpm_simplify_syz",Pdpm_simplify_syz,2},
 
   {"dp_rref2",Pdp_rref2,2},
   {"sumi_updatepairs",Psumi_updatepairs,3},
@@ -926,7 +934,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; 
+    if ( spec->id >= 256 ) dpm_ordtype = spec->module_ordtype; 
   }
 }
 
@@ -1091,7 +1099,7 @@ void Pdpm_dptodpm(NODE arg,DPM *rp)
 {
   DP p;
   MP mp;
-  int pos;
+  int pos,shift;
   DMM m0,m;
 
   p = (DP)ARG0(arg);
@@ -1103,7 +1111,15 @@ void Pdpm_dptodpm(NODE arg,DPM *rp)
     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;
+    if ( dp_current_spec->module_rank ) {
+      if ( pos > dp_current_spec->module_rank )
+        error("dpm_dptodpm : inconsistent order spec");
+      shift = dp_current_spec->module_top_weight[pos-1];
+      m->dl->td += shift;
+    } else
+      shift = 0;
+
+    MKDPM(p->nv,m0,*rp); (*rp)->sugar = p->sugar+shift;
   }
 }
 
@@ -1121,6 +1137,10 @@ void Pdpm_dtol(NODE arg,LIST *rp)
   Obj s;
 
   a = (DPM)ARG0(arg);
+  if ( !a ) {
+   MKLIST(*rp,0);
+   return;
+  }
   for ( vl = 0, nd = BDY((LIST)ARG1(arg)), nv = 0; nd; nd = NEXT(nd), nv++ ) {
     if ( !vl ) {
       NEWVL(vl); tvl = vl;
@@ -1131,7 +1151,8 @@ void Pdpm_dtol(NODE arg,LIST *rp)
   }
   if ( vl )
     NEXT(tvl) = 0;
-   n = ZTOS((Q)ARG2(arg));
+  for ( t = BDY(a), n = 0; t; t = NEXT(t) )
+    if ( t->pos > n ) n = t->pos;
    w = (MP *)CALLOC(n,sizeof(MP));
    for ( t = BDY(a), len = 0; t; t = NEXT(t) ) len++;
    wa = (DMM *)MALLOC(len*sizeof(DMM));
@@ -1139,8 +1160,8 @@ void Pdpm_dtol(NODE arg,LIST *rp)
    for ( i = len-1; i >= 0; i-- ) {
      NEWMP(m); m->dl = wa[i]->dl; C(m) = C(wa[i]);
      pos = wa[i]->pos;
-     NEXT(m) = w[pos];
-     w[pos] = m;
+     NEXT(m) = w[pos-1];
+     w[pos-1] = m;
    }
   nd = 0;
   for ( i = n-1; i >= 0; i-- ) {
@@ -1300,24 +1321,31 @@ void Pdp_weyl_nf(NODE arg,DP *rp)
 void Pdpm_nf(NODE arg,DPM *rp)
 {
   NODE b;
-  DPM *ps;
+  VECT ps;
   DPM g;
-  int full;
+  int ac,full;
 
   if ( !(g = (DPM)ARG1(arg)) ) {
     *rp = 0; return;
   }
   do_weyl = 0; dp_fcoeffs = 0;
-  asir_assert(ARG0(arg),O_LIST,"dpm_nf");
-  asir_assert(ARG1(arg),O_DPM,"dpm_nf");
-  asir_assert(ARG2(arg),O_VECT,"dpm_nf");
-  asir_assert(ARG3(arg),O_N,"dpm_nf");
-  b = BDY((LIST)ARG0(arg)); ps = (DPM *)BDY((VECT)ARG2(arg));
-  full = (Q)ARG3(arg) ? 1 : 0;
+  ac = argc(arg);
+  if ( ac < 3 )
+    error("dpm_nf: invalid arguments");
+  else if ( ac == 3 ) {
+    asir_assert(ARG1(arg),O_VECT,"dpm_nf");
+    b = 0; g = (DPM)ARG0(arg); ps = (VECT)ARG1(arg);
+  } else if ( ac == 4 ) {
+    asir_assert(ARG0(arg),O_LIST,"dpm_nf");
+    asir_assert(ARG2(arg),O_VECT,"dpm_nf");
+    b = BDY((LIST)ARG0(arg)); g = (DPM)ARG1(arg); ps = (VECT)ARG2(arg);
+    full = (Q)ARG3(arg) ? 1 : 0;
+  }
   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);
+DPM dpm_nf_and_quotient2(NODE b,DPM g,VECT ps,DPM *rp,P *dnp);
 
 void Pdpm_nf_and_quotient(NODE arg,LIST *rp)
 {
@@ -1334,11 +1362,11 @@ void Pdpm_nf_and_quotient(NODE arg,LIST *rp)
   if ( ac < 2 )
     error("dpm_nf_and_quotient : invalid arguments");
   else if ( ac == 2 ) {
-    asir_assert(ARG1(arg),O_VECT,"dpm_nf");
+    asir_assert(ARG1(arg),O_VECT,"dpm_nf_and_quotient");
     b = 0; g = (DPM)ARG0(arg); ps = (VECT)ARG1(arg);
   } else if ( ac == 3 ) {
-    asir_assert(ARG0(arg),O_LIST,"dpm_nf");
-    asir_assert(ARG2(arg),O_VECT,"dpm_nf");
+    asir_assert(ARG0(arg),O_LIST,"dpm_nf_and_quotient");
+    asir_assert(ARG2(arg),O_VECT,"dpm_nf_and_quotient");
     b = BDY((LIST)ARG0(arg)); g = (DPM)ARG1(arg); ps = (VECT)ARG2(arg);
   }
   NEWVECT(quo); quo->len = ps->len;
@@ -1352,23 +1380,59 @@ void Pdpm_nf_and_quotient(NODE arg,LIST *rp)
   MKLIST(*rp,n);
 }
 
+void Pdpm_nf_and_quotient2(NODE arg,LIST *rp)
+{
+  NODE b;
+  VECT ps;
+  DPM g,nm,q;
+  P dn;
+  NODE n;
+  int ac;
+
+  do_weyl = 0; dp_fcoeffs = 0;
+  ac = argc(arg);
+  if ( ac < 2 )
+    error("dpm_nf_and_quotient2 : invalid arguments");
+  else if ( ac == 2 ) {
+    asir_assert(ARG1(arg),O_VECT,"dpm_nf_and_quotient2");
+    b = 0; g = (DPM)ARG0(arg); ps = (VECT)ARG1(arg);
+  } else if ( ac == 3 ) {
+    asir_assert(ARG0(arg),O_LIST,"dpm_nf_and_quotient2");
+    asir_assert(ARG2(arg),O_VECT,"dpm_nf_and_quotient2");
+    b = BDY((LIST)ARG0(arg)); g = (DPM)ARG1(arg); ps = (VECT)ARG2(arg);
+  }
+  if ( g ) {
+    q = dpm_nf_and_quotient2(b,g,ps,&nm,&dn);
+  } else {
+    q = 0; nm = 0; dn = (P)ONE;
+  }
+  n = mknode(3,nm,dn,q);
+  MKLIST(*rp,n);
+}
+
 void Pdpm_weyl_nf(NODE arg,DPM *rp)
 {
   NODE b;
-  DPM *ps;
+  VECT ps;
   DPM g;
-  int full;
+  int ac,full;
 
   if ( !(g = (DPM)ARG1(arg)) ) {
     *rp = 0; return;
   }
-  asir_assert(ARG0(arg),O_LIST,"dpm_weyl_nf");
-  asir_assert(ARG1(arg),O_DPM,"dpm_weyl_nf");
-  asir_assert(ARG2(arg),O_VECT,"dpm_weyl_nf");
-  asir_assert(ARG3(arg),O_N,"dpm_weyl_nf");
-  b = BDY((LIST)ARG0(arg)); ps = (DPM *)BDY((VECT)ARG2(arg));
-  full = (Q)ARG3(arg) ? 1 : 0;
-  do_weyl = 1;
+  do_weyl = 1; dp_fcoeffs = 0;
+  ac = argc(arg);
+  if ( ac < 3 )
+    error("dpm_weyl_nf: invalid arguments");
+  else if ( ac == 3 ) {
+    asir_assert(ARG1(arg),O_VECT,"dpm_nf");
+    b = 0; g = (DPM)ARG0(arg); ps = (VECT)ARG1(arg);
+  } else if ( ac == 4 ) {
+    asir_assert(ARG0(arg),O_LIST,"dpm_weyl_nf");
+    asir_assert(ARG2(arg),O_VECT,"dpm_weyl_nf");
+    b = BDY((LIST)ARG0(arg)); g = (DPM)ARG1(arg); ps = (VECT)ARG2(arg);
+    full = (Q)ARG3(arg) ? 1 : 0;
+  }
   dpm_nf_z(b,g,ps,full,DP_Multiple,rp);
   do_weyl = 0;
 }
@@ -1419,38 +1483,51 @@ void Pdp_weyl_nf_f(NODE arg,DP *rp)
 void Pdpm_nf_f(NODE arg,DPM *rp)
 {
   NODE b;
-  DPM *ps;
+  VECT ps;
   DPM g;
-  int full;
+  int ac,full;
 
   if ( !(g = (DPM)ARG1(arg)) ) {
     *rp = 0; return;
   }
-  asir_assert(ARG0(arg),O_LIST,"dpm_nf_f");
-  asir_assert(ARG1(arg),O_DPM,"dpm_nf_f");
-  asir_assert(ARG2(arg),O_VECT,"dpm_nf_f");
-  asir_assert(ARG3(arg),O_N,"dpm_nf_f");
-  b = BDY((LIST)ARG0(arg)); ps = (DPM *)BDY((VECT)ARG2(arg));
-  full = (Q)ARG3(arg) ? 1 : 0;
+  ac = argc(arg);
+  if ( ac < 3 )
+    error("dpm_nf_f: invalid arguments");
+  else if ( ac == 3 ) {
+    asir_assert(ARG1(arg),O_VECT,"dpm_nf_f");
+    b = 0; g = (DPM)ARG0(arg); ps = (VECT)ARG1(arg);
+  } else if ( ac == 4 ) {
+    asir_assert(ARG0(arg),O_LIST,"dpm_nf_f");
+    asir_assert(ARG2(arg),O_VECT,"dpm_nf_f");
+    b = BDY((LIST)ARG0(arg)); g = (DPM)ARG1(arg); ps = (VECT)ARG2(arg);
+    full = (Q)ARG3(arg) ? 1 : 0;
+  }
+  do_weyl = 0;
   dpm_nf_f(b,g,ps,full,rp);
 }
 
 void Pdpm_weyl_nf_f(NODE arg,DPM *rp)
 {
   NODE b;
-  DPM *ps;
+  VECT ps;
   DPM g;
-  int full;
+  int ac,full;
 
   if ( !(g = (DPM)ARG1(arg)) ) {
     *rp = 0; return;
   }
-  asir_assert(ARG0(arg),O_LIST,"dpm_weyl_nf_f");
-  asir_assert(ARG1(arg),O_DP,"dpm_weyl_nf_f");
-  asir_assert(ARG2(arg),O_VECT,"dpm_weyl_nf_f");
-  asir_assert(ARG3(arg),O_N,"dpm_weyl_nf_f");
-  b = BDY((LIST)ARG0(arg)); ps = (DPM *)BDY((VECT)ARG2(arg));
-  full = (Q)ARG3(arg) ? 1 : 0;
+  ac = argc(arg);
+  if ( ac < 3 )
+    error("dpm_weyl_nf_f: invalid arguments");
+  else if ( ac == 3 ) {
+    asir_assert(ARG1(arg),O_VECT,"dpm_weyl_nf_f");
+    b = 0; g = (DPM)ARG0(arg); ps = (VECT)ARG1(arg);
+  } else if ( ac == 4 ) {
+    asir_assert(ARG0(arg),O_LIST,"dpm_weyl_nf_f");
+    asir_assert(ARG2(arg),O_VECT,"dpm_weyl_nf_f");
+    b = BDY((LIST)ARG0(arg)); g = (DPM)ARG1(arg); ps = (VECT)ARG2(arg);
+    full = (Q)ARG3(arg) ? 1 : 0;
+  }
   do_weyl = 1;
   dpm_nf_f(b,g,ps,full,rp);
   do_weyl = 0;
@@ -1843,6 +1920,29 @@ void Pdpm_redble(NODE arg,Z *rp)
     *rp = 0;
 }
 
+void dpm_schreyer_base(LIST g,LIST *s);
+
+void Pdpm_schreyer_base(NODE arg,LIST *rp)
+{
+  asir_assert(ARG0(arg),O_LIST,"dpm_schreyer_base");
+  dpm_schreyer_base((LIST)ARG0(arg),rp);
+}
+
+void dpm_simplify_syz(LIST m,LIST s,LIST *m1,LIST *s1,LIST *w1);
+
+void Pdpm_simplify_syz(NODE arg,LIST *rp)
+{
+  LIST s1,m1,w1;
+  NODE t;
+
+  asir_assert(ARG0(arg),O_LIST,"dpm_simplify_syz");
+  asir_assert(ARG1(arg),O_LIST,"dpm_simplify_syz");
+  dpm_simplify_syz((LIST)ARG0(arg),(LIST)ARG1(arg),&s1,&m1,&w1);
+  t = mknode(3,s1,m1,w1);
+  MKLIST(*rp,t);
+}
+
+
 void Pdp_red_mod(NODE arg,LIST *rp)
 {
   DP h,r;
@@ -2126,6 +2226,17 @@ void Pdp_td(NODE arg,Z *rp)
     STOZ(BDY(p)->dl->td,*rp);
 }
 
+void Pdpm_td(NODE arg,Z *rp)
+{
+  DPM p;
+
+  p = (DPM)ARG0(arg); asir_assert(p,O_DPM,"dpm_td");
+  if ( !p )
+    *rp = 0;
+  else
+    STOZ(BDY(p)->dl->td,*rp);
+}
+
 void Pdp_sugar(NODE arg,Z *rp)
 {
   DP p;
@@ -2366,6 +2477,22 @@ void Pdp_dehomo(NODE arg,DP *rp)
   dp_dehomo((DP)ARG0(arg),rp);
 }
 
+void dpm_homo(DPM a,DPM *b);
+void dpm_dehomo(DPM a,DPM *b);
+
+void Pdpm_homo(NODE arg,DPM *rp)
+{
+  asir_assert(ARG0(arg),O_DPM,"dpm_homo");
+  dpm_homo((DPM)ARG0(arg),rp);
+}
+
+void Pdpm_dehomo(NODE arg,DPM *rp)
+{
+  asir_assert(ARG0(arg),O_DPM,"dpm_dehomo");
+  dpm_dehomo((DPM)ARG0(arg),rp);
+}
+
+
 void Pdp_gr_flags(NODE arg,LIST *rp)
 {
   Obj name,value;
@@ -3864,18 +3991,19 @@ void Pdpv_ord(NODE arg,Obj *rp)
 }
 
 extern int dpm_ordtype;
+extern DMMstack dmm_stack;
 
-void set_schreyer_order(NODE n);
+void set_schreyer_order(LIST n);
 
-LIST schreyer_obj;
-
 void Pdpm_set_schreyer(NODE arg,LIST *rp)
 {
   if ( argc(arg) ) {
-    schreyer_obj = (LIST)ARG0(arg);
-    set_schreyer_order(schreyer_obj?BDY(schreyer_obj):0);
+    set_schreyer_order(ARG0(arg)?(LIST)ARG0(arg):0);
   }
-  *rp = schreyer_obj;
+  if ( dmm_stack )
+    *rp = dmm_stack->obj;
+  else
+    *rp = 0;
 }
 
 void Pdpm_hm(NODE arg,DPM *rp)
@@ -3955,15 +4083,25 @@ void Pdpm_split(NODE arg,LIST *rp)
 }
 
 
-void Pdpm_hc(NODE arg,Obj *rp)
+void Pdpm_hc(NODE arg,DP *rp)
 {
+  DPM p;
+  DP d;
+  MP m;
+
   asir_assert(ARG0(arg),O_DPM,"dpm_hc");
   if ( !ARG0(arg) )
     *rp = 0;
-  else
-    *rp = BDY((DPM)ARG0(arg))->c;
+  else {
+    p = (DPM)ARG0(arg);
+    NEWMP(m);
+    m->dl = BDY(p)->dl;
+    m->c = BDY(p)->c;
+    NEXT(m) = 0;
+    MKDP(NV(p),m,d); d->sugar = p->sugar;
+    *rp = d;
+  }
 }
-
 
 void Pdpv_ht(NODE arg,LIST *rp)
 {