summaryrefslogtreecommitdiff
path: root/src/auxiliaryFunctions/abs/zabss.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/auxiliaryFunctions/abs/zabss.c')
-rw-r--r--src/auxiliaryFunctions/abs/zabss.c38
1 files changed, 25 insertions, 13 deletions
diff --git a/src/auxiliaryFunctions/abs/zabss.c b/src/auxiliaryFunctions/abs/zabss.c
index 6a82b6d2..4e7b4dd3 100644
--- a/src/auxiliaryFunctions/abs/zabss.c
+++ b/src/auxiliaryFunctions/abs/zabss.c
@@ -1,19 +1,31 @@
/*
-** -*- C -*-
-**
-** zabss.c
-** Made by Bruno JOFRET <bruno.jofret@inria.fr>
-**
-** Started on Mon Apr 23 17:03:36 2007 jofret
-** Last update Mon Apr 23 17:16:05 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
+ *
+ */
+
+#include <math.h>
#include "abs.h"
+#include "sqrt.h"
+#include "max.h"
+#include "min.h"
double zabss(doubleComplex in) {
- double real = zreals(in);
- double imag = zimags(in);
- return (dsqrts( (real*real) + (imag*imag) ));
+ double real = dabss(zreals(in));
+ double imag = dabss(zimags(in));
+ double zMax = max(real, imag);
+ double zMin = min(real, imag);
+
+ if(zMin == 0)
+ {
+ return zMax;
+ }
+ return zMax * (dsqrts(1 + (zMin / zMax) * (zMin / zMax)));
}