=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2018/builtin/dp-supp.c,v retrieving revision 1.13 retrieving revision 1.17 diff -u -p -r1.13 -r1.17 --- OpenXM_contrib2/asir2018/builtin/dp-supp.c 2019/12/27 08:13:59 1.13 +++ OpenXM_contrib2/asir2018/builtin/dp-supp.c 2020/12/15 07:40:09 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-supp.c,v 1.12 2019/12/12 04:44:59 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2018/builtin/dp-supp.c,v 1.16 2020/12/05 03:27:20 noro Exp $ */ #include "ca.h" #include "base.h" @@ -315,6 +315,21 @@ int _dl_redble(DL d1,DL d2,int nvar) return 1; } +int _dl_redble_ext(DL d1,DL d2,DL quo,int nvar) +{ + int i; + + if ( (quo->td = d2->td-d1->td) < 0 ) + return 0; + for ( i = 0; i < nvar; i++ ) + if ( (quo->d[i] = d2->d[i]-d1->d[i]) < 0 ) + break; + if ( i < nvar ) + return 0; + else + return 1; +} + void insert_to_node(DL d,NODE *n,int nvar) { DL d1; @@ -2747,7 +2762,7 @@ int create_order_spec(VL vl,Obj obj,struct order_spec spec->pot_nelim = 0; break; - case 3: /* [n,[wv,wm],ord] */ + case 3: /* [n,[mlist1,mlist2,...],ord] or [n,[wv,wm],ord] */ spec->module_ordtype = ZTOS((Z)BDY(node)); if ( spec->module_ordtype < 0 ) { spec->pot_nelim = -spec->module_ordtype; @@ -3323,6 +3338,29 @@ void dp_mod(DP p,int mod,NODE subst,DP *rp) } } +void dpm_mod(DPM p,int mod,DPM *rp) +{ + DMM m,mr,mr0; + P t; + V v; + NODE tn; + + if ( !p ) + *rp = 0; + else { + for ( mr0 = 0, m = BDY(p); m; m = NEXT(m) ) { + ptomp(mod,(P)m->c,&t); + if ( t ) { + NEXTDMM(mr0,mr); mr->c = (Obj)t; mr->dl = m->dl; + } + } + if ( mr0 ) { + NEXT(mr) = 0; MKDPM(p->nv,mr0,*rp); (*rp)->sugar = p->sugar; + } else + *rp = 0; + } +} + void dp_rat(DP p,DP *rp) { MP m,mr,mr0; @@ -3622,6 +3660,23 @@ void dpm_rest(DPM p,DPM *rp) if ( *rp ) (*rp)->sugar = p->sugar; } +} + +int dp_getdeg(DP p) +{ + int max,n,i; + MP m; + int *d; + + if ( !p ) return 0; + n = p->nv; + max = 0; + for ( m = BDY(p); m; m = NEXT(m) ) { + d = m->dl->d; + for ( i = 0; i < n; i++ ) + if ( d[i] > max ) max = d[i]; + } + return max; } int dpm_getdeg(DPM p,int *r)