summaryrefslogtreecommitdiff
path: root/src/elementaryFunctions/cosh
diff options
context:
space:
mode:
Diffstat (limited to 'src/elementaryFunctions/cosh')
-rw-r--r--src/elementaryFunctions/cosh/Makefile10
-rw-r--r--src/elementaryFunctions/cosh/ccosha.c6
-rw-r--r--src/elementaryFunctions/cosh/ccoshs.c11
-rw-r--r--src/elementaryFunctions/cosh/cosh.h57
-rw-r--r--src/elementaryFunctions/cosh/dcosha.c4
-rw-r--r--src/elementaryFunctions/cosh/scosha.c4
-rw-r--r--src/elementaryFunctions/cosh/zcosha.c6
-rw-r--r--src/elementaryFunctions/cosh/zcoshs.c11
8 files changed, 23 insertions, 86 deletions
diff --git a/src/elementaryFunctions/cosh/Makefile b/src/elementaryFunctions/cosh/Makefile
index 6bdb078e..a03ec7c0 100644
--- a/src/elementaryFunctions/cosh/Makefile
+++ b/src/elementaryFunctions/cosh/Makefile
@@ -5,7 +5,7 @@
## Made by Bruno JOFRET <bruno.jofret@inria.fr>
##
## Started on Thu Nov 30 16:33:40 2006 jofret
-## Last update Wed Jan 31 11:59:11 2007 jofret
+## Last update Fri Feb 23 16:45:55 2007 jofret
##
## Copyright INRIA 2006
##
@@ -14,9 +14,9 @@ NAME = ../../lib/libCosh.a
RM = rm -f
CC = gcc
-INCLUDE = ../../type
-LINK = ../../lib
-CFLAGS = -Werror -Wall -pedantic -ansi -I $(INCLUDE) -L $(LINK) $(STANDARD)
+INCLUDE = -I ../../type -I ../includes
+LINK = -L ../../lib
+CFLAGS = -Werror -Wall -pedantic -ansi $(INCLUDE) $(LINK) $(STANDARD)
AR = ar cru
RANLIB = ranlib
@@ -29,7 +29,7 @@ SRC = scoshs.c \
ccosha.c \
zcosha.c
-HEAD = cosh.h
+HEAD = ../includes/cosh.h
OBJ = $(SRC:.c=.o)
all: $(NAME)
diff --git a/src/elementaryFunctions/cosh/ccosha.c b/src/elementaryFunctions/cosh/ccosha.c
index 7de4fd4d..d3c474bb 100644
--- a/src/elementaryFunctions/cosh/ccosha.c
+++ b/src/elementaryFunctions/cosh/ccosha.c
@@ -5,14 +5,12 @@
** Made by Bruno JOFRET <bruno.jofret@inria.fr>
**
** Started on Thu Dec 7 14:54:24 2006 jofret
-** Last update Wed Jan 31 11:14:37 2007 jofret
+** Last update Fri Feb 23 16:47:14 2007 jofret
**
** Copyright INRIA 2006
*/
-#include "floatComplex.h"
-
-floatComplex ccoshs(floatComplex);
+#include "cosh.h"
void ccosha(floatComplex* x, int strideX, floatComplex* y, int strideY, int size) {
int i = 0;
diff --git a/src/elementaryFunctions/cosh/ccoshs.c b/src/elementaryFunctions/cosh/ccoshs.c
index 3ead28df..2a2958ac 100644
--- a/src/elementaryFunctions/cosh/ccoshs.c
+++ b/src/elementaryFunctions/cosh/ccoshs.c
@@ -5,19 +5,18 @@
** Made by Bruno JOFRET <bruno.jofret@inria.fr>
**
** Started on Thu Dec 7 12:04:28 2006 jofret
-** Last update Tue Feb 6 10:46:56 2007 jofret
+** Last update Fri Feb 23 16:48:08 2007 jofret
**
** Copyright INRIA 2006
*/
-#include "floatComplex.h"
-
-floatComplex ccoss(floatComplex);
+#include "cosh.h"
+#include "cos.h"
/** ch(z) = cos(i.z) */
floatComplex ccoshs(floatComplex z) {
- float real = creal(z);
- float minusImag = -cimag(z);
+ float real = creals(z);
+ float minusImag = -cimags(z);
return (ccoss(FloatComplex(minusImag, real)));
}
diff --git a/src/elementaryFunctions/cosh/cosh.h b/src/elementaryFunctions/cosh/cosh.h
deleted file mode 100644
index c0e3ef54..00000000
--- a/src/elementaryFunctions/cosh/cosh.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-** -*- C -*-
-**
-** cosh.h
-** Made by Bruno JOFRET <bruno.jofret@inria.fr>
-**
-** Started on Tue Dec 5 15:49:18 2006 jofret
-** Last update Fri Jan 19 14:52:47 2007 jofret
-**
-** Copyright INRIA 2006
-*/
-
-/*
-** Compute Cosine for different types .
-*/
-
-/*
-** \brief Float Cosine function
-*/
-float scoshs(float);
-
-/*
-** \brief Double Cosine function
-*/
-double dcoshs(double);
-
-/*
-** \brief Float Complex Cosine function
-*/
-floatComplex ccoshs(floatComplex);
-
-/*
-** \brief Double Complex Cosine function
-*/
-doubleComplex zcoshs(doubleComplex);
-
-/*
-** \brief Float Matrix Cosine function
-*/
-void scosha(float*, int, float*, int, int);
-
-/*
-** \brief Double Matrix Cosine function
-*/
-void dcosha(double*, int, double*, int, int);
-
-/*
-** \brief Float Complex Matrix Cosine function
-*/
-void ccosha(floatComplex*, int, floatComplex*, int, int);
-
-/*
-** \brief Double Complex Matrix Cosine function
-*/
-void zcosha(doubleComplex*, int, doubleComplex*, int, int);
-
-
diff --git a/src/elementaryFunctions/cosh/dcosha.c b/src/elementaryFunctions/cosh/dcosha.c
index 828499b0..2da48b42 100644
--- a/src/elementaryFunctions/cosh/dcosha.c
+++ b/src/elementaryFunctions/cosh/dcosha.c
@@ -5,12 +5,12 @@
** Made by Bruno JOFRET <bruno.jofret@inria.fr>
**
** Started on Thu Dec 7 14:54:56 2006 jofret
-** Last update Fri Jan 19 14:56:10 2007 jofret
+** Last update Fri Feb 23 16:46:28 2007 jofret
**
** Copyright INRIA 2006
*/
-double dcoshs(double);
+#include "cosh.h"
void dcosha(double* x, int strideX, double* y, int strideY, int size) {
int i = 0;
diff --git a/src/elementaryFunctions/cosh/scosha.c b/src/elementaryFunctions/cosh/scosha.c
index 10f30267..5e2dbdd8 100644
--- a/src/elementaryFunctions/cosh/scosha.c
+++ b/src/elementaryFunctions/cosh/scosha.c
@@ -5,12 +5,12 @@
** Made by Bruno JOFRET <bruno.jofret@inria.fr>
**
** Started on Thu Dec 7 16:03:27 2006 jofret
-** Last update Fri Jan 19 14:55:49 2007 jofret
+** Last update Fri Feb 23 16:46:14 2007 jofret
**
** Copyright INRIA 2006
*/
-float scoshs(float);
+#include "cosh.h"
void scosha(float* x, int strideX, float* y, int strideY, int size) {
int i = 0;
diff --git a/src/elementaryFunctions/cosh/zcosha.c b/src/elementaryFunctions/cosh/zcosha.c
index fdfe3d3c..47e6433c 100644
--- a/src/elementaryFunctions/cosh/zcosha.c
+++ b/src/elementaryFunctions/cosh/zcosha.c
@@ -5,14 +5,12 @@
** Made by Bruno JOFRET <bruno.jofret@inria.fr>
**
** Started on Thu Dec 7 16:12:02 2006 jofret
-** Last update Wed Jan 31 11:14:15 2007 jofret
+** Last update Fri Feb 23 16:42:40 2007 jofret
**
** Copyright INRIA 2006
*/
-#include "doubleComplex.h"
-
-doubleComplex zcoshs(doubleComplex);
+#include "cosh.h"
void zcosha(doubleComplex* x, int strideX, doubleComplex* y, int strideY, int size) {
int i = 0;
diff --git a/src/elementaryFunctions/cosh/zcoshs.c b/src/elementaryFunctions/cosh/zcoshs.c
index 816e9022..d80fd091 100644
--- a/src/elementaryFunctions/cosh/zcoshs.c
+++ b/src/elementaryFunctions/cosh/zcoshs.c
@@ -5,18 +5,17 @@
** Made by Bruno JOFRET <bruno.jofret@inria.fr>
**
** Started on Thu Dec 7 12:05:48 2006 jofret
-** Last update Tue Feb 6 10:48:24 2007 jofret
+** Last update Fri Feb 23 16:48:33 2007 jofret
**
** Copyright INRIA 2006
*/
-#include "doubleComplex.h"
-
-doubleComplex zcoss(doubleComplex);
+#include "cosh.h"
+#include "cos.h"
doubleComplex zcoshs(doubleComplex z) {
- double real = creal(z);
- double minusImag = -cimag(z);
+ double real = zreals(z);
+ double minusImag = -zimags(z);
return (zcoss(DoubleComplex(minusImag, real)));
}
generated by cgit (git 2.34.1) at 2025-03-16 09:19:30 +0000