diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/elementaryFunctions/cosh/ccoshs.c | 11 | ||||
-rw-r--r-- | src/elementaryFunctions/cosh/zcoshs.c | 10 | ||||
-rw-r--r-- | src/elementaryFunctions/sin/csins.c | 13 | ||||
-rw-r--r-- | src/elementaryFunctions/sin/zsins.c | 13 |
4 files changed, 35 insertions, 12 deletions
diff --git a/src/elementaryFunctions/cosh/ccoshs.c b/src/elementaryFunctions/cosh/ccoshs.c index bfeac33a..3ead28df 100644 --- a/src/elementaryFunctions/cosh/ccoshs.c +++ b/src/elementaryFunctions/cosh/ccoshs.c @@ -5,14 +5,19 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Thu Dec 7 12:04:28 2006 jofret -** Last update Wed Jan 31 11:14:28 2007 jofret +** Last update Tue Feb 6 10:46:56 2007 jofret ** ** Copyright INRIA 2006 */ #include "floatComplex.h" +floatComplex ccoss(floatComplex); + +/** ch(z) = cos(i.z) */ floatComplex ccoshs(floatComplex z) { - /* FIXME: Dummy... */ - return z; + float real = creal(z); + float minusImag = -cimag(z); + + return (ccoss(FloatComplex(minusImag, real))); } diff --git a/src/elementaryFunctions/cosh/zcoshs.c b/src/elementaryFunctions/cosh/zcoshs.c index c9436928..816e9022 100644 --- a/src/elementaryFunctions/cosh/zcoshs.c +++ b/src/elementaryFunctions/cosh/zcoshs.c @@ -5,14 +5,18 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Thu Dec 7 12:05:48 2006 jofret -** Last update Wed Jan 31 11:14:07 2007 jofret +** Last update Tue Feb 6 10:48:24 2007 jofret ** ** Copyright INRIA 2006 */ #include "doubleComplex.h" +doubleComplex zcoss(doubleComplex); + doubleComplex zcoshs(doubleComplex z) { - /* FIXME: Dummy... */ - return (DoubleComplex(0,1)); + double real = creal(z); + double minusImag = -cimag(z); + + return (zcoss(DoubleComplex(minusImag, real))); } diff --git a/src/elementaryFunctions/sin/csins.c b/src/elementaryFunctions/sin/csins.c index eb6cab04..2461fb42 100644 --- a/src/elementaryFunctions/sin/csins.c +++ b/src/elementaryFunctions/sin/csins.c @@ -5,14 +5,21 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Fri Dec 8 12:04:39 2006 jofret -** Last update Wed Jan 31 11:13:02 2007 jofret +** Last update Tue Feb 6 15:56:55 2007 jofret ** ** Copyright INRIA 2006 */ #include "floatComplex.h" +float ssins(float); +float scoss(float); +float ssinhs(float); +float scoshs(float); + floatComplex csins(floatComplex z) { - /* FIXME: Dummy... */ - return z; + float real = creal(z); + float imag = cimag(z); + + return(FloatComplex(ssins(real) * scoshs(imag), scoss(real) * ssinhs(imag))); } diff --git a/src/elementaryFunctions/sin/zsins.c b/src/elementaryFunctions/sin/zsins.c index c256db48..535ba09e 100644 --- a/src/elementaryFunctions/sin/zsins.c +++ b/src/elementaryFunctions/sin/zsins.c @@ -5,14 +5,21 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Fri Dec 8 12:06:35 2006 jofret -** Last update Wed Jan 31 11:12:02 2007 jofret +** Last update Tue Feb 6 17:24:03 2007 jofret ** ** Copyright INRIA 2006 */ #include "doubleComplex.h" +double dsins(double); +double dcoss(double); +double dsinhs(double); +double dcoshs(double); + doubleComplex zsins(doubleComplex z) { - /* FIXME: Dummy... */ - return z; + double real = creal(z); + double imag = cimag(z); + + return(DoubleComplex(dsins(real) * dcoshs(imag), dcoss(real) * dsinhs(imag))); } |