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

Diff for /OpenXM_contrib2/asir2018/engine/dist.c between version 1.1 and 1.2

version 1.1, 2018/09/19 05:45:07 version 1.2, 2018/09/28 08:20:28
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: OpenXM_contrib2/asir2018/engine/dist.c,v 1.1 2018/09/19 05:45:07 noro Exp $
 */  */
 #include "ca.h"  #include "ca.h"
   
Line 263  void ptod(VL vl,VL dvl,P p,DP *pr)
Line 263  void ptod(VL vl,VL dvl,P p,DP *pr)
   
         for ( j = k-1, s = 0; j >= 0; j-- ) {          for ( j = k-1, s = 0; j >= 0; j-- ) {
           ptod(vl,dvl,COEF(w[j]),&t);            ptod(vl,dvl,COEF(w[j]),&t);
           NEWDL(d,n); d->d[i] = QTOS(DEG(w[j]));            NEWDL(d,n); d->d[i] = ZTOS(DEG(w[j]));
           d->td = MUL_WEIGHT(d->d[i],i);            d->td = MUL_WEIGHT(d->d[i],i);
           NEWMP(m); m->dl = d; C(m) = (Obj)ONE; NEXT(m) = 0; MKDP(n,m,u); u->sugar = d->td;            NEWMP(m); m->dl = d; C(m) = (Obj)ONE; NEXT(m) = 0; MKDP(n,m,u); u->sugar = d->td;
           comm_muld(vl,t,u,&r); addd(vl,r,s,&t); s = t;            comm_muld(vl,t,u,&r); addd(vl,r,s,&t); s = t;
Line 305  void dtop(VL vl,VL dvl,DP p,Obj *pr)
Line 305  void dtop(VL vl,VL dvl,DP p,Obj *pr)
       }        }
       for ( i = 0, d = m->dl, tvl = dvl;        for ( i = 0, d = m->dl, tvl = dvl;
         i < n; tvl = NEXT(tvl), i++ ) {          i < n; tvl = NEXT(tvl), i++ ) {
         MKV(tvl->v,r); STOQ(d->d[i],q); pwrp(vl,r,q,(P *)&u);          MKV(tvl->v,r); STOZ(d->d[i],q); pwrp(vl,r,q,(P *)&u);
         arf_mul(vl,t,(Obj)u,&w); t = w;          arf_mul(vl,t,(Obj)u,&w); t = w;
       }        }
       arf_add(vl,s,t,&u); s = u;        arf_add(vl,s,t,&u); s = u;
Line 332  void nodetod(NODE node,DP *dp)
Line 332  void nodetod(NODE node,DP *dp)
     else if ( !NUM(e) || !RATN(e) || !INT(e) )      else if ( !NUM(e) || !RATN(e) || !INT(e) )
       error("nodetod : invalid input");        error("nodetod : invalid input");
     else {      else {
       d->d[i] = QTOS((Q)e); td += MUL_WEIGHT(d->d[i],i);        d->d[i] = ZTOS((Q)e); td += MUL_WEIGHT(d->d[i],i);
     }      }
   }    }
   d->td = td;    d->td = td;
Line 358  void nodetodpm(NODE node,Obj pos,DPM *dp)
Line 358  void nodetodpm(NODE node,Obj pos,DPM *dp)
     else if ( !NUM(e) || !RATN(e) || !INT(e) )      else if ( !NUM(e) || !RATN(e) || !INT(e) )
       error("nodetodpm : invalid input");        error("nodetodpm : invalid input");
     else {      else {
       d->d[i] = QTOS((Q)e); td += MUL_WEIGHT(d->d[i],i);        d->d[i] = ZTOS((Q)e); td += MUL_WEIGHT(d->d[i],i);
     }      }
   }    }
   d->td = td;    d->td = td;
   NEWDMM(m); m->dl = d; m->pos = QTOS((Q)pos); C(m) = (Obj)ONE; NEXT(m) = 0;    NEWDMM(m); m->dl = d; m->pos = ZTOS((Q)pos); C(m) = (Obj)ONE; NEXT(m) = 0;
   MKDPM(len,m,u); u->sugar = td; *dp = u;    MKDPM(len,m,u); u->sugar = td; *dp = u;
 }  }
   
Line 942  void actm(VL vl,int nv,MP m1,MP m2,DP *pr)
Line 942  void actm(VL vl,int nv,MP m1,MP m2,DP *pr)
   c = ONE;    c = ONE;
   for ( i = 0; i < nv; i++ ) {    for ( i = 0; i < nv; i++ ) {
     for ( j = d2->d[i], k = d1->d[i]; k > 0; k--, j-- ) {      for ( j = d2->d[i], k = d1->d[i]; k > 0; k--, j-- ) {
       STOQ(j,jq); mulz(c,jq,&c1); c = c1;        STOZ(j,jq); mulz(c,jq,&c1); c = c1;
     }      }
     d->d[i] = d2->d[i]-d1->d[i];      d->d[i] = d2->d[i]-d1->d[i];
   }    }
Line 2364  void pwrnbp(VL vl,NBP a,Z q,NBP *c)
Line 2364  void pwrnbp(VL vl,NBP a,Z q,NBP *c)
   else if ( UNIQ(q) )    else if ( UNIQ(q) )
     *c = a;      *c = a;
   else {    else {
     STOQ(2,two);      STOZ(2,two);
     divqrz(q,two,&q1,&r1);      divqrz(q,two,&q1,&r1);
     pwrnbp(vl,a,q1,&a1);      pwrnbp(vl,a,q1,&a1);
     mulnbp(vl,a1,a1,&a2);      mulnbp(vl,a1,a1,&a2);
Legend:
Removed from v.1.1  
changed lines
  Added in v.1.2
FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>