summaryrefslogtreecommitdiff
path: root/src/matrixOperations/subtraction
diff options
context:
space:
mode:
Diffstat (limited to 'src/matrixOperations/subtraction')
-rw-r--r--src/matrixOperations/subtraction/Makefile.am5
-rw-r--r--src/matrixOperations/subtraction/Makefile.in47
-rw-r--r--src/matrixOperations/subtraction/cdiffma.c33
-rw-r--r--src/matrixOperations/subtraction/ddiffma.c33
-rw-r--r--src/matrixOperations/subtraction/sdiffma.c60
-rw-r--r--src/matrixOperations/subtraction/zdiffma.c33
6 files changed, 142 insertions, 69 deletions
diff --git a/src/matrixOperations/subtraction/Makefile.am b/src/matrixOperations/subtraction/Makefile.am
index e57e5703..801a6084 100644
--- a/src/matrixOperations/subtraction/Makefile.am
+++ b/src/matrixOperations/subtraction/Makefile.am
@@ -17,7 +17,10 @@ instdir = $(top_builddir)/lib
pkglib_LTLIBRARIES = libMatrixSubtraction.la
-libMatrixSubtraction_la_SOURCES = matrixSubtraction.c
+libMatrixSubtraction_la_SOURCES = sdiffma.c \
+ ddiffma.c \
+ cdiffma.c \
+ zdiffma.c
check_PROGRAMS = testMatrixSubtraction
diff --git a/src/matrixOperations/subtraction/Makefile.in b/src/matrixOperations/subtraction/Makefile.in
index cb6b20a8..46e22f02 100644
--- a/src/matrixOperations/subtraction/Makefile.in
+++ b/src/matrixOperations/subtraction/Makefile.in
@@ -54,7 +54,10 @@ pkglibLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(pkglib_LTLIBRARIES)
libMatrixSubtraction_la_LIBADD =
am_libMatrixSubtraction_la_OBJECTS = \
- libMatrixSubtraction_la-matrixSubtraction.lo
+ libMatrixSubtraction_la-sdiffma.lo \
+ libMatrixSubtraction_la-ddiffma.lo \
+ libMatrixSubtraction_la-cdiffma.lo \
+ libMatrixSubtraction_la-zdiffma.lo
libMatrixSubtraction_la_OBJECTS = \
$(am_libMatrixSubtraction_la_OBJECTS)
libMatrixSubtraction_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -203,7 +206,11 @@ libMatrixSubtraction_la_CFLAGS = -I $(top_builddir)/type \
instdir = $(top_builddir)/lib
pkglib_LTLIBRARIES = libMatrixSubtraction.la
-libMatrixSubtraction_la_SOURCES = matrixSubtraction.c
+libMatrixSubtraction_la_SOURCES = sdiffma.c \
+ ddiffma.c \
+ cdiffma.c \
+ zdiffma.c
+
check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
$(top_builddir)/type/libFloatComplex.la \
libMatrixSubtraction.la
@@ -293,7 +300,10 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixSubtraction_la-matrixSubtraction.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixSubtraction_la-cdiffma.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixSubtraction_la-ddiffma.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixSubtraction_la-sdiffma.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libMatrixSubtraction_la-zdiffma.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testMatrixSubtraction-testMatrixSubtraction.Po@am__quote@
.c.o:
@@ -317,12 +327,33 @@ distclean-compile:
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-libMatrixSubtraction_la-matrixSubtraction.lo: matrixSubtraction.c
-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixSubtraction_la_CFLAGS) $(CFLAGS) -MT libMatrixSubtraction_la-matrixSubtraction.lo -MD -MP -MF $(DEPDIR)/libMatrixSubtraction_la-matrixSubtraction.Tpo -c -o libMatrixSubtraction_la-matrixSubtraction.lo `test -f 'matrixSubtraction.c' || echo '$(srcdir)/'`matrixSubtraction.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixSubtraction_la-matrixSubtraction.Tpo $(DEPDIR)/libMatrixSubtraction_la-matrixSubtraction.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='matrixSubtraction.c' object='libMatrixSubtraction_la-matrixSubtraction.lo' libtool=yes @AMDEPBACKSLASH@
+libMatrixSubtraction_la-sdiffma.lo: sdiffma.c
+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixSubtraction_la_CFLAGS) $(CFLAGS) -MT libMatrixSubtraction_la-sdiffma.lo -MD -MP -MF $(DEPDIR)/libMatrixSubtraction_la-sdiffma.Tpo -c -o libMatrixSubtraction_la-sdiffma.lo `test -f 'sdiffma.c' || echo '$(srcdir)/'`sdiffma.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixSubtraction_la-sdiffma.Tpo $(DEPDIR)/libMatrixSubtraction_la-sdiffma.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sdiffma.c' object='libMatrixSubtraction_la-sdiffma.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) $(libMatrixSubtraction_la_CFLAGS) $(CFLAGS) -c -o libMatrixSubtraction_la-sdiffma.lo `test -f 'sdiffma.c' || echo '$(srcdir)/'`sdiffma.c
+
+libMatrixSubtraction_la-ddiffma.lo: ddiffma.c
+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixSubtraction_la_CFLAGS) $(CFLAGS) -MT libMatrixSubtraction_la-ddiffma.lo -MD -MP -MF $(DEPDIR)/libMatrixSubtraction_la-ddiffma.Tpo -c -o libMatrixSubtraction_la-ddiffma.lo `test -f 'ddiffma.c' || echo '$(srcdir)/'`ddiffma.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixSubtraction_la-ddiffma.Tpo $(DEPDIR)/libMatrixSubtraction_la-ddiffma.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='ddiffma.c' object='libMatrixSubtraction_la-ddiffma.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) $(libMatrixSubtraction_la_CFLAGS) $(CFLAGS) -c -o libMatrixSubtraction_la-ddiffma.lo `test -f 'ddiffma.c' || echo '$(srcdir)/'`ddiffma.c
+
+libMatrixSubtraction_la-cdiffma.lo: cdiffma.c
+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixSubtraction_la_CFLAGS) $(CFLAGS) -MT libMatrixSubtraction_la-cdiffma.lo -MD -MP -MF $(DEPDIR)/libMatrixSubtraction_la-cdiffma.Tpo -c -o libMatrixSubtraction_la-cdiffma.lo `test -f 'cdiffma.c' || echo '$(srcdir)/'`cdiffma.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixSubtraction_la-cdiffma.Tpo $(DEPDIR)/libMatrixSubtraction_la-cdiffma.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cdiffma.c' object='libMatrixSubtraction_la-cdiffma.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) $(libMatrixSubtraction_la_CFLAGS) $(CFLAGS) -c -o libMatrixSubtraction_la-cdiffma.lo `test -f 'cdiffma.c' || echo '$(srcdir)/'`cdiffma.c
+
+libMatrixSubtraction_la-zdiffma.lo: zdiffma.c
+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixSubtraction_la_CFLAGS) $(CFLAGS) -MT libMatrixSubtraction_la-zdiffma.lo -MD -MP -MF $(DEPDIR)/libMatrixSubtraction_la-zdiffma.Tpo -c -o libMatrixSubtraction_la-zdiffma.lo `test -f 'zdiffma.c' || echo '$(srcdir)/'`zdiffma.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libMatrixSubtraction_la-zdiffma.Tpo $(DEPDIR)/libMatrixSubtraction_la-zdiffma.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='zdiffma.c' object='libMatrixSubtraction_la-zdiffma.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) $(libMatrixSubtraction_la_CFLAGS) $(CFLAGS) -c -o libMatrixSubtraction_la-matrixSubtraction.lo `test -f 'matrixSubtraction.c' || echo '$(srcdir)/'`matrixSubtraction.c
+@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libMatrixSubtraction_la_CFLAGS) $(CFLAGS) -c -o libMatrixSubtraction_la-zdiffma.lo `test -f 'zdiffma.c' || echo '$(srcdir)/'`zdiffma.c
testMatrixSubtraction-testMatrixSubtraction.o: testMatrixSubtraction.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testMatrixSubtraction_CFLAGS) $(CFLAGS) -MT testMatrixSubtraction-testMatrixSubtraction.o -MD -MP -MF $(DEPDIR)/testMatrixSubtraction-testMatrixSubtraction.Tpo -c -o testMatrixSubtraction-testMatrixSubtraction.o `test -f 'testMatrixSubtraction.c' || echo '$(srcdir)/'`testMatrixSubtraction.c
diff --git a/src/matrixOperations/subtraction/cdiffma.c b/src/matrixOperations/subtraction/cdiffma.c
new file mode 100644
index 00000000..d97e5e1a
--- /dev/null
+++ b/src/matrixOperations/subtraction/cdiffma.c
@@ -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
+ *
+ */
+
+#include "matrixSubtraction.h"
+
+/*
+** \brief Compute an substraction element ways for complex single precision.
+** \param in1 : input array.
+** \param size1 : size of in1 array.
+** \param in2 : input arry.
+** \param size2 : size of in2 array.
+** \param out : array that contains in1 - in2.
+*/
+void cdiffma(floatComplex *in1, int size1,
+ floatComplex *in2, int size2,
+ floatComplex *out)
+{
+ int i = 0;
+
+ for(i = 0 ; i < size1 && i < size2 ; ++i)
+ {
+ out[i] = cdiffs(in1[i], in2[i]);
+ }
+}
diff --git a/src/matrixOperations/subtraction/ddiffma.c b/src/matrixOperations/subtraction/ddiffma.c
new file mode 100644
index 00000000..4af091be
--- /dev/null
+++ b/src/matrixOperations/subtraction/ddiffma.c
@@ -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
+ *
+ */
+
+#include "matrixSubtraction.h"
+
+/*
+** \brief Compute an substraction element ways for double.
+** \param in1 : input array.
+** \param size1 : size of in1 array.
+** \param in2 : input arry.
+** \param size2 : size of in2 array.
+** \param out : array that contains in1 - in2.
+*/
+void ddiffma(double *in1, int size1,
+ double *in2, int size2,
+ double * out)
+{
+ int i = 0;
+
+ for(i = 0 ; i < size1 && i < size2 ; ++i)
+ {
+ out[i] = in1[i] - in2[i];
+ }
+}
diff --git a/src/matrixOperations/subtraction/sdiffma.c b/src/matrixOperations/subtraction/sdiffma.c
index ffd30d7a..fb8d6127 100644
--- a/src/matrixOperations/subtraction/sdiffma.c
+++ b/src/matrixOperations/subtraction/sdiffma.c
@@ -31,63 +31,3 @@ void sdiffma(float *in1, int size1,
out[i] = in1[i] - in2[i];
}
}
-
-/*
-** \brief Compute an substraction element ways for double.
-** \param in1 : input array.
-** \param size1 : size of in1 array.
-** \param in2 : input arry.
-** \param size2 : size of in2 array.
-** \param out : array that contains in1 - in2.
-*/
-void ddiffma(double *in1, int size1,
- double *in2, int size2,
- double * out)
-{
- int i = 0;
-
- for(i = 0 ; i < size1 && i < size2 ; ++i)
- {
- out[i] = in1[i] - in2[i];
- }
-}
-
-/*
-** \brief Compute an substraction element ways for complex single precision.
-** \param in1 : input array.
-** \param size1 : size of in1 array.
-** \param in2 : input arry.
-** \param size2 : size of in2 array.
-** \param out : array that contains in1 - in2.
-*/
-void cdiffma(floatComplex *in1, int size1,
- floatComplex *in2, int size2,
- floatComplex *out)
-{
- int i = 0;
-
- for(i = 0 ; i < size1 && i < size2 ; ++i)
- {
- out[i] = cdiffs(in1[i], in2[i]);
- }
-}
-
-/*
-** \brief Compute an substraction element ways for complex double precision.
-** \param in1 : input array.
-** \param size1 : size of in1 array.
-** \param in2 : input arry.
-** \param size2 : size of in2 array.
-** \param out : array that contains in1 - in2.
-*/
-void zdiffma(doubleComplex *in1, int size1,
- doubleComplex *in2, int size2,
- doubleComplex *out)
-{
- int i = 0;
-
- for(i = 0 ; i < size1 && i < size2 ; ++i)
- {
- out[i] = zdiffs(in1[i], in2[i]);
- }
-}
diff --git a/src/matrixOperations/subtraction/zdiffma.c b/src/matrixOperations/subtraction/zdiffma.c
new file mode 100644
index 00000000..3c3a1249
--- /dev/null
+++ b/src/matrixOperations/subtraction/zdiffma.c
@@ -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
+ *
+ */
+
+#include "matrixSubtraction.h"
+
+/*
+** \brief Compute an substraction element ways for complex double precision.
+** \param in1 : input array.
+** \param size1 : size of in1 array.
+** \param in2 : input arry.
+** \param size2 : size of in2 array.
+** \param out : array that contains in1 - in2.
+*/
+void zdiffma(doubleComplex *in1, int size1,
+ doubleComplex *in2, int size2,
+ doubleComplex *out)
+{
+ int i = 0;
+
+ for(i = 0 ; i < size1 && i < size2 ; ++i)
+ {
+ out[i] = zdiffs(in1[i], in2[i]);
+ }
+}