diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/elementaryFunctions/log10/Makefile.am | 27 | ||||
-rw-r--r-- | src/elementaryFunctions/log10/Makefile.in | 163 | ||||
-rw-r--r-- | src/elementaryFunctions/log10/clog10s.c | 22 | ||||
-rw-r--r-- | src/elementaryFunctions/log10/slog10s.c | 22 | ||||
-rw-r--r-- | src/elementaryFunctions/log10/testDoubleLog10.c | 36 | ||||
-rw-r--r-- | src/elementaryFunctions/log10/testFloatLog10.c | 36 | ||||
-rw-r--r-- | src/elementaryFunctions/log10/testLog10.h | 38 | ||||
-rw-r--r-- | src/elementaryFunctions/log10/zlog10s.c | 22 |
8 files changed, 316 insertions, 50 deletions
diff --git a/src/elementaryFunctions/log10/Makefile.am b/src/elementaryFunctions/log10/Makefile.am index efdffbfd..3934a102 100644 --- a/src/elementaryFunctions/log10/Makefile.am +++ b/src/elementaryFunctions/log10/Makefile.am @@ -29,3 +29,30 @@ SRC = slog10s.c \ zlog10a.c HEAD = ../includes/log10.h + +#### +# Checking Part +#### + +check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \ + -I $(top_builddir)/type + +check_LDADD = $(top_builddir)/type/libDoubleComplex.la \ + $(top_builddir)/type/libFloatComplex.la \ + $(top_builddir)/elementaryFunctions/log10/libLog10.la \ + @LIBMATH@ + +check_PROGRAMS = testFloatLog10 testDoubleLog10 + +TESTS = testFloatLog10 testDoubleLog10 + +# +# -*- 10-Base Logarithm Tests -*- +# +testFloatLog10_SOURCES = testFloatLog10.c +testFloatLog10_CFLAGS = $(check_INCLUDES) +testFloatLog10_LDADD = $(check_LDADD) + +testDoubleLog10_SOURCES = testDoubleLog10.c +testDoubleLog10_CFLAGS = $(check_INCLUDES) +testDoubleLog10_LDADD = $(check_LDADD)
\ No newline at end of file diff --git a/src/elementaryFunctions/log10/Makefile.in b/src/elementaryFunctions/log10/Makefile.in index 58bbfd6c..333d1fc6 100644 --- a/src/elementaryFunctions/log10/Makefile.in +++ b/src/elementaryFunctions/log10/Makefile.in @@ -32,6 +32,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ +check_PROGRAMS = testLog10$(EXEEXT) +TESTS = testLog10$(EXEEXT) subdir = elementaryFunctions/log10 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -61,6 +63,14 @@ libLog10_la_OBJECTS = $(am_libLog10_la_OBJECTS) libLog10_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libLog10_la_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ +am_testLog10_OBJECTS = testLog10-testLog10.$(OBJEXT) +testLog10_OBJECTS = $(am_testLog10_OBJECTS) +testLog10_DEPENDENCIES = $(top_builddir)/type/libDoubleComplex.la \ + $(top_builddir)/type/libFloatComplex.la \ + $(top_builddir)/elementaryFunctions/log10/libLog10.la +testLog10_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testLog10_CFLAGS) \ + $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I. -I$(top_builddir)/includes@am__isrc@ depcomp = $(SHELL) $(top_srcdir)/config/depcomp am__depfiles_maybe = depfiles @@ -73,8 +83,8 @@ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(libLog10_la_SOURCES) -DIST_SOURCES = $(libLog10_la_SOURCES) +SOURCES = $(libLog10_la_SOURCES) $(testLog10_SOURCES) +DIST_SOURCES = $(libLog10_la_SOURCES) $(testLog10_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -202,6 +212,24 @@ SRC = slog10s.c \ zlog10a.c HEAD = ../includes/log10.h + +#### +# Checking Part +#### +check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \ + -I $(top_builddir)/type + + +# +# -*- Acosine Tests -*- +# +testLog10_SOURCES = testLog10.c +testLog10_CFLAGS = $(check_INCLUDES) +testLog10_LDADD = $(top_builddir)/type/libDoubleComplex.la \ + $(top_builddir)/type/libFloatComplex.la \ + $(top_builddir)/elementaryFunctions/log10/libLog10.la \ + @LIBMATH@ + all: all-am .SUFFIXES: @@ -265,6 +293,16 @@ clean-pkglibLTLIBRARIES: libLog10.la: $(libLog10_la_OBJECTS) $(libLog10_la_DEPENDENCIES) $(libLog10_la_LINK) -rpath $(pkglibdir) $(libLog10_la_OBJECTS) $(libLog10_la_LIBADD) $(LIBS) +clean-checkPROGRAMS: + @list='$(check_PROGRAMS)'; for p in $$list; do \ + f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \ + echo " rm -f $$p $$f"; \ + rm -f $$p $$f ; \ + done +testLog10$(EXEEXT): $(testLog10_OBJECTS) $(testLog10_DEPENDENCIES) + @rm -f testLog10$(EXEEXT) + $(testLog10_LINK) $(testLog10_OBJECTS) $(testLog10_LDADD) $(LIBS) + mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -279,6 +317,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libLog10_la-slog10s.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libLog10_la-zlog10a.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libLog10_la-zlog10s.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testLog10-testLog10.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -357,6 +396,20 @@ libLog10_la-zlog10a.lo: zlog10a.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) $(libLog10_la_CFLAGS) $(CFLAGS) -c -o libLog10_la-zlog10a.lo `test -f 'zlog10a.c' || echo '$(srcdir)/'`zlog10a.c +testLog10-testLog10.o: testLog10.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testLog10_CFLAGS) $(CFLAGS) -MT testLog10-testLog10.o -MD -MP -MF $(DEPDIR)/testLog10-testLog10.Tpo -c -o testLog10-testLog10.o `test -f 'testLog10.c' || echo '$(srcdir)/'`testLog10.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/testLog10-testLog10.Tpo $(DEPDIR)/testLog10-testLog10.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testLog10.c' object='testLog10-testLog10.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) $(testLog10_CFLAGS) $(CFLAGS) -c -o testLog10-testLog10.o `test -f 'testLog10.c' || echo '$(srcdir)/'`testLog10.c + +testLog10-testLog10.obj: testLog10.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testLog10_CFLAGS) $(CFLAGS) -MT testLog10-testLog10.obj -MD -MP -MF $(DEPDIR)/testLog10-testLog10.Tpo -c -o testLog10-testLog10.obj `if test -f 'testLog10.c'; then $(CYGPATH_W) 'testLog10.c'; else $(CYGPATH_W) '$(srcdir)/testLog10.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/testLog10-testLog10.Tpo $(DEPDIR)/testLog10-testLog10.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testLog10.c' object='testLog10-testLog10.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) $(testLog10_CFLAGS) $(CFLAGS) -c -o testLog10-testLog10.obj `if test -f 'testLog10.c'; then $(CYGPATH_W) 'testLog10.c'; else $(CYGPATH_W) '$(srcdir)/testLog10.c'; fi` + mostlyclean-libtool: -rm -f *.lo @@ -411,6 +464,79 @@ GTAGS: distclean-tags: -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags +check-TESTS: $(TESTS) + @failed=0; all=0; xfail=0; xpass=0; skip=0; ws='[ ]'; \ + srcdir=$(srcdir); export srcdir; \ + list=' $(TESTS) '; \ + if test -n "$$list"; then \ + for tst in $$list; do \ + if test -f ./$$tst; then dir=./; \ + elif test -f $$tst; then dir=; \ + else dir="$(srcdir)/"; fi; \ + if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *$$ws$$tst$$ws*) \ + xpass=`expr $$xpass + 1`; \ + failed=`expr $$failed + 1`; \ + echo "XPASS: $$tst"; \ + ;; \ + *) \ + echo "PASS: $$tst"; \ + ;; \ + esac; \ + elif test $$? -ne 77; then \ + all=`expr $$all + 1`; \ + case " $(XFAIL_TESTS) " in \ + *$$ws$$tst$$ws*) \ + xfail=`expr $$xfail + 1`; \ + echo "XFAIL: $$tst"; \ + ;; \ + *) \ + failed=`expr $$failed + 1`; \ + echo "FAIL: $$tst"; \ + ;; \ + esac; \ + else \ + skip=`expr $$skip + 1`; \ + echo "SKIP: $$tst"; \ + fi; \ + done; \ + if test "$$failed" -eq 0; then \ + if test "$$xfail" -eq 0; then \ + banner="All $$all tests passed"; \ + else \ + banner="All $$all tests behaved as expected ($$xfail expected failures)"; \ + fi; \ + else \ + if test "$$xpass" -eq 0; then \ + banner="$$failed of $$all tests failed"; \ + else \ + banner="$$failed of $$all tests did not behave as expected ($$xpass unexpected passes)"; \ + fi; \ + fi; \ + dashes="$$banner"; \ + skipped=""; \ + if test "$$skip" -ne 0; then \ + skipped="($$skip tests were not run)"; \ + test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$skipped"; \ + fi; \ + report=""; \ + if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ + report="Please report to $(PACKAGE_BUGREPORT)"; \ + test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ + dashes="$$report"; \ + fi; \ + dashes=`echo "$$dashes" | sed s/./=/g`; \ + echo "$$dashes"; \ + echo "$$banner"; \ + test -z "$$skipped" || echo "$$skipped"; \ + test -z "$$report" || echo "$$report"; \ + echo "$$dashes"; \ + test "$$failed" -eq 0; \ + else :; fi + distdir: $(DISTFILES) @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ @@ -438,6 +564,8 @@ distdir: $(DISTFILES) fi; \ done check-am: all-am + $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) + $(MAKE) $(AM_MAKEFLAGS) check-TESTS check: check-am all-am: Makefile $(LTLIBRARIES) installdirs: @@ -470,8 +598,8 @@ maintainer-clean-generic: @echo "it deletes files that may require special tools to rebuild." clean: clean-am -clean-am: clean-generic clean-libtool clean-pkglibLTLIBRARIES \ - mostlyclean-am +clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ + clean-pkglibLTLIBRARIES mostlyclean-am distclean: distclean-am -rm -rf ./$(DEPDIR) @@ -529,19 +657,20 @@ uninstall-am: uninstall-pkglibLTLIBRARIES .MAKE: install-am install-strip -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-pkglibLTLIBRARIES ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-pkglibLTLIBRARIES \ - install-ps install-ps-am install-strip installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-pkglibLTLIBRARIES +.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ + clean-checkPROGRAMS clean-generic clean-libtool \ + clean-pkglibLTLIBRARIES ctags distclean distclean-compile \ + distclean-generic distclean-libtool distclean-tags distdir dvi \ + dvi-am html html-am info info-am install install-am \ + install-data install-data-am install-dvi install-dvi-am \ + install-exec install-exec-am install-html install-html-am \ + install-info install-info-am install-man install-pdf \ + install-pdf-am install-pkglibLTLIBRARIES install-ps \ + install-ps-am install-strip installcheck installcheck-am \ + installdirs maintainer-clean maintainer-clean-generic \ + mostlyclean mostlyclean-compile mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ + uninstall-am uninstall-pkglibLTLIBRARIES # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/src/elementaryFunctions/log10/clog10s.c b/src/elementaryFunctions/log10/clog10s.c index f6da08fc..31e0ec85 100644 --- a/src/elementaryFunctions/log10/clog10s.c +++ b/src/elementaryFunctions/log10/clog10s.c @@ -1,18 +1,18 @@ /* -** -*- C -*- -** -** clog10s.c -** Made by Bruno JOFRET <bruno.jofret@inria.fr> -** -** Started on Fri Apr 20 14:29:12 2007 jofret -** Last update Thu Sep 6 16:23:37 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 "log10.h" floatComplex clog10s(floatComplex in) { /* FIXME : Implementation */ - return FloatComplex(0, 0); + return in; } diff --git a/src/elementaryFunctions/log10/slog10s.c b/src/elementaryFunctions/log10/slog10s.c index 07ad59fa..cd1ed8e8 100644 --- a/src/elementaryFunctions/log10/slog10s.c +++ b/src/elementaryFunctions/log10/slog10s.c @@ -1,18 +1,18 @@ /* -** -*- C -*- -** -** slog10s.c -** Made by Bruno JOFRET <bruno.jofret@inria.fr> -** -** Started on Fri Apr 20 14:25:04 2007 jofret -** Last update Thu Sep 6 16:22:12 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 "log10.h" float slog10s(float in) { - return (log10(in)); + return (log10f(in)); } diff --git a/src/elementaryFunctions/log10/testDoubleLog10.c b/src/elementaryFunctions/log10/testDoubleLog10.c new file mode 100644 index 00000000..bab15190 --- /dev/null +++ b/src/elementaryFunctions/log10/testDoubleLog10.c @@ -0,0 +1,36 @@ +/* + * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab + * Copyright (C) 2006-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 "testLog10.h" + +void dlog10sTest(void) { + /* FIXME : Implement some test here ... */ + printf(">> Double scalar\n"); + printf("dlog10s(0) = %e\n", dlog10s(0.0)); +} + +int testLog10(void) { + printf("\n>>>> Double 10-Based Logarithm Tests\n"); + dlog10sTest(); + /* FIXME : Implement some test here ... */ + /* + zlog10sTest(); + dlog10aTest(); + zlog10aTest(); + */ + return 0; +} + +int main(void) { + assert(testLog10() == 0); + return 0; +} diff --git a/src/elementaryFunctions/log10/testFloatLog10.c b/src/elementaryFunctions/log10/testFloatLog10.c new file mode 100644 index 00000000..f3a8b953 --- /dev/null +++ b/src/elementaryFunctions/log10/testFloatLog10.c @@ -0,0 +1,36 @@ +/* + * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab + * Copyright (C) 2006-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 "testLog10.h" + +void slog10sTest(void) { + /* FIXME : Implement some test here ... */ + printf(">> Float scalar\n"); + printf("slog10s(0) = %f\n", slog10s(0.0f)); +} + +int testLog10(void) { + printf("\n>>>> 10-Based Logarithm Tests\n"); + slog10sTest(); + /* FIXME : Implement some test here ... */ + /* + clog10sTest(); + slog10aTest(); + clog10aTest(); + */ + return 0; +} + +int main(void) { + assert(testLog10() == 0); + return 0; +} diff --git a/src/elementaryFunctions/log10/testLog10.h b/src/elementaryFunctions/log10/testLog10.h new file mode 100644 index 00000000..229b1341 --- /dev/null +++ b/src/elementaryFunctions/log10/testLog10.h @@ -0,0 +1,38 @@ +/* + * 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 + * + */ + +#ifndef _TESTLOG10_H_ +#define _TESTLOG10_H_ + +#include <stdio.h> +#include <assert.h> +#include "log10.h" + +void slog10sTest(void); + +void dlog10sTest(void); + +void clog10sTest(void); + +void zlog10sTest(void); + +void slog10aTest(void); + +void dlog10aTest(void); + +void clog10aTest(void); + +void zlog10aTest(void); + +int testLog10(void); + +#endif /* ! _TESTLOG10_H_ */ diff --git a/src/elementaryFunctions/log10/zlog10s.c b/src/elementaryFunctions/log10/zlog10s.c index cdae9336..7988b00d 100644 --- a/src/elementaryFunctions/log10/zlog10s.c +++ b/src/elementaryFunctions/log10/zlog10s.c @@ -1,18 +1,18 @@ /* -** -*- C -*- -** -** zlog10s.c -** Made by Bruno JOFRET <bruno.jofret@inria.fr> -** -** Started on Fri Apr 20 14:31:56 2007 jofret -** Last update Thu Sep 6 16:21:32 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 "log10.h" doubleComplex zlog10s(doubleComplex in) { /* FIXME : Implementation */ - return DoubleComplex(0, 0); + return in; } |