diff options
Diffstat (limited to 'src/elementaryFunctions')
73 files changed, 241 insertions, 272 deletions
diff --git a/src/elementaryFunctions/Makefile b/src/elementaryFunctions/Makefile index 6d079772..56598bb8 100644 --- a/src/elementaryFunctions/Makefile +++ b/src/elementaryFunctions/Makefile @@ -5,7 +5,7 @@ ## Made by Bruno JOFRET <bruno.jofret@inria.fr> ## ## Started on Tue Dec 5 09:19:53 2006 jofret -## Last update Wed Feb 14 14:03:59 2007 jofret +## Last update Fri Feb 23 17:23:57 2007 jofret ## ## Copyright INRIA 2006 ## @@ -20,6 +20,7 @@ DIRS = cos \ tanh \ exp #\ # log +# sqrt all: recure diff --git a/src/elementaryFunctions/acos/Makefile b/src/elementaryFunctions/acos/Makefile index 78456138..b6acc97f 100644 --- a/src/elementaryFunctions/acos/Makefile +++ b/src/elementaryFunctions/acos/Makefile @@ -5,7 +5,7 @@ ## Made by Bruno JOFRET <bruno.jofret@inria.fr> ## ## Started on Fri Jan 5 10:19:16 2007 jofret -## Last update Wed Jan 31 11:59:19 2007 jofret +## Last update Fri Feb 23 16:38:02 2007 jofret ## ## Copyright INRIA 2007 ## @@ -14,9 +14,9 @@ NAME = ../../lib/libAcos.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 = sacoss.c \ cacosa.c \ zacosa.c -HEAD = acos.h +HEAD = ../includes/acos.h OBJ = $(SRC:.c=.o) all: $(NAME) diff --git a/src/elementaryFunctions/acos/cacosa.c b/src/elementaryFunctions/acos/cacosa.c index 3db39792..b7e6dc51 100644 --- a/src/elementaryFunctions/acos/cacosa.c +++ b/src/elementaryFunctions/acos/cacosa.c @@ -5,14 +5,12 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Fri Jan 5 10:23:49 2007 jofret -** Last update Wed Jan 31 11:16:23 2007 jofret +** Last update Fri Feb 23 16:37:20 2007 jofret ** ** Copyright INRIA 2007 */ -#include "floatComplex.h" - -floatComplex cacoss(floatComplex); +#include "acos.h" void cacosa(floatComplex* x, int strideX, floatComplex* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/acos/cacoss.c b/src/elementaryFunctions/acos/cacoss.c index 61a90bd3..ed174fda 100644 --- a/src/elementaryFunctions/acos/cacoss.c +++ b/src/elementaryFunctions/acos/cacoss.c @@ -5,12 +5,12 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Fri Jan 5 11:29:45 2007 jofret -** Last update Wed Jan 31 11:16:14 2007 jofret +** Last update Fri Feb 23 16:37:08 2007 jofret ** ** Copyright INRIA 2007 */ -#include "floatComplex.h" +#include "acos.h" floatComplex cacoss(floatComplex z) { /* FIXME: Dummy... */ diff --git a/src/elementaryFunctions/acos/dacosa.c b/src/elementaryFunctions/acos/dacosa.c index ba3aff1c..a6d9e484 100644 --- a/src/elementaryFunctions/acos/dacosa.c +++ b/src/elementaryFunctions/acos/dacosa.c @@ -5,13 +5,12 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Fri Jan 5 11:29:20 2007 jofret -** Last update Fri Jan 5 11:29:30 2007 jofret +** Last update Fri Feb 23 16:36:57 2007 jofret ** ** Copyright INRIA 2007 */ - -double dacoss(double); +#include "acos.h" void dacosa(double* x, int strideX, double* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/acos/sacosa.c b/src/elementaryFunctions/acos/sacosa.c index f33fc4da..30a47651 100644 --- a/src/elementaryFunctions/acos/sacosa.c +++ b/src/elementaryFunctions/acos/sacosa.c @@ -5,13 +5,12 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Fri Jan 5 10:25:57 2007 jofret -** Last update Fri Jan 5 10:26:07 2007 jofret +** Last update Fri Feb 23 16:36:44 2007 jofret ** ** Copyright INRIA 2007 */ - -float sacoss(float); +#include "acos.h" void sacosa(float* x, int strideX, float* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/acos/zacosa.c b/src/elementaryFunctions/acos/zacosa.c index 3bad836c..13866008 100644 --- a/src/elementaryFunctions/acos/zacosa.c +++ b/src/elementaryFunctions/acos/zacosa.c @@ -5,14 +5,12 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Fri Jan 5 10:25:14 2007 jofret -** Last update Wed Jan 31 11:15:58 2007 jofret +** Last update Fri Feb 23 16:36:26 2007 jofret ** ** Copyright INRIA 2007 */ -#include "doubleComplex.h" - -doubleComplex zacoss(doubleComplex); +#include "acos.h" void zacosa(doubleComplex* x, int strideX, doubleComplex* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/acos/zacoss.c b/src/elementaryFunctions/acos/zacoss.c index 8cbc4c60..908b55e2 100644 --- a/src/elementaryFunctions/acos/zacoss.c +++ b/src/elementaryFunctions/acos/zacoss.c @@ -5,12 +5,12 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Fri Jan 5 10:24:38 2007 jofret -** Last update Wed Jan 31 11:15:51 2007 jofret +** Last update Fri Feb 23 16:36:16 2007 jofret ** ** Copyright INRIA 2007 */ -#include "doubleComplex.h" +#include "acos.h" doubleComplex zacoss(doubleComplex z) { /* FIXME: Dummy... */ diff --git a/src/elementaryFunctions/asin/Makefile b/src/elementaryFunctions/asin/Makefile index 01f11596..d1070da0 100644 --- a/src/elementaryFunctions/asin/Makefile +++ b/src/elementaryFunctions/asin/Makefile @@ -5,7 +5,7 @@ ## Made by Bruno JOFRET <bruno.jofret@inria.fr> ## ## Started on Fri Jan 5 10:19:16 2007 jofret -## Last update Wed Jan 31 11:59:14 2007 jofret +## Last update Fri Feb 23 16:40:50 2007 jofret ## ## Copyright INRIA 2007 ## @@ -14,9 +14,9 @@ NAME = ../../lib/libAsin.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 = sasins.c \ casina.c \ zasina.c -HEAD = asin.h +HEAD = ../includes/asin.h OBJ = $(SRC:.c=.o) all: $(NAME) diff --git a/src/elementaryFunctions/asin/casina.c b/src/elementaryFunctions/asin/casina.c index c9493012..98e5da7b 100644 --- a/src/elementaryFunctions/asin/casina.c +++ b/src/elementaryFunctions/asin/casina.c @@ -5,14 +5,12 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Fri Jan 5 10:23:49 2007 jofret -** Last update Wed Jan 31 11:15:40 2007 jofret +** Last update Fri Feb 23 16:40:16 2007 jofret ** ** Copyright INRIA 2007 */ -#include "floatComplex.h" - -floatComplex casins(floatComplex); +#include "asin.h" void casina(floatComplex* x, int strideX, floatComplex* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/asin/casins.c b/src/elementaryFunctions/asin/casins.c index fa668316..4b6e0700 100644 --- a/src/elementaryFunctions/asin/casins.c +++ b/src/elementaryFunctions/asin/casins.c @@ -5,12 +5,12 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Fri Jan 5 11:29:45 2007 jofret -** Last update Wed Jan 31 11:15:31 2007 jofret +** Last update Fri Feb 23 16:40:05 2007 jofret ** ** Copyright INRIA 2007 */ -#include "floatComplex.h" +#include "asin.h" floatComplex casins(floatComplex z) { /* FIXME: Dummy... */ diff --git a/src/elementaryFunctions/asin/dasina.c b/src/elementaryFunctions/asin/dasina.c index 3854aeb3..8a5754d4 100644 --- a/src/elementaryFunctions/asin/dasina.c +++ b/src/elementaryFunctions/asin/dasina.c @@ -5,13 +5,12 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Fri Jan 5 11:29:20 2007 jofret -** Last update Fri Jan 5 16:23:58 2007 jofret +** Last update Fri Feb 23 16:39:54 2007 jofret ** ** Copyright INRIA 2007 */ - -double dasins(double); +#include "asin.h" void dasina(double* x, int strideX, double* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/asin/sasina.c b/src/elementaryFunctions/asin/sasina.c index 9cc177d4..4f651a94 100644 --- a/src/elementaryFunctions/asin/sasina.c +++ b/src/elementaryFunctions/asin/sasina.c @@ -5,12 +5,12 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Fri Jan 5 10:25:57 2007 jofret -** Last update Wed Jan 31 11:15:18 2007 jofret +** Last update Fri Feb 23 16:39:39 2007 jofret ** ** Copyright INRIA 2007 */ -float sasins(float); +#include "asin.h" void sasina(float* x, int strideX, float* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/asin/zasina.c b/src/elementaryFunctions/asin/zasina.c index b3dc3603..cf64dd8d 100644 --- a/src/elementaryFunctions/asin/zasina.c +++ b/src/elementaryFunctions/asin/zasina.c @@ -5,14 +5,12 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Fri Jan 5 10:25:14 2007 jofret -** Last update Wed Jan 31 11:15:10 2007 jofret +** Last update Fri Feb 23 16:39:26 2007 jofret ** ** Copyright INRIA 2007 */ -#include "doubleComplex.h" - -doubleComplex zasins(doubleComplex); +#include "asin.h" void zasina(doubleComplex* x, int strideX, doubleComplex* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/asin/zasins.c b/src/elementaryFunctions/asin/zasins.c index 30bf7a9f..17edd29e 100644 --- a/src/elementaryFunctions/asin/zasins.c +++ b/src/elementaryFunctions/asin/zasins.c @@ -5,12 +5,12 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Fri Jan 5 10:24:38 2007 jofret -** Last update Wed Jan 31 11:15:02 2007 jofret +** Last update Fri Feb 23 16:39:16 2007 jofret ** ** Copyright INRIA 2007 */ -#include "doubleComplex.h" +#include "asin.h" doubleComplex zasins(doubleComplex z) { /* FIXME: Dummy... */ diff --git a/src/elementaryFunctions/cos/Makefile b/src/elementaryFunctions/cos/Makefile index 118716cc..fab89b1e 100644 --- a/src/elementaryFunctions/cos/Makefile +++ b/src/elementaryFunctions/cos/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:57:33 2007 jofret +## Last update Fri Feb 23 16:33:38 2007 jofret ## ## Copyright INRIA 2006 ## @@ -14,9 +14,9 @@ NAME = ../../lib/libCos.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 = scoss.c \ ccosa.c \ zcosa.c -HEAD = cos.h +HEAD = ../includes/cos.h OBJ = $(SRC:.c=.o) all: $(NAME) diff --git a/src/elementaryFunctions/cos/ccosa.c b/src/elementaryFunctions/cos/ccosa.c index 4c49b29b..5657e320 100644 --- a/src/elementaryFunctions/cos/ccosa.c +++ b/src/elementaryFunctions/cos/ccosa.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:50 2007 jofret +** Last update Fri Feb 23 16:16:05 2007 jofret ** ** Copyright INRIA 2006 */ -#include "floatComplex.h" - -floatComplex ccoss(floatComplex); +#include "cos.h" void ccosa(floatComplex* x, int strideX, floatComplex* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/cos/ccoss.c b/src/elementaryFunctions/cos/ccoss.c index 91a822fa..66d73129 100644 --- a/src/elementaryFunctions/cos/ccoss.c +++ b/src/elementaryFunctions/cos/ccoss.c @@ -5,21 +5,19 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Thu Dec 7 12:04:28 2006 jofret -** Last update Mon Feb 5 17:24:00 2007 jofret +** Last update Fri Feb 23 16:35:12 2007 jofret ** ** Copyright INRIA 2006 */ -#include "floatComplex.h" - -float scoss(float); -float scoshs(float); -float ssins(float); -float ssinhs(float); +#include "cos.h" +#include "sin.h" +#include "cosh.h" +#include "sinh.h" floatComplex ccoss(floatComplex z) { - float real = creal(z); - float imag = cimag(z); + float real = creals(z); + float imag = cimags(z); return FloatComplex(scoss(real) * scoshs(imag), -ssins(real) * ssinhs(imag)); diff --git a/src/elementaryFunctions/cos/dcosa.c b/src/elementaryFunctions/cos/dcosa.c index 45c18465..0027e533 100644 --- a/src/elementaryFunctions/cos/dcosa.c +++ b/src/elementaryFunctions/cos/dcosa.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 Thu Dec 7 17:30:17 2006 jofret +** Last update Fri Feb 23 16:15:34 2007 jofret ** ** Copyright INRIA 2006 */ -double dcoss(double); +#include "cos.h" void dcosa(double* x, int strideX, double* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/cos/scosa.c b/src/elementaryFunctions/cos/scosa.c index ef9ae739..745b5d85 100644 --- a/src/elementaryFunctions/cos/scosa.c +++ b/src/elementaryFunctions/cos/scosa.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 Thu Dec 7 17:32:22 2006 jofret +** Last update Fri Feb 23 16:15:20 2007 jofret ** ** Copyright INRIA 2006 */ -float scoss(float); +#include "cos.h" void scosa(float* x, int strideX, float* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/cos/zcosa.c b/src/elementaryFunctions/cos/zcosa.c index 525c04d5..a68c6e30 100644 --- a/src/elementaryFunctions/cos/zcosa.c +++ b/src/elementaryFunctions/cos/zcosa.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 10:19:21 2007 jofret +** Last update Fri Feb 23 16:24:10 2007 jofret ** ** Copyright INRIA 2006 */ -#include "doubleComplex.h" - -doubleComplex zcoss(doubleComplex); +#include "cos.h" void zcosa(doubleComplex* x, int strideX, doubleComplex* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/cos/zcoss.c b/src/elementaryFunctions/cos/zcoss.c index c5fe96bc..12000191 100644 --- a/src/elementaryFunctions/cos/zcoss.c +++ b/src/elementaryFunctions/cos/zcoss.c @@ -5,21 +5,19 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Thu Dec 7 12:05:48 2006 jofret -** Last update Mon Feb 5 17:25:27 2007 jofret +** Last update Fri Feb 23 16:35:32 2007 jofret ** ** Copyright INRIA 2006 */ -#include "doubleComplex.h" - -double dcoss(double); -double dcoshs(double); -double dsins(double); -double dsinhs(double); +#include "cos.h" +#include "sin.h" +#include "cosh.h" +#include "sinh.h" doubleComplex zcoss(doubleComplex z) { - double real = creal(z); - double imag = cimag(z); + double real = zreals(z); + double imag = zimags(z); return DoubleComplex(dcoss(real) * dcoshs(imag), -dsins(real) * dsinhs(imag)); 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/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))); } diff --git a/src/elementaryFunctions/exp/Makefile b/src/elementaryFunctions/exp/Makefile index 8738b977..3b0e8495 100644 --- a/src/elementaryFunctions/exp/Makefile +++ b/src/elementaryFunctions/exp/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:06 2007 jofret +## Last update Fri Feb 23 17:05:56 2007 jofret ## ## Copyright INRIA 2006 ## @@ -14,9 +14,9 @@ NAME = ../../lib/libExp.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 = sexps.c \ cexpa.c \ zexpa.c -HEAD = exp.h +HEAD = ../includes/exp.h OBJ = $(SRC:.c=.o) all: $(NAME) diff --git a/src/elementaryFunctions/exp/cexpa.c b/src/elementaryFunctions/exp/cexpa.c index eec3a98c..090124fe 100644 --- a/src/elementaryFunctions/exp/cexpa.c +++ b/src/elementaryFunctions/exp/cexpa.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:13:51 2007 jofret +** Last update Fri Feb 23 17:05:25 2007 jofret ** ** Copyright INRIA 2006 */ -#include "floatComplex.h" - -floatComplex cexps(floatComplex); +#include "exp.h" void cexpa(floatComplex* x, int strideX, floatComplex* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/exp/cexps.c b/src/elementaryFunctions/exp/cexps.c index 13b839aa..667c29d0 100644 --- a/src/elementaryFunctions/exp/cexps.c +++ b/src/elementaryFunctions/exp/cexps.c @@ -5,20 +5,18 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Thu Dec 7 12:04:28 2006 jofret -** Last update Fri Feb 9 17:00:38 2007 jofret +** Last update Fri Feb 23 17:08:27 2007 jofret ** ** Copyright INRIA 2006 */ -#include "floatComplex.h" - -float sexps(float); -float scoss(float); -float ssins(float); +#include "exp.h" +#include "cos.h" +#include "sin.h" floatComplex cexps(floatComplex z) { - float real = creal(z); - float imag = cimag(z); + float real = creals(z); + float imag = cimags(z); return FloatComplex(sexps(real)*scoss(imag), sexps(real)*ssins(imag)); diff --git a/src/elementaryFunctions/exp/dexpa.c b/src/elementaryFunctions/exp/dexpa.c index 8d80ea06..45785e90 100644 --- a/src/elementaryFunctions/exp/dexpa.c +++ b/src/elementaryFunctions/exp/dexpa.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 Wed Jan 31 09:20:51 2007 jofret +** Last update Fri Feb 23 17:04:43 2007 jofret ** ** Copyright INRIA 2006 */ -double dexps(double); +#include "exp.h" void dexpa(double* x, int strideX, double* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/exp/sexpa.c b/src/elementaryFunctions/exp/sexpa.c index fe7d0a2e..7b89eb50 100644 --- a/src/elementaryFunctions/exp/sexpa.c +++ b/src/elementaryFunctions/exp/sexpa.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 Wed Jan 31 09:20:32 2007 jofret +** Last update Fri Feb 23 17:04:29 2007 jofret ** ** Copyright INRIA 2006 */ -float sexps(float); +#include "exp.h" void sexpa(float* x, int strideX, float* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/exp/zexpa.c b/src/elementaryFunctions/exp/zexpa.c index a22f381c..05a0b89f 100644 --- a/src/elementaryFunctions/exp/zexpa.c +++ b/src/elementaryFunctions/exp/zexpa.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:13:29 2007 jofret +** Last update Fri Feb 23 17:04:17 2007 jofret ** ** Copyright INRIA 2006 */ -#include "doubleComplex.h" - -doubleComplex zexps(doubleComplex); +#include "exp.h" void zexpa(doubleComplex* x, int strideX, doubleComplex* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/exp/zexps.c b/src/elementaryFunctions/exp/zexps.c index fac6746d..91babc61 100644 --- a/src/elementaryFunctions/exp/zexps.c +++ b/src/elementaryFunctions/exp/zexps.c @@ -5,20 +5,18 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Thu Dec 7 12:05:48 2006 jofret -** Last update Fri Feb 9 17:01:19 2007 jofret +** Last update Fri Feb 23 17:08:38 2007 jofret ** ** Copyright INRIA 2006 */ -#include "doubleComplex.h" - -double dexps(double); -double dcoss(double); -double dsins(double); +#include "exp.h" +#include "cos.h" +#include "sin.h" doubleComplex zexps(doubleComplex z) { - double real = creal(z); - double imag = cimag(z); + double real = zreals(z); + double imag = zimags(z); return DoubleComplex(dexps(real)*dcoss(imag), dexps(real)*dsins(imag)); diff --git a/src/elementaryFunctions/acos/acos.h b/src/elementaryFunctions/includes/acos.h index 2f45482c..96c705e3 100644 --- a/src/elementaryFunctions/acos/acos.h +++ b/src/elementaryFunctions/includes/acos.h @@ -5,11 +5,14 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Fri Jan 5 10:20:35 2007 jofret -** Last update Fri Jan 5 10:21:28 2007 jofret +** Last update Fri Feb 23 16:38:45 2007 jofret ** ** Copyright INRIA 2007 */ +#include "floatComplex.h" +#include "doubleComplex.h" + /* ** Compute ArcCosine for different types . */ diff --git a/src/elementaryFunctions/asin/asin.h b/src/elementaryFunctions/includes/asin.h index cecf30df..b554897a 100644 --- a/src/elementaryFunctions/asin/asin.h +++ b/src/elementaryFunctions/includes/asin.h @@ -5,11 +5,14 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Fri Jan 5 10:20:35 2007 jofret -** Last update Fri Jan 5 16:22:36 2007 jofret +** Last update Fri Feb 23 16:41:38 2007 jofret ** ** Copyright INRIA 2007 */ +#include "floatComplex.h" +#include "doubleComplex.h" + /* ** Compute ArcSine for different types . */ diff --git a/src/elementaryFunctions/cos/cos.h b/src/elementaryFunctions/includes/cos.h index 13a4b303..57b21e4f 100644 --- a/src/elementaryFunctions/cos/cos.h +++ b/src/elementaryFunctions/includes/cos.h @@ -5,11 +5,14 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Tue Dec 5 15:49:18 2006 jofret -** Last update Thu Dec 7 15:53:29 2006 jofret +** Last update Fri Feb 23 16:14:12 2007 jofret ** ** Copyright INRIA 2006 */ +#include "floatComplex.h" +#include "doubleComplex.h" + /* ** Compute Cosine for different types . */ diff --git a/src/elementaryFunctions/cosh/cosh.h b/src/elementaryFunctions/includes/cosh.h index c0e3ef54..4f3879f9 100644 --- a/src/elementaryFunctions/cosh/cosh.h +++ b/src/elementaryFunctions/includes/cosh.h @@ -5,11 +5,14 @@ ** 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 +** Last update Fri Feb 23 16:47:51 2007 jofret ** ** Copyright INRIA 2006 */ +#include "floatComplex.h" +#include "doubleComplex.h" + /* ** Compute Cosine for different types . */ diff --git a/src/elementaryFunctions/exp/exp.h b/src/elementaryFunctions/includes/exp.h index ed2aa79d..d4c93ce1 100644 --- a/src/elementaryFunctions/exp/exp.h +++ b/src/elementaryFunctions/includes/exp.h @@ -5,11 +5,14 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Tue Dec 5 15:49:18 2006 jofret -** Last update Wed Jan 31 09:07:56 2007 jofret +** Last update Fri Feb 23 17:06:25 2007 jofret ** ** Copyright INRIA 2006 */ +#include "floatComplex.h" +#include "doubleComplex.h" + /* ** Compute Exponential for different types . */ diff --git a/src/elementaryFunctions/sin/sin.h b/src/elementaryFunctions/includes/sin.h index 75ca0bd9..f6342d56 100644 --- a/src/elementaryFunctions/sin/sin.h +++ b/src/elementaryFunctions/includes/sin.h @@ -5,11 +5,14 @@ ** 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 +** Last update Fri Feb 23 17:13:32 2007 jofret ** ** Copyright INRIA 2006 */ +#include "floatComplex.h" +#include "doubleComplex.h" + /* ** Compute Sine for different types . */ diff --git a/src/elementaryFunctions/sinh/sinh.h b/src/elementaryFunctions/includes/sinh.h index be4343d0..cb3e4dee 100644 --- a/src/elementaryFunctions/sinh/sinh.h +++ b/src/elementaryFunctions/includes/sinh.h @@ -5,11 +5,14 @@ ** 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 +** Last update Fri Feb 23 17:18:37 2007 jofret ** ** Copyright INRIA 2006 */ +#include "floatComplex.h" +#include "doubleComplex.h" + /* ** Compute Sine for different types . */ diff --git a/src/elementaryFunctions/tan/tan.h b/src/elementaryFunctions/includes/tan.h index 62309c9e..f6d7235c 100644 --- a/src/elementaryFunctions/tan/tan.h +++ b/src/elementaryFunctions/includes/tan.h @@ -5,11 +5,14 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Tue Dec 5 15:49:18 2006 jofret -** Last update Mon Jan 29 16:10:30 2007 jofret +** Last update Fri Feb 23 17:26:35 2007 jofret ** ** Copyright INRIA 2006 */ +#include "floatComplex.h" +#include "doubleComplex.h" + /* ** Compute Tangeant for different types . */ diff --git a/src/elementaryFunctions/tanh/tanh.h b/src/elementaryFunctions/includes/tanh.h index 7a73685d..22368869 100644 --- a/src/elementaryFunctions/tanh/tanh.h +++ b/src/elementaryFunctions/includes/tanh.h @@ -5,11 +5,14 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Tue Dec 5 15:49:18 2006 jofret -** Last update Mon Jan 29 17:04:18 2007 jofret +** Last update Fri Feb 23 17:32:55 2007 jofret ** ** Copyright INRIA 2006 */ +#include "floatComplex.h" +#include "doubleComplex.h" + /* ** Compute Hyperbolic Tangeant for different types . */ 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/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))); } 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/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))); } diff --git a/src/elementaryFunctions/tan/Makefile b/src/elementaryFunctions/tan/Makefile index 7e216db8..252b3494 100644 --- a/src/elementaryFunctions/tan/Makefile +++ b/src/elementaryFunctions/tan/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:47 2007 jofret +## Last update Fri Feb 23 17:24:49 2007 jofret ## ## Copyright INRIA 2006 ## @@ -14,9 +14,9 @@ NAME = ../../lib/libTan.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 = stans.c \ ctana.c \ ztana.c -HEAD = tan.h +HEAD = ../includes/tan.h OBJ = $(SRC:.c=.o) all: $(NAME) diff --git a/src/elementaryFunctions/tan/ctana.c b/src/elementaryFunctions/tan/ctana.c index 4cbf11cb..a87a1331 100644 --- a/src/elementaryFunctions/tan/ctana.c +++ b/src/elementaryFunctions/tan/ctana.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:11:52 2007 jofret +** Last update Fri Feb 23 17:26:05 2007 jofret ** ** Copyright INRIA 2006 */ -#include "floatComplex.h" - -floatComplex ctans(floatComplex); +#include "tan.h" void ctana(floatComplex* x, int strideX, floatComplex* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/tan/ctans.c b/src/elementaryFunctions/tan/ctans.c index 20e10b61..f083a506 100644 --- a/src/elementaryFunctions/tan/ctans.c +++ b/src/elementaryFunctions/tan/ctans.c @@ -5,12 +5,12 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Thu Dec 7 12:04:28 2006 jofret -** Last update Mon Feb 12 16:57:09 2007 jofret +** Last update Fri Feb 23 17:25:49 2007 jofret ** ** Copyright INRIA 2006 */ -#include "floatComplex.h" +#include "tan.h" floatComplex ctans(floatComplex z) { /* FIXME: Dummy... */ diff --git a/src/elementaryFunctions/tan/dtana.c b/src/elementaryFunctions/tan/dtana.c index 42e85490..bf3529c1 100644 --- a/src/elementaryFunctions/tan/dtana.c +++ b/src/elementaryFunctions/tan/dtana.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 Mon Jan 29 16:12:12 2007 jofret +** Last update Fri Feb 23 17:25:41 2007 jofret ** ** Copyright INRIA 2006 */ -double dtans(double); +#include "tan.h" void dtana(double* x, int strideX, double* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/tan/stana.c b/src/elementaryFunctions/tan/stana.c index 44058c44..6b061ed4 100644 --- a/src/elementaryFunctions/tan/stana.c +++ b/src/elementaryFunctions/tan/stana.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 Mon Jan 29 16:11:44 2007 jofret +** Last update Fri Feb 23 17:25:29 2007 jofret ** ** Copyright INRIA 2006 */ -float stans(float); +#include "tan.h" void stana(float* x, int strideX, float* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/tan/ztana.c b/src/elementaryFunctions/tan/ztana.c index 91e05fb5..01a52560 100644 --- a/src/elementaryFunctions/tan/ztana.c +++ b/src/elementaryFunctions/tan/ztana.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 10:55:53 2007 jofret +** Last update Fri Feb 23 17:25:16 2007 jofret ** ** Copyright INRIA 2006 */ -#include "doubleComplex.h" - -doubleComplex ztans(doubleComplex); +#include "tan.h" void ztana(doubleComplex* x, int strideX, doubleComplex* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/tan/ztans.c b/src/elementaryFunctions/tan/ztans.c index b15ad177..e2cfe2b0 100644 --- a/src/elementaryFunctions/tan/ztans.c +++ b/src/elementaryFunctions/tan/ztans.c @@ -5,12 +5,12 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Thu Dec 7 12:05:48 2006 jofret -** Last update Wed Jan 31 10:55:44 2007 jofret +** Last update Fri Feb 23 17:25:07 2007 jofret ** ** Copyright INRIA 2006 */ -#include "doubleComplex.h" +#include "tan.h" doubleComplex ztans(doubleComplex z) { /* FIXME: Dummy... */ diff --git a/src/elementaryFunctions/tanh/Makefile b/src/elementaryFunctions/tanh/Makefile index 1da672a6..c37f631c 100644 --- a/src/elementaryFunctions/tanh/Makefile +++ b/src/elementaryFunctions/tanh/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:52 2007 jofret +## Last update Fri Feb 23 17:28:51 2007 jofret ## ## Copyright INRIA 2006 ## @@ -14,9 +14,9 @@ NAME = ../../lib/libTanh.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 = stanhs.c \ ctanha.c \ ztanha.c -HEAD = tanh.h +HEAD = ../includes/tanh.h OBJ = $(SRC:.c=.o) all: $(NAME) diff --git a/src/elementaryFunctions/tanh/ctanha.c b/src/elementaryFunctions/tanh/ctanha.c index 86871d97..5062be25 100644 --- a/src/elementaryFunctions/tanh/ctanha.c +++ b/src/elementaryFunctions/tanh/ctanha.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:11:30 2007 jofret +** Last update Fri Feb 23 17:32:04 2007 jofret ** ** Copyright INRIA 2006 */ -#include "floatComplex.h" - -floatComplex ctanhs(floatComplex); +#include "tanh.h" void ctanha(floatComplex* x, int strideX, floatComplex* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/tanh/ctanhs.c b/src/elementaryFunctions/tanh/ctanhs.c index aae62956..1be95099 100644 --- a/src/elementaryFunctions/tanh/ctanhs.c +++ b/src/elementaryFunctions/tanh/ctanhs.c @@ -5,20 +5,18 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Thu Dec 7 12:04:28 2006 jofret -** Last update Tue Feb 13 11:03:07 2007 jofret +** Last update Fri Feb 23 17:31:52 2007 jofret ** ** Copyright INRIA 2006 */ -#include "floatComplex.h" - -floatComplex ctans(floatComplex); +#include "tanh.h" +#include "tan.h" floatComplex ctanhs(floatComplex z) { - float real = creal(z); - float imag = cimag(z); + float real = creals(z); + float imag = cimags(z); floatComplex result = ctans(FloatComplex(-imag, real)); - return (FloatComplex(cimag(result), -creal(result))); - return z; + return (FloatComplex(cimags(result), -creals(result))); } diff --git a/src/elementaryFunctions/tanh/dtanha.c b/src/elementaryFunctions/tanh/dtanha.c index 0a10ae16..fe690b23 100644 --- a/src/elementaryFunctions/tanh/dtanha.c +++ b/src/elementaryFunctions/tanh/dtanha.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 Mon Jan 29 17:05:17 2007 jofret +** Last update Fri Feb 23 17:31:10 2007 jofret ** ** Copyright INRIA 2006 */ -double dtanhs(double); +#include "tanh.h" void dtanha(double* x, int strideX, double* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/tanh/stanha.c b/src/elementaryFunctions/tanh/stanha.c index c0e47b2f..54aea93d 100644 --- a/src/elementaryFunctions/tanh/stanha.c +++ b/src/elementaryFunctions/tanh/stanha.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 Mon Jan 29 17:04:59 2007 jofret +** Last update Fri Feb 23 17:30:54 2007 jofret ** ** Copyright INRIA 2006 */ -float stanhs(float); +#include "tanh.h" void stanha(float* x, int strideX, float* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/tanh/ztanha.c b/src/elementaryFunctions/tanh/ztanha.c index ff22d6a9..d1ca0fc7 100644 --- a/src/elementaryFunctions/tanh/ztanha.c +++ b/src/elementaryFunctions/tanh/ztanha.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 10:56:20 2007 jofret +** Last update Fri Feb 23 17:30:40 2007 jofret ** ** Copyright INRIA 2006 */ -#include "doubleComplex.h" - -doubleComplex ztanhs(doubleComplex); +#include "tanh.h" void ztanha(doubleComplex* x, int strideX, doubleComplex* y, int strideY, int size) { int i = 0; diff --git a/src/elementaryFunctions/tanh/ztanhs.c b/src/elementaryFunctions/tanh/ztanhs.c index 3c2498a7..0cc3e64c 100644 --- a/src/elementaryFunctions/tanh/ztanhs.c +++ b/src/elementaryFunctions/tanh/ztanhs.c @@ -5,20 +5,18 @@ ** Made by Bruno JOFRET <bruno.jofret@inria.fr> ** ** Started on Thu Dec 7 12:05:48 2006 jofret -** Last update Tue Feb 13 10:47:24 2007 jofret +** Last update Fri Feb 23 17:30:25 2007 jofret ** ** Copyright INRIA 2006 */ -#include "doubleComplex.h" - -doubleComplex ztans(doubleComplex); +#include "tanh.h" +#include "tan.h" doubleComplex ztanhs(doubleComplex z) { - double real = creal(z); - double imag = cimag(z); + double real = zreals(z); + double imag = zimags(z); doubleComplex result = ztans(DoubleComplex(-imag, real)); - return (DoubleComplex(cimag(result), -creal(result))); - return (DoubleComplex(0,1)); + return (DoubleComplex(zimags(result), -zreals(result))); } |