summaryrefslogtreecommitdiff
path: root/src/elementaryFunctions/sinh
diff options
context:
space:
mode:
Diffstat (limited to 'src/elementaryFunctions/sinh')
-rw-r--r--src/elementaryFunctions/sinh/Makefile10
-rw-r--r--src/elementaryFunctions/sinh/csinha.c6
-rw-r--r--src/elementaryFunctions/sinh/csinhs.c13
-rw-r--r--src/elementaryFunctions/sinh/dsinha.c4
-rw-r--r--src/elementaryFunctions/sinh/sinh.h57
-rw-r--r--src/elementaryFunctions/sinh/ssinha.c4
-rw-r--r--src/elementaryFunctions/sinh/zsinha.c6
-rw-r--r--src/elementaryFunctions/sinh/zsinhs.c13
8 files changed, 25 insertions, 88 deletions
diff --git a/src/elementaryFunctions/sinh/Makefile b/src/elementaryFunctions/sinh/Makefile
index 97e5fa2d..1e990c97 100644
--- a/src/elementaryFunctions/sinh/Makefile
+++ b/src/elementaryFunctions/sinh/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:02 2007 jofret
+## Last update Fri Feb 23 17:15:12 2007 jofret
##
## Copyright INRIA 2006
##
@@ -14,9 +14,9 @@ NAME = ../../lib/libSinh.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 = ssinhs.c \
csinha.c \
zsinha.c
-HEAD = sinh.h
+HEAD = ../includes/sinh.h
OBJ = $(SRC:.c=.o)
all: $(NAME)
diff --git a/src/elementaryFunctions/sinh/csinha.c b/src/elementaryFunctions/sinh/csinha.c
index 1e271767..9ef7ad65 100644
--- a/src/elementaryFunctions/sinh/csinha.c
+++ b/src/elementaryFunctions/sinh/csinha.c
@@ -5,14 +5,12 @@
** Made by Bruno JOFRET <bruno.jofret@inria.fr>
**
** Started on Fri Dec 8 13:07:37 2006 jofret
-** Last update Wed Jan 31 11:12:52 2007 jofret
+** Last update Fri Feb 23 17:17:56 2007 jofret
**
** Copyright INRIA 2006
*/
-#include "floatComplex.h"
-
-floatComplex csinhs(floatComplex);
+#include "sinh.h"
void csinha(floatComplex* x, int strideX, floatComplex* y, int strideY, int size) {
int i = 0;
diff --git a/src/elementaryFunctions/sinh/csinhs.c b/src/elementaryFunctions/sinh/csinhs.c
index 53632cb7..94d85ff6 100644
--- a/src/elementaryFunctions/sinh/csinhs.c
+++ b/src/elementaryFunctions/sinh/csinhs.c
@@ -5,19 +5,18 @@
** Made by Bruno JOFRET <bruno.jofret@inria.fr>
**
** Started on Fri Dec 8 12:04:39 2006 jofret
-** Last update Mon Feb 12 16:15:52 2007 jofret
+** Last update Fri Feb 23 17:22:29 2007 jofret
**
** Copyright INRIA 2006
*/
-#include "floatComplex.h"
-
-floatComplex csins(floatComplex);
+#include "sinh.h"
+#include "sin.h"
floatComplex csinhs(floatComplex z) {
- float real = creal(z);
- float imag = cimag(z);
+ float real = creals(z);
+ float imag = cimags(z);
floatComplex result = csins(FloatComplex(-imag, real));
- return (FloatComplex(cimag(result), -creal(result)));
+ return (FloatComplex(cimags(result), -creals(result)));
}
diff --git a/src/elementaryFunctions/sinh/dsinha.c b/src/elementaryFunctions/sinh/dsinha.c
index ba24e112..df3e004b 100644
--- a/src/elementaryFunctions/sinh/dsinha.c
+++ b/src/elementaryFunctions/sinh/dsinha.c
@@ -5,12 +5,12 @@
** Made by Bruno JOFRET <bruno.jofret@inria.fr>
**
** Started on Fri Dec 8 11:02:19 2006 jofret
-** Last update Fri Jan 19 15:20:32 2007 jofret
+** Last update Fri Feb 23 17:17:29 2007 jofret
**
** Copyright INRIA 2006
*/
-double dsinhs(double);
+#include "sinh.h"
void dsinha(double* x, int strideX, double* y, int strideY, int size) {
int i = 0;
diff --git a/src/elementaryFunctions/sinh/sinh.h b/src/elementaryFunctions/sinh/sinh.h
deleted file mode 100644
index be4343d0..00000000
--- a/src/elementaryFunctions/sinh/sinh.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-** -*- C -*-
-**
-** sinh.h
-** Made by Bruno JOFRET <bruno.jofret@inria.fr>
-**
-** Started on Tue Dec 5 15:49:18 2006 jofret
-** Last update Fri Jan 19 15:19:49 2007 jofret
-**
-** Copyright INRIA 2006
-*/
-
-/*
-** Compute Sine for different types .
-*/
-
-/*
-** \brief Float Sine function
-*/
-float ssinhs(float);
-
-/*
-** \brief Double Sine function
-*/
-double dsinhs(double);
-
-/*
-** \brief Float Complex Sine function
-*/
-floatComplex csinhs(floatComplex);
-
-/*
-** \brief Double Complex Sine function
-*/
-doubleComplex zsinhs(doubleComplex);
-
-/*
-** \brief Float Matrix Sine function
-*/
-void ssinha(float*, int, float*, int, int);
-
-/*
-** \brief Double Matrix Sine function
-*/
-void dsinha(double*, int, double*, int, int);
-
-/*
-** \brief Float Complex Matrix Sine function
-*/
-void csinha(floatComplex*, int, floatComplex*, int, int);
-
-/*
-** \brief Double Complex Matrix Sine function
-*/
-void zsinha(doubleComplex*, int, doubleComplex*, int, int);
-
-
diff --git a/src/elementaryFunctions/sinh/ssinha.c b/src/elementaryFunctions/sinh/ssinha.c
index aa74d5a5..33b2afad 100644
--- a/src/elementaryFunctions/sinh/ssinha.c
+++ b/src/elementaryFunctions/sinh/ssinha.c
@@ -5,12 +5,12 @@
** Made by Bruno JOFRET <bruno.jofret@inria.fr>
**
** Started on Fri Dec 8 10:52:14 2006 jofret
-** Last update Fri Jan 19 15:19:28 2007 jofret
+** Last update Fri Feb 23 17:17:07 2007 jofret
**
** Copyright INRIA 2006
*/
-float ssinhs(float);
+#include "sinh.h"
void ssinha(float* x, int strideX, float* y, int strideY, int size) {
int i = 0;
diff --git a/src/elementaryFunctions/sinh/zsinha.c b/src/elementaryFunctions/sinh/zsinha.c
index 730baf1a..110599ab 100644
--- a/src/elementaryFunctions/sinh/zsinha.c
+++ b/src/elementaryFunctions/sinh/zsinha.c
@@ -5,14 +5,12 @@
** Made by Bruno JOFRET <bruno.jofret@inria.fr>
**
** Started on Fri Dec 8 14:02:04 2006 jofret
-** Last update Wed Jan 31 11:12:30 2007 jofret
+** Last update Fri Feb 23 17:16:53 2007 jofret
**
** Copyright INRIA 2006
*/
-#include "doubleComplex.h"
-
-doubleComplex zsinhs(doubleComplex);
+#include "sinh.h"
void zsinha(doubleComplex* x, int strideX, doubleComplex* y, int strideY, int size) {
int i = 0;
diff --git a/src/elementaryFunctions/sinh/zsinhs.c b/src/elementaryFunctions/sinh/zsinhs.c
index 7aeb2bf3..fcaf96ba 100644
--- a/src/elementaryFunctions/sinh/zsinhs.c
+++ b/src/elementaryFunctions/sinh/zsinhs.c
@@ -5,19 +5,18 @@
** Made by Bruno JOFRET <bruno.jofret@inria.fr>
**
** Started on Fri Dec 8 12:06:35 2006 jofret
-** Last update Mon Feb 12 16:38:29 2007 jofret
+** Last update Fri Feb 23 17:23:10 2007 jofret
**
** Copyright INRIA 2006
*/
-#include "doubleComplex.h"
-
-doubleComplex zsins(doubleComplex);
+#include "sinh.h"
+#include "sin.h"
doubleComplex zsinhs(doubleComplex z) {
- double real = creal(z);
- double imag = cimag(z);
+ double real = zreals(z);
+ double imag = zimags(z);
doubleComplex result = zsins(DoubleComplex(-imag, real));
- return (DoubleComplex(cimag(result), -creal(result)));
+ return (DoubleComplex(zimags(result), -zreals(result)));
}
generated by cgit (git 2.34.1) at 2025-03-13 19:39:13 +0000