=================================================================== RCS file: /home/cvs/OpenXM_contrib2/asir2000/engine/vect.c,v retrieving revision 1.2 retrieving revision 1.6 diff -u -p -r1.2 -r1.6 --- OpenXM_contrib2/asir2000/engine/vect.c 2000/08/21 08:31:29 1.2 +++ OpenXM_contrib2/asir2000/engine/vect.c 2018/03/29 01:32:52 1.6 @@ -23,7 +23,7 @@ * shall be made on your publication or presentation in any form of the * results obtained by use of the SOFTWARE. * (4) In the event that you modify the SOFTWARE, you shall notify FLL by - * e-mail at risa-admin@flab.fujitsu.co.jp of the detailed specification + * e-mail at risa-admin@sec.flab.fujitsu.co.jp of the detailed specification * for such modification or the source code of the modified part of the * SOFTWARE. * @@ -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/vect.c,v 1.1.1.1 1999/12/03 07:39:08 noro Exp $ + * $OpenXM: OpenXM_contrib2/asir2000/engine/vect.c,v 1.5 2003/05/22 07:01:40 noro Exp $ */ #include "ca.h" @@ -53,97 +53,97 @@ void addvect(vl,a,b,c) VL vl; VECT a,b,*c; { - int len,i; - VECT t; - pointer *ab,*bb,*tb; + int len,i; + VECT t; + pointer *ab,*bb,*tb; - if ( !a ) - *c = b; - else if ( !b ) - *c = a; - else if ( a->len != b->len ) { - *c = 0; error("addvect : size mismatch"); - } else { - len = a->len; - MKVECT(t,len); - for ( i = 0, ab = BDY(a), bb = BDY(b), tb = BDY(t); i < len; i++ ) - addr(vl,(Obj)ab[i],(Obj)bb[i],(Obj *)&tb[i]); - *c = t; - } + if ( !a ) + *c = b; + else if ( !b ) + *c = a; + else if ( a->len != b->len ) { + *c = 0; error("addvect : size mismatch"); + } else { + len = a->len; + MKVECT(t,len); + for ( i = 0, ab = BDY(a), bb = BDY(b), tb = BDY(t); i < len; i++ ) + arf_add(vl,(Obj)ab[i],(Obj)bb[i],(Obj *)&tb[i]); + *c = t; + } } void subvect(vl,a,b,c) VL vl; VECT a,b,*c; { - int len,i; - VECT t; - pointer *ab,*bb,*tb; + int len,i; + VECT t; + pointer *ab,*bb,*tb; - if ( !a ) - chsgnvect(b,c); - else if ( !b ) - *c = a; - else if (a->len != b->len ) { - *c = 0; error("subvect : size mismatch"); - } else { - len = a->len; - MKVECT(t,len); - for ( i = 0, ab = BDY(a), bb = BDY(b), tb = BDY(t); - i < len; i++ ) - subr(vl,(Obj)ab[i],(Obj)bb[i],(Obj *)&tb[i]); - *c = t; - } + if ( !a ) + chsgnvect(b,c); + else if ( !b ) + *c = a; + else if (a->len != b->len ) { + *c = 0; error("subvect : size mismatch"); + } else { + len = a->len; + MKVECT(t,len); + for ( i = 0, ab = BDY(a), bb = BDY(b), tb = BDY(t); + i < len; i++ ) + arf_sub(vl,(Obj)ab[i],(Obj)bb[i],(Obj *)&tb[i]); + *c = t; + } } void mulvect(vl,a,b,c) VL vl; Obj a,b,*c; { - if ( !a || !b ) - *c = 0; - else if ( OID(a) <= O_R ) - mulrvect(vl,a,(VECT)b,(VECT *)c); - else if ( OID(b) <= O_R ) - mulrvect(vl,b,(VECT)a,(VECT *)c); - else - notdef(vl,a,b,c); + if ( !a || !b ) + *c = 0; + else if ( OID(a) <= O_R || OID(a) == O_DP ) + mulrvect(vl,a,(VECT)b,(VECT *)c); + else if ( OID(b) <= O_R || OID(b) == O_DP ) + mulrvect(vl,b,(VECT)a,(VECT *)c); + else + notdef(vl,a,b,c); } void divvect(vl,a,b,c) VL vl; Obj a,b,*c; { - Obj t; + Obj t; - if ( !b ) - error("divvect : division by 0"); - else if ( !a ) - *c = 0; - else if ( OID(b) > O_R ) - notdef(vl,a,b,c); - else { - divr(vl,(Obj)ONE,b,&t); mulrvect(vl,(Obj)t,(VECT)a,(VECT *)c); - } + if ( !b ) + error("divvect : division by 0"); + else if ( !a ) + *c = 0; + else if ( OID(b) > O_R ) + notdef(vl,a,b,c); + else { + arf_div(vl,(Obj)ONE,b,&t); mulrvect(vl,(Obj)t,(VECT)a,(VECT *)c); + } } void chsgnvect(a,b) VECT a,*b; { - VECT t; - int len,i; - pointer *ab,*tb; + VECT t; + int len,i; + pointer *ab,*tb; - if ( !a ) - *b = 0; - else { - len = a->len; - MKVECT(t,len); - for ( i = 0, ab = BDY(a), tb = BDY(t); - i < len; i++ ) - chsgnr((Obj)ab[i],(Obj *)&tb[i]); - *b = t; - } + if ( !a ) + *b = 0; + else { + len = a->len; + MKVECT(t,len); + for ( i = 0, ab = BDY(a), tb = BDY(t); + i < len; i++ ) + arf_chsgn((Obj)ab[i],(Obj *)&tb[i]); + *b = t; + } } void mulrvect(vl,a,b,c) @@ -151,37 +151,37 @@ VL vl; Obj a; VECT b,*c; { - int len,i; - VECT t; - pointer *bb,*tb; + int len,i; + VECT t; + pointer *bb,*tb; - if ( !a || !b ) - *c = 0; - else { - len = b->len; - MKVECT(t,len); - for ( i = 0, bb = BDY(b), tb = BDY(t); i < len; i++ ) - mulr(vl,a,(Obj)bb[i],(Obj *)&tb[i]); - *c = t; - } + if ( !a || !b ) + *c = 0; + else { + len = b->len; + MKVECT(t,len); + for ( i = 0, bb = BDY(b), tb = BDY(t); i < len; i++ ) + arf_mul(vl,a,(Obj)bb[i],(Obj *)&tb[i]); + *c = t; + } } int compvect(vl,a,b) VL vl; VECT a,b; { - int i,len,t; + int i,len,t; - if ( !a ) - return b?-1:0; - else if ( !b ) - return 1; - else if ( a->len != b->len ) - return a->len>b->len ? 1 : -1; - else { - for ( i = 0, len = a->len; i < len; i++ ) - if ( t = compr(vl,(Obj)BDY(a)[i],(Obj)BDY(b)[i]) ) - return t; - return 0; - } + if ( !a ) + return b?-1:0; + else if ( !b ) + return 1; + else if ( a->len != b->len ) + return a->len>b->len ? 1 : -1; + else { + for ( i = 0, len = a->len; i < len; i++ ) + if ( t = arf_comp(vl,(Obj)BDY(a)[i],(Obj)BDY(b)[i]) ) + return t; + return 0; + } }