summaryrefslogtreecommitdiff
path: root/src/auxiliaryFunctions/size
diff options
context:
space:
mode:
Diffstat (limited to 'src/auxiliaryFunctions/size')
-rw-r--r--src/auxiliaryFunctions/size/Makefile.am13
-rw-r--r--src/auxiliaryFunctions/size/Makefile.in51
-rw-r--r--src/auxiliaryFunctions/size/csizea.c1
-rw-r--r--src/auxiliaryFunctions/size/dsizea.c1
-rw-r--r--src/auxiliaryFunctions/size/ssizea.c18
-rw-r--r--src/auxiliaryFunctions/size/testSize.c106
-rw-r--r--src/auxiliaryFunctions/size/testSize.h33
-rw-r--r--src/auxiliaryFunctions/size/zsizea.c1
8 files changed, 149 insertions, 75 deletions
diff --git a/src/auxiliaryFunctions/size/Makefile.am b/src/auxiliaryFunctions/size/Makefile.am
index 90c5b188..9d2148b4 100644
--- a/src/auxiliaryFunctions/size/Makefile.am
+++ b/src/auxiliaryFunctions/size/Makefile.am
@@ -11,18 +11,13 @@
##
libSize_la_CFLAGS = -I ../../type \
- -I ../includes
+ -I ../includes
instdir = $(top_builddir)/lib
pkglib_LTLIBRARIES = libSize.la
-libSize_la_SOURCES = $(HEAD) $(SRC)
-
-SRC = ssizea.c \
- dsizea.c \
- csizea.c \
- zsizea.c
+libSize_la_SOURCES = $(HEAD)
HEAD = ../includes/size.h
@@ -30,7 +25,7 @@ HEAD = ../includes/size.h
# Checking Part
####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
+check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \
-I $(top_builddir)/type
check_PROGRAMS = testSize
@@ -44,5 +39,5 @@ testSize_SOURCES = testSize.c
testSize_CFLAGS = $(check_INCLUDES)
testSize_LDADD = $(top_builddir)/type/libDoubleComplex.la \
$(top_builddir)/type/libFloatComplex.la \
- $(top_builddir)/auxiliaryFunctions/libSize.la \
+ $(top_builddir)/auxiliaryFunctions/size/libSize.la \
@LIBMATH@
diff --git a/src/auxiliaryFunctions/size/Makefile.in b/src/auxiliaryFunctions/size/Makefile.in
index 8b2f33d9..d1c1a62a 100644
--- a/src/auxiliaryFunctions/size/Makefile.in
+++ b/src/auxiliaryFunctions/size/Makefile.in
@@ -54,9 +54,7 @@ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(pkglib_LTLIBRARIES)
libSize_la_LIBADD =
am__objects_1 =
-am__objects_2 = libSize_la-ssizea.lo libSize_la-dsizea.lo \
- libSize_la-csizea.lo libSize_la-zsizea.lo
-am_libSize_la_OBJECTS = $(am__objects_1) $(am__objects_2)
+am_libSize_la_OBJECTS = $(am__objects_1)
libSize_la_OBJECTS = $(am_libSize_la_OBJECTS)
libSize_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libSize_la_CFLAGS) \
@@ -65,7 +63,7 @@ am_testSize_OBJECTS = testSize-testSize.$(OBJEXT)
testSize_OBJECTS = $(am_testSize_OBJECTS)
testSize_DEPENDENCIES = $(top_builddir)/type/libDoubleComplex.la \
$(top_builddir)/type/libFloatComplex.la \
- $(top_builddir)/auxiliaryFunctions/libSize.la
+ $(top_builddir)/auxiliaryFunctions/size/libSize.la
testSize_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
--mode=link $(CCLD) $(testSize_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
$(LDFLAGS) -o $@
@@ -195,22 +193,17 @@ target_alias = @target_alias@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
libSize_la_CFLAGS = -I ../../type \
- -I ../includes
+ -I ../includes
instdir = $(top_builddir)/lib
pkglib_LTLIBRARIES = libSize.la
-libSize_la_SOURCES = $(HEAD) $(SRC)
-SRC = ssizea.c \
- dsizea.c \
- csizea.c \
- zsizea.c
-
+libSize_la_SOURCES = $(HEAD)
HEAD = ../includes/size.h
####
# Checking Part
####
-check_INCLUDES = -I $(top_builddir)/elementaryFunctions/includes \
+check_INCLUDES = -I $(top_builddir)/auxiliaryFunctions/includes \
-I $(top_builddir)/type
@@ -221,7 +214,7 @@ testSize_SOURCES = testSize.c
testSize_CFLAGS = $(check_INCLUDES)
testSize_LDADD = $(top_builddir)/type/libDoubleComplex.la \
$(top_builddir)/type/libFloatComplex.la \
- $(top_builddir)/auxiliaryFunctions/libSize.la \
+ $(top_builddir)/auxiliaryFunctions/size/libSize.la \
@LIBMATH@
all: all-am
@@ -303,10 +296,6 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSize_la-csizea.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSize_la-dsizea.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSize_la-ssizea.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSize_la-zsizea.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testSize-testSize.Po@am__quote@
.c.o:
@@ -330,34 +319,6 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-libSize_la-ssizea.lo: ssizea.c
-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSize_la_CFLAGS) $(CFLAGS) -MT libSize_la-ssizea.lo -MD -MP -MF $(DEPDIR)/libSize_la-ssizea.Tpo -c -o libSize_la-ssizea.lo `test -f 'ssizea.c' || echo '$(srcdir)/'`ssizea.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libSize_la-ssizea.Tpo $(DEPDIR)/libSize_la-ssizea.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ssizea.c' object='libSize_la-ssizea.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) $(libSize_la_CFLAGS) $(CFLAGS) -c -o libSize_la-ssizea.lo `test -f 'ssizea.c' || echo '$(srcdir)/'`ssizea.c
-
-libSize_la-dsizea.lo: dsizea.c
-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSize_la_CFLAGS) $(CFLAGS) -MT libSize_la-dsizea.lo -MD -MP -MF $(DEPDIR)/libSize_la-dsizea.Tpo -c -o libSize_la-dsizea.lo `test -f 'dsizea.c' || echo '$(srcdir)/'`dsizea.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libSize_la-dsizea.Tpo $(DEPDIR)/libSize_la-dsizea.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dsizea.c' object='libSize_la-dsizea.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) $(libSize_la_CFLAGS) $(CFLAGS) -c -o libSize_la-dsizea.lo `test -f 'dsizea.c' || echo '$(srcdir)/'`dsizea.c
-
-libSize_la-csizea.lo: csizea.c
-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSize_la_CFLAGS) $(CFLAGS) -MT libSize_la-csizea.lo -MD -MP -MF $(DEPDIR)/libSize_la-csizea.Tpo -c -o libSize_la-csizea.lo `test -f 'csizea.c' || echo '$(srcdir)/'`csizea.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libSize_la-csizea.Tpo $(DEPDIR)/libSize_la-csizea.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='csizea.c' object='libSize_la-csizea.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) $(libSize_la_CFLAGS) $(CFLAGS) -c -o libSize_la-csizea.lo `test -f 'csizea.c' || echo '$(srcdir)/'`csizea.c
-
-libSize_la-zsizea.lo: zsizea.c
-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSize_la_CFLAGS) $(CFLAGS) -MT libSize_la-zsizea.lo -MD -MP -MF $(DEPDIR)/libSize_la-zsizea.Tpo -c -o libSize_la-zsizea.lo `test -f 'zsizea.c' || echo '$(srcdir)/'`zsizea.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libSize_la-zsizea.Tpo $(DEPDIR)/libSize_la-zsizea.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='zsizea.c' object='libSize_la-zsizea.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) $(libSize_la_CFLAGS) $(CFLAGS) -c -o libSize_la-zsizea.lo `test -f 'zsizea.c' || echo '$(srcdir)/'`zsizea.c
-
testSize-testSize.o: testSize.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testSize_CFLAGS) $(CFLAGS) -MT testSize-testSize.o -MD -MP -MF $(DEPDIR)/testSize-testSize.Tpo -c -o testSize-testSize.o `test -f 'testSize.c' || echo '$(srcdir)/'`testSize.c
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/testSize-testSize.Tpo $(DEPDIR)/testSize-testSize.Po
diff --git a/src/auxiliaryFunctions/size/csizea.c b/src/auxiliaryFunctions/size/csizea.c
deleted file mode 100644
index d27117ff..00000000
--- a/src/auxiliaryFunctions/size/csizea.c
+++ /dev/null
@@ -1 +0,0 @@
-/* FIXME : Implementation */
diff --git a/src/auxiliaryFunctions/size/dsizea.c b/src/auxiliaryFunctions/size/dsizea.c
deleted file mode 100644
index d27117ff..00000000
--- a/src/auxiliaryFunctions/size/dsizea.c
+++ /dev/null
@@ -1 +0,0 @@
-/* FIXME : Implementation */
diff --git a/src/auxiliaryFunctions/size/ssizea.c b/src/auxiliaryFunctions/size/ssizea.c
deleted file mode 100644
index 17557edd..00000000
--- a/src/auxiliaryFunctions/size/ssizea.c
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-** -*- C -*-
-**
-** ssizea.c
-** Made by Bruno JOFRET <bruno.jofret@inria.fr>
-**
-** Started on Mon Oct 22 10:47:17 2007 bruno
-** Last update Mon Oct 22 10:47:59 2007 bruno
-**
-** Copyright INRIA 2007
-*/
-
-#include "size.h"
-
-int ssizea(float *in, int size) {
- /* FIXME : Implementation */
- return 0;
-}
diff --git a/src/auxiliaryFunctions/size/testSize.c b/src/auxiliaryFunctions/size/testSize.c
new file mode 100644
index 00000000..e9ebea89
--- /dev/null
+++ b/src/auxiliaryFunctions/size/testSize.c
@@ -0,0 +1,106 @@
+/*
+ * 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 "testSize.h"
+
+int ssizeaTest() {
+ float goodArray[5] = {0.,2.,3.,5.,10.};
+ float badArray[5] = {0.,0.,0.,0.,0.};
+
+ /* Only to avoid gss unused variable warning */
+ goodArray[4] = 10.0f;
+ badArray[4] = 0.0f;
+
+ printf(">> Floats \n");
+ assert(ssizea(goodArray, 5) == 5);
+ assert(ssizea(badArray, 5) == 5);
+ return 0;
+}
+
+int dsizeaTest() {
+ double goodArray[5] = {0.,2.,3.,5.,10.};
+ double badArray[5] = {0.,0.,0.,0.,0.};
+
+ /* Only to avoid gss unused variable warning */
+ goodArray[4] = 10.0;
+ badArray[4] = 0.0;
+
+ printf(">> Doubles \n");
+ assert(dsizea(goodArray, 5) == 5);
+ assert(dsizea(badArray, 5) == 5);
+ return 0;
+}
+
+int csizeaTest() {
+ floatComplex goodArray[5];
+ floatComplex badArray[5];
+
+ /* Good values in goodArray */
+ goodArray[0] = FloatComplex(0., 0.);
+ goodArray[1] = FloatComplex(0., 2.);
+ goodArray[2] = FloatComplex(3., 50.);
+ goodArray[3] = FloatComplex(5., 10.);
+ goodArray[4] = FloatComplex(10., -10.);
+ /* Bad values in badArray */
+ badArray[5] = FloatComplex(0., 0.);
+ badArray[5] = FloatComplex(0., 0.);
+ badArray[5] = FloatComplex(0., 0.);
+ badArray[5] = FloatComplex(0., 0.);
+ badArray[5] = FloatComplex(0., 0.);
+
+ printf(">> Float Complex \n");
+ assert(csizea(goodArray, 5) == 5);
+ assert(csizea(badArray, 5) == 5);
+ return 0;
+}
+
+int zsizeaTest() {
+ doubleComplex goodArray[5];
+ doubleComplex badArray[5];
+
+ /* Good values in goodArray. */
+ goodArray[0] = DoubleComplex(0., 0.);
+ goodArray[1] = DoubleComplex(0., 2.);
+ goodArray[2] = DoubleComplex(3., 50.);
+ goodArray[3] = DoubleComplex(5., 10.);
+ goodArray[4] = DoubleComplex(10., -10.);
+ /* Bad values in badArray */
+ badArray[0] = DoubleComplex(0., 0.);
+ badArray[1] = DoubleComplex(0., 0.);
+ badArray[2] = DoubleComplex(0., 0.);
+ badArray[3] = DoubleComplex(0., 0.);
+ badArray[4] = DoubleComplex(0., 0.);
+
+ printf(">> Double Complex \n");
+ assert(zsizea(goodArray, 5) == 5);
+ assert(zsizea(goodArray, 5) == 5);
+ return 0;
+}
+
+int testSize() {
+ int ssizeaStatus, dsizeaStatus = 0;
+ int csizeaStatus, zsizeaStatus = 0;
+
+ printf(">>>> Size Tests\n");
+ ssizeaStatus = ssizeaTest();
+ dsizeaStatus = dsizeaTest();
+ csizeaStatus = csizeaTest();
+ zsizeaStatus = zsizeaTest();
+
+ return (ssizeaStatus + dsizeaStatus +
+ csizeaStatus + zsizeaStatus);
+}
+
+int main(void) {
+ assert(testSize() == 0);
+ return 0;
+}
diff --git a/src/auxiliaryFunctions/size/testSize.h b/src/auxiliaryFunctions/size/testSize.h
new file mode 100644
index 00000000..b26ad7a6
--- /dev/null
+++ b/src/auxiliaryFunctions/size/testSize.h
@@ -0,0 +1,33 @@
+/*
+ * 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 _TESTSIZE_H_
+#define _TESTSIZE_H_
+
+#include <stdio.h>
+#include <assert.h>
+
+#include "floatComplex.h"
+#include "doubleComplex.h"
+#include "size.h"
+
+int ssizeaTest(void);
+
+int dsizeaTest(void);
+
+int csizeaTest(void);
+
+int zsizeaTest(void);
+
+int testSize(void);
+
+#endif /* ! _TESTSIZE_H_ */
diff --git a/src/auxiliaryFunctions/size/zsizea.c b/src/auxiliaryFunctions/size/zsizea.c
deleted file mode 100644
index d27117ff..00000000
--- a/src/auxiliaryFunctions/size/zsizea.c
+++ /dev/null
@@ -1 +0,0 @@
-/* FIXME : Implementation */