diff options
author | jofret | 2008-04-18 14:01:15 +0000 |
---|---|---|
committer | jofret | 2008-04-18 14:01:15 +0000 |
commit | 163c4c224ccd32a1eb036511c022860ba983d967 (patch) | |
tree | 59a2e625ba897eebccd55af26ad2649e88c20d7f /src/elementaryFunctions/asinh | |
parent | 127a939c11b4b9c43b29a4deae5d261ee5c4247a (diff) | |
download | scilab2c-163c4c224ccd32a1eb036511c022860ba983d967.tar.gz scilab2c-163c4c224ccd32a1eb036511c022860ba983d967.tar.bz2 scilab2c-163c4c224ccd32a1eb036511c022860ba983d967.zip |
Double vs Float better management. Enable psycho warnings.
Diffstat (limited to 'src/elementaryFunctions/asinh')
-rw-r--r-- | src/elementaryFunctions/asinh/Makefile.am | 22 | ||||
-rw-r--r-- | src/elementaryFunctions/asinh/Makefile.in | 92 | ||||
-rw-r--r-- | src/elementaryFunctions/asinh/sasinhs.c | 22 | ||||
-rw-r--r-- | src/elementaryFunctions/asinh/testAsinh.c | 152 | ||||
-rw-r--r-- | src/elementaryFunctions/asinh/testDoubleAsinh.c | 88 | ||||
-rw-r--r-- | src/elementaryFunctions/asinh/testFloatAsinh.c | 87 | ||||
-rw-r--r-- | src/elementaryFunctions/asinh/zasinhs.c | 22 |
7 files changed, 273 insertions, 212 deletions
diff --git a/src/elementaryFunctions/asinh/Makefile.am b/src/elementaryFunctions/asinh/Makefile.am index e84ed15e..91132334 100644 --- a/src/elementaryFunctions/asinh/Makefile.am +++ b/src/elementaryFunctions/asinh/Makefile.am @@ -37,16 +37,22 @@ HEAD = ../includes/asinh.h check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \ -I $(top_builddir)/type -check_PROGRAMS = testAsinh +check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ + $(top_builddir)/type/libFloatComplex.la \ + $(top_builddir)/elementaryFunctions/asinh/libAsinh.la \ + @LIBMATH@ + +check_PROGRAMS = testFloatAsinh testDoubleAsinh -TESTS = testAsinh +TESTS = testFloatAsinh testDoubleAsinh # # -*- Hyperbolic ArcSine Tests -*- # -testAsinh_SOURCES = testAsinh.c -testAsinh_CFLAGS = $(check_INCLUDES) -testAsinh_LDADD = $(top_builddir)/type/libDoubleComplex.la \ - $(top_builddir)/type/libFloatComplex.la \ - $(top_builddir)/elementaryFunctions/asinh/libAsinh.la \ - @LIBMATH@
\ No newline at end of file +testFloatAsinh_SOURCES = testFloatAsinh.c +testFloatAsinh_CFLAGS = $(check_INCLUDES) +testFloatAsinh_LDADD = $(check_LDADD) + +testDoubleAsinh_SOURCES = testDoubleAsinh.c +testDoubleAsinh_CFLAGS = $(check_INCLUDES) +testDoubleAsinh_LDADD = $(check_LDADD)
\ No newline at end of file diff --git a/src/elementaryFunctions/asinh/Makefile.in b/src/elementaryFunctions/asinh/Makefile.in index 826be79a..22d467f3 100644 --- a/src/elementaryFunctions/asinh/Makefile.in +++ b/src/elementaryFunctions/asinh/Makefile.in @@ -32,8 +32,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -check_PROGRAMS = testAsinh$(EXEEXT) -TESTS = testAsinh$(EXEEXT) +check_PROGRAMS = testFloatAsinh$(EXEEXT) testDoubleAsinh$(EXEEXT) +TESTS = testFloatAsinh$(EXEEXT) testDoubleAsinh$(EXEEXT) subdir = elementaryFunctions/asinh DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -63,13 +63,21 @@ libAsinh_la_OBJECTS = $(am_libAsinh_la_OBJECTS) libAsinh_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libAsinh_la_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -am_testAsinh_OBJECTS = testAsinh-testAsinh.$(OBJEXT) -testAsinh_OBJECTS = $(am_testAsinh_OBJECTS) -testAsinh_DEPENDENCIES = $(top_builddir)/type/libDoubleComplex.la \ +am_testDoubleAsinh_OBJECTS = \ + testDoubleAsinh-testDoubleAsinh.$(OBJEXT) +testDoubleAsinh_OBJECTS = $(am_testDoubleAsinh_OBJECTS) +am__DEPENDENCIES_1 = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/type/libFloatComplex.la \ $(top_builddir)/elementaryFunctions/asinh/libAsinh.la -testAsinh_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testAsinh_CFLAGS) \ +testDoubleAsinh_DEPENDENCIES = $(am__DEPENDENCIES_1) +testDoubleAsinh_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleAsinh_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +am_testFloatAsinh_OBJECTS = testFloatAsinh-testFloatAsinh.$(OBJEXT) +testFloatAsinh_OBJECTS = $(am_testFloatAsinh_OBJECTS) +testFloatAsinh_DEPENDENCIES = $(am__DEPENDENCIES_1) +testFloatAsinh_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testFloatAsinh_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I. -I$(top_builddir)/includes@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/config/depcomp @@ -83,8 +91,10 @@ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(libAsinh_la_SOURCES) $(testAsinh_SOURCES) -DIST_SOURCES = $(libAsinh_la_SOURCES) $(testAsinh_SOURCES) +SOURCES = $(libAsinh_la_SOURCES) $(testDoubleAsinh_SOURCES) \ + $(testFloatAsinh_SOURCES) +DIST_SOURCES = $(libAsinh_la_SOURCES) $(testDoubleAsinh_SOURCES) \ + $(testFloatAsinh_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -219,17 +229,21 @@ HEAD = ../includes/asinh.h check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \ -I $(top_builddir)/type - -# -# -*- Hyperbolic ArcSine Tests -*- -# -testAsinh_SOURCES = testAsinh.c -testAsinh_CFLAGS = $(check_INCLUDES) -testAsinh_LDADD = $(top_builddir)/type/libDoubleComplex.la \ +check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ $(top_builddir)/type/libFloatComplex.la \ $(top_builddir)/elementaryFunctions/asinh/libAsinh.la \ @LIBMATH@ + +# +# -*- Hyperbolic ArcSine Tests -*- +# +testFloatAsinh_SOURCES = testFloatAsinh.c +testFloatAsinh_CFLAGS = $(check_INCLUDES) +testFloatAsinh_LDADD = $(check_LDADD) +testDoubleAsinh_SOURCES = testDoubleAsinh.c +testDoubleAsinh_CFLAGS = $(check_INCLUDES) +testDoubleAsinh_LDADD = $(check_LDADD) all: all-am .SUFFIXES: @@ -299,9 +313,12 @@ clean-checkPROGRAMS: echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done -testAsinh$(EXEEXT): $(testAsinh_OBJECTS) $(testAsinh_DEPENDENCIES) - @rm -f testAsinh$(EXEEXT) - $(testAsinh_LINK) $(testAsinh_OBJECTS) $(testAsinh_LDADD) $(LIBS) +testDoubleAsinh$(EXEEXT): $(testDoubleAsinh_OBJECTS) $(testDoubleAsinh_DEPENDENCIES) + @rm -f testDoubleAsinh$(EXEEXT) + $(testDoubleAsinh_LINK) $(testDoubleAsinh_OBJECTS) $(testDoubleAsinh_LDADD) $(LIBS) +testFloatAsinh$(EXEEXT): $(testFloatAsinh_OBJECTS) $(testFloatAsinh_DEPENDENCIES) + @rm -f testFloatAsinh$(EXEEXT) + $(testFloatAsinh_LINK) $(testFloatAsinh_OBJECTS) $(testFloatAsinh_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -317,7 +334,8 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libAsinh_la-sasinhs.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libAsinh_la-zasinha.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libAsinh_la-zasinhs.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testAsinh-testAsinh.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testDoubleAsinh-testDoubleAsinh.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testFloatAsinh-testFloatAsinh.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -396,19 +414,33 @@ libAsinh_la-zasinha.lo: zasinha.c @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libAsinh_la_CFLAGS) $(CFLAGS) -c -o libAsinh_la-zasinha.lo `test -f 'zasinha.c' || echo '$(srcdir)/'`zasinha.c -testAsinh-testAsinh.o: testAsinh.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testAsinh_CFLAGS) $(CFLAGS) -MT testAsinh-testAsinh.o -MD -MP -MF $(DEPDIR)/testAsinh-testAsinh.Tpo -c -o testAsinh-testAsinh.o `test -f 'testAsinh.c' || echo '$(srcdir)/'`testAsinh.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/testAsinh-testAsinh.Tpo $(DEPDIR)/testAsinh-testAsinh.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testAsinh.c' object='testAsinh-testAsinh.o' libtool=no @AMDEPBACKSLASH@ +testDoubleAsinh-testDoubleAsinh.o: testDoubleAsinh.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testDoubleAsinh_CFLAGS) $(CFLAGS) -MT testDoubleAsinh-testDoubleAsinh.o -MD -MP -MF $(DEPDIR)/testDoubleAsinh-testDoubleAsinh.Tpo -c -o testDoubleAsinh-testDoubleAsinh.o `test -f 'testDoubleAsinh.c' || echo '$(srcdir)/'`testDoubleAsinh.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/testDoubleAsinh-testDoubleAsinh.Tpo $(DEPDIR)/testDoubleAsinh-testDoubleAsinh.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testDoubleAsinh.c' object='testDoubleAsinh-testDoubleAsinh.o' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testDoubleAsinh_CFLAGS) $(CFLAGS) -c -o testDoubleAsinh-testDoubleAsinh.o `test -f 'testDoubleAsinh.c' || echo '$(srcdir)/'`testDoubleAsinh.c + +testDoubleAsinh-testDoubleAsinh.obj: testDoubleAsinh.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testDoubleAsinh_CFLAGS) $(CFLAGS) -MT testDoubleAsinh-testDoubleAsinh.obj -MD -MP -MF $(DEPDIR)/testDoubleAsinh-testDoubleAsinh.Tpo -c -o testDoubleAsinh-testDoubleAsinh.obj `if test -f 'testDoubleAsinh.c'; then $(CYGPATH_W) 'testDoubleAsinh.c'; else $(CYGPATH_W) '$(srcdir)/testDoubleAsinh.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/testDoubleAsinh-testDoubleAsinh.Tpo $(DEPDIR)/testDoubleAsinh-testDoubleAsinh.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testDoubleAsinh.c' object='testDoubleAsinh-testDoubleAsinh.obj' libtool=no @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testDoubleAsinh_CFLAGS) $(CFLAGS) -c -o testDoubleAsinh-testDoubleAsinh.obj `if test -f 'testDoubleAsinh.c'; then $(CYGPATH_W) 'testDoubleAsinh.c'; else $(CYGPATH_W) '$(srcdir)/testDoubleAsinh.c'; fi` + +testFloatAsinh-testFloatAsinh.o: testFloatAsinh.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFloatAsinh_CFLAGS) $(CFLAGS) -MT testFloatAsinh-testFloatAsinh.o -MD -MP -MF $(DEPDIR)/testFloatAsinh-testFloatAsinh.Tpo -c -o testFloatAsinh-testFloatAsinh.o `test -f 'testFloatAsinh.c' || echo '$(srcdir)/'`testFloatAsinh.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/testFloatAsinh-testFloatAsinh.Tpo $(DEPDIR)/testFloatAsinh-testFloatAsinh.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testFloatAsinh.c' object='testFloatAsinh-testFloatAsinh.o' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testAsinh_CFLAGS) $(CFLAGS) -c -o testAsinh-testAsinh.o `test -f 'testAsinh.c' || echo '$(srcdir)/'`testAsinh.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFloatAsinh_CFLAGS) $(CFLAGS) -c -o testFloatAsinh-testFloatAsinh.o `test -f 'testFloatAsinh.c' || echo '$(srcdir)/'`testFloatAsinh.c -testAsinh-testAsinh.obj: testAsinh.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testAsinh_CFLAGS) $(CFLAGS) -MT testAsinh-testAsinh.obj -MD -MP -MF $(DEPDIR)/testAsinh-testAsinh.Tpo -c -o testAsinh-testAsinh.obj `if test -f 'testAsinh.c'; then $(CYGPATH_W) 'testAsinh.c'; else $(CYGPATH_W) '$(srcdir)/testAsinh.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/testAsinh-testAsinh.Tpo $(DEPDIR)/testAsinh-testAsinh.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testAsinh.c' object='testAsinh-testAsinh.obj' libtool=no @AMDEPBACKSLASH@ +testFloatAsinh-testFloatAsinh.obj: testFloatAsinh.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFloatAsinh_CFLAGS) $(CFLAGS) -MT testFloatAsinh-testFloatAsinh.obj -MD -MP -MF $(DEPDIR)/testFloatAsinh-testFloatAsinh.Tpo -c -o testFloatAsinh-testFloatAsinh.obj `if test -f 'testFloatAsinh.c'; then $(CYGPATH_W) 'testFloatAsinh.c'; else $(CYGPATH_W) '$(srcdir)/testFloatAsinh.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/testFloatAsinh-testFloatAsinh.Tpo $(DEPDIR)/testFloatAsinh-testFloatAsinh.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testFloatAsinh.c' object='testFloatAsinh-testFloatAsinh.obj' libtool=no @AMDEPBACKSLASH@ @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testAsinh_CFLAGS) $(CFLAGS) -c -o testAsinh-testAsinh.obj `if test -f 'testAsinh.c'; then $(CYGPATH_W) 'testAsinh.c'; else $(CYGPATH_W) '$(srcdir)/testAsinh.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFloatAsinh_CFLAGS) $(CFLAGS) -c -o testFloatAsinh-testFloatAsinh.obj `if test -f 'testFloatAsinh.c'; then $(CYGPATH_W) 'testFloatAsinh.c'; else $(CYGPATH_W) '$(srcdir)/testFloatAsinh.c'; fi` mostlyclean-libtool: -rm -f *.lo diff --git a/src/elementaryFunctions/asinh/sasinhs.c b/src/elementaryFunctions/asinh/sasinhs.c index 03a5d690..cc685aeb 100644 --- a/src/elementaryFunctions/asinh/sasinhs.c +++ b/src/elementaryFunctions/asinh/sasinhs.c @@ -1,18 +1,18 @@ /* -** -*- C -*- -** -** sasinhs.c -** Made by Bruno JOFRET <bruno.jofret@inria.fr> -** -** Started on Fri Jan 5 10:25:44 2007 jofret -** Last update Thu Sep 6 11:21:04 2007 bruno -** -** Copyright INRIA 2007 -*/ + * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab + * Copyright (C) 2008-2008 - INRIA - Bruno JOFRET + * + * This file must be used under the terms of the CeCILL. + * This source file is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at + * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + * + */ #include <math.h> #include "asinh.h" float sasinhs(float x) { - return (asinh(x)); + return (asinhf(x)); } diff --git a/src/elementaryFunctions/asinh/testAsinh.c b/src/elementaryFunctions/asinh/testAsinh.c deleted file mode 100644 index 5c78625a..00000000 --- a/src/elementaryFunctions/asinh/testAsinh.c +++ /dev/null @@ -1,152 +0,0 @@ -/* -** -*- C -*- -** -** testAsinh.c -** Made by Bruno JOFRET <bruno.jofret@inria.fr> -** -** Started on Fri Dec 8 15:05:44 2006 jofret -** Last update Mon Oct 22 14:17:39 2007 bruno -** -** Copyright INRIA 2006 -*/ - -#include "testAsinh.h" - -void sasinhsTest(void) { - printf(">> Float scalar\n"); - printf("sasinhs(0) = %f\n", sasinhs((float) 0)); - printf("sasinhs(PI) = %f\n", sasinhs(PI)); - printf("sasinhs(PI/2) = %f\n", sasinhs(PI/2)); - printf("sasinhs(PI/3) = %f\n", sasinhs(PI/3)); - printf("sasinhs(PI/4) = %f\n", sasinhs(PI/4)); - printf("sasinhs(PI/6) = %f\n", sasinhs(PI/6)); - printf("sasinhs(-PI) = %f\n", sasinhs(-PI)); - printf("sasinhs(-PI/2) = %f\n", sasinhs(-PI/2)); - printf("sasinhs(-PI/3) = %f\n", sasinhs(-PI/3)); - printf("sasinhs(-PI/4) = %f\n", sasinhs(-PI/4)); - printf("sasinhs(-PI/6) = %f\n", sasinhs(-PI/6)); -} - -void dasinhsTest(void) { - printf(">> Double scalar\n"); - printf("dasinhs(0) = %e\n", dasinhs((double) 0)); - printf("dasinhs(PI) = %e\n", dasinhs(PI)); - printf("dasinhs(PI/2) = %e\n", dasinhs(PI/2)); - printf("dasinhs(PI/3) = %e\n", dasinhs(PI/3)); - printf("dasinhs(PI/4) = %e\n", dasinhs(PI/4)); - printf("dasinhs(PI/6) = %e\n", dasinhs(PI/6)); - printf("dasinhs(-PI) = %e\n", dasinhs(-PI)); - printf("dasinhs(-PI/2) = %e\n", dasinhs(-PI/2)); - printf("dasinhs(-PI/3) = %e\n", dasinhs(-PI/3)); - printf("dasinhs(-PI/4) = %e\n", dasinhs(-PI/4)); - printf("dasinhs(-PI/6) = %e\n", dasinhs(-PI/6)); -} - -void casinhsTest(void) { - floatComplex pi_pi = FloatComplex(PI, PI); - floatComplex pi_2_pi_2 = FloatComplex(PI/2, PI/2); - floatComplex pi_2_pi_3 = FloatComplex(PI/2, PI/3); - floatComplex pi_2_pi_4 = FloatComplex(PI/2, PI/4); - floatComplex out; - - printf(">> Float Complex scalar\n"); - out = casinhs(pi_pi); - printf("casinhs(PI + I*PI) = %f + I * %f\n", creals(out), cimags(out)); - out = casinhs(pi_2_pi_2); - printf("casinhs(PI/2 + I*PI/2) = %f + I * %f\n", creals(out), cimags(out)); - out = casinhs(pi_2_pi_3); - printf("casinhs(PI/2 + I*PI/3) = %f + I * %f\n", creals(out), cimags(out)); - out = casinhs(pi_2_pi_4); - printf("casinhs(PI/2 + I*PI/4) = %f + I * %f\n", creals(out), cimags(out)); -} - -void zasinhsTest(void) { - doubleComplex pi_pi = DoubleComplex(PI, PI); - doubleComplex pi_2_pi_2 = DoubleComplex(PI/2, PI/2); - doubleComplex pi_2_pi_3 = DoubleComplex(PI/2, PI/3); - doubleComplex pi_2_pi_4 = DoubleComplex(PI/2, PI/4); - doubleComplex out; - - printf(">> Double Complex scalar\n"); - out = zasinhs(pi_pi); - printf("zasinhs(PI + I*PI) = %e + I * %e\n", zreals(out), zimags(out)); - out = zasinhs(pi_2_pi_2); - printf("zasinhs(PI/2 + I*PI/2) = %e + I * %e\n", zreals(out), zimags(out)); - out = zasinhs(pi_2_pi_3); - printf("zasinhs(PI/2 + I*PI/3) = %e + I * %e\n", zreals(out), zimags(out)); - out = zasinhs(pi_2_pi_4); - printf("zasinhs(PI/2 + I*PI/4) = %e + I * %e\n", zreals(out), zimags(out)); -} - -void sasinhaTest(void) { - float out[5]; - float in[5] = {PI, PI/2, PI/3, PI/4, PI/6}; - int i = 0; - - printf(">> Float array\n"); - sasinha(in, 5, out); - for (i = 0 ; i < 5 ; ++i) - printf("sasinha(array) = %f\n", out[i]); -} - -void dasinhaTest(void) { - double out[5]; - double in[5] = {PI, PI/2, PI/3, PI/4, PI/6}; - int i = 0; - - printf(">> Double Array\n"); - dasinha(in, 5, out); - for (i = 0 ; i < 5 ; ++i) - printf("sasinha(array) = %f\n", out[i]); - -} - -void casinhaTest(void) { - floatComplex in[4]; - floatComplex out[4]; - int i = 0; - - in[0] = FloatComplex(PI, PI); - in[1] = FloatComplex(PI/2, PI/2); - in[2] = FloatComplex(PI/2, PI/3); - in[3] = FloatComplex(PI/2, PI/4); - - casinha(in, 4, out); - printf(">> Float Complex Array\n"); - for (i = 0 ; i < 4 ; ++i) - printf("casinha(array) = %e + I * %e\n", creals(out[i]), cimags(out[i])); -} - -void zasinhaTest(void) { - doubleComplex in[4]; - doubleComplex out[4]; - int i = 0; - - in[0] = DoubleComplex(PI, PI); - in[1] = DoubleComplex(PI/2, PI/2); - in[2] = DoubleComplex(PI/2, PI/3); - in[3] = DoubleComplex(PI/2, PI/4); - - zasinha(in, 4, out); - printf(">> Double Complex Array\n"); - for (i = 0 ; i < 4 ; ++i) - printf("zasinha(array) = %e + I * %e\n", zreals(out[i]), zimags(out[i])); -} - -int testAsinh(void) { - printf("\n>>>> ArcSinhe Tests\n"); - sasinhsTest(); - dasinhsTest(); - casinhsTest(); - zasinhsTest(); - sasinhaTest(); - dasinhaTest(); - casinhaTest(); - zasinhaTest(); - return 0; -} - -int main(void) { - assert(testAsinh() == 0); - return 0; -} diff --git a/src/elementaryFunctions/asinh/testDoubleAsinh.c b/src/elementaryFunctions/asinh/testDoubleAsinh.c new file mode 100644 index 00000000..13cb1bbc --- /dev/null +++ b/src/elementaryFunctions/asinh/testDoubleAsinh.c @@ -0,0 +1,88 @@ +/* + * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab + * Copyright (C) 2008-2008 - INRIA - Bruno JOFRET + * + * This file must be used under the terms of the CeCILL. + * This source file is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at + * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + * + */ + +#include "testAsinh.h" + +void dasinhsTest(void) { + printf(">> Double scalar\n"); + printf("dasinhs(0) = %e\n", dasinhs(0.0)); + printf("dasinhs(PI) = %e\n", dasinhs(DPI)); + printf("dasinhs(PI/2) = %e\n", dasinhs(DPI/2)); + printf("dasinhs(PI/3) = %e\n", dasinhs(DPI/3)); + printf("dasinhs(PI/4) = %e\n", dasinhs(DPI/4)); + printf("dasinhs(PI/6) = %e\n", dasinhs(DPI/6)); + printf("dasinhs(-PI) = %e\n", dasinhs(-DPI)); + printf("dasinhs(-PI/2) = %e\n", dasinhs(-DPI/2)); + printf("dasinhs(-PI/3) = %e\n", dasinhs(-DPI/3)); + printf("dasinhs(-PI/4) = %e\n", dasinhs(-DPI/4)); + printf("dasinhs(-PI/6) = %e\n", dasinhs(-DPI/6)); +} + +void zasinhsTest(void) { + doubleComplex pi_pi = DoubleComplex(DPI, DPI); + doubleComplex pi_2_pi_2 = DoubleComplex(DPI/2, DPI/2); + doubleComplex pi_2_pi_3 = DoubleComplex(DPI/2, DPI/3); + doubleComplex pi_2_pi_4 = DoubleComplex(DPI/2, DPI/4); + doubleComplex out; + + printf(">> Double Complex scalar\n"); + out = zasinhs(pi_pi); + printf("zasinhs(PI + I*PI) = %e + I * %e\n", zreals(out), zimags(out)); + out = zasinhs(pi_2_pi_2); + printf("zasinhs(PI/2 + I*PI/2) = %e + I * %e\n", zreals(out), zimags(out)); + out = zasinhs(pi_2_pi_3); + printf("zasinhs(PI/2 + I*PI/3) = %e + I * %e\n", zreals(out), zimags(out)); + out = zasinhs(pi_2_pi_4); + printf("zasinhs(PI/2 + I*PI/4) = %e + I * %e\n", zreals(out), zimags(out)); +} + +void dasinhaTest(void) { + double out[5]; + double in[5] = {DPI, DPI/2, DPI/3, DPI/4, DPI/6}; + int i = 0; + + printf(">> Double Array\n"); + dasinha(in, 5, out); + for (i = 0 ; i < 5 ; ++i) + printf("sasinha(array) = %f\n", out[i]); + +} + +void zasinhaTest(void) { + doubleComplex in[4]; + doubleComplex out[4]; + int i = 0; + + in[0] = DoubleComplex(DPI, DPI); + in[1] = DoubleComplex(DPI/2, DPI/2); + in[2] = DoubleComplex(DPI/2, DPI/3); + in[3] = DoubleComplex(DPI/2, DPI/4); + + zasinha(in, 4, out); + printf(">> Double Complex Array\n"); + for (i = 0 ; i < 4 ; ++i) + printf("zasinha(array) = %e + I * %e\n", zreals(out[i]), zimags(out[i])); +} + +int testAsinh(void) { + printf("\n>>>> Double Hyperbolic ArcSine Tests\n"); + dasinhsTest(); + zasinhsTest(); + dasinhaTest(); + zasinhaTest(); + return 0; +} + +int main(void) { + assert(testAsinh() == 0); + return 0; +} diff --git a/src/elementaryFunctions/asinh/testFloatAsinh.c b/src/elementaryFunctions/asinh/testFloatAsinh.c new file mode 100644 index 00000000..c033f93b --- /dev/null +++ b/src/elementaryFunctions/asinh/testFloatAsinh.c @@ -0,0 +1,87 @@ +/* + * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab + * Copyright (C) 2008-2008 - INRIA - Bruno JOFRET + * + * This file must be used under the terms of the CeCILL. + * This source file is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at + * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + * + */ + +#include "testAsinh.h" + +void sasinhsTest(void) { + printf(">> Float scalar\n"); + printf("sasinhs(0) = %f\n", sasinhs(0.0f)); + printf("sasinhs(PI) = %f\n", sasinhs(FPI)); + printf("sasinhs(PI/2) = %f\n", sasinhs(FPI/2)); + printf("sasinhs(PI/3) = %f\n", sasinhs(FPI/3)); + printf("sasinhs(PI/4) = %f\n", sasinhs(FPI/4)); + printf("sasinhs(PI/6) = %f\n", sasinhs(FPI/6)); + printf("sasinhs(-PI) = %f\n", sasinhs(-FPI)); + printf("sasinhs(-PI/2) = %f\n", sasinhs(-FPI/2)); + printf("sasinhs(-PI/3) = %f\n", sasinhs(-FPI/3)); + printf("sasinhs(-PI/4) = %f\n", sasinhs(-FPI/4)); + printf("sasinhs(-PI/6) = %f\n", sasinhs(-FPI/6)); +} + +void casinhsTest(void) { + floatComplex pi_pi = FloatComplex(FPI, FPI); + floatComplex pi_2_pi_2 = FloatComplex(FPI/2, FPI/2); + floatComplex pi_2_pi_3 = FloatComplex(FPI/2, FPI/3); + floatComplex pi_2_pi_4 = FloatComplex(FPI/2, FPI/4); + floatComplex out; + + printf(">> Float Complex scalar\n"); + out = casinhs(pi_pi); + printf("casinhs(PI + I*PI) = %f + I * %f\n", creals(out), cimags(out)); + out = casinhs(pi_2_pi_2); + printf("casinhs(PI/2 + I*PI/2) = %f + I * %f\n", creals(out), cimags(out)); + out = casinhs(pi_2_pi_3); + printf("casinhs(PI/2 + I*PI/3) = %f + I * %f\n", creals(out), cimags(out)); + out = casinhs(pi_2_pi_4); + printf("casinhs(PI/2 + I*PI/4) = %f + I * %f\n", creals(out), cimags(out)); +} + +void sasinhaTest(void) { + float out[5]; + float in[5] = {FPI, FPI/2, FPI/3, FPI/4, FPI/6}; + int i = 0; + + printf(">> Float array\n"); + sasinha(in, 5, out); + for (i = 0 ; i < 5 ; ++i) + printf("sasinha(array) = %f\n", out[i]); +} + +void casinhaTest(void) { + floatComplex in[4]; + floatComplex out[4]; + int i = 0; + + in[0] = FloatComplex(FPI, FPI); + in[1] = FloatComplex(FPI/2, FPI/2); + in[2] = FloatComplex(FPI/2, FPI/3); + in[3] = FloatComplex(FPI/2, FPI/4); + + casinha(in, 4, out); + printf(">> Float Complex Array\n"); + for (i = 0 ; i < 4 ; ++i) + printf("casinha(array) = %e + I * %e\n", creals(out[i]), cimags(out[i])); +} + +int testAsinh(void) { + printf("\n>>>> Float Hyperbolic ArcSine Tests\n"); + sasinhsTest(); + casinhsTest(); + sasinhaTest(); + casinhaTest(); + return 0; +} + +int main(void) { + assert(testAsinh() == 0); + return 0; +} diff --git a/src/elementaryFunctions/asinh/zasinhs.c b/src/elementaryFunctions/asinh/zasinhs.c index d55932ce..58dac9c7 100644 --- a/src/elementaryFunctions/asinh/zasinhs.c +++ b/src/elementaryFunctions/asinh/zasinhs.c @@ -1,18 +1,18 @@ /* -** -*- C -*- -** -** zasinhs.c -** Made by Bruno JOFRET <bruno.jofret@inria.fr> -** -** Started on Fri Jan 5 10:24:38 2007 jofret -** Last update Thu Sep 6 11:20:31 2007 bruno -** -** Copyright INRIA 2007 -*/ + * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab + * Copyright (C) 2007-2008 - INRIA - Bruno JOFRET + * + * This file must be used under the terms of the CeCILL. + * This source file is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at + * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt + * + */ #include "asinh.h" doubleComplex zasinhs(doubleComplex z) { /* FIXME: Dummy... */ - return (DoubleComplex(0,1)); + return z; } |