summaryrefslogtreecommitdiff
path: root/src/operations
diff options
context:
space:
mode:
Diffstat (limited to 'src/operations')
-rw-r--r--src/operations/division/Makefile.am4
-rw-r--r--src/operations/division/Makefile.in23
-rw-r--r--src/operations/division/cdivides.c39
-rw-r--r--src/operations/division/crdivs.c29
-rw-r--r--src/operations/division/zdivides.c39
-rw-r--r--src/operations/division/zrdivs.c30
-rw-r--r--src/operations/includes/division.h12
7 files changed, 52 insertions, 124 deletions
diff --git a/src/operations/division/Makefile.am b/src/operations/division/Makefile.am
index 765cd913..b93415c9 100644
--- a/src/operations/division/Makefile.am
+++ b/src/operations/division/Makefile.am
@@ -36,9 +36,7 @@ libDivision_la_SOURCES = $(HEAD) \
sldiva.c \
dldiva.c \
cldiva.c \
- zldiva.c \
- cdivides.c \
- zdivides.c
+ zldiva.c
check_PROGRAMS = testDivision \
testLDivision \
diff --git a/src/operations/division/Makefile.in b/src/operations/division/Makefile.in
index fbeca773..eec49c49 100644
--- a/src/operations/division/Makefile.in
+++ b/src/operations/division/Makefile.in
@@ -64,8 +64,7 @@ am_libDivision_la_OBJECTS = $(am__objects_1) libDivision_la-srdivs.lo \
libDivision_la-drdiva.lo libDivision_la-crdiva.lo \
libDivision_la-zrdiva.lo libDivision_la-sldiva.lo \
libDivision_la-dldiva.lo libDivision_la-cldiva.lo \
- libDivision_la-zldiva.lo libDivision_la-cdivides.lo \
- libDivision_la-zdivides.lo
+ libDivision_la-zldiva.lo
libDivision_la_OBJECTS = $(am_libDivision_la_OBJECTS)
libDivision_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(libDivision_la_CFLAGS) \
@@ -240,9 +239,7 @@ libDivision_la_SOURCES = $(HEAD) \
sldiva.c \
dldiva.c \
cldiva.c \
- zldiva.c \
- cdivides.c \
- zdivides.c
+ zldiva.c
check_LDADD = $(top_builddir)/type/libDoubleComplex.la \
$(top_builddir)/type/libFloatComplex.la \
@@ -347,7 +344,6 @@ mostlyclean-compile:
distclean-compile:
-rm -f *.tab.c
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDivision_la-cdivides.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDivision_la-cldiva.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDivision_la-cldivs.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDivision_la-crdiva.Plo@am__quote@
@@ -360,7 +356,6 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDivision_la-sldivs.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDivision_la-srdiva.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDivision_la-srdivs.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDivision_la-zdivides.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDivision_la-zldiva.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDivision_la-zldivs.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libDivision_la-zrdiva.Plo@am__quote@
@@ -502,20 +497,6 @@ libDivision_la-zldiva.lo: zldiva.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) $(libDivision_la_CFLAGS) $(CFLAGS) -c -o libDivision_la-zldiva.lo `test -f 'zldiva.c' || echo '$(srcdir)/'`zldiva.c
-libDivision_la-cdivides.lo: cdivides.c
-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDivision_la_CFLAGS) $(CFLAGS) -MT libDivision_la-cdivides.lo -MD -MP -MF $(DEPDIR)/libDivision_la-cdivides.Tpo -c -o libDivision_la-cdivides.lo `test -f 'cdivides.c' || echo '$(srcdir)/'`cdivides.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libDivision_la-cdivides.Tpo $(DEPDIR)/libDivision_la-cdivides.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cdivides.c' object='libDivision_la-cdivides.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) $(libDivision_la_CFLAGS) $(CFLAGS) -c -o libDivision_la-cdivides.lo `test -f 'cdivides.c' || echo '$(srcdir)/'`cdivides.c
-
-libDivision_la-zdivides.lo: zdivides.c
-@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libDivision_la_CFLAGS) $(CFLAGS) -MT libDivision_la-zdivides.lo -MD -MP -MF $(DEPDIR)/libDivision_la-zdivides.Tpo -c -o libDivision_la-zdivides.lo `test -f 'zdivides.c' || echo '$(srcdir)/'`zdivides.c
-@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libDivision_la-zdivides.Tpo $(DEPDIR)/libDivision_la-zdivides.Plo
-@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='zdivides.c' object='libDivision_la-zdivides.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) $(libDivision_la_CFLAGS) $(CFLAGS) -c -o libDivision_la-zdivides.lo `test -f 'zdivides.c' || echo '$(srcdir)/'`zdivides.c
-
testDivision-testDivision.o: testDivision.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testDivision_CFLAGS) $(CFLAGS) -MT testDivision-testDivision.o -MD -MP -MF $(DEPDIR)/testDivision-testDivision.Tpo -c -o testDivision-testDivision.o `test -f 'testDivision.c' || echo '$(srcdir)/'`testDivision.c
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/testDivision-testDivision.Tpo $(DEPDIR)/testDivision-testDivision.Po
diff --git a/src/operations/division/cdivides.c b/src/operations/division/cdivides.c
deleted file mode 100644
index f7bfc7f0..00000000
--- a/src/operations/division/cdivides.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET
- *
- * 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
- *
- */
-
-#ifdef __STDC_VERSION__
-# ifndef STDC
-# define STDC
-# endif
-# if __STDC_VERSION__ >= 199901L
-# ifndef STDC99
-# define STDC99
-# endif
-# endif
-#endif
-
-#include "floatComplex.h"
-#include "division.h"
-
-/*
-** \function cdivides
-** \brief Divide 2 Complex numbers.
-*/
-floatComplex cdivides(floatComplex z1, floatComplex z2) {
-#ifndef STDC99
- return FloatComplex((z1.real*z2.real + z1.imag*z2.imag) / (z2.real*z2.real + z2.imag* z2.imag),
- (z1.imag*z2.real - z1.real*z2.imag) / (z2.real*z2.real + z2.imag* z2.imag));
-#else
- return z1 / z2;
-#endif
-}
-
diff --git a/src/operations/division/crdivs.c b/src/operations/division/crdivs.c
index fec7c62b..f0d5c9bc 100644
--- a/src/operations/division/crdivs.c
+++ b/src/operations/division/crdivs.c
@@ -1,6 +1,6 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET
+ * 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
@@ -10,10 +10,29 @@
*
*/
+#ifdef __STDC_VERSION__
+# ifndef STDC
+# define STDC
+# endif
+# if __STDC_VERSION__ >= 199901L
+# ifndef STDC99
+# define STDC99
+# endif
+# endif
+#endif
-#include "division.h"
+#include "division.h"
-
-floatComplex crdivs (floatComplex in1, floatComplex in2){
- return cdivides(in1,in2);
+/*
+** \function cdivides
+** \brief Divide 2 Complex numbers.
+*/
+floatComplex crdivs(floatComplex z1, floatComplex z2) {
+#ifndef STDC99
+ return FloatComplex((z1.real*z2.real + z1.imag*z2.imag) / (z2.real*z2.real + z2.imag* z2.imag),
+ (z1.imag*z2.real - z1.real*z2.imag) / (z2.real*z2.real + z2.imag* z2.imag));
+#else
+ return z1 / z2;
+#endif
}
+
diff --git a/src/operations/division/zdivides.c b/src/operations/division/zdivides.c
deleted file mode 100644
index 683817e4..00000000
--- a/src/operations/division/zdivides.c
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET
- *
- * 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
- *
- */
-
-#ifdef __STDC_VERSION__
-# ifndef STDC
-# define STDC
-# endif
-# if __STDC_VERSION__ >= 199901L
-# ifndef STDC99
-# define STDC99
-# endif
-# endif
-#endif
-
-
-#include "doubleComplex.h"
-#include "division.h"
-
-/*
-** \function zdivides
-** \brief Divide 2 Complex numbers.
-*/
-doubleComplex zdivides(doubleComplex z1, doubleComplex z2) {
-#ifndef STDC99
- return DoubleComplex((z1.real*z2.real + z1.imag*z2.imag) / (z2.real*z2.real + z2.imag* z2.imag),
- (z1.imag*z2.real - z1.real*z2.imag) / (z2.real*z2.real + z2.imag* z2.imag));
-#else
- return z1 / z2;
-#endif
-}
diff --git a/src/operations/division/zrdivs.c b/src/operations/division/zrdivs.c
index faed8424..eca3a986 100644
--- a/src/operations/division/zrdivs.c
+++ b/src/operations/division/zrdivs.c
@@ -1,6 +1,6 @@
/*
* Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
- * Copyright (C) 2008-2008 - INRIA - Arnaud TORSET
+ * 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
@@ -10,10 +10,30 @@
*
*/
+#ifdef __STDC_VERSION__
+# ifndef STDC
+# define STDC
+# endif
+# if __STDC_VERSION__ >= 199901L
+# ifndef STDC99
+# define STDC99
+# endif
+# endif
+#endif
-#include "division.h"
-
-doubleComplex zrdivs (doubleComplex in1, doubleComplex in2){
- return zdivides(in1,in2);
+#include "doubleComplex.h"
+#include "division.h"
+
+/*
+** \function zdivides
+** \brief Divide 2 Complex numbers.
+*/
+doubleComplex zrdivs(doubleComplex z1, doubleComplex z2) {
+#ifndef STDC99
+ return DoubleComplex((z1.real*z2.real + z1.imag*z2.imag) / (z2.real*z2.real + z2.imag* z2.imag),
+ (z1.imag*z2.real - z1.real*z2.imag) / (z2.real*z2.real + z2.imag* z2.imag));
+#else
+ return z1 / z2;
+#endif
}
diff --git a/src/operations/includes/division.h b/src/operations/includes/division.h
index e6016fc6..e5ff2e3e 100644
--- a/src/operations/includes/division.h
+++ b/src/operations/includes/division.h
@@ -194,17 +194,5 @@ void zldiva(doubleComplex* in1, int size1,
doubleComplex* out );
-/*
-** \function cdivides
-** \brief Divide 2 Complex numbers.
-*/
-floatComplex cdivides(floatComplex z1, floatComplex z2);
-
-
-/*
-** \function zdivides
-** \brief Divide 2 Complex numbers.
-*/
-doubleComplex zdivides(doubleComplex z1, doubleComplex z2);
#endif /* !__DIVISION_H__ */
generated by cgit (git 2.34.1) at 2025-03-17 02:49:12 +0000