===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2018/builtin/dp.c,v
retrieving revision 1.9
retrieving revision 1.15
diff -u -p -r1.9 -r1.15
--- OpenXM_contrib2/asir2018/builtin/dp.c	2019/08/21 00:37:47	1.9
+++ OpenXM_contrib2/asir2018/builtin/dp.c	2019/09/19 06:29:47	1.15
@@ -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.8 2019/03/18 10:30:41 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2018/builtin/dp.c,v 1.14 2019/09/13 09:02:49 noro Exp $
 */
 #include "ca.h"
 #include "base.h"
@@ -90,7 +90,8 @@ 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_hm(),Pdpm_ht(),Pdpm_hc(),Pdpm_shift(),Pdpm_split(),Pdpm_sort(),Pdpm_dptodpm(),Pdpm_redble();
+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 +159,9 @@ 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_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 +217,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 +277,7 @@ 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},
 
   /* criteria */
   {"dp_cri1",Pdp_cri1,2},
@@ -295,6 +296,8 @@ struct ftab dp_supp_tab[] = {
   {"dpm_hm",Pdpm_hm,1},
   {"dpm_ht",Pdpm_ht,1},
   {"dpm_hc",Pdpm_hc,1},
+  {"dpm_hp",Pdpm_hp,1},
+  {"dpm_rest",Pdpm_rest,1},
   {"dpm_shift",Pdpm_shift,2},
   {"dpm_split",Pdpm_split,2},
   {"dpm_sort",Pdpm_sort,1},
@@ -308,6 +311,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},
@@ -322,6 +326,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},
@@ -924,7 +930,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; 
   }
 }
 
@@ -1119,6 +1125,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;
@@ -1129,7 +1139,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));
@@ -1137,8 +1148,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-- ) {
@@ -1298,20 +1309,26 @@ 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);
 }
 
@@ -1332,20 +1349,20 @@ 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(ARG0(arg),O_DPM,"dpm_nf");
-    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(ARG1(arg),O_DPM,"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);
   }
-  if ( !g ) {
-    *rp = 0; return;
-  }
   NEWVECT(quo); quo->len = ps->len;
-  quo->body = (pointer *)dpm_nf_and_quotient(b,g,ps,&nm,&dn);
+  if ( g ) {
+    quo->body = (pointer *)dpm_nf_and_quotient(b,g,ps,&nm,&dn);
+  } else {
+    quo->body = (pointer *)MALLOC(quo->len*sizeof(pointer));
+    nm = 0; dn = (P)ONE;
+  }
   n = mknode(3,nm,dn,quo);
   MKLIST(*rp,n);
 }
@@ -1353,20 +1370,26 @@ void Pdpm_nf_and_quotient(NODE arg,LIST *rp)
 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;
 }
@@ -1417,38 +1440,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;
@@ -1841,6 +1877,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);
+
+void Pdpm_simplify_syz(NODE arg,LIST *rp)
+{
+  LIST s1,m1;
+  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);
+  t = mknode(2,s1,m1);
+  MKLIST(*rp,t);
+}
+
+
 void Pdp_red_mod(NODE arg,LIST *rp)
 {
   DP h,r;
@@ -2124,6 +2183,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;
@@ -3862,18 +3932,16 @@ 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,Z *rp)
+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((LIST)ARG0(arg));
   }
-  *rp = schreyer_obj;
+  *rp = dmm_stack->obj;
 }
 
 void Pdpm_hm(NODE arg,DPM *rp)
@@ -3892,6 +3960,27 @@ void Pdpm_ht(NODE arg,DPM *rp)
   dpm_ht(p,rp);
 }
 
+void dpm_rest(DPM p,DPM *r);
+
+void Pdpm_rest(NODE arg,DPM *rp)
+{
+  DPM p;
+
+  p = (DPM)ARG0(arg); asir_assert(p,O_DPM,"dpm_ht");
+  dpm_rest(p,rp);
+}
+
+
+void Pdpm_hp(NODE arg,Z *rp)
+{
+  DPM p;
+  int pos;
+
+  p = (DPM)ARG0(arg); asir_assert(p,O_DPM,"dpm_ht");
+  pos = BDY(p)->pos;
+  STOZ(pos,*rp);
+}
+
 void dpm_shift(DPM p,int s,DPM *rp);
 
 void Pdpm_shift(NODE arg,DPM *rp)
@@ -3911,7 +4000,8 @@ void Pdpm_sort(NODE arg,DPM *rp)
   DPM p;
   int s;
 
-  p = (DPM)ARG0(arg); asir_assert(p,O_DPM,"dpm_shift");
+  p = (DPM)ARG0(arg); 
+  if ( !p ) *rp = 0;
   dpm_sort(p,rp);
 }
 
@@ -3923,7 +4013,7 @@ void Pdpm_split(NODE arg,LIST *rp)
   int s;
   NODE nd;
 
-  p = (DPM)ARG0(arg); asir_assert(p,O_DPM,"dpm_split");
+  p = (DPM)ARG0(arg);
   s = ZTOS((Z)ARG1(arg));
   dpm_split(p,s,&up,&lo);
   nd = mknode(2,up,lo);
@@ -3931,15 +4021,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)
 {