===================================================================
RCS file: /home/cvs/OpenXM_contrib2/asir2018/builtin/dp.c,v
retrieving revision 1.13
retrieving revision 1.16
diff -u -p -r1.13 -r1.16
--- OpenXM_contrib2/asir2018/builtin/dp.c	2019/09/05 08:49:43	1.13
+++ OpenXM_contrib2/asir2018/builtin/dp.c	2019/10/11 03:45:56	1.16
@@ -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.12 2019/09/04 05:32:10 noro Exp $
+ * $OpenXM: OpenXM_contrib2/asir2018/builtin/dp.c,v 1.15 2019/09/19 06:29:47 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();
@@ -91,7 +92,7 @@ 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_hp(),Pdpm_rest(),Pdpm_shift(),Pdpm_split(),Pdpm_sort(),Pdpm_dptodpm(),Pdpm_redble();
-void Pdpm_schreyer_base(),Pdpm_simplify_syz();
+void Pdpm_schreyer_base(),Pdpm_simplify_syz(),Pdpm_td();
 
 void Pdp_weyl_red();
 void Pdp_weyl_sp();
@@ -277,7 +278,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},
@@ -311,6 +314,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},
@@ -929,7 +933,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; 
   }
 }
 
@@ -1094,7 +1098,7 @@ void Pdpm_dptodpm(NODE arg,DPM *rp)
 {
   DP p;
   MP mp;
-  int pos;
+  int pos,shift;
   DMM m0,m;
 
   p = (DP)ARG0(arg);
@@ -1106,7 +1110,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;
   }
 }
 
@@ -1124,6 +1136,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;
@@ -1134,7 +1150,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));
@@ -1142,8 +1159,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-- ) {
@@ -1879,17 +1896,17 @@ void Pdpm_schreyer_base(NODE arg,LIST *rp)
   dpm_schreyer_base((LIST)ARG0(arg),rp);
 }
 
-void dpm_simplify_syz(LIST m,LIST s,LIST *m1,LIST *s1);
+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;
+  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);
-  t = mknode(2,s1,m1);
+  dpm_simplify_syz((LIST)ARG0(arg),(LIST)ARG1(arg),&s1,&m1,&w1);
+  t = mknode(3,s1,m1,w1);
   MKLIST(*rp,t);
 }
 
@@ -2177,6 +2194,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;
@@ -2417,6 +2445,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;
@@ -3915,18 +3959,16 @@ void Pdpv_ord(NODE arg,Obj *rp)
 }
 
 extern int dpm_ordtype;
+extern DMMstack dmm_stack;
 
 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);
+    set_schreyer_order((LIST)ARG0(arg));
   }
-  *rp = schreyer_obj;
+  *rp = dmm_stack->obj;
 }
 
 void Pdpm_hm(NODE arg,DPM *rp)