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

Diff for /OpenXM_contrib2/asir2018/builtin/dp-supp.c between version 1.12 and 1.13

version 1.12, 2019/12/12 04:44:59 version 1.13, 2019/12/27 08:13:59
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-supp.c,v 1.11 2019/11/21 04:03:16 noro Exp $   * $OpenXM: OpenXM_contrib2/asir2018/builtin/dp-supp.c,v 1.12 2019/12/12 04:44:59 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
 #include "base.h"  #include "base.h"
Line 1961  last:
Line 1961  last:
   
 /* psiv is a vector of lists of Z */  /* psiv is a vector of lists of Z */
   
 DPM dpm_sp_nf_zlist(VECT psv,VECT psiv,int i,int j,DPM *nf)  DPM dpm_sp_nf_zlist(VECT psv,VECT psiv,int i,int j,int top,DPM *nf)
 {  {
   DPM *ps;    DPM *ps;
   int n,nv,s1,s2,sugar,max,pos,psugar;    int n,nv,s1,s2,sugar,max,pos,psugar;
Line 2023  DPM dpm_sp_nf_zlist(VECT psv,VECT psiv,int i,int j,DPM
Line 2023  DPM dpm_sp_nf_zlist(VECT psv,VECT psiv,int i,int j,DPM
     }      }
     if ( u ) {      if ( u ) {
       g = u;        g = u;
     } else {      } else if ( !top ) {
 #if 0  
       m = BDY(g);        m = BDY(g);
       NEXTDMM(mr0,mr);        NEXTDMM(mr0,mr);
       mr->dl = m->dl; mr->c = m->c; mr->pos = m->pos;        mr->dl = m->dl; mr->c = m->c; mr->pos = m->pos;
       dpm_rest(g,&t); g = t;        dpm_rest(g,&t); g = t;
 #else      } else {
       *nf = g;        *nf = g;
       if ( mq0 ) {        if ( mq0 ) {
         NEXT(mq) = 0; MKDPM(nv,mq0,q); q->sugar = sugar;          NEXT(mq) = 0; MKDPM(nv,mq0,q); q->sugar = sugar;
       } else        } else
         q = 0;          q = 0;
       return q;        return q;
 #endif  
     }      }
   }    }
 last:  last:
Line 2305  void dpm_split(DPM p,int s,DPM *up,DPM *lo)
Line 2303  void dpm_split(DPM p,int s,DPM *up,DPM *lo)
   }    }
 }  }
   
   /* extract the component in DP of position s */
   void dpm_extract(DPM p,int s,DP *r)
   {
     DMM m;
     MP mu0,mu;
     DP t;
   
     if ( !p ) {
       *r = 0; return;
     }
     for ( m = BDY(p), mu0 = 0; m; m = NEXT(m) ) {
       if ( m->pos == s ) {
         NEXTMP(mu0,mu);
         mu->dl = m->dl; mu->c = m->c;
       }
     }
     if ( mu0 ) {
       NEXT(mu) = 0; MKDP(p->nv,mu0,t); t->sugar = p->sugar;
       *r = t;
     } else
       *r = 0;
   }
   
 /* nf computation over a field */  /* nf computation over a field */
   
 void dp_nf_f(NODE b,DP g,DP *ps,int full,DP *rp)  void dp_nf_f(NODE b,DP g,DP *ps,int full,DP *rp)
Line 2760  int create_order_spec(VL vl,Obj obj,struct order_spec 
Line 2781  int create_order_spec(VL vl,Obj obj,struct order_spec 
           create_order_spec(0,baseobj,&basespec);            create_order_spec(0,baseobj,&basespec);
           basespec->obj = baseobj;            basespec->obj = baseobj;
           spec->base = basespec;            spec->base = basespec;
         } else {  /* weighted order */          } else if ( spec->module_ordtype == 4 ) {  /* POT with base order [n,bord,ord] */
             NODE base_ord;
             int rank;
   
             create_order_spec(0,(Obj)BDY(NEXT(NEXT(node))),&spec);
             spec->id += 256; spec->obj = obj;
             spec->top_weight = 0;
             spec->module_rank = 0;
             spec->module_top_weight = 0;
             spec->pot_nelim = 0;
             spec->module_ordtype = 4;
             node = NEXT(node);
             if ( !BDY(node) || OID(BDY(node)) != O_LIST )
               error("create_order_spec : a permitation list must be specified");
             base_ord = BDY((LIST)BDY(node));
             spec->module_rank = rank = length(base_ord);
             spec->module_base_ord = (int *)MALLOC_ATOMIC((rank+1)*sizeof(int));
             for ( i = 1, t = base_ord; i <= rank; i++, t = NEXT(t) )
               spec->module_base_ord[ZTOS((Q)BDY(t))] = i;
             break;
           } else {  /* weighted order * [n,[wv,wm],ord] */
           int ordtype;            int ordtype;
   
           ordtype = spec->module_ordtype;            ordtype = spec->module_ordtype;
Legend:
Removed from v.1.12  
changed lines
  Added in v.1.13
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>