[BACK]Return to dp.c CVS log [TXT][DIR] Up to [local] / OpenXM_contrib2 / asir2018 / builtin

Diff for /OpenXM_contrib2/asir2018/builtin/dp.c between version 1.10 and 1.17

version 1.10, 2019/08/28 23:27:33 version 1.17, 2019/11/12 07:47:45
Line 45 
Line 45 
  * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,   * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE,
  * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE.   * 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 "ca.h"
 #include "base.h"  #include "base.h"
Line 79  void Pdp_nf_mod(),Pdp_true_nf_mod();
Line 79  void Pdp_nf_mod(),Pdp_true_nf_mod();
 void Pdp_criB(),Pdp_nelim();  void Pdp_criB(),Pdp_nelim();
 void Pdp_minp(),Pdp_sp_mod();  void Pdp_minp(),Pdp_sp_mod();
 void Pdp_homo(),Pdp_dehomo();  void Pdp_homo(),Pdp_dehomo();
   void Pdpm_homo(),Pdpm_dehomo();
 void Pdp_gr_mod_main(),Pdp_gr_f_main();  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_gr_main(),Pdp_gr_hm_main(),Pdp_gr_d_main(),Pdp_gr_flags();
 void Pdp_interreduce();  void Pdp_interreduce();
Line 89  void Pdp_vtoe(), Pdp_etov(), Pdp_dtov(), Pdp_idiv(), P
Line 90  void Pdp_vtoe(), Pdp_etov(), Pdp_dtov(), Pdp_idiv(), P
 void Pdp_cont();  void Pdp_cont();
 void Pdp_gr_checklist();  void Pdp_gr_checklist();
 void Pdp_ltod(),Pdpv_ord(),Pdpv_ht(),Pdpv_hm(),Pdpv_hc();  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_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_red();
 void Pdp_weyl_sp();  void Pdp_weyl_sp();
Line 158  struct ftab dp_tab[] = {
Line 160  struct ftab dp_tab[] = {
   {"dp_nf_mod",Pdp_nf_mod,5},    {"dp_nf_mod",Pdp_nf_mod,5},
   {"dp_nf_f",Pdp_nf_f,4},    {"dp_nf_f",Pdp_nf_f,4},
   {"dpm_nf_and_quotient",Pdpm_nf_and_quotient,-3},    {"dpm_nf_and_quotient",Pdpm_nf_and_quotient,-3},
   {"dpm_nf_f",Pdpm_nf_f,4},    {"dpm_nf_and_quotient2",Pdpm_nf_and_quotient2,-3},
   {"dpm_weyl_nf_f",Pdpm_weyl_nf_f,4},    {"dpm_nf_f",Pdpm_nf_f,-4},
   {"dpm_nf",Pdpm_nf,4},    {"dpm_weyl_nf_f",Pdpm_weyl_nf_f,-4},
     {"dpm_nf",Pdpm_nf,-4},
   {"dpm_sp",Pdpm_sp,2},    {"dpm_sp",Pdpm_sp,2},
   {"dpm_weyl_sp",Pdpm_weyl_sp,2},    {"dpm_weyl_sp",Pdpm_weyl_sp,2},
   
Line 216  struct ftab dp_tab[] = {
Line 219  struct ftab dp_tab[] = {
   
   /* normal form */    /* normal form */
   {"dp_weyl_nf",Pdp_weyl_nf,4},    {"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_mod",Pdp_weyl_nf_mod,5},
   {"dp_weyl_nf_f",Pdp_weyl_nf_f,4},    {"dp_weyl_nf_f",Pdp_weyl_nf_f,4},
   
Line 276  struct ftab dp_supp_tab[] = {
Line 279  struct ftab dp_supp_tab[] = {
   
   {"dpm_ltod",Pdpm_ltod,2},    {"dpm_ltod",Pdpm_ltod,2},
   {"dpm_dptodpm",Pdpm_dptodpm,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 */    /* criteria */
   {"dp_cri1",Pdp_cri1,2},    {"dp_cri1",Pdp_cri1,2},
Line 310  struct ftab dp_supp_tab[] = {
Line 315  struct ftab dp_supp_tab[] = {
   {"dp_mag",Pdp_mag,1},    {"dp_mag",Pdp_mag,1},
   {"dp_sugar",Pdp_sugar,1},    {"dp_sugar",Pdp_sugar,1},
   {"dp_set_sugar",Pdp_set_sugar,2},    {"dp_set_sugar",Pdp_set_sugar,2},
     {"dpm_td",Pdpm_td,1},
   
   /* misc */    /* misc */
   {"dp_mbase",Pdp_mbase,1},    {"dp_mbase",Pdp_mbase,1},
Line 324  struct ftab dp_supp_tab[] = {
Line 330  struct ftab dp_supp_tab[] = {
   {"dp_compute_essential_df",Pdp_compute_essential_df,2},    {"dp_compute_essential_df",Pdp_compute_essential_df,2},
   {"dp_mono_raddec",Pdp_mono_raddec,2},    {"dp_mono_raddec",Pdp_mono_raddec,2},
   {"dp_mono_reduce",Pdp_mono_reduce,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},    {"dp_rref2",Pdp_rref2,2},
   {"sumi_updatepairs",Psumi_updatepairs,3},    {"sumi_updatepairs",Psumi_updatepairs,3},
Line 926  void Pdp_ord(NODE arg,Obj *rp)
Line 934  void Pdp_ord(NODE arg,Obj *rp)
     else if ( !create_order_spec(0,(Obj)ARG0(arg),&spec) )      else if ( !create_order_spec(0,(Obj)ARG0(arg),&spec) )
       error("dp_ord : invalid order specification");        error("dp_ord : invalid order specification");
     initd(spec); *rp = spec->obj;      initd(spec); *rp = spec->obj;
     if ( spec->id >= 256 ) dpm_ordtype = spec->ispot;      if ( spec->id >= 256 ) dpm_ordtype = spec->module_ordtype;
   }    }
 }  }
   
Line 1091  void Pdpm_dptodpm(NODE arg,DPM *rp)
Line 1099  void Pdpm_dptodpm(NODE arg,DPM *rp)
 {  {
   DP p;    DP p;
   MP mp;    MP mp;
   int pos;    int pos,shift;
   DMM m0,m;    DMM m0,m;
   
   p = (DP)ARG0(arg);    p = (DP)ARG0(arg);
Line 1103  void Pdpm_dptodpm(NODE arg,DPM *rp)
Line 1111  void Pdpm_dptodpm(NODE arg,DPM *rp)
     for ( m0 = 0, mp = BDY(p); mp; mp = NEXT(mp) ) {      for ( m0 = 0, mp = BDY(p); mp; mp = NEXT(mp) ) {
       NEXTDMM(m0,m); m->dl = mp->dl; m->c = mp->c; m->pos = pos;        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;
   }    }
 }  }
   
Line 1121  void Pdpm_dtol(NODE arg,LIST *rp)
Line 1137  void Pdpm_dtol(NODE arg,LIST *rp)
   Obj s;    Obj s;
   
   a = (DPM)ARG0(arg);    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++ ) {    for ( vl = 0, nd = BDY((LIST)ARG1(arg)), nv = 0; nd; nd = NEXT(nd), nv++ ) {
     if ( !vl ) {      if ( !vl ) {
       NEWVL(vl); tvl = vl;        NEWVL(vl); tvl = vl;
Line 1131  void Pdpm_dtol(NODE arg,LIST *rp)
Line 1151  void Pdpm_dtol(NODE arg,LIST *rp)
   }    }
   if ( vl )    if ( vl )
     NEXT(tvl) = 0;      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));     w = (MP *)CALLOC(n,sizeof(MP));
    for ( t = BDY(a), len = 0; t; t = NEXT(t) ) len++;     for ( t = BDY(a), len = 0; t; t = NEXT(t) ) len++;
    wa = (DMM *)MALLOC(len*sizeof(DMM));     wa = (DMM *)MALLOC(len*sizeof(DMM));
Line 1139  void Pdpm_dtol(NODE arg,LIST *rp)
Line 1160  void Pdpm_dtol(NODE arg,LIST *rp)
    for ( i = len-1; i >= 0; i-- ) {     for ( i = len-1; i >= 0; i-- ) {
      NEWMP(m); m->dl = wa[i]->dl; C(m) = C(wa[i]);       NEWMP(m); m->dl = wa[i]->dl; C(m) = C(wa[i]);
      pos = wa[i]->pos;       pos = wa[i]->pos;
      NEXT(m) = w[pos];       NEXT(m) = w[pos-1];
      w[pos] = m;       w[pos-1] = m;
    }     }
   nd = 0;    nd = 0;
   for ( i = n-1; i >= 0; i-- ) {    for ( i = n-1; i >= 0; i-- ) {
Line 1300  void Pdp_weyl_nf(NODE arg,DP *rp)
Line 1321  void Pdp_weyl_nf(NODE arg,DP *rp)
 void Pdpm_nf(NODE arg,DPM *rp)  void Pdpm_nf(NODE arg,DPM *rp)
 {  {
   NODE b;    NODE b;
   DPM *ps;    VECT ps;
   DPM g;    DPM g;
   int full;    int ac,full;
   
   if ( !(g = (DPM)ARG1(arg)) ) {    if ( !(g = (DPM)ARG1(arg)) ) {
     *rp = 0; return;      *rp = 0; return;
   }    }
   do_weyl = 0; dp_fcoeffs = 0;    do_weyl = 0; dp_fcoeffs = 0;
   asir_assert(ARG0(arg),O_LIST,"dpm_nf");    ac = argc(arg);
   asir_assert(ARG1(arg),O_DPM,"dpm_nf");    if ( ac < 3 )
   asir_assert(ARG2(arg),O_VECT,"dpm_nf");      error("dpm_nf: invalid arguments");
   asir_assert(ARG3(arg),O_N,"dpm_nf");    else if ( ac == 3 ) {
   b = BDY((LIST)ARG0(arg)); ps = (DPM *)BDY((VECT)ARG2(arg));      asir_assert(ARG1(arg),O_VECT,"dpm_nf");
   full = (Q)ARG3(arg) ? 1 : 0;      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);    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);  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)  void Pdpm_nf_and_quotient(NODE arg,LIST *rp)
 {  {
Line 1334  void Pdpm_nf_and_quotient(NODE arg,LIST *rp)
Line 1362  void Pdpm_nf_and_quotient(NODE arg,LIST *rp)
   if ( ac < 2 )    if ( ac < 2 )
     error("dpm_nf_and_quotient : invalid arguments");      error("dpm_nf_and_quotient : invalid arguments");
   else if ( ac == 2 ) {    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);      b = 0; g = (DPM)ARG0(arg); ps = (VECT)ARG1(arg);
   } else if ( ac == 3 ) {    } else if ( ac == 3 ) {
     asir_assert(ARG0(arg),O_LIST,"dpm_nf");      asir_assert(ARG0(arg),O_LIST,"dpm_nf_and_quotient");
     asir_assert(ARG2(arg),O_VECT,"dpm_nf");      asir_assert(ARG2(arg),O_VECT,"dpm_nf_and_quotient");
     b = BDY((LIST)ARG0(arg)); g = (DPM)ARG1(arg); ps = (VECT)ARG2(arg);      b = BDY((LIST)ARG0(arg)); g = (DPM)ARG1(arg); ps = (VECT)ARG2(arg);
   }    }
   NEWVECT(quo); quo->len = ps->len;    NEWVECT(quo); quo->len = ps->len;
Line 1352  void Pdpm_nf_and_quotient(NODE arg,LIST *rp)
Line 1380  void Pdpm_nf_and_quotient(NODE arg,LIST *rp)
   MKLIST(*rp,n);    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)  void Pdpm_weyl_nf(NODE arg,DPM *rp)
 {  {
   NODE b;    NODE b;
   DPM *ps;    VECT ps;
   DPM g;    DPM g;
   int full;    int ac,full;
   
   if ( !(g = (DPM)ARG1(arg)) ) {    if ( !(g = (DPM)ARG1(arg)) ) {
     *rp = 0; return;      *rp = 0; return;
   }    }
   asir_assert(ARG0(arg),O_LIST,"dpm_weyl_nf");    do_weyl = 1; dp_fcoeffs = 0;
   asir_assert(ARG1(arg),O_DPM,"dpm_weyl_nf");    ac = argc(arg);
   asir_assert(ARG2(arg),O_VECT,"dpm_weyl_nf");    if ( ac < 3 )
   asir_assert(ARG3(arg),O_N,"dpm_weyl_nf");      error("dpm_weyl_nf: invalid arguments");
   b = BDY((LIST)ARG0(arg)); ps = (DPM *)BDY((VECT)ARG2(arg));    else if ( ac == 3 ) {
   full = (Q)ARG3(arg) ? 1 : 0;      asir_assert(ARG1(arg),O_VECT,"dpm_nf");
   do_weyl = 1;      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);    dpm_nf_z(b,g,ps,full,DP_Multiple,rp);
   do_weyl = 0;    do_weyl = 0;
 }  }
Line 1419  void Pdp_weyl_nf_f(NODE arg,DP *rp)
Line 1483  void Pdp_weyl_nf_f(NODE arg,DP *rp)
 void Pdpm_nf_f(NODE arg,DPM *rp)  void Pdpm_nf_f(NODE arg,DPM *rp)
 {  {
   NODE b;    NODE b;
   DPM *ps;    VECT ps;
   DPM g;    DPM g;
   int full;    int ac,full;
   
   if ( !(g = (DPM)ARG1(arg)) ) {    if ( !(g = (DPM)ARG1(arg)) ) {
     *rp = 0; return;      *rp = 0; return;
   }    }
   asir_assert(ARG0(arg),O_LIST,"dpm_nf_f");    ac = argc(arg);
   asir_assert(ARG1(arg),O_DPM,"dpm_nf_f");    if ( ac < 3 )
   asir_assert(ARG2(arg),O_VECT,"dpm_nf_f");      error("dpm_nf_f: invalid arguments");
   asir_assert(ARG3(arg),O_N,"dpm_nf_f");    else if ( ac == 3 ) {
   b = BDY((LIST)ARG0(arg)); ps = (DPM *)BDY((VECT)ARG2(arg));      asir_assert(ARG1(arg),O_VECT,"dpm_nf_f");
   full = (Q)ARG3(arg) ? 1 : 0;      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);    dpm_nf_f(b,g,ps,full,rp);
 }  }
   
 void Pdpm_weyl_nf_f(NODE arg,DPM *rp)  void Pdpm_weyl_nf_f(NODE arg,DPM *rp)
 {  {
   NODE b;    NODE b;
   DPM *ps;    VECT ps;
   DPM g;    DPM g;
   int full;    int ac,full;
   
   if ( !(g = (DPM)ARG1(arg)) ) {    if ( !(g = (DPM)ARG1(arg)) ) {
     *rp = 0; return;      *rp = 0; return;
   }    }
   asir_assert(ARG0(arg),O_LIST,"dpm_weyl_nf_f");    ac = argc(arg);
   asir_assert(ARG1(arg),O_DP,"dpm_weyl_nf_f");    if ( ac < 3 )
   asir_assert(ARG2(arg),O_VECT,"dpm_weyl_nf_f");      error("dpm_weyl_nf_f: invalid arguments");
   asir_assert(ARG3(arg),O_N,"dpm_weyl_nf_f");    else if ( ac == 3 ) {
   b = BDY((LIST)ARG0(arg)); ps = (DPM *)BDY((VECT)ARG2(arg));      asir_assert(ARG1(arg),O_VECT,"dpm_weyl_nf_f");
   full = (Q)ARG3(arg) ? 1 : 0;      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;    do_weyl = 1;
   dpm_nf_f(b,g,ps,full,rp);    dpm_nf_f(b,g,ps,full,rp);
   do_weyl = 0;    do_weyl = 0;
Line 1843  void Pdpm_redble(NODE arg,Z *rp)
Line 1920  void Pdpm_redble(NODE arg,Z *rp)
     *rp = 0;      *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)  void Pdp_red_mod(NODE arg,LIST *rp)
 {  {
   DP h,r;    DP h,r;
Line 2126  void Pdp_td(NODE arg,Z *rp)
Line 2226  void Pdp_td(NODE arg,Z *rp)
     STOZ(BDY(p)->dl->td,*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)  void Pdp_sugar(NODE arg,Z *rp)
 {  {
   DP p;    DP p;
Line 2366  void Pdp_dehomo(NODE arg,DP *rp)
Line 2477  void Pdp_dehomo(NODE arg,DP *rp)
   dp_dehomo((DP)ARG0(arg),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)  void Pdp_gr_flags(NODE arg,LIST *rp)
 {  {
   Obj name,value;    Obj name,value;
Line 3864  void Pdpv_ord(NODE arg,Obj *rp)
Line 3991  void Pdpv_ord(NODE arg,Obj *rp)
 }  }
   
 extern int dpm_ordtype;  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)  void Pdpm_set_schreyer(NODE arg,LIST *rp)
 {  {
   if ( argc(arg) ) {    if ( argc(arg) ) {
     schreyer_obj = (LIST)ARG0(arg);      set_schreyer_order(ARG0(arg)?(LIST)ARG0(arg):0);
     set_schreyer_order(schreyer_obj?BDY(schreyer_obj):0);  
   }    }
   *rp = schreyer_obj;    if ( dmm_stack )
       *rp = dmm_stack->obj;
     else
       *rp = 0;
 }  }
   
 void Pdpm_hm(NODE arg,DPM *rp)  void Pdpm_hm(NODE arg,DPM *rp)
Line 3955  void Pdpm_split(NODE arg,LIST *rp)
Line 4083  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");    asir_assert(ARG0(arg),O_DPM,"dpm_hc");
   if ( !ARG0(arg) )    if ( !ARG0(arg) )
     *rp = 0;      *rp = 0;
   else    else {
     *rp = BDY((DPM)ARG0(arg))->c;      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)  void Pdpv_ht(NODE arg,LIST *rp)
 {  {
Legend:
Removed from v.1.10  
changed lines
  Added in v.1.17
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>