From 7edbd124b350b41741c4c9f96a9d21180c5d029c Mon Sep 17 00:00:00 2001 From: jofret Date: Fri, 11 Apr 2008 12:54:21 +0000 Subject: mimic Scilab behaviour --- src/auxiliaryFunctions/abs/cabss.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) (limited to 'src/auxiliaryFunctions/abs/cabss.c') diff --git a/src/auxiliaryFunctions/abs/cabss.c b/src/auxiliaryFunctions/abs/cabss.c index a9826990..8cd766df 100644 --- a/src/auxiliaryFunctions/abs/cabss.c +++ b/src/auxiliaryFunctions/abs/cabss.c @@ -1,19 +1,30 @@ /* -** -*- C -*- -** -** cabss.c -** Made by Bruno JOFRET -** -** Started on Mon Apr 23 17:08:52 2007 jofret -** Last update Mon Apr 23 17:10:22 2007 jofret -** -** Copyright INRIA 2007 -*/ + * 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 "abs.h" +#include "sqrt.h" +#include "max.h" +#include "min.h" float cabss(floatComplex in) { - float real = creals(in); - float imag = cimags(in); - return (ssqrts( (real*real) + (imag*imag) )); + float real = sabss(creals(in)); + float imag = sabss(cimags(in)); + float zMax = max(real, imag); + float zMin = min(real, imag); + + if(zMin == 0) + { + return zMax; + } + return zMax * (ssqrts(1 + (zMin / zMax) * (zMin / zMax))); } -- cgit