8 files changed, 27 insertions, 92 deletions
diff --git a/src/elementaryFunctions/sin/Makefile b/src/elementaryFunctions/sin/Makefile
index 1cfcc0fd..7b8d0f55 100644
--- a/src/elementaryFunctions/sin/Makefile
+++ b/src/elementaryFunctions/sin/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:58:56 2007 jofret
+## Last update Fri Feb 23 17:10:58 2007 jofret
 ##
 ## Copyright INRIA 2006
 ##
@@ -14,9 +14,9 @@ NAME	=	../../lib/libSin.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	=	ssins.c \
 		csina.c \
 		zsina.c
 
-HEAD	=	sin.h
+HEAD	=	../includes/sin.h
 OBJ	=	$(SRC:.c=.o)
 
 all: $(NAME)
diff --git a/src/elementaryFunctions/sin/csina.c b/src/elementaryFunctions/sin/csina.c
index 6c458c8e..7922dd92 100644
--- a/src/elementaryFunctions/sin/csina.c
+++ b/src/elementaryFunctions/sin/csina.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:13:10 2007 jofret
+** Last update Fri Feb 23 17:12:53 2007 jofret
 **
 ** Copyright INRIA 2006
 */
 
-#include "floatComplex.h"
-
-floatComplex csins(floatComplex);
+#include "sin.h"
 
 void csina(floatComplex* x, int strideX, floatComplex* y, int strideY, int size) {
   int i = 0;
diff --git a/src/elementaryFunctions/sin/csins.c b/src/elementaryFunctions/sin/csins.c
index 2461fb42..e824a200 100644
--- a/src/elementaryFunctions/sin/csins.c
+++ b/src/elementaryFunctions/sin/csins.c
@@ -5,21 +5,19 @@
 ** Made by  Bruno JOFRET <bruno.jofret@inria.fr>
 **
 ** Started on  Fri Dec  8 12:04:39 2006 jofret
-** Last update Tue Feb  6 15:56:55 2007 jofret
+** Last update Fri Feb 23 17:13:53 2007 jofret
 **
 ** Copyright INRIA 2006
 */
 
-#include "floatComplex.h"
-
-float	ssins(float);
-float	scoss(float);
-float	ssinhs(float);
-float	scoshs(float);
+#include "sin.h"
+#include "cos.h"
+#include "sinh.h"
+#include "cosh.h"
 
 floatComplex csins(floatComplex z) {
-  float real = creal(z);
-  float imag = cimag(z);
+  float real = creals(z);
+  float imag = cimags(z);
 
   return(FloatComplex(ssins(real) * scoshs(imag), scoss(real) * ssinhs(imag)));
 }
diff --git a/src/elementaryFunctions/sin/dsina.c b/src/elementaryFunctions/sin/dsina.c
index b8d6b9e9..acf7356e 100644
--- a/src/elementaryFunctions/sin/dsina.c
+++ b/src/elementaryFunctions/sin/dsina.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 Dec  8 11:04:08 2006 jofret
+** Last update Fri Feb 23 17:12:06 2007 jofret
 **
 ** Copyright INRIA 2006
 */
 
-double dsins(double);
+#include "sin.h"
 
 void dsina(double* x, int strideX, double* y, int strideY, int size) {
   int i = 0;
diff --git a/src/elementaryFunctions/sin/sin.h b/src/elementaryFunctions/sin/sin.h
deleted file mode 100644
index 75ca0bd9..00000000
--- a/src/elementaryFunctions/sin/sin.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-**  -*- C -*-
-**
-** sin.h
-** Made by  Bruno JOFRET <bruno.jofret@inria.fr>
-**
-** Started on  Tue Dec  5 15:49:18 2006 jofret
-** Last update Fri Dec  8 10:10:07 2006 jofret
-**
-** Copyright INRIA 2006
-*/
-
-/*
-** Compute Sine for different types .
-*/
-
-/*
-** \brief Float Sine function
-*/
-float		ssins(float);
-
-/*
-** \brief Double Sine function
-*/
-double		dsins(double);
-
-/*
-** \brief Float Complex Sine function
-*/
-floatComplex	csins(floatComplex);
-
-/*
-** \brief Double Complex Sine function
-*/
-doubleComplex	zsins(doubleComplex);
-
-/*
-** \brief Float Matrix Sine function
-*/
-void		ssina(float*, int, float*, int, int);
-
-/*
-** \brief Double Matrix Sine function
-*/
-void		dsina(double*, int, double*, int, int);
-
-/*
-** \brief Float Complex Matrix Sine function
-*/
-void		csina(floatComplex*, int, floatComplex*, int, int);
-
-/*
-** \brief Double Complex Matrix Sine function
-*/
-void		zsina(doubleComplex*, int, doubleComplex*, int, int);
-
-
diff --git a/src/elementaryFunctions/sin/ssina.c b/src/elementaryFunctions/sin/ssina.c
index 17411df7..95e382d9 100644
--- a/src/elementaryFunctions/sin/ssina.c
+++ b/src/elementaryFunctions/sin/ssina.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 Dec  8 11:01:32 2006 jofret
+** Last update Fri Feb 23 17:11:53 2007 jofret
 **
 ** Copyright INRIA 2006
 */
 
-float ssins(float);
+#include "sin.h"
 
 void ssina(float* x, int strideX, float* y, int strideY, int size) {
   int i = 0;
diff --git a/src/elementaryFunctions/sin/zsina.c b/src/elementaryFunctions/sin/zsina.c
index 87c72535..2604d3a8 100644
--- a/src/elementaryFunctions/sin/zsina.c
+++ b/src/elementaryFunctions/sin/zsina.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:12 2007 jofret
+** Last update Fri Feb 23 17:11:40 2007 jofret
 **
 ** Copyright INRIA 2006
 */
 
-#include "doubleComplex.h"
-
-doubleComplex	zsins(doubleComplex);
+#include "sin.h"
 
 void zsina(doubleComplex* x, int strideX, doubleComplex* y, int strideY, int size) {
   int i = 0;
diff --git a/src/elementaryFunctions/sin/zsins.c b/src/elementaryFunctions/sin/zsins.c
index 535ba09e..151bbb77 100644
--- a/src/elementaryFunctions/sin/zsins.c
+++ b/src/elementaryFunctions/sin/zsins.c
@@ -5,21 +5,19 @@
 ** Made by  Bruno JOFRET <bruno.jofret@inria.fr>
 **
 ** Started on  Fri Dec  8 12:06:35 2006 jofret
-** Last update Tue Feb  6 17:24:03 2007 jofret
+** Last update Fri Feb 23 17:14:02 2007 jofret
 **
 ** Copyright INRIA 2006
 */
 
-#include "doubleComplex.h"
-
-double	dsins(double);
-double	dcoss(double);
-double	dsinhs(double);
-double	dcoshs(double);
+#include "sin.h"
+#include "cos.h"
+#include "sinh.h"
+#include "cosh.h"
 
 doubleComplex	zsins(doubleComplex z) {
-  double real = creal(z);
-  double imag = cimag(z);
+  double real = zreals(z);
+  double imag = zimags(z);
 
   return(DoubleComplex(dsins(real) * dcoshs(imag), dcoss(real) * dsinhs(imag)));
 }