From: xav <xa...@us...> - 2004-04-09 20:00:48
|
Update of /cvsroot/teem/teem/src/nrrd In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv905 Modified Files: enumsNrrd.c arith.c nrrdEnums.h Log Message: added log2 as new unary op Index: arith.c =================================================================== RCS file: /cvsroot/teem/teem/src/nrrd/arith.c,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** arith.c 14 Feb 2004 20:01:07 -0000 1.34 --- arith.c 9 Apr 2004 19:47:26 -0000 1.35 *************** *** 124,127 **** --- 124,128 ---- double _nrrdUnaryOpExp(double a) {return exp(a);} double _nrrdUnaryOpLog(double a) {return log(a);} + double _nrrdUnaryOpLog2(double a) {return log(a)/0.69314718;} double _nrrdUnaryOpLog10(double a) {return log10(a);} double _nrrdUnaryOpLog1p(double a) { *************** *** 160,163 **** --- 161,165 ---- _nrrdUnaryOpExp, _nrrdUnaryOpLog, + _nrrdUnaryOpLog2, _nrrdUnaryOpLog10, _nrrdUnaryOpLog1p, Index: nrrdEnums.h =================================================================== RCS file: /cvsroot/teem/teem/src/nrrd/nrrdEnums.h,v retrieving revision 1.45 retrieving revision 1.46 diff -C2 -d -r1.45 -r1.46 *** nrrdEnums.h 1 Apr 2004 19:29:35 -0000 1.45 --- nrrdEnums.h 9 Apr 2004 19:47:26 -0000 1.46 *************** *** 398,417 **** nrrdUnaryOpExp, /* 9 */ nrrdUnaryOpLog, /* 10 */ ! nrrdUnaryOpLog10, /* 11 */ ! nrrdUnaryOpLog1p, /* 12 */ ! nrrdUnaryOpSqrt, /* 13 */ ! nrrdUnaryOpCbrt, /* 14 */ ! nrrdUnaryOpErf, /* 15 */ ! nrrdUnaryOpCeil, /* 16 */ ! nrrdUnaryOpFloor, /* 17 */ ! nrrdUnaryOpRoundUp, /* 18 */ ! nrrdUnaryOpRoundDown, /* 19 */ ! nrrdUnaryOpAbs, /* 20 */ ! nrrdUnaryOpSgn, /* 21 */ ! nrrdUnaryOpExists, /* 22 */ ! nrrdUnaryOpRand, /* 23 */ nrrdUnaryOpLast }; ! #define NRRD_UNARY_OP_MAX 23 /* --- 398,418 ---- nrrdUnaryOpExp, /* 9 */ nrrdUnaryOpLog, /* 10 */ ! nrrdUnaryOpLog2, /* 11 */ ! nrrdUnaryOpLog10, /* 12 */ ! nrrdUnaryOpLog1p, /* 13 */ ! nrrdUnaryOpSqrt, /* 14 */ ! nrrdUnaryOpCbrt, /* 15 */ ! nrrdUnaryOpErf, /* 16 */ ! nrrdUnaryOpCeil, /* 17 */ ! nrrdUnaryOpFloor, /* 18 */ ! nrrdUnaryOpRoundUp, /* 19 */ ! nrrdUnaryOpRoundDown, /* 20 */ ! nrrdUnaryOpAbs, /* 21 */ ! nrrdUnaryOpSgn, /* 22 */ ! nrrdUnaryOpExists, /* 23 */ ! nrrdUnaryOpRand, /* 24 */ nrrdUnaryOpLast }; ! #define NRRD_UNARY_OP_MAX 24 /* Index: enumsNrrd.c =================================================================== RCS file: /cvsroot/teem/teem/src/nrrd/enumsNrrd.c,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** enumsNrrd.c 9 Apr 2004 17:27:59 -0000 1.34 --- enumsNrrd.c 9 Apr 2004 19:47:25 -0000 1.35 *************** *** 699,702 **** --- 699,703 ---- #define nuExp nrrdUnaryOpExp #define nuLge nrrdUnaryOpLog + #define nuLg2 nrrdUnaryOpLog2 #define nuLgt nrrdUnaryOpLog10 #define nuL1p nrrdUnaryOpLog1p *************** *** 726,729 **** --- 727,731 ---- "exp", "log", + "log2", "log10", "log1p", *************** *** 754,757 **** --- 756,760 ---- "e raised to something", "natural (base e) logarithm", + "base 2 logarithm", "base 10 logarithm", "ln(1+x), accurate for small x", *************** *** 781,784 **** --- 784,788 ---- "exp", "ln", "log", + "log2", "log10", "ln1p", "log1p", *************** *** 809,812 **** --- 813,817 ---- nuExp, nuLge, nuLge, + nuLg2, nuLgt, nuL1p, nuL1p, |