From b0df4c8bb591d5df8a2401b15ea36c6402161c53 Mon Sep 17 00:00:00 2001 From: Abhinav Dronamraju Date: Thu, 20 Jul 2017 21:38:57 +0530 Subject: Pmodulo and nanmax started --- .../src/c/elementaryFunctions/includes/ismatrix.h | 3 ++ .../src/c/elementaryFunctions/includes/isvector.h | 8 ++--- 2.3-1/src/c/elementaryFunctions/includes/nanmax.h | 40 ++++++++++++++++++++++ 2.3-1/src/c/elementaryFunctions/includes/pmodulo.h | 40 ++++++++++++++++++++++ 4 files changed, 87 insertions(+), 4 deletions(-) create mode 100644 2.3-1/src/c/elementaryFunctions/includes/nanmax.h create mode 100644 2.3-1/src/c/elementaryFunctions/includes/pmodulo.h (limited to '2.3-1/src/c/elementaryFunctions/includes') diff --git a/2.3-1/src/c/elementaryFunctions/includes/ismatrix.h b/2.3-1/src/c/elementaryFunctions/includes/ismatrix.h index 072bfdcb..0dd8b4a3 100644 --- a/2.3-1/src/c/elementaryFunctions/includes/ismatrix.h +++ b/2.3-1/src/c/elementaryFunctions/includes/ismatrix.h @@ -17,6 +17,7 @@ #include "types.h" #include "doubleComplex.h" #include "floatComplex.h" +#include "uint16.h" #ifdef __cplusplus extern "C" { @@ -30,6 +31,8 @@ char gismatrixa(char*); char gismatrixs(char); char zismatrixa(doubleComplex*); char zismatrixs(doubleComplex); +char u16ismatrixa(uint16*); +char u16ismatrixs(uint16); #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/elementaryFunctions/includes/isvector.h b/2.3-1/src/c/elementaryFunctions/includes/isvector.h index 5f45abbe..75599cdd 100644 --- a/2.3-1/src/c/elementaryFunctions/includes/isvector.h +++ b/2.3-1/src/c/elementaryFunctions/includes/isvector.h @@ -22,13 +22,13 @@ extern "C" { #endif -char disvectora(double* , int); +char disvectora(double* , int, int); char disvectors(double); -char sisvectora( float* , int); +char sisvectora( float* , int, int); char sisvectors( float); -char gisvectora(char* , int); +char gisvectora(char* , int, int ); char gisvectors(char); -char zisvectora(doubleComplex*, int); +char zisvectora(doubleComplex*, int, int); char zisvectors(doubleComplex); #ifdef __cplusplus diff --git a/2.3-1/src/c/elementaryFunctions/includes/nanmax.h b/2.3-1/src/c/elementaryFunctions/includes/nanmax.h new file mode 100644 index 00000000..bea83f78 --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/includes/nanmax.h @@ -0,0 +1,40 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + 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 + Author: Abhinav Dronamraju + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#ifndef __NANMAX_H__ +#define __NANMAX_H__ + + +#include "types.h" +#include "doubleComplex.h" +#include "floatComplex.h" +#include "int16.h" + +#ifdef __cplusplus +extern "C" { +#endif + +double dnanmaxa (double* , int); +void dnanmaxrowa (double*, int , int, double*); +void dnanmaxcola (double*, int , int, double*); + +float snanmaxa (float* , int); +void snanmaxrowa (float*, int , int, float*); +void snanmaxcola (float*, int , int, float*); + + + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif diff --git a/2.3-1/src/c/elementaryFunctions/includes/pmodulo.h b/2.3-1/src/c/elementaryFunctions/includes/pmodulo.h new file mode 100644 index 00000000..d46febc3 --- /dev/null +++ b/2.3-1/src/c/elementaryFunctions/includes/pmodulo.h @@ -0,0 +1,40 @@ +/* Copyright (C) 2016 - IIT Bombay - FOSSEE + + 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 + Author: Abhinav Dronamraju + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +#ifndef __PMODULO_H__ +#define __PMODULO_H__ + + +#include "types.h" +#include "doubleComplex.h" +#include "floatComplex.h" +#include "int16.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void dpmoduloa(double*, int ,double*, double*); +double dpmodulos(double, double); + +void spmoduloa(float*, int ,float*, float*); +float spmodulos(float, float); + +void i16pmoduloa(int16*, int ,int16*, int16*); +int16 i16pmodulos(int16, int16); + + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif -- cgit