=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/dist.c,v retrieving revision 1.35 retrieving revision 1.40 diff -u -p -r1.35 -r1.40 --- OpenXM_contrib2/asir2000/engine/dist.c 2005/11/25 02:43:39 1.35 +++ OpenXM_contrib2/asir2000/engine/dist.c 2006/04/16 00:51:13 1.40 @@ -45,7 +45,7 @@ * DEVELOPER SHALL HAVE NO LIABILITY IN CONNECTION WITH THE USE, * PERFORMANCE OR NON-PERFORMANCE OF THE SOFTWARE. * - * $OpenXM: OpenXM_contrib2/asir2000/engine/dist.c,v 1.34 2005/11/24 08:16:03 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/engine/dist.c,v 1.39 2005/12/21 23:18:16 noro Exp $ */ #include "ca.h" @@ -1121,6 +1121,8 @@ int compd(VL vl,DP p1,DP p2) return p2 ? -1 : 0; else if ( !p2 ) return 1; + else if ( NV(p1) != NV(p2) ) + error("compd : size mismatch"); else { for ( n = NV(p1), m1 = BDY(p1), m2 = BDY(p2); m1 && m2; m1 = NEXT(m1), m2 = NEXT(m2) ) @@ -1496,6 +1498,8 @@ int cmpdl_order_pair(int n,DL d1,DL d2) struct order_pair *pair; len = dp_current_spec->ord.block.length; + if ( n != dp_current_spec->nv ) + error("cmpdl_order_pair : incompatible order specification"); pair = dp_current_spec->ord.block.order_pair; head = 0; @@ -1819,14 +1823,13 @@ NBM mul_nbm(NBM a,NBM b) int ad,bd,d,i,j; int *ab,*bb,*mb; NBM m; - Q c,c1; NODE r; NBP u; ad = a->d; bd = b->d; ab = a->b; bb = b->b; d = ad + bd; NEWNBM(m); NEWNBMBDY(m,d); - m->d = d; mulq(a->c,b->c,&m->c); mb = m->b; + m->d = d; mulp(CO,a->c,b->c,&m->c); mb = m->b; j = 0; for ( i = 0; i < ad; i++, j++ ) if ( NBM_GET(ab,i) ) NBM_SET(mb,j); @@ -1837,164 +1840,152 @@ NBM mul_nbm(NBM a,NBM b) return m; } -NBP shuffle_mul_nbm(NBM a,NBM b) +NBP nbmtonbp(NBM m) { - int ad,bd,d,i,ai,bi,bit,s; - int *ab,*bb,*wmb,*w; - NBM wm,tm; - Q c,c1; - NODE r,t,t1,p; + NODE n; NBP u; - ad = a->d; bd = b->d; ab = a->b; bb = b->b; - d = ad + bd; - w = (int *)ALLOCA(d*sizeof(int)); - NEWNBM(wm); NEWNBMBDY(wm,d); wmb = wm->b; - for ( i = 0; i < ad; i++ ) w[i] = 1; - for ( ; i < d; i++ ) w[i] = 0; - mulq(a->c,b->c,&c); - r = 0; - do { - wm->d = d; wm->c = c; - ai = 0; bi = 0; - for ( i = 0; i < d; i++ ) { - if ( w[i] ) { bit = NBM_GET(ab,ai); ai++; } - else { bit = NBM_GET(bb,bi); bi++; } - if ( bit ) NBM_SET(wmb,i); - else NBM_CLR(wmb,i); + MKNODE(n,m,0); + MKNBP(u,n); + return u; +} + +/* a=c*x*rest -> a0= x*rest, ah=x, ar=rest */ + +P separate_nbm(NBM a,NBP *a0,NBP *ah,NBP *ar) +{ + int i,d1; + NBM t; + + if ( !a->d ) error("separate_nbm : invalid argument"); + + if ( a0 ) { + NEWNBM(t); t->d = a->d; t->b = a->b; t->c = (P)ONE; + *a0 = nbmtonbp(t); + } + + if ( ah ) { + NEWNBM(t); NEWNBMBDY(t,1); t->d = 1; t->c = (P)ONE; + if ( NBM_GET(a->b,0) ) NBM_SET(t->b,0); + else NBM_CLR(t->b,0); + *ah = nbmtonbp(t); + } + + if ( ar ) { + d1 = a->d-1; + NEWNBM(t); NEWNBMBDY(t,d1); t->d = d1; t->c = (P)ONE; + for ( i = 0; i < d1; i++ ) { + if ( NBM_GET(a->b,i+1) ) NBM_SET(t->b,i); + else NBM_CLR(t->b,i); } - for ( p = 0, t = r; t; p = t, t = NEXT(t) ) { - tm = (NBM)BDY(t); - s = comp_nbm(tm,wm); - if ( s < 0 ) { - /* insert */ - MKNODE(t1,wm,t); - if ( !p ) r = t1; - else NEXT(p) = t1; - NEWNBM(wm); NEWNBMBDY(wm,d); wmb = wm->b; - break; - } else if ( s == 0 ) { - /* add coefs */ - addq(tm->c,c,&c1); - if ( c1 ) tm->c = c1; - else NEXT(p) = NEXT(t); - break; - } + *ar = nbmtonbp(t); + } + + return a->c; +} + +NBP make_xky(int k) +{ + int k1,i; + NBM t; + + NEWNBM(t); NEWNBMBDY(t,k); t->d = k; t->c = (P)ONE; + k1 = k-1; + for ( i = 0; i < k1; i++ ) NBM_SET(t->b,i); + NBM_CLR(t->b,i); + return nbmtonbp(t); +} + +/* a=c*x^(k-1)*y*rest -> a0= x^(k-1)*y*rest, ah=x^(k-1)*y, ar=rest */ + +P separate_xky_nbm(NBM a,NBP *a0,NBP *ah,NBP *ar) +{ + int i,d1,k,k1; + NBM t; + + if ( !a->d ) + error("separate_nbm : invalid argument"); + for ( i = 0; i < a->d && NBM_GET(a->b,i); i++ ); + if ( i == a->d ) + error("separate_nbm : invalid argument"); + k1 = i; + k = i+1; + + if ( a0 ) { + NEWNBM(t); t->d = a->d; t->b = a->b; t->c = (P)ONE; + *a0 = nbmtonbp(t); + } + + if ( ah ) { + NEWNBM(t); NEWNBMBDY(t,k); t->d = k; t->c = (P)ONE; + for ( i = 0; i < k1; i++ ) NBM_SET(t->b,i); + NBM_CLR(t->b,i); + *ah = nbmtonbp(t); + } + + if ( ar ) { + d1 = a->d-k; + NEWNBM(t); NEWNBMBDY(t,d1); t->d = d1; t->c = (P)ONE; + for ( i = 0; i < d1; i++ ) { + if ( NBM_GET(a->b,i+k) ) NBM_SET(t->b,i); + else NBM_CLR(t->b,i); } - if ( !t ) { - /* append */ - MKNODE(t1,wm,t); - if ( !p ) r = t1; - else NEXT(p) = t1; - NEWNBM(wm); NEWNBMBDY(wm,d); wmb = wm->b; - } - } while ( ni_next(w,d) ); - MKNBP(u,r); - return u; + *ar = nbmtonbp(t); + } + + return a->c; } -int nbmtoxky(NBM a,int *b) +void shuffle_mulnbp(VL vl,NBP p1,NBP p2, NBP *rp); +void harmonic_mulnbp(VL vl,NBP p1,NBP p2, NBP *rp); +void mulnbmnbp(VL vl,NBM m,NBP p, NBP *rp); +void mulnbpnbm(VL vl,NBP p,NBM m, NBP *rp); + +NBP shuffle_mul_nbm(NBM a,NBM b) { - int d,i,j,k; - int *p; + NBP u,a0,ah,ar,b0,bh,br,a1,b1,t; + P ac,bc,c; - d = a->d; p = a->b; - for ( i = j = 0, k = 1; i < d; i++ ) { - if ( !NBM_GET(p,i) ) { - b[j++] = k; - k = 1; - } else k++; + if ( !a->d || !b->d ) + u = nbmtonbp(mul_nbm(a,b)); + else { + ac = separate_nbm(a,&a0,&ah,&ar); + bc = separate_nbm(b,&b0,&bh,&br); + mulp(CO,ac,bc,&c); + shuffle_mulnbp(CO,ar,b0,&t); mulnbp(CO,ah,t,&a1); + shuffle_mulnbp(CO,a0,br,&t); mulnbp(CO,bh,t,&b1); + addnbp(CO,a1,b1,&t); mulnbp(CO,(NBP)c,t,&u); } - return j; + return u; } NBP harmonic_mul_nbm(NBM a,NBM b) { - int da,db,d,la,lb,lmax,lmin,l,lab,la1,lb1,lab1; - int i,j,k,ia,ib,s; - int *wa,*wb,*w,*wab,*wa1,*wmb; - Q c,c1; - NBM wm,tm; - NODE r,t1,t,p; - NBP u; + NBP u,a0,ah,ar,b0,bh,br,a1,b1,t,s,abk,ab1; + P ac,bc,c; - da = a->d; db = b->d; d = da+db; - wa = (int *)ALLOCA(da*sizeof(int)); - wb = (int *)ALLOCA(db*sizeof(int)); - la = nbmtoxky(a,wa); - lb = nbmtoxky(b,wb); - mulq(a->c,b->c,&c); - /* wa[0],..,wa[la-1] <-> x^wa[0]y x^wa[1]y .. */ - /* lmax : total length */ - lmax = la+lb; - lmin = la>lb?la:lb; - w = (int *)ALLOCA(lmax*sizeof(int)); - /* position of a+b */ - wab = (int *)ALLOCA(lmax*sizeof(int)); - /* position of a */ - wa1 = (int *)ALLOCA(lmax*sizeof(int)); - NEWNBM(wm); NEWNBMBDY(wm,d); wmb = wm->b; - for ( l = lmin, r = 0; l <= lmax; l++ ) { - lab = lmax - l; - la1 = la - lab; - lb1 = lb - lab; - lab1 = l-lab; - /* partion l into three parts: a, b, a+b */ - /* initialize wab */ - for ( i = 0; i < lab; i++ ) wab[i] = 1; - for ( ; i < l; i++ ) wab[i] = 0; - do { - /* initialize wa1 */ - for ( i = 0; i < la1; i++ ) wa1[i] = 1; - for ( ; i < lab1; i++ ) wa1[i] = 0; - do { - ia = 0; ib = 0; - for ( i = j = 0; i < l; i++ ) - if ( wab[i] ) w[i] = wa[ia++]+wb[ib++]; - else if ( wa1[j++] ) w[i] = wa[ia++]; - else w[i] = wb[ib++]; - for ( i = j = 0; i < l; i++ ) { - for ( k = w[i]-1; k > 0; k--, j++ ) NBM_SET(wmb,j); - NBM_CLR(wmb,j); j++; - } - wm->d = j; wm->c = c; - for ( p = 0, t = r; t; p = t, t = NEXT(t) ) { - tm = (NBM)BDY(t); - s = comp_nbm(tm,wm); - if ( s < 0 ) { - /* insert */ - MKNODE(t1,wm,t); - if ( !p ) r = t1; - else NEXT(p) = t1; - NEWNBM(wm); NEWNBMBDY(wm,d); wmb = wm->b; - break; - } else if ( s == 0 ) { - /* add coefs */ - addq(tm->c,c,&c1); - if ( c1 ) tm->c = c1; - else NEXT(p) = NEXT(t); - break; - } - } - if ( !t ) { - /* append */ - MKNODE(t1,wm,t); - if ( !p ) r = t1; - else NEXT(p) = t1; - NEWNBM(wm); NEWNBMBDY(wm,d); wmb = wm->b; - } - } while ( ni_next(wa1,lab1) ); - } while ( ni_next(wab,l) ); + if ( !a->d || !b->d ) + u = nbmtonbp(mul_nbm(a,b)); + else { + mulp(CO,a->c,b->c,&c); + ac = separate_xky_nbm(a,&a0,&ah,&ar); + bc = separate_xky_nbm(b,&b0,&bh,&br); + mulp(CO,ac,bc,&c); + harmonic_mulnbp(CO,ar,b0,&t); mulnbp(CO,ah,t,&a1); + harmonic_mulnbp(CO,a0,br,&t); mulnbp(CO,bh,t,&b1); + abk = make_xky(((NBM)BDY(BDY(ah)))->d+((NBM)BDY(BDY(bh)))->d); + harmonic_mulnbp(CO,ar,br,&t); mulnbp(CO,abk,t,&ab1); + addnbp(CO,a1,b1,&t); addnbp(CO,t,ab1,&s); mulnbp(CO,(NBP)c,s,&u); } - MKNBP(u,r); return u; + } void addnbp(VL vl,NBP p1,NBP p2, NBP *rp) { NODE b1,b2,br,br0; NBM m1,m2,m; - Q c; + P c; if ( !p1 ) *rp = p2; @@ -2005,7 +1996,7 @@ void addnbp(VL vl,NBP p1,NBP p2, NBP *rp) m1 = (NBM)BDY(b1); m2 = (NBM)BDY(b2); switch ( comp_nbm(m1,m2) ) { case 0: - addq(m1->c,m2->c,&c); + addp(CO,m1->c,m2->c,&c); if ( c ) { NEXTNODE(br0,br); NEWNBM(m); m->d = m1->d; m->c = c; m->b = m1->b; @@ -2055,23 +2046,35 @@ void chsgnnbp(NBP p,NBP *rp) for ( r0 = 0, b = BDY(p); b; b = NEXT(b) ) { NEXTNODE(r0,r); m = (NBM)BDY(b); - NEWNBM(m1); m1->d = m->d; m1->b = m->b; chsgnq(m->c,&m1->c); + NEWNBM(m1); m1->d = m->d; m1->b = m->b; chsgnp(m->c,&m1->c); BDY(r) = m1; } if ( r0 ) NEXT(r) = 0; MKNBP(*rp,r0); } -void mulnbmnbp(VL vl,NBM m,NBP p, NBP *rp); -void mulnbpnbm(VL vl,NBP p,NBM m, NBP *rp); - void mulnbp(VL vl,NBP p1,NBP p2, NBP *rp) { - NODE b; + NODE b,n; NBP r,t,s; + NBM m; - if ( !p1 || !p2 ) *rp = 0; - else if ( length(BDY(p1)) < length(BDY(p2)) ) { + if ( !p1 || !p2 ) { + *rp = 0; return; + } + if ( OID(p1) != O_NBP ) { + if ( !POLY(p1) ) + error("mulnbp : invalid argument"); + NEWNBM(m); m->d = 0; m->b = 0; m->c = (P)p1; + MKNODE(n,m,0); MKNBP(p1,n); + } + if ( OID(p2) != O_NBP ) { + if ( !POLY(p2) ) + error("mulnbp : invalid argument"); + NEWNBM(m); m->d = 0; m->b = 0; m->c = (P)p2; + MKNODE(n,m,0); MKNBP(p2,n); + } + if ( length(BDY(p1)) < length(BDY(p2)) ) { for ( r = 0, b = BDY(p1); b; b = NEXT(b) ) { mulnbmnbp(vl,(NBM)BDY(b),p2,&t); addnbp(vl,r,t,&s); r = s; @@ -2126,7 +2129,7 @@ void pwrnbp(VL vl,NBP a,Q q,NBP *c) NODE r; if ( !q ) { - NEWNBM(m); m->d = 0; m->c = ONE; m->b = 0; + NEWNBM(m); m->d = 0; m->c = (P)ONE; m->b = 0; MKNODE(r,m,0); MKNBP(*c,r); } else if ( !a ) *c = 0; @@ -2143,36 +2146,241 @@ void pwrnbp(VL vl,NBP a,Q q,NBP *c) } } +int compnbp(VL vl,NBP p1,NBP p2) +{ + NODE n1,n2; + NBM m1,m2; + int t; + + if ( !p1 ) + return p2 ? -1 : 0; + else if ( !p2 ) + return 1; + else { + for ( n1 = BDY(p1), n2 = BDY(p2); + n1 && n2; n1 = NEXT(n1), n2 = NEXT(n2) ) { + m1 = (NBM)BDY(n1); m2 = (NBM)BDY(n2); + if ( (t = comp_nbm(m1,m2)) || (t = compp(CO,m1->c,m2->c) ) ) + return t; + } + if ( n1 ) + return 1; + else if ( n2 ) + return -1; + else + return 0; + } +} + void shuffle_mulnbp(VL vl,NBP p1,NBP p2, NBP *rp) { - NODE b1,b2; + NODE b1,b2,n; NBP r,t,s; NBM m; - if ( !p1 || !p2 ) *rp = 0; - else { - for ( r = 0, b1 = BDY(p1); b1; b1 = NEXT(b1) ) - for ( m = BDY(b1), b2 = BDY(p2); b2; b2 = NEXT(b2) ) { - t = shuffle_mul_nbm(m,(NBM)BDY(b2)); - addnbp(vl,r,t,&s); r = s; - } - *rp = r; + if ( !p1 || !p2 ) { + *rp = 0; return; } + if ( OID(p1) != O_NBP ) { + if ( !POLY(p1) ) + error("shuffle_mulnbp : invalid argument"); + NEWNBM(m); m->d = 0; m->b = 0; m->c = (P)p1; + MKNODE(n,m,0); MKNBP(p1,n); + } + if ( OID(p2) != O_NBP ) { + if ( !POLY(p2) ) + error("shuffle_mulnbp : invalid argument"); + NEWNBM(m); m->d = 0; m->b = 0; m->c = (P)p2; + MKNODE(n,m,0); MKNBP(p2,n); + } + for ( r = 0, b1 = BDY(p1); b1; b1 = NEXT(b1) ) + for ( m = BDY(b1), b2 = BDY(p2); b2; b2 = NEXT(b2) ) { + t = shuffle_mul_nbm(m,(NBM)BDY(b2)); + addnbp(vl,r,t,&s); r = s; + } + *rp = r; } void harmonic_mulnbp(VL vl,NBP p1,NBP p2, NBP *rp) { - NODE b1,b2; + NODE b1,b2,n; NBP r,t,s; NBM m; - if ( !p1 || !p2 ) *rp = 0; - else { - for ( r = 0, b1 = BDY(p1); b1; b1 = NEXT(b1) ) - for ( m = BDY(b1), b2 = BDY(p2); b2; b2 = NEXT(b2) ) { - t = harmonic_mul_nbm(m,(NBM)BDY(b2)); - addnbp(vl,r,t,&s); r = s; + if ( !p1 || !p2 ) { + *rp = 0; return; + } + if ( OID(p1) != O_NBP ) { + if ( !POLY(p1) ) + error("harmonic_mulnbp : invalid argument"); + NEWNBM(m); m->d = 0; m->b = 0; m->c = (P)p1; + MKNODE(n,m,0); MKNBP(p1,n); + } + if ( OID(p2) != O_NBP ) { + if ( !POLY(p2) ) + error("harmonic_mulnbp : invalid argument"); + NEWNBM(m); m->d = 0; m->b = 0; m->c = (P)p2; + MKNODE(n,m,0); MKNBP(p2,n); + } + for ( r = 0, b1 = BDY(p1); b1; b1 = NEXT(b1) ) + for ( m = BDY(b1), b2 = BDY(p2); b2; b2 = NEXT(b2) ) { + t = harmonic_mul_nbm(m,(NBM)BDY(b2)); + addnbp(vl,r,t,&s); r = s; + } + *rp = r; +} + +#if 0 +NBP shuffle_mul_nbm(NBM a,NBM b) +{ + int ad,bd,d,i,ai,bi,bit,s; + int *ab,*bb,*wmb,*w; + NBM wm,tm; + P c,c1; + NODE r,t,t1,p; + NBP u; + + ad = a->d; bd = b->d; ab = a->b; bb = b->b; + d = ad + bd; + w = (int *)ALLOCA(d*sizeof(int)); + NEWNBM(wm); NEWNBMBDY(wm,d); wmb = wm->b; + for ( i = 0; i < ad; i++ ) w[i] = 1; + for ( ; i < d; i++ ) w[i] = 0; + mulp(CO,a->c,b->c,&c); + r = 0; + do { + wm->d = d; wm->c = c; + ai = 0; bi = 0; + for ( i = 0; i < d; i++ ) { + if ( w[i] ) { bit = NBM_GET(ab,ai); ai++; } + else { bit = NBM_GET(bb,bi); bi++; } + if ( bit ) NBM_SET(wmb,i); + else NBM_CLR(wmb,i); + } + for ( p = 0, t = r; t; p = t, t = NEXT(t) ) { + tm = (NBM)BDY(t); + s = comp_nbm(tm,wm); + if ( s < 0 ) { + /* insert */ + MKNODE(t1,wm,t); + if ( !p ) r = t1; + else NEXT(p) = t1; + NEWNBM(wm); NEWNBMBDY(wm,d); wmb = wm->b; + break; + } else if ( s == 0 ) { + /* add coefs */ + addp(CO,tm->c,c,&c1); + if ( c1 ) tm->c = c1; + else NEXT(p) = NEXT(t); + break; } - *rp = r; + } + if ( !t ) { + /* append */ + MKNODE(t1,wm,t); + if ( !p ) r = t1; + else NEXT(p) = t1; + NEWNBM(wm); NEWNBMBDY(wm,d); wmb = wm->b; + } + } while ( ni_next(w,d) ); + MKNBP(u,r); + return u; +} + +int nbmtoxky(NBM a,int *b) +{ + int d,i,j,k; + int *p; + + d = a->d; p = a->b; + for ( i = j = 0, k = 1; i < d; i++ ) { + if ( !NBM_GET(p,i) ) { + b[j++] = k; + k = 1; + } else k++; } + return j; } + +NBP harmonic_mul_nbm(NBM a,NBM b) +{ + int da,db,d,la,lb,lmax,lmin,l,lab,la1,lb1,lab1; + int i,j,k,ia,ib,s; + int *wa,*wb,*w,*wab,*wa1,*wmb; + P c,c1; + NBM wm,tm; + NODE r,t1,t,p; + NBP u; + + da = a->d; db = b->d; d = da+db; + wa = (int *)ALLOCA(da*sizeof(int)); + wb = (int *)ALLOCA(db*sizeof(int)); + la = nbmtoxky(a,wa); + lb = nbmtoxky(b,wb); + mulp(CO,a->c,b->c,&c); + /* wa[0],..,wa[la-1] <-> x^wa[0]y x^wa[1]y .. */ + /* lmax : total length */ + lmax = la+lb; + lmin = la>lb?la:lb; + w = (int *)ALLOCA(lmax*sizeof(int)); + /* position of a+b */ + wab = (int *)ALLOCA(lmax*sizeof(int)); + /* position of a */ + wa1 = (int *)ALLOCA(lmax*sizeof(int)); + NEWNBM(wm); NEWNBMBDY(wm,d); wmb = wm->b; + for ( l = lmin, r = 0; l <= lmax; l++ ) { + lab = lmax - l; + la1 = la - lab; + lb1 = lb - lab; + lab1 = l-lab; + /* partion l into three parts: a, b, a+b */ + /* initialize wab */ + for ( i = 0; i < lab; i++ ) wab[i] = 1; + for ( ; i < l; i++ ) wab[i] = 0; + do { + /* initialize wa1 */ + for ( i = 0; i < la1; i++ ) wa1[i] = 1; + for ( ; i < lab1; i++ ) wa1[i] = 0; + do { + ia = 0; ib = 0; + for ( i = j = 0; i < l; i++ ) + if ( wab[i] ) w[i] = wa[ia++]+wb[ib++]; + else if ( wa1[j++] ) w[i] = wa[ia++]; + else w[i] = wb[ib++]; + for ( i = j = 0; i < l; i++ ) { + for ( k = w[i]-1; k > 0; k--, j++ ) NBM_SET(wmb,j); + NBM_CLR(wmb,j); j++; + } + wm->d = j; wm->c = c; + for ( p = 0, t = r; t; p = t, t = NEXT(t) ) { + tm = (NBM)BDY(t); + s = comp_nbm(tm,wm); + if ( s < 0 ) { + /* insert */ + MKNODE(t1,wm,t); + if ( !p ) r = t1; + else NEXT(p) = t1; + NEWNBM(wm); NEWNBMBDY(wm,d); wmb = wm->b; + break; + } else if ( s == 0 ) { + /* add coefs */ + addp(CO,tm->c,c,&c1); + if ( c1 ) tm->c = c1; + else NEXT(p) = NEXT(t); + break; + } + } + if ( !t ) { + /* append */ + MKNODE(t1,wm,t); + if ( !p ) r = t1; + else NEXT(p) = t1; + NEWNBM(wm); NEWNBMBDY(wm,d); wmb = wm->b; + } + } while ( ni_next(wa1,lab1) ); + } while ( ni_next(wab,l) ); + } + MKNBP(u,r); + return u; +} +#endif