summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/auxiliaryFunctions/pythag/Makefile.am3
-rw-r--r--src/auxiliaryFunctions/pythag/Makefile.in13
-rw-r--r--src/auxiliaryFunctions/pythag/cpythags.c20
-rw-r--r--src/auxiliaryFunctions/pythag/dpythags.c20
-rw-r--r--src/auxiliaryFunctions/pythag/spythags.c20
-rw-r--r--src/auxiliaryFunctions/pythag/testPythag.h23
-rw-r--r--src/auxiliaryFunctions/pythag/zpythags.c19
7 files changed, 74 insertions, 44 deletions
diff --git a/src/auxiliaryFunctions/pythag/Makefile.am b/src/auxiliaryFunctions/pythag/Makefile.am
index 2fa58ebe..001462f3 100644
--- a/src/auxiliaryFunctions/pythag/Makefile.am
+++ b/src/auxiliaryFunctions/pythag/Makefile.am
@@ -22,7 +22,8 @@ libPythag_la_SOURCES = $(HEAD) $(SRC)
SRC = spythags.c \
dpythags.c \
- cpythags.c
+ cpythags.c \
+ zpythags.c
HEAD = ../includes/pythag.h
diff --git a/src/auxiliaryFunctions/pythag/Makefile.in b/src/auxiliaryFunctions/pythag/Makefile.in
index e31a2f92..19328bc0 100644
--- a/src/auxiliaryFunctions/pythag/Makefile.in
+++ b/src/auxiliaryFunctions/pythag/Makefile.in
@@ -55,7 +55,7 @@ LTLIBRARIES = $(pkglib_LTLIBRARIES)
libPythag_la_LIBADD =
am__objects_1 =
am__objects_2 = libPythag_la-spythags.lo libPythag_la-dpythags.lo \
- libPythag_la-cpythags.lo
+ libPythag_la-cpythags.lo libPythag_la-zpythags.lo
am_libPythag_la_OBJECTS = $(am__objects_1) $(am__objects_2)
libPythag_la_OBJECTS = $(am_libPythag_la_OBJECTS)
libPythag_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
@@ -209,7 +209,8 @@ pkglib_LTLIBRARIES = libPythag.la
libPythag_la_SOURCES = $(HEAD) $(SRC)
SRC = spythags.c \
dpythags.c \
- cpythags.c
+ cpythags.c \
+ zpythags.c
HEAD = ../includes/pythag.h
@@ -317,6 +318,7 @@ distclean-compile:
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libPythag_la-cpythags.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libPythag_la-dpythags.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libPythag_la-spythags.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libPythag_la-zpythags.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testPythag-testPythag.Po@am__quote@
.c.o:
@@ -361,6 +363,13 @@ libPythag_la-cpythags.lo: cpythags.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) $(libPythag_la_CFLAGS) $(CFLAGS) -c -o libPythag_la-cpythags.lo `test -f 'cpythags.c' || echo '$(srcdir)/'`cpythags.c
+libPythag_la-zpythags.lo: zpythags.c
+@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libPythag_la_CFLAGS) $(CFLAGS) -MT libPythag_la-zpythags.lo -MD -MP -MF $(DEPDIR)/libPythag_la-zpythags.Tpo -c -o libPythag_la-zpythags.lo `test -f 'zpythags.c' || echo '$(srcdir)/'`zpythags.c
+@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/libPythag_la-zpythags.Tpo $(DEPDIR)/libPythag_la-zpythags.Plo
+@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='zpythags.c' object='libPythag_la-zpythags.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) $(libPythag_la_CFLAGS) $(CFLAGS) -c -o libPythag_la-zpythags.lo `test -f 'zpythags.c' || echo '$(srcdir)/'`zpythags.c
+
testPythag-testPythag.o: testPythag.c
@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testPythag_CFLAGS) $(CFLAGS) -MT testPythag-testPythag.o -MD -MP -MF $(DEPDIR)/testPythag-testPythag.Tpo -c -o testPythag-testPythag.o `test -f 'testPythag.c' || echo '$(srcdir)/'`testPythag.c
@am__fastdepCC_TRUE@ mv -f $(DEPDIR)/testPythag-testPythag.Tpo $(DEPDIR)/testPythag-testPythag.Po
diff --git a/src/auxiliaryFunctions/pythag/cpythags.c b/src/auxiliaryFunctions/pythag/cpythags.c
index 0701ce98..d0dcb625 100644
--- a/src/auxiliaryFunctions/pythag/cpythags.c
+++ b/src/auxiliaryFunctions/pythag/cpythags.c
@@ -1,14 +1,14 @@
/*
-** -*- C -*-
-**
-** spythags.c
-** Made by Bruno JOFRET <bruno.jofret@inria.fr>
-**
-** Started on Mon Apr 23 11:31:47 2007 jofret
-** Last update Thu Aug 16 12:17:21 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 "complex.h"
#include "pythag.h"
diff --git a/src/auxiliaryFunctions/pythag/dpythags.c b/src/auxiliaryFunctions/pythag/dpythags.c
index a40fa7cd..9e2c09a6 100644
--- a/src/auxiliaryFunctions/pythag/dpythags.c
+++ b/src/auxiliaryFunctions/pythag/dpythags.c
@@ -1,14 +1,14 @@
/*
-** -*- C -*-
-**
-** dpythags.c
-** Made by Bruno JOFRET <bruno.jofret@inria.fr>
-**
-** Started on Mon Apr 23 11:54:15 2007 jofret
-** Last update Thu Aug 16 12:10:17 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 "pythag.h"
diff --git a/src/auxiliaryFunctions/pythag/spythags.c b/src/auxiliaryFunctions/pythag/spythags.c
index 47c0e85c..64d22a47 100644
--- a/src/auxiliaryFunctions/pythag/spythags.c
+++ b/src/auxiliaryFunctions/pythag/spythags.c
@@ -1,14 +1,14 @@
/*
-** -*- C -*-
-**
-** spythags.c
-** Made by Bruno JOFRET <bruno.jofret@inria.fr>
-**
-** Started on Mon Apr 23 11:31:47 2007 jofret
-** Last update Thu Aug 16 12:10:01 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 "pythag.h"
diff --git a/src/auxiliaryFunctions/pythag/testPythag.h b/src/auxiliaryFunctions/pythag/testPythag.h
index 1d32dc37..f2981db4 100644
--- a/src/auxiliaryFunctions/pythag/testPythag.h
+++ b/src/auxiliaryFunctions/pythag/testPythag.h
@@ -1,14 +1,15 @@
- /*
-** -*- C -*-
-**
-** testPythag.h
-** Made by Bruno JOFRET <bruno.jofret@inria.fr>
-**
-** Started on Mon Apr 23 16:26:14 2007 jofret
-** Last update Thu Apr 26 10:34:36 2007 jofret
-**
-** 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
+ *
+ */
+
#ifndef _TESTPYTHAG_H_
#define _TESTPYTHAG_H_
diff --git a/src/auxiliaryFunctions/pythag/zpythags.c b/src/auxiliaryFunctions/pythag/zpythags.c
new file mode 100644
index 00000000..ae11e962
--- /dev/null
+++ b/src/auxiliaryFunctions/pythag/zpythags.c
@@ -0,0 +1,19 @@
+/*
+ * 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 "complex.h"
+#include "pythag.h"
+
+doubleComplex zpythags(doubleComplex x, doubleComplex y) {
+ return (zsqrts( zadds(ztimess(x,x),
+ ztimess(y,y)) ));
+}
generated by cgit (git 2.34.1) at 2025-03-22 11:23:31 +0000