|
From: <kin...@us...> - 2004-02-23 02:52:13
|
Update of /cvsroot/teem/teem/src/ell In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26020 Modified Files: ellMacros.h Log Message: added some more ELL_3V macros Index: ellMacros.h =================================================================== RCS file: /cvsroot/teem/teem/src/ell/ellMacros.h,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** ellMacros.h 7 Jan 2004 15:34:29 -0000 1.37 --- ellMacros.h 23 Feb 2004 02:38:59 -0000 1.38 *************** *** 138,141 **** --- 138,146 ---- (v2)[2] = (a)*(v1)[2]) + #define ELL_3V_SCALE_INCR(v2, s0, v0) \ + ((v2)[0] += (s0)*(v0)[0], \ + (v2)[1] += (s0)*(v0)[1], \ + (v2)[2] += (s0)*(v0)[2]) + #define ELL_3V_SCALE_ADD2(v2, s0, v0, s1, v1) \ ((v2)[0] = (s0)*(v0)[0] + (s1)*(v1)[0], \ *************** *** 143,156 **** (v2)[2] = (s0)*(v0)[2] + (s1)*(v1)[2]) ! #define ELL_3V_SCALE_INCR(v2, s0, v0) \ ! ((v2)[0] += (s0)*(v0)[0], \ ! (v2)[1] += (s0)*(v0)[1], \ ! (v2)[2] += (s0)*(v0)[2]) ! #define ELL_3V_SCALE_ADD3(v3, s0, v0, s1, v1, s2, v2) \ ! ((v3)[0] = (s0)*(v0)[0] + (s1)*(v1)[0] + (s2)*(v2)[0], \ ! (v3)[1] = (s0)*(v0)[1] + (s1)*(v1)[1] + (s2)*(v2)[1], \ (v3)[2] = (s0)*(v0)[2] + (s1)*(v1)[2] + (s2)*(v2)[2]) #define ELL_3V_LEN(v) (sqrt(ELL_3V_DOT((v),(v)))) --- 148,180 ---- (v2)[2] = (s0)*(v0)[2] + (s1)*(v1)[2]) ! #define ELL_3V_SCALE_INCR2(v2, s0, v0, s1, v1) \ ! ((v2)[0] += (s0)*(v0)[0] + (s1)*(v1)[0], \ ! (v2)[1] += (s0)*(v0)[1] + (s1)*(v1)[1], \ ! (v2)[2] += (s0)*(v0)[2] + (s1)*(v1)[2]) ! #define ELL_3V_SCALE_ADD3(v3, s0, v0, s1, v1, s2, v2) \ ! ((v3)[0] = (s0)*(v0)[0] + (s1)*(v1)[0] + (s2)*(v2)[0], \ ! (v3)[1] = (s0)*(v0)[1] + (s1)*(v1)[1] + (s2)*(v2)[1], \ (v3)[2] = (s0)*(v0)[2] + (s1)*(v1)[2] + (s2)*(v2)[2]) + #define ELL_3V_SCALE_ADD4(v3, s0, v0, s1, v1, s2, v2, s3, v3) \ + ((v3)[0] = (s0)*(v0)[0] + (s1)*(v1)[0] + (s2)*(v2)[0] + (s3)*(v3)[0], \ + (v3)[1] = (s0)*(v0)[1] + (s1)*(v1)[1] + (s2)*(v2)[1] + (s3)*(v3)[1], \ + (v3)[2] = (s0)*(v0)[2] + (s1)*(v1)[2] + (s2)*(v2)[2] + (s3)*(v3)[2]) + + #define ELL_3V_SCALE_ADD6(v3, s0, v0, s1, v1, s2, v2, \ + s3, v3, s4, v4, s5, v5) \ + ((v3)[0] = (s0)*(v0)[0] + (s1)*(v1)[0] + (s2)*(v2)[0] \ + + (s3)*(v3)[0] + (s4)*(v4)[0] + (s5)*(v5)[0], \ + (v3)[1] = (s0)*(v0)[1] + (s1)*(v1)[1] + (s2)*(v2)[1] \ + + (s3)*(v3)[1] + (s4)*(v4)[1] + (s5)*(v5)[1], \ + (v3)[2] = (s0)*(v0)[2] + (s1)*(v1)[2] + (s2)*(v2)[2] \ + + (s3)*(v3)[2] + (s4)*(v4)[2] + (s5)*(v5)[2]) + + #define ELL_3V_SCALE_INCR3(v3, s0, v0, s1, v1, s2, v2) \ + ((v3)[0] += (s0)*(v0)[0] + (s1)*(v1)[0] + (s2)*(v2)[0], \ + (v3)[1] += (s0)*(v0)[1] + (s1)*(v1)[1] + (s2)*(v2)[1], \ + (v3)[2] += (s0)*(v0)[2] + (s1)*(v1)[2] + (s2)*(v2)[2]) + #define ELL_3V_LEN(v) (sqrt(ELL_3V_DOT((v),(v)))) |