From e153f6f5ef78997abe9f4605356a1fe3edbfe90b Mon Sep 17 00:00:00 2001 From: jofret Date: Tue, 9 Sep 2008 12:35:50 +0000 Subject: Remove DSP in name --- src/matrixOperations/hilbert/Makefile.am | 20 ++--- src/matrixOperations/hilbert/Makefile.in | 102 +++++++++++------------ src/matrixOperations/hilbert/testDSPHilbert.c | 112 -------------------------- src/matrixOperations/hilbert/testHilbert.c | 112 ++++++++++++++++++++++++++ 4 files changed, 173 insertions(+), 173 deletions(-) delete mode 100644 src/matrixOperations/hilbert/testDSPHilbert.c create mode 100644 src/matrixOperations/hilbert/testHilbert.c (limited to 'src/matrixOperations') diff --git a/src/matrixOperations/hilbert/Makefile.am b/src/matrixOperations/hilbert/Makefile.am index 64f203be..0b5ca42d 100644 --- a/src/matrixOperations/hilbert/Makefile.am +++ b/src/matrixOperations/hilbert/Makefile.am @@ -10,28 +10,28 @@ ## ## -libDSPHilbert_la_CFLAGS = -I $(top_builddir)/type \ +libHilbert_la_CFLAGS = -I $(top_builddir)/type \ -I ../includes instdir = $(top_builddir)/lib -pkglib_LTLIBRARIES = libDSPHilbert.la +pkglib_LTLIBRARIES = libHilbert.la HEAD = ../includes/hilbert.h -libDSPHilbert_la_SOURCES = $(HEAD) \ +libHilbert_la_SOURCES = $(HEAD) \ shilba.c \ - dhilba.c + dhilba.c -check_PROGRAMS = testDSPHilbert +check_PROGRAMS = testHilbert -check_LDADD = libDSPHilbert.la +check_LDADD = libHilbert.la check_INCLUDES = -I $(top_builddir)/type \ -I ../includes -testDSPHilbert_SOURCES = testDSPHilbert.c -testDSPHilbert_LDADD = $(check_LDADD) -testDSPHilbert_CFLAGS = $(check_INCLUDES) +testHilbert_SOURCES = testHilbert.c +testHilbert_LDADD = $(check_LDADD) +testHilbert_CFLAGS = $(check_INCLUDES) -TESTS = testDSPHilbert +TESTS = testHilbert diff --git a/src/matrixOperations/hilbert/Makefile.in b/src/matrixOperations/hilbert/Makefile.in index 263e9653..8c70a76c 100644 --- a/src/matrixOperations/hilbert/Makefile.in +++ b/src/matrixOperations/hilbert/Makefile.in @@ -32,8 +32,8 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -check_PROGRAMS = testDSPHilbert$(EXEEXT) -TESTS = testDSPHilbert$(EXEEXT) +check_PROGRAMS = testHilbert$(EXEEXT) +TESTS = testHilbert$(EXEEXT) subdir = matrixOperations/hilbert DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 @@ -52,19 +52,19 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(pkglibdir)" pkglibLTLIBRARIES_INSTALL = $(INSTALL) LTLIBRARIES = $(pkglib_LTLIBRARIES) -libDSPHilbert_la_LIBADD = +libHilbert_la_LIBADD = am__objects_1 = -am_libDSPHilbert_la_OBJECTS = $(am__objects_1) \ - libDSPHilbert_la-shilba.lo libDSPHilbert_la-dhilba.lo -libDSPHilbert_la_OBJECTS = $(am_libDSPHilbert_la_OBJECTS) -libDSPHilbert_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libDSPHilbert_la_CFLAGS) \ +am_libHilbert_la_OBJECTS = $(am__objects_1) libHilbert_la-shilba.lo \ + libHilbert_la-dhilba.lo +libHilbert_la_OBJECTS = $(am_libHilbert_la_OBJECTS) +libHilbert_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libHilbert_la_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -am_testDSPHilbert_OBJECTS = testDSPHilbert-testDSPHilbert.$(OBJEXT) -testDSPHilbert_OBJECTS = $(am_testDSPHilbert_OBJECTS) -testDSPHilbert_DEPENDENCIES = $(check_LDADD) -testDSPHilbert_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDSPHilbert_CFLAGS) \ +am_testHilbert_OBJECTS = testHilbert-testHilbert.$(OBJEXT) +testHilbert_OBJECTS = $(am_testHilbert_OBJECTS) +testHilbert_DEPENDENCIES = $(check_LDADD) +testHilbert_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ + $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testHilbert_CFLAGS) \ $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/includes depcomp = $(SHELL) $(top_srcdir)/config/depcomp @@ -78,8 +78,8 @@ CCLD = $(CC) LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ $(LDFLAGS) -o $@ -SOURCES = $(libDSPHilbert_la_SOURCES) $(testDSPHilbert_SOURCES) -DIST_SOURCES = $(libDSPHilbert_la_SOURCES) $(testDSPHilbert_SOURCES) +SOURCES = $(libHilbert_la_SOURCES) $(testHilbert_SOURCES) +DIST_SOURCES = $(libHilbert_la_SOURCES) $(testHilbert_SOURCES) ETAGS = etags CTAGS = ctags DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) @@ -193,23 +193,23 @@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -libDSPHilbert_la_CFLAGS = -I $(top_builddir)/type \ +libHilbert_la_CFLAGS = -I $(top_builddir)/type \ -I ../includes instdir = $(top_builddir)/lib -pkglib_LTLIBRARIES = libDSPHilbert.la +pkglib_LTLIBRARIES = libHilbert.la HEAD = ../includes/hilbert.h -libDSPHilbert_la_SOURCES = $(HEAD) \ +libHilbert_la_SOURCES = $(HEAD) \ shilba.c \ - dhilba.c + dhilba.c -check_LDADD = libDSPHilbert.la +check_LDADD = libHilbert.la check_INCLUDES = -I $(top_builddir)/type \ -I ../includes -testDSPHilbert_SOURCES = testDSPHilbert.c -testDSPHilbert_LDADD = $(check_LDADD) -testDSPHilbert_CFLAGS = $(check_INCLUDES) +testHilbert_SOURCES = testHilbert.c +testHilbert_LDADD = $(check_LDADD) +testHilbert_CFLAGS = $(check_INCLUDES) all: all-am .SUFFIXES: @@ -270,8 +270,8 @@ clean-pkglibLTLIBRARIES: echo "rm -f \"$${dir}/so_locations\""; \ rm -f "$${dir}/so_locations"; \ done -libDSPHilbert.la: $(libDSPHilbert_la_OBJECTS) $(libDSPHilbert_la_DEPENDENCIES) - $(libDSPHilbert_la_LINK) -rpath $(pkglibdir) $(libDSPHilbert_la_OBJECTS) $(libDSPHilbert_la_LIBADD) $(LIBS) +libHilbert.la: $(libHilbert_la_OBJECTS) $(libHilbert_la_DEPENDENCIES) + $(libHilbert_la_LINK) -rpath $(pkglibdir) $(libHilbert_la_OBJECTS) $(libHilbert_la_LIBADD) $(LIBS) clean-checkPROGRAMS: @list='$(check_PROGRAMS)'; for p in $$list; do \ @@ -279,9 +279,9 @@ clean-checkPROGRAMS: echo " rm -f $$p $$f"; \ rm -f $$p $$f ; \ done -testDSPHilbert$(EXEEXT): $(testDSPHilbert_OBJECTS) $(testDSPHilbert_DEPENDENCIES) - @rm -f testDSPHilbert$(EXEEXT) - $(testDSPHilbert_LINK) $(testDSPHilbert_OBJECTS) $(testDSPHilbert_LDADD) $(LIBS) +testHilbert$(EXEEXT): $(testHilbert_OBJECTS) $(testHilbert_DEPENDENCIES) + @rm -f testHilbert$(EXEEXT) + $(testHilbert_LINK) $(testHilbert_OBJECTS) $(testHilbert_LDADD) $(LIBS) mostlyclean-compile: -rm -f *.$(OBJEXT) @@ -289,9 +289,9 @@ mostlyclean-compile: distclean-compile: -rm -f *.tab.c -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDSPHilbert_la-dhilba.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDSPHilbert_la-shilba.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testDSPHilbert-testDSPHilbert.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libHilbert_la-dhilba.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libHilbert_la-shilba.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testHilbert-testHilbert.Po@am__quote@ .c.o: @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< @@ -314,33 +314,33 @@ distclean-compile: @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< -libDSPHilbert_la-shilba.lo: shilba.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDSPHilbert_la_CFLAGS) $(CFLAGS) -MT libDSPHilbert_la-shilba.lo -MD -MP -MF $(DEPDIR)/libDSPHilbert_la-shilba.Tpo -c -o libDSPHilbert_la-shilba.lo `test -f 'shilba.c' || echo '$(srcdir)/'`shilba.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libDSPHilbert_la-shilba.Tpo $(DEPDIR)/libDSPHilbert_la-shilba.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='shilba.c' object='libDSPHilbert_la-shilba.lo' libtool=yes @AMDEPBACKSLASH@ +libHilbert_la-shilba.lo: shilba.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libHilbert_la_CFLAGS) $(CFLAGS) -MT libHilbert_la-shilba.lo -MD -MP -MF $(DEPDIR)/libHilbert_la-shilba.Tpo -c -o libHilbert_la-shilba.lo `test -f 'shilba.c' || echo '$(srcdir)/'`shilba.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libHilbert_la-shilba.Tpo $(DEPDIR)/libHilbert_la-shilba.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='shilba.c' object='libHilbert_la-shilba.lo' libtool=yes @AMDEPBACKSLASH@ @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) $(libDSPHilbert_la_CFLAGS) $(CFLAGS) -c -o libDSPHilbert_la-shilba.lo `test -f 'shilba.c' || echo '$(srcdir)/'`shilba.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libHilbert_la_CFLAGS) $(CFLAGS) -c -o libHilbert_la-shilba.lo `test -f 'shilba.c' || echo '$(srcdir)/'`shilba.c -libDSPHilbert_la-dhilba.lo: dhilba.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDSPHilbert_la_CFLAGS) $(CFLAGS) -MT libDSPHilbert_la-dhilba.lo -MD -MP -MF $(DEPDIR)/libDSPHilbert_la-dhilba.Tpo -c -o libDSPHilbert_la-dhilba.lo `test -f 'dhilba.c' || echo '$(srcdir)/'`dhilba.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libDSPHilbert_la-dhilba.Tpo $(DEPDIR)/libDSPHilbert_la-dhilba.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dhilba.c' object='libDSPHilbert_la-dhilba.lo' libtool=yes @AMDEPBACKSLASH@ +libHilbert_la-dhilba.lo: dhilba.c +@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libHilbert_la_CFLAGS) $(CFLAGS) -MT libHilbert_la-dhilba.lo -MD -MP -MF $(DEPDIR)/libHilbert_la-dhilba.Tpo -c -o libHilbert_la-dhilba.lo `test -f 'dhilba.c' || echo '$(srcdir)/'`dhilba.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libHilbert_la-dhilba.Tpo $(DEPDIR)/libHilbert_la-dhilba.Plo +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dhilba.c' object='libHilbert_la-dhilba.lo' libtool=yes @AMDEPBACKSLASH@ @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) $(libDSPHilbert_la_CFLAGS) $(CFLAGS) -c -o libDSPHilbert_la-dhilba.lo `test -f 'dhilba.c' || echo '$(srcdir)/'`dhilba.c +@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libHilbert_la_CFLAGS) $(CFLAGS) -c -o libHilbert_la-dhilba.lo `test -f 'dhilba.c' || echo '$(srcdir)/'`dhilba.c -testDSPHilbert-testDSPHilbert.o: testDSPHilbert.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testDSPHilbert_CFLAGS) $(CFLAGS) -MT testDSPHilbert-testDSPHilbert.o -MD -MP -MF $(DEPDIR)/testDSPHilbert-testDSPHilbert.Tpo -c -o testDSPHilbert-testDSPHilbert.o `test -f 'testDSPHilbert.c' || echo '$(srcdir)/'`testDSPHilbert.c -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/testDSPHilbert-testDSPHilbert.Tpo $(DEPDIR)/testDSPHilbert-testDSPHilbert.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testDSPHilbert.c' object='testDSPHilbert-testDSPHilbert.o' libtool=no @AMDEPBACKSLASH@ +testHilbert-testHilbert.o: testHilbert.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testHilbert_CFLAGS) $(CFLAGS) -MT testHilbert-testHilbert.o -MD -MP -MF $(DEPDIR)/testHilbert-testHilbert.Tpo -c -o testHilbert-testHilbert.o `test -f 'testHilbert.c' || echo '$(srcdir)/'`testHilbert.c +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/testHilbert-testHilbert.Tpo $(DEPDIR)/testHilbert-testHilbert.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testHilbert.c' object='testHilbert-testHilbert.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) $(testDSPHilbert_CFLAGS) $(CFLAGS) -c -o testDSPHilbert-testDSPHilbert.o `test -f 'testDSPHilbert.c' || echo '$(srcdir)/'`testDSPHilbert.c +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testHilbert_CFLAGS) $(CFLAGS) -c -o testHilbert-testHilbert.o `test -f 'testHilbert.c' || echo '$(srcdir)/'`testHilbert.c -testDSPHilbert-testDSPHilbert.obj: testDSPHilbert.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testDSPHilbert_CFLAGS) $(CFLAGS) -MT testDSPHilbert-testDSPHilbert.obj -MD -MP -MF $(DEPDIR)/testDSPHilbert-testDSPHilbert.Tpo -c -o testDSPHilbert-testDSPHilbert.obj `if test -f 'testDSPHilbert.c'; then $(CYGPATH_W) 'testDSPHilbert.c'; else $(CYGPATH_W) '$(srcdir)/testDSPHilbert.c'; fi` -@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/testDSPHilbert-testDSPHilbert.Tpo $(DEPDIR)/testDSPHilbert-testDSPHilbert.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testDSPHilbert.c' object='testDSPHilbert-testDSPHilbert.obj' libtool=no @AMDEPBACKSLASH@ +testHilbert-testHilbert.obj: testHilbert.c +@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testHilbert_CFLAGS) $(CFLAGS) -MT testHilbert-testHilbert.obj -MD -MP -MF $(DEPDIR)/testHilbert-testHilbert.Tpo -c -o testHilbert-testHilbert.obj `if test -f 'testHilbert.c'; then $(CYGPATH_W) 'testHilbert.c'; else $(CYGPATH_W) '$(srcdir)/testHilbert.c'; fi` +@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/testHilbert-testHilbert.Tpo $(DEPDIR)/testHilbert-testHilbert.Po +@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testHilbert.c' object='testHilbert-testHilbert.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) $(testDSPHilbert_CFLAGS) $(CFLAGS) -c -o testDSPHilbert-testDSPHilbert.obj `if test -f 'testDSPHilbert.c'; then $(CYGPATH_W) 'testDSPHilbert.c'; else $(CYGPATH_W) '$(srcdir)/testDSPHilbert.c'; fi` +@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testHilbert_CFLAGS) $(CFLAGS) -c -o testHilbert-testHilbert.obj `if test -f 'testHilbert.c'; then $(CYGPATH_W) 'testHilbert.c'; else $(CYGPATH_W) '$(srcdir)/testHilbert.c'; fi` mostlyclean-libtool: -rm -f *.lo diff --git a/src/matrixOperations/hilbert/testDSPHilbert.c b/src/matrixOperations/hilbert/testDSPHilbert.c deleted file mode 100644 index 5a2029aa..00000000 --- a/src/matrixOperations/hilbert/testDSPHilbert.c +++ /dev/null @@ -1,112 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Allan SIMON - * - * 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 -#include -#include -#include -#include "hilbert.h" - -#define SIZE 6 - -static void shilbaTest ( void ){ - - int i = 0 ; - int j = 0 ; - - - float Result[] = - {36.0f,-630.0f,3360.0f,-7560.0f,7560.0f,-2772.0f, --630.0f,14700.0f,-88200.0f,211680.0f,-220500.0f,83160.0f, -3360.0f,-88200.0f,564480.0f,-1411200.0f,1512000.0f,-582120.0f, --7560.0f,211680.0f,-1411200.0f,3628800.0f,-3969000.0f,1552320.0f, -7560.0f,-220500.0f,1512000.0f,-3969000.0f,4410000.0f,-1746360.0f, --2772.0f,83160.0f,-582120.0f,1552320.0f,-1746360.0f,698544.0f}; - - - - float out[SIZE*SIZE] ; - shilba ( out , SIZE ) ; - - for (i = 0 ; i < SIZE ; i++) - { - printf ("\n\t" ) ; - for ( j = 0 ; j < SIZE; j++) - printf ("%e\t" , out[i + j*SIZE] ); - - } - - for ( i = 0 ; i < SIZE*SIZE ; i++ ) - { - assert ( fabs ( out[i] - Result[i] ) / fabs( out[i]) < 1e-06 ) ; - } - - printf ("\n\n" ) ; -} - -static void dhilbaTest ( void ){ - - int i = 0 ; - int j = 0 ; - - double Result[] = -{36,-630,3360,-7560,7560,-2772, --630,14700,-88200,211680,-220500,83160, -3360,-88200,564480,-1411200,1512000,-582120, --7560,211680,-1411200,3628800,-3969000,1552320, -7560,-220500,1512000,-3969000,4410000,-1746360, --2772,83160,-582120,1552320,-1746360,698544} -; - - - double out[SIZE*SIZE] ; - - dhilba ( out , SIZE ) ; - - for (i = 0 ; i < SIZE ; i++) - { - printf ("\n\t" ) ; - for ( j = 0 ; j < SIZE; j++) - printf ("%e\t" , out[i + j*SIZE] ); - - } - - - for ( i = 0 ; i < SIZE*SIZE ; i++ ) - { - assert ( fabs ( out[i] - Result[i] ) / fabs( out[i]) < 1e-16 ) ; - } - - printf ("\n\n" ) ; -} - - - -static int testHilbert(void) { - - printf("\n>>>>Hilbert's Matrix Tests\n"); - - printf("\n\t>>> Float Test\n"); - shilbaTest(); - - printf("\n\t>>> Double Test\n"); - dhilbaTest(); - - return 0; -} - - - -int main(void) { - assert(testHilbert() == 0); - return 0; -} diff --git a/src/matrixOperations/hilbert/testHilbert.c b/src/matrixOperations/hilbert/testHilbert.c new file mode 100644 index 00000000..5a2029aa --- /dev/null +++ b/src/matrixOperations/hilbert/testHilbert.c @@ -0,0 +1,112 @@ +/* + * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab + * Copyright (C) 2008-2008 - INRIA - Allan SIMON + * + * 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 +#include +#include +#include +#include "hilbert.h" + +#define SIZE 6 + +static void shilbaTest ( void ){ + + int i = 0 ; + int j = 0 ; + + + float Result[] = + {36.0f,-630.0f,3360.0f,-7560.0f,7560.0f,-2772.0f, +-630.0f,14700.0f,-88200.0f,211680.0f,-220500.0f,83160.0f, +3360.0f,-88200.0f,564480.0f,-1411200.0f,1512000.0f,-582120.0f, +-7560.0f,211680.0f,-1411200.0f,3628800.0f,-3969000.0f,1552320.0f, +7560.0f,-220500.0f,1512000.0f,-3969000.0f,4410000.0f,-1746360.0f, +-2772.0f,83160.0f,-582120.0f,1552320.0f,-1746360.0f,698544.0f}; + + + + float out[SIZE*SIZE] ; + shilba ( out , SIZE ) ; + + for (i = 0 ; i < SIZE ; i++) + { + printf ("\n\t" ) ; + for ( j = 0 ; j < SIZE; j++) + printf ("%e\t" , out[i + j*SIZE] ); + + } + + for ( i = 0 ; i < SIZE*SIZE ; i++ ) + { + assert ( fabs ( out[i] - Result[i] ) / fabs( out[i]) < 1e-06 ) ; + } + + printf ("\n\n" ) ; +} + +static void dhilbaTest ( void ){ + + int i = 0 ; + int j = 0 ; + + double Result[] = +{36,-630,3360,-7560,7560,-2772, +-630,14700,-88200,211680,-220500,83160, +3360,-88200,564480,-1411200,1512000,-582120, +-7560,211680,-1411200,3628800,-3969000,1552320, +7560,-220500,1512000,-3969000,4410000,-1746360, +-2772,83160,-582120,1552320,-1746360,698544} +; + + + double out[SIZE*SIZE] ; + + dhilba ( out , SIZE ) ; + + for (i = 0 ; i < SIZE ; i++) + { + printf ("\n\t" ) ; + for ( j = 0 ; j < SIZE; j++) + printf ("%e\t" , out[i + j*SIZE] ); + + } + + + for ( i = 0 ; i < SIZE*SIZE ; i++ ) + { + assert ( fabs ( out[i] - Result[i] ) / fabs( out[i]) < 1e-16 ) ; + } + + printf ("\n\n" ) ; +} + + + +static int testHilbert(void) { + + printf("\n>>>>Hilbert's Matrix Tests\n"); + + printf("\n\t>>> Float Test\n"); + shilbaTest(); + + printf("\n\t>>> Double Test\n"); + dhilbaTest(); + + return 0; +} + + + +int main(void) { + assert(testHilbert() == 0); + return 0; +} -- cgit