From 9b3788e3f1b061bee62ad14c0bfbd7dfd64fbd01 Mon Sep 17 00:00:00 2001 From: Abhinav Dronamraju Date: Thu, 27 Jul 2017 18:16:59 +0530 Subject: Nan Median Added --- demos/Abhinav_Demos/Column.sci | 26 --------- demos/Abhinav_Demos/Row.sci | 25 --------- demos/Abhinav_Demos/column.sci | 26 +++++++++ demos/Abhinav_Demos/matrix_reshape.sci | 18 +++++++ demos/Abhinav_Demos/matrixreshape.sci | 18 ------- demos/Abhinav_Demos/nan_max.sci | 40 +++----------- demos/Abhinav_Demos/nan_median.sci | 33 ++++++++++++ demos/Abhinav_Demos/non_zero.sci | 15 ++++++ demos/Abhinav_Demos/nth_root.sci | 23 ++++++++ demos/Abhinav_Demos/nthroot1.sci | 23 -------- demos/Abhinav_Demos/row.sci | 25 +++++++++ includes/sci2clib.h | 3 ++ jar/scilab_en_US_help.jar | Bin 11210 -> 11210 bytes .../ToolInitialization/INIT_FillSCI2LibCDirs.sci | 23 ++++++++ macros/findDeps/getAllHeaders.sci | 1 + macros/findDeps/getAllInterfaces.sci | 1 + macros/findDeps/getAllSources.sci | 13 +++++ src/c/elementaryFunctions/interfaces/int_nanmax.h | 5 +- src/c/elementaryFunctions/nanmax/dnanmax1a.c | 58 +++++++++++++++++++++ src/c/elementaryFunctions/nanmax/znanmaxa.c | 57 -------------------- src/c/elementaryFunctions/nanmax/znanmaxcola.c | 36 ------------- src/c/elementaryFunctions/nanmax/znanmaxrowa.c | 37 ------------- src/c/signalProcessing/interfaces/int_dct.h | 2 +- src/c/statisticsFunctions/includes/nanmedian.h | 40 ++++++++++++++ .../statisticsFunctions/interfaces/int_nanmedian.h | 27 ++++++++++ src/c/statisticsFunctions/nanmedian/dnanmediana.c | 51 ++++++++++++++++++ .../statisticsFunctions/nanmedian/dnanmediancola.c | 35 +++++++++++++ .../statisticsFunctions/nanmedian/dnanmedianrowa.c | 36 +++++++++++++ src/c/statisticsFunctions/nanmedian/snanmediana.c | 49 +++++++++++++++++ .../statisticsFunctions/nanmedian/snanmediancola.c | 36 +++++++++++++ .../statisticsFunctions/nanmedian/snanmedianrowa.c | 37 +++++++++++++ 31 files changed, 562 insertions(+), 257 deletions(-) delete mode 100644 demos/Abhinav_Demos/Column.sci delete mode 100644 demos/Abhinav_Demos/Row.sci create mode 100644 demos/Abhinav_Demos/column.sci create mode 100644 demos/Abhinav_Demos/matrix_reshape.sci delete mode 100644 demos/Abhinav_Demos/matrixreshape.sci create mode 100644 demos/Abhinav_Demos/nan_median.sci create mode 100644 demos/Abhinav_Demos/non_zero.sci create mode 100644 demos/Abhinav_Demos/nth_root.sci delete mode 100644 demos/Abhinav_Demos/nthroot1.sci create mode 100644 demos/Abhinav_Demos/row.sci create mode 100644 src/c/elementaryFunctions/nanmax/dnanmax1a.c delete mode 100644 src/c/elementaryFunctions/nanmax/znanmaxa.c delete mode 100644 src/c/elementaryFunctions/nanmax/znanmaxcola.c delete mode 100644 src/c/elementaryFunctions/nanmax/znanmaxrowa.c create mode 100644 src/c/statisticsFunctions/includes/nanmedian.h create mode 100644 src/c/statisticsFunctions/interfaces/int_nanmedian.h create mode 100644 src/c/statisticsFunctions/nanmedian/dnanmediana.c create mode 100644 src/c/statisticsFunctions/nanmedian/dnanmediancola.c create mode 100644 src/c/statisticsFunctions/nanmedian/dnanmedianrowa.c create mode 100644 src/c/statisticsFunctions/nanmedian/snanmediana.c create mode 100644 src/c/statisticsFunctions/nanmedian/snanmediancola.c create mode 100644 src/c/statisticsFunctions/nanmedian/snanmedianrowa.c diff --git a/demos/Abhinav_Demos/Column.sci b/demos/Abhinav_Demos/Column.sci deleted file mode 100644 index b9dc55bd..00000000 --- a/demos/Abhinav_Demos/Column.sci +++ /dev/null @@ -1,26 +0,0 @@ -// Test file for "Column" function for the data types double, float, double complex, string , uint16. -// All the below statements are added to initialize variables in different data types -//The function written doesn't work for string or character scalar as of now. - - -function Column() - a=[1,2,3,4; 5,6,7,8; 98,162,6587,0] - disp( iscolumn(a)) - disp('') - b= float(a) - disp(iscolumn(b)) - c= [1,2,34,5] - d= uint16(c) - disp(iscolumn(d)) - disp('') - f= [1;2;3;4] - disp(iscolumn(f)) - disp('') - u= uint16(c) - disp(iscolumn(u)) - disp('') - g= [%i] - disp(iscolumn(g)) - disp('') - -endfunction diff --git a/demos/Abhinav_Demos/Row.sci b/demos/Abhinav_Demos/Row.sci deleted file mode 100644 index 264b174a..00000000 --- a/demos/Abhinav_Demos/Row.sci +++ /dev/null @@ -1,25 +0,0 @@ -// Test file for "Column" function for the data types double, float, double complex, string , uint16. -// All the below statements are added to initialize variables in different data types -//The function written doesn't work for string or character scalar as of now. - - -function Row() - a=[1,2,3,4; 5,6,7,8; 98,162,6587,0] - disp( isrow(a)) - disp('') - b= float(a) - disp(isrow(b)) - c= [1,2,34,5] - d= uint16(c) - disp(isrow(d)) - disp('') - f= [1;2;3;4] - disp(isrow(f)) - disp('') - u= uint16(c) - disp(isrow(u)) - disp('') - g= [%i*1; 7] - disp(isrow(g)) - disp('') -endfunction diff --git a/demos/Abhinav_Demos/column.sci b/demos/Abhinav_Demos/column.sci new file mode 100644 index 00000000..82209876 --- /dev/null +++ b/demos/Abhinav_Demos/column.sci @@ -0,0 +1,26 @@ +// Test file for "Column" function for the data types double, float, double complex, string , uint16. +// All the below statements are added to initialize variables in different data types +//The function written doesn't work for string or character scalar as of now. + + +function column() + a=[1,2,3,4; 5,6,7,8; 98,162,6587,0] + disp( iscolumn(a)) + disp('') + b= float(a) + disp(iscolumn(b)) + c= [1,2,34,5] + d= uint16(c) + disp(iscolumn(d)) + disp('') + f= [1;2;3;4] + disp(iscolumn(f)) + disp('') + u= uint16(c) + disp(iscolumn(u)) + disp('') + g= [%i] + disp(iscolumn(g)) + disp('') + +endfunction diff --git a/demos/Abhinav_Demos/matrix_reshape.sci b/demos/Abhinav_Demos/matrix_reshape.sci new file mode 100644 index 00000000..bf7fbbc8 --- /dev/null +++ b/demos/Abhinav_Demos/matrix_reshape.sci @@ -0,0 +1,18 @@ + +// Test file for "matrix" function for the data types double, float, double complex, uint16 + +function matrix_reshape() + a=[1,2,3,4;5,6,7,8;8,9,1,2] + b=float(a) + c= uint16(b) + d=[%i*2,3,4,5;%i+34,45,32,23; 1,%i*54,8690,1] + +double1= matrix(a,4,3) +float1= matrix (b,4,3) +uint161= matrix(c,4,3) +complex1= matrix(d,4,3) +disp( double1) +disp( float1) +disp( uint161) +disp( complex1) +endfunction diff --git a/demos/Abhinav_Demos/matrixreshape.sci b/demos/Abhinav_Demos/matrixreshape.sci deleted file mode 100644 index 38fa0a53..00000000 --- a/demos/Abhinav_Demos/matrixreshape.sci +++ /dev/null @@ -1,18 +0,0 @@ - -// Test file for "matrix" function for the data types double, float, double complex, uint16 - -function matrixreshape() - a=[1,2,3,4;5,6,7,8;8,9,1,2] - b=float(a) - c= uint16(b) - d=[%i*2,3,4,5;%i+34,45,32,23; 1,%i*54,8690,1] - -double1= matrix(a,4,3) -float1= matrix (b,4,3) -uint161= matrix(c,4,3) -complex1= matrix(d,4,3) -disp( double1) -disp( float1) -disp( uint161) -disp( complex1) -endfunction diff --git a/demos/Abhinav_Demos/nan_max.sci b/demos/Abhinav_Demos/nan_max.sci index 769a92a7..ce7e10ef 100644 --- a/demos/Abhinav_Demos/nan_max.sci +++ b/demos/Abhinav_Demos/nan_max.sci @@ -1,33 +1,9 @@ -function nan_max() - -x=[%nan 0.121 %nan 0.5 0.8; 0.12 %nan 9 12 %nan] - -disp('Double') - -disp(nanmax(x)) -disp('') - -disp(nanmax(x , 'r')) -disp('') - -disp(nanmax(x, 'c')) -disp('') - -y= uint16(x) - -disp('Float') - -disp(nanmax(y)) -disp('') - -disp(nanmax(y , 'r')) -disp('') - -disp(nanmax(y, 'c')) -disp('') - - - - +function nan_max + x= double([1 2 1 0.8; 21 1 13 0.1]) + [a,b]= nanmin(x) + disp(a) + disp('') + disp(b) + disp('') + endfunction - diff --git a/demos/Abhinav_Demos/nan_median.sci b/demos/Abhinav_Demos/nan_median.sci new file mode 100644 index 00000000..993b2d72 --- /dev/null +++ b/demos/Abhinav_Demos/nan_median.sci @@ -0,0 +1,33 @@ +function nan_median() + +x=[%nan 0.121 %nan 0.5 0.8; 0.12 %nan 1 0.9812 %nan; 0.4 0.65 1.08 12 0.1621; 12 12 24 1 12] + +disp('Double') + +disp(nanmedian(x)) +disp('') + +disp(nanmedian(x , 'r')) +disp('') + +disp(nanmedian(x, 'c')) +disp('') + +y= float(x) + +disp('Float') + +disp(nanmedian(y)) +disp('') + +disp(nanmedian(y , 'r')) +disp('') + +disp(nanmedian(y, 'c')) +disp('') + + + + +endfunction + diff --git a/demos/Abhinav_Demos/non_zero.sci b/demos/Abhinav_Demos/non_zero.sci new file mode 100644 index 00000000..3e2b3ba9 --- /dev/null +++ b/demos/Abhinav_Demos/non_zero.sci @@ -0,0 +1,15 @@ + +// Test file for "nonzero" function for the data types double, float, double complex, uint16 + +function non_zero() + a=[12,4,4; 12,51,6] // double array + disp(nnz(a)) + b=0 //double scalar + disp(nnz(b)) + f= float(a) //float array + disp(nnz(f)) + z=%i*2+0 // doubleComplex scalar + disp(nnz(z)) + + +endfunction diff --git a/demos/Abhinav_Demos/nth_root.sci b/demos/Abhinav_Demos/nth_root.sci new file mode 100644 index 00000000..13e4223e --- /dev/null +++ b/demos/Abhinav_Demos/nth_root.sci @@ -0,0 +1,23 @@ +// Test file for "nthroot" function for the data types double, float, double complex. + + +function nth_root() + b= [1,2,3,4;5,6,7,8] + c=[45,12,4,12; 23,34,5,6] + d= nthroot(b,c) +disp(d) +disp('') +e=34 +f= nthroot(b,e) +disp(f) +disp('') +k=nthroot(3.2123,12) +disp(k) +disp('') + +m= float(b) +l= float(c) +disp(nthroot(m,l)) + + +endfunction diff --git a/demos/Abhinav_Demos/nthroot1.sci b/demos/Abhinav_Demos/nthroot1.sci deleted file mode 100644 index 201338b3..00000000 --- a/demos/Abhinav_Demos/nthroot1.sci +++ /dev/null @@ -1,23 +0,0 @@ -// Test file for "nthroot" function for the data types double, float, double complex. - - -function nthroot1() - b= [1,2,3,4;5,6,7,8] - c=[45,12,4,12; 23,34,5,6] - d= nthroot(b,c) -disp(d) -disp('') -e=34 -f= nthroot(b,e) -disp(f) -disp('') -k=nthroot(3.2123,12) -disp(k) -disp('') - -m= float(b) -l= float(c) -disp(nthroot(m,l)) - - -endfunction diff --git a/demos/Abhinav_Demos/row.sci b/demos/Abhinav_Demos/row.sci new file mode 100644 index 00000000..264b174a --- /dev/null +++ b/demos/Abhinav_Demos/row.sci @@ -0,0 +1,25 @@ +// Test file for "Column" function for the data types double, float, double complex, string , uint16. +// All the below statements are added to initialize variables in different data types +//The function written doesn't work for string or character scalar as of now. + + +function Row() + a=[1,2,3,4; 5,6,7,8; 98,162,6587,0] + disp( isrow(a)) + disp('') + b= float(a) + disp(isrow(b)) + c= [1,2,34,5] + d= uint16(c) + disp(isrow(d)) + disp('') + f= [1;2;3;4] + disp(isrow(f)) + disp('') + u= uint16(c) + disp(isrow(u)) + disp('') + g= [%i*1; 7] + disp(isrow(g)) + disp('') +endfunction diff --git a/includes/sci2clib.h b/includes/sci2clib.h index caad1f1d..a3cb8f50 100644 --- a/includes/sci2clib.h +++ b/includes/sci2clib.h @@ -619,6 +619,9 @@ extern "C" { /* interfacing median */ #include "median.h" #include "int_median.h" +/* interfacing nanmedian */ +#include "nanmedian.h" +#include "int_nanmedian.h" /* interfacing mad */ #include "mad.h" #include "int_mad.h" diff --git a/jar/scilab_en_US_help.jar b/jar/scilab_en_US_help.jar index cb24dadd..eedd25c7 100644 Binary files a/jar/scilab_en_US_help.jar and b/jar/scilab_en_US_help.jar differ diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index 436d8bc1..44e36a29 100644 --- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -1028,6 +1028,15 @@ PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); +PrintStringInfo('NIN= 1',ClassFileName,'file','y'); +PrintStringInfo('NOUT= 2',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(2)= ''1''',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(1)= ''1''',ClassFileName,'file','y'); +PrintStringInfo('OUT(1).SZ(2)= ''2''',ClassFileName,'file','y'); + PrintStringInfo('NIN= 2',ClassFileName,'file','y'); PrintStringInfo('NOUT= 1',ClassFileName,'file','y'); PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y'); @@ -1036,6 +1045,7 @@ PrintStringInfo('OUT(1).SZ(2)= FA_SZ_SEL2(IN(1).SZ(2),IN(2).VAL)',ClassFileName, //---Function list class. ---- ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls); PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y'); +PrintStringInfo('d2'+ArgSeparator+'d0d2',ClassFileName,'file','y'); PrintStringInfo('d2g2'+ArgSeparator+'d2',ClassFileName,'file','y'); PrintStringInfo('s2'+ArgSeparator+'s0',ClassFileName,'file','y'); PrintStringInfo('s2g2'+ArgSeparator+'s2',ClassFileName,'file','y'); @@ -1046,6 +1056,14 @@ FunctionName = 'nanmax'; PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); + +// --- Annotation Function And Function List Function. --- +FunctionName = 'nanmin'; +PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); + + // ------------------- // --- Class Issquare. --- // ------------------- @@ -1982,6 +2000,11 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); +FunctionName = 'nanmedian'; // BJ : Done AS : Float_Done +PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); +INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun); + FunctionName = 'st_deviation'; // BJ : Not implemented PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y'); INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun); diff --git a/macros/findDeps/getAllHeaders.sci b/macros/findDeps/getAllHeaders.sci index 90b80dfc..a8a2e477 100644 --- a/macros/findDeps/getAllHeaders.sci +++ b/macros/findDeps/getAllHeaders.sci @@ -146,6 +146,7 @@ function allHeaders = getAllHeaders(SharedInfo) "src/c/statisticsFunctions/includes/sum.h" "src/c/statisticsFunctions/includes/mean.h" "src/c/statisticsFunctions/includes/median.h" + "src/c/statisticsFunctions/includes/nanmedian.h" "src/c/statisticsFunctions/includes/mad.h" "src/c/statisticsFunctions/includes/meanf.h" "src/c/statisticsFunctions/includes/stdevf.h" diff --git a/macros/findDeps/getAllInterfaces.sci b/macros/findDeps/getAllInterfaces.sci index 49829000..74acfe40 100644 --- a/macros/findDeps/getAllInterfaces.sci +++ b/macros/findDeps/getAllInterfaces.sci @@ -135,6 +135,7 @@ function allInterfaces = getAllInterfaces(SharedInfo) "src/c/elementaryFunctions/interfaces/int_isequal.h" "src/c/statisticsFunctions/interfaces/int_mean.h" "src/c/statisticsFunctions/interfaces/int_median.h" + "src/c/statisticsFunctions/interfaces/int_nanmedian.h" "src/c/statisticsFunctions/interfaces/int_mad.h" "src/c/statisticsFunctions/interfaces/int_meanf.h" "src/c/statisticsFunctions/interfaces/int_stdevf.h" diff --git a/macros/findDeps/getAllSources.sci b/macros/findDeps/getAllSources.sci index cbb0a1ec..6558f55a 100644 --- a/macros/findDeps/getAllSources.sci +++ b/macros/findDeps/getAllSources.sci @@ -811,6 +811,7 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/elementaryFunctions/pmodulo/i16pmodulos.c" "src/c/elementaryFunctions/pmodulo/i16pmoduloa.c" "src/c/elementaryFunctions/nanmax/dnanmaxa.c" + "src/c/elementaryFunctions/nanmax/dnanmax1a.c" "src/c/elementaryFunctions/nanmax/dnanmaxcola.c" "src/c/elementaryFunctions/nanmax/dnanmaxrowa.c" "src/c/elementaryFunctions/nanmax/snanmaxa.c" @@ -954,6 +955,18 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/statisticsFunctions/median/zmediana.c" "src/c/statisticsFunctions/median/zmediancola.c" "src/c/statisticsFunctions/median/zmedianrowa.c" + "src/c/statisticsFunctions/nanmedian/dnanmediana.c" + "src/c/statisticsFunctions/nanmedian/dnanmedianrowa.c" + "src/c/statisticsFunctions/nanmedian/dnanmediancola.c" + "src/c/statisticsFunctions/nanmedian/snanmediana.c" + "src/c/statisticsFunctions/nanmedian/snanmedianrowa.c" + "src/c/statisticsFunctions/nanmedian/snanmediancola.c" + //"src/c/statisticsFunctions/nanmedian/u16nanmediana.c" + //"src/c/statisticsFunctions/nanmedian/u16nanmedianrowa.c" + //"src/c/statisticsFunctions/nanmedian/u16nanmediancola.c" + //"src/c/statisticsFunctions/nanmedian/znanmediana.c" + //"src/c/statisticsFunctions/nanmedian/znanmediancola.c" + //"src/c/statisticsFunctions/nanmedian/znanmedianrowa.c" "src/c/statisticsFunctions/mad/dmada.c" "src/c/statisticsFunctions/mad/dmadrowa.c" "src/c/statisticsFunctions/mad/dmadcola.c" diff --git a/src/c/elementaryFunctions/interfaces/int_nanmax.h b/src/c/elementaryFunctions/interfaces/int_nanmax.h index dd3df71d..45dd55e5 100644 --- a/src/c/elementaryFunctions/interfaces/int_nanmax.h +++ b/src/c/elementaryFunctions/interfaces/int_nanmax.h @@ -13,8 +13,9 @@ #ifndef __INT_NANMAX_H__ #define __INT_NANMAX_H__ -#define d2nanmaxd0(in1, size) dnanmaxa(in1,size[0]* size[1]) -#define d2g2nanmaxd2(in1, size1, in2, size2, out) (in2[0]=='r') ? dnanmaxrowa(in1, size1[0], size1[1], out) : dnanmaxcola(in1, size1[0] , size1[1], out) +#define d2nanmaxd0(in1, size) dnanmaxa(in1,size[0]* size[1]) +//#define d2nanmaxd0d2(in1, size, out) dnanmaxa(in1,size[0], size[1], out) +#define d2g2nanmaxd2(in1, size1, in2, size2, out) (in2[0]=='r') ? dnanmaxrowa(in1, size1[0], size1[1], out) : dnanmaxcola(in1, size1[0] , size1[1], out) #define s2nanmaxs0(in1, size) snanmaxa(in1,size[0]* size[1]) #define s2g2nanmaxs2(in1, size1, in2, size2, out) (in2[0]=='r') ? snanmaxrowa(in1, size1[0], size1[1], out) : snanmaxcola(in1, size1[0] , size1[1], out) diff --git a/src/c/elementaryFunctions/nanmax/dnanmax1a.c b/src/c/elementaryFunctions/nanmax/dnanmax1a.c new file mode 100644 index 00000000..a0e7eede --- /dev/null +++ b/src/c/elementaryFunctions/nanmax/dnanmax1a.c @@ -0,0 +1,58 @@ +/* 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 +*/ + +#include +#include +#include +#include "nanmax.h" +#include "types.h" +double dnanmax1a(double* in, int row, int col, double* out) +{ +double high; +int ival=0; +for(int i=0; i high) + { + high= in[i]; + ival=i; + + } + + + } + + + } + +out[0]= ival%row +1; +out[1]= ival/row +1; + + + +return high; + +} diff --git a/src/c/elementaryFunctions/nanmax/znanmaxa.c b/src/c/elementaryFunctions/nanmax/znanmaxa.c deleted file mode 100644 index 6283bf16..00000000 --- a/src/c/elementaryFunctions/nanmax/znanmaxa.c +++ /dev/null @@ -1,57 +0,0 @@ -/* 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 -*/ - -#include -#include -#include -#include "nanmax.h" -#include "types.h" -#include "doubleComplex.h" -#include "abs.h" - -doubleComplex znanmaxa(doubleComplex* in, int size) -{ -doubleComplex high=0; int k=0; -for(int i=0; i zabss(high)) - { - high= in[i]; - - } - - - } - - - } - - -if(k != 0) -return high; -else -return - 0.0/0.0; -} diff --git a/src/c/elementaryFunctions/nanmax/znanmaxcola.c b/src/c/elementaryFunctions/nanmax/znanmaxcola.c deleted file mode 100644 index ffb96b20..00000000 --- a/src/c/elementaryFunctions/nanmax/znanmaxcola.c +++ /dev/null @@ -1,36 +0,0 @@ -/* 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 -*/ - - -#include "nanmax.h" -#include "types.h" -#include "uint16.h" -#include "doubleComplex.h" - -void znanmaxcola(doubleComplex *in, int row, int col, doubleComplex* out) -{ - doubleComplex inter[col]; - - -for(int i=0; i< row; i++) - { - for(int j=0 ; j< col; j++) - { - inter[j]= in[i+ (j*row)]; - - } - out[i]= znanmaxa( inter, col); - - } - - -} diff --git a/src/c/elementaryFunctions/nanmax/znanmaxrowa.c b/src/c/elementaryFunctions/nanmax/znanmaxrowa.c deleted file mode 100644 index e035e778..00000000 --- a/src/c/elementaryFunctions/nanmax/znanmaxrowa.c +++ /dev/null @@ -1,37 +0,0 @@ -/* 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 -*/ - - -#include "nanmax.h" -#include "types.h" -#include "uint16.h" -#include "doubleComplex.h" - -void znanmaxrowa(doubleComplex *in, int row, int col, doubleComplex* out) -{ - doubleComplex inter[row]; - - - -for(int i=0; i< col; i++) - { - for(int j=0 ; j< row; j++) - { - inter[j]= in[j+ (i*row)]; - - } - out[i]= znanmaxa( inter, row); - - } - - -} diff --git a/src/c/signalProcessing/interfaces/int_dct.h b/src/c/signalProcessing/interfaces/int_dct.h index ef58b48e..b5cbc282 100644 --- a/src/c/signalProcessing/interfaces/int_dct.h +++ b/src/c/signalProcessing/interfaces/int_dct.h @@ -17,7 +17,7 @@ -#define d2dctd2(in,size,out) ddcta(in,size[0],size[1],-1,out) +#define d2d2dctd2(in,size,out) ddcta(in,size[0],size[1],-1,out) #define d2d0dctd2(in,size,sign,out) ddcta(in,size[0],size[1],sign,out) diff --git a/src/c/statisticsFunctions/includes/nanmedian.h b/src/c/statisticsFunctions/includes/nanmedian.h new file mode 100644 index 00000000..85bbcf56 --- /dev/null +++ b/src/c/statisticsFunctions/includes/nanmedian.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 __NANMEDIAN_H__ +#define __NANMEDIAN_H__ + + +#include "types.h" +#include "doubleComplex.h" +#include "floatComplex.h" +#include "int16.h" + +#ifdef __cplusplus +extern "C" { +#endif + +double dnanmediana (double* , int); +void dnanmedianrowa (double*, int , int, double*); +void dnanmediancola (double*, int , int, double*); + +float snanmediana (float* , int); +void snanmedianrowa (float*, int , int, float*); +void snanmediancola (float*, int , int, float*); + + + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif diff --git a/src/c/statisticsFunctions/interfaces/int_nanmedian.h b/src/c/statisticsFunctions/interfaces/int_nanmedian.h new file mode 100644 index 00000000..26b74878 --- /dev/null +++ b/src/c/statisticsFunctions/interfaces/int_nanmedian.h @@ -0,0 +1,27 @@ + /*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 __INT_NANMEDIAN_H__ +#define __INT_NANMEDIAN_H__ + +#define d2nanmediand0(in1, size) dnanmediana(in1,size[0]* size[1]) +#define d2g2nanmediand2(in1, size1, in2, size2, out) (in2[0]=='r') ? dnanmedianrowa(in1, size1[0], size1[1], out) : dnanmediancola(in1, size1[0] , size1[1], out) + +#define s2nanmedians0(in1, size) snanmediana(in1,size[0]* size[1]) +#define s2g2nanmedians2(in1, size1, in2, size2, out) (in2[0]=='r') ? snanmedianrowa(in1, size1[0], size1[1], out) : snanmediancola(in1, size1[0] , size1[1], out) + + +//#define i160i160pmoduloi160(in1, in2) i16pmodulos(in1,in2) +//#define i162i162pmoduloi162(in1, size1, in2, size2, out) i16pmoduloa(in1,size1[0]*size1[1],in2, out) + + +#endif diff --git a/src/c/statisticsFunctions/nanmedian/dnanmediana.c b/src/c/statisticsFunctions/nanmedian/dnanmediana.c new file mode 100644 index 00000000..0fb7de12 --- /dev/null +++ b/src/c/statisticsFunctions/nanmedian/dnanmediana.c @@ -0,0 +1,51 @@ +/* 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 +*/ + +#include +#include +#include +#include "nanmedian.h" +#include "median.h" +#include "types.h" +double dnanmediana(double* in, int size) +{ + +double temp[size]; +double out; +int j=0; + +double a= 0.0/0.0; + + + + for(int i=0; i< size; i++) + { + if( !(isnan(in[i])) ) + { + temp[j]= in[i]; + j=j+1; + + + } + + + } + + +out= dmediana(temp, j); + +if(j=0) +return a; +else +return out; + +} diff --git a/src/c/statisticsFunctions/nanmedian/dnanmediancola.c b/src/c/statisticsFunctions/nanmedian/dnanmediancola.c new file mode 100644 index 00000000..37b3f128 --- /dev/null +++ b/src/c/statisticsFunctions/nanmedian/dnanmediancola.c @@ -0,0 +1,35 @@ +/* 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 +*/ + + +#include "nanmedian.h" +#include "types.h" +#include "uint16.h" + +void dnanmediancola(double *in, int row, int col, double* out) +{ + double inter[col]; + + +for(int i=0; i< row; i++) + { + for(int j=0 ; j< col; j++) + { + inter[j]= in[i+ (j*row)]; + + } + out[i]= dnanmediana( inter, col); + + } + + +} diff --git a/src/c/statisticsFunctions/nanmedian/dnanmedianrowa.c b/src/c/statisticsFunctions/nanmedian/dnanmedianrowa.c new file mode 100644 index 00000000..d24ba828 --- /dev/null +++ b/src/c/statisticsFunctions/nanmedian/dnanmedianrowa.c @@ -0,0 +1,36 @@ +/* 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 +*/ + + +#include "nanmedian.h" +#include "types.h" +#include "uint16.h" + +void dnanmedianrowa(double *in, int row, int col, double* out) +{ + double inter[row]; + + + +for(int i=0; i< col; i++) + { + for(int j=0 ; j< row; j++) + { + inter[j]= in[j+ (i*row)]; + + } + out[i]= dnanmediana( inter, row); + + } + + +} diff --git a/src/c/statisticsFunctions/nanmedian/snanmediana.c b/src/c/statisticsFunctions/nanmedian/snanmediana.c new file mode 100644 index 00000000..cddb990e --- /dev/null +++ b/src/c/statisticsFunctions/nanmedian/snanmediana.c @@ -0,0 +1,49 @@ +/* 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 +*/ + +#include +#include +#include +#include "nanmedian.h" +#include "median.h" +#include "types.h" +float snanmediana(float* in, int size) +{ + +float temp[size]; +float out; +int j=0; + +float a= 0.0/0.0; + + for(int i=0; i< size; i++) + { + if( !(isnan(in[i])) ) + { + temp[j]= in[i]; + j=j+1; + + + } + + + } + + +out= smediana(temp, j); + +if(j=0) +return a; +else +return out; + +} diff --git a/src/c/statisticsFunctions/nanmedian/snanmediancola.c b/src/c/statisticsFunctions/nanmedian/snanmediancola.c new file mode 100644 index 00000000..a8077f19 --- /dev/null +++ b/src/c/statisticsFunctions/nanmedian/snanmediancola.c @@ -0,0 +1,36 @@ +/* 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 +*/ + + +#include "nanmedian.h" +#include "mean.h" +#include "types.h" +#include "uint16.h" + +void snanmediancola(float *in, int row, int col, float* out) +{ + float inter[col]; + + +for(int i=0; i< row; i++) + { + for(int j=0 ; j< col; j++) + { + inter[j]= in[i+ (j*row)]; + + } + out[i]= snanmediana( inter, col); + + } + + +} diff --git a/src/c/statisticsFunctions/nanmedian/snanmedianrowa.c b/src/c/statisticsFunctions/nanmedian/snanmedianrowa.c new file mode 100644 index 00000000..47425e0f --- /dev/null +++ b/src/c/statisticsFunctions/nanmedian/snanmedianrowa.c @@ -0,0 +1,37 @@ +/* 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 +*/ + + +#include "nanmedian.h" +#include "mean.h" +#include "types.h" +#include "uint16.h" + +void snanmedianrowa(float *in, int row, int col, float* out) +{ + float inter[row]; + + + +for(int i=0; i< col; i++) + { + for(int j=0 ; j< row; j++) + { + inter[j]= in[j+ (i*row)]; + + } + out[i]= snanmediana( inter, row); + + } + + +} -- cgit