summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjofret2007-04-20 09:14:27 +0000
committerjofret2007-04-20 09:14:27 +0000
commita039a9c35b7f12cef12d674644cbbdda1b110cd1 (patch)
tree0e1585a92bfd460328afb0337361766fef53a681
parent253684509ac9a972c5211feb256b8d7c5f8b2051 (diff)
downloadscilab2c-a039a9c35b7f12cef12d674644cbbdda1b110cd1.tar.gz
scilab2c-a039a9c35b7f12cef12d674644cbbdda1b110cd1.tar.bz2
scilab2c-a039a9c35b7f12cef12d674644cbbdda1b110cd1.zip
Ending Sine implementation and tests.
-rw-r--r--src/elementaryFunctions/sin/Makefile.am5
-rw-r--r--src/elementaryFunctions/sin/Makefile.in6
-rw-r--r--src/elementaryFunctions/sin/testSin.c106
3 files changed, 105 insertions, 12 deletions
diff --git a/src/elementaryFunctions/sin/Makefile.am b/src/elementaryFunctions/sin/Makefile.am
index 8bc00b9f..946229ad 100644
--- a/src/elementaryFunctions/sin/Makefile.am
+++ b/src/elementaryFunctions/sin/Makefile.am
@@ -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 Apr 18 16:50:03 2007 jofret
+## Last update Fri Apr 20 11:27:10 2007 jofret
##
## Copyright INRIA 2007
##
@@ -51,4 +51,7 @@ testSin_CFLAGS = $(check_INCLUDES)
testSin_LDADD = $(top_builddir)/lib/libDoubleComplex.a \
$(top_builddir)/lib/libFloatComplex.a \
$(top_builddir)/lib/libSin.a \
+ $(top_builddir)/lib/libCos.a \
+ $(top_builddir)/lib/libSinh.a \
+ $(top_builddir)/lib/libCosh.a \
@LIBMATH@
diff --git a/src/elementaryFunctions/sin/Makefile.in b/src/elementaryFunctions/sin/Makefile.in
index feef12ce..6f348e77 100644
--- a/src/elementaryFunctions/sin/Makefile.in
+++ b/src/elementaryFunctions/sin/Makefile.in
@@ -70,7 +70,8 @@ am_testSin_OBJECTS = testSin-testSin.$(OBJEXT)
testSin_OBJECTS = $(am_testSin_OBJECTS)
testSin_DEPENDENCIES = $(top_builddir)/lib/libDoubleComplex.a \
$(top_builddir)/lib/libFloatComplex.a \
- $(top_builddir)/lib/libSin.a
+ $(top_builddir)/lib/libSin.a $(top_builddir)/lib/libCos.a \
+ $(top_builddir)/lib/libSinh.a $(top_builddir)/lib/libCosh.a
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/includes
depcomp = $(SHELL) $(top_srcdir)/config/depcomp
am__depfiles_maybe = depfiles
@@ -212,6 +213,9 @@ testSin_CFLAGS = $(check_INCLUDES)
testSin_LDADD = $(top_builddir)/lib/libDoubleComplex.a \
$(top_builddir)/lib/libFloatComplex.a \
$(top_builddir)/lib/libSin.a \
+ $(top_builddir)/lib/libCos.a \
+ $(top_builddir)/lib/libSinh.a \
+ $(top_builddir)/lib/libCosh.a \
@LIBMATH@
all: all-am
diff --git a/src/elementaryFunctions/sin/testSin.c b/src/elementaryFunctions/sin/testSin.c
index 0efe6396..1ed78db0 100644
--- a/src/elementaryFunctions/sin/testSin.c
+++ b/src/elementaryFunctions/sin/testSin.c
@@ -5,7 +5,7 @@
** Made by Bruno JOFRET <bruno.jofret@inria.fr>
**
** Started on Fri Dec 8 15:06:16 2006 jofret
-** Last update Fri Mar 30 11:12:32 2007 jofret
+** Last update Fri Apr 20 11:25:31 2007 jofret
**
** Copyright INRIA 2006
*/
@@ -42,19 +42,105 @@ void dsinsTest() {
printf("dsins(-PI/6) = %e\n", dsins(-PI/6));
}
+void csinsTest(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 = csins(pi_pi);
+ printf("csins(PI + I*PI) = %f + I * %f\n", creals(out), cimags(out));
+ out = csins(pi_2_pi_2);
+ printf("csins(PI/2 + I*PI/2) = %f + I * %f\n", creals(out), cimags(out));
+ out = csins(pi_2_pi_3);
+ printf("csins(PI/2 + I*PI/3) = %f + I * %f\n", creals(out), cimags(out));
+ out = csins(pi_2_pi_4);
+ printf("csins(PI/2 + I*PI/4) = %f + I * %f\n", creals(out), cimags(out));
+}
+
+void zsinsTest(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 = zsins(pi_pi);
+ printf("zsins(PI + I*PI) = %e + I * %e\n", zreals(out), zimags(out));
+ out = zsins(pi_2_pi_2);
+ printf("zsins(PI/2 + I*PI/2) = %e + I * %e\n", zreals(out), zimags(out));
+ out = zsins(pi_2_pi_3);
+ printf("zsins(PI/2 + I*PI/3) = %e + I * %e\n", zreals(out), zimags(out));
+ out = zsins(pi_2_pi_4);
+ printf("zsins(PI/2 + I*PI/4) = %e + I * %e\n", zreals(out), zimags(out));
+}
+
+void ssinaTest(void) {
+ float out[5];
+ float in[5] = {PI, PI/2, PI/3, PI/4, PI/6};
+ int i = 0;
+
+ printf(">> Float array\n");
+ ssina(in, out, 5);
+ for (i = 0 ; i < 5 ; ++i)
+ printf("ssina(array) = %f\n", out[i]);
+}
+
+void dsinaTest(void) {
+ double out[5];
+ double in[5] = {PI, PI/2, PI/3, PI/4, PI/6};
+ int i = 0;
+
+ printf(">> Double Array\n");
+ dsina(in, out, 5);
+ for (i = 0 ; i < 5 ; ++i)
+ printf("ssina(array) = %f\n", out[i]);
+
+}
+
+void csinaTest(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 in[4] = {pi_pi, pi_2_pi_2, pi_2_pi_3, pi_2_pi_4};
+ floatComplex out[4];
+ int i = 0;
+
+ csina(in, out, 4);
+ printf(">> Float Complex Array\n");
+ for (i = 0 ; i < 4 ; ++i)
+ printf("csina(array) = %e + I * %e\n", creals(out[i]), cimags(out[i]));
+}
+
+void zsinaTest(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 in[4] = {pi_pi, pi_2_pi_2, pi_2_pi_3, pi_2_pi_4 };
+ doubleComplex out[4];
+ int i = 0;
+
+ zsina(in, out, 4);
+ printf(">> Double Complex Array\n");
+ for (i = 0 ; i < 4 ; ++i)
+ printf("zsina(array) = %e + I * %e\n", zreals(out[i]), zimags(out[i]));
+}
+
int testSin() {
printf("\n>>>> Sine Tests\n");
ssinsTest();
dsinsTest();
- /* FIXME : Implement some test here ... */
- /*
- csinsTest();
- zsinsTest();
- ssinaTest();
- dsinaTest();
- csinaTest();
- zsinaTest();
- */
+ csinsTest();
+ zsinsTest();
+ ssinaTest();
+ dsinaTest();
+ csinaTest();
+ zsinaTest();
return 0;
}