diff options
39 files changed, 1619 insertions, 22 deletions
diff --git a/includes/sci2clib.h b/includes/sci2clib.h index 0597e63..47ce35c 100644 --- a/includes/sci2clib.h +++ b/includes/sci2clib.h @@ -619,6 +619,14 @@ extern "C" { #include "buttmag.h" #include "int_buttmag.h" +/*interfacing kalm */ +#include "kalm.h" +#include "int_kalm.h" + +/*interfacing faurre */ +#include "faurre.h" +#include "int_faurre.h" + /*interfacing cheb1mag */ #include "cheb1mag.h" #include "int_cheb1mag.h" @@ -675,6 +683,9 @@ extern "C" { /* interfacing median */ #include "median.h" #include "int_median.h" +/* interfacing mvcorrel */ +#include "mvcorrel.h" +#include "int_mvcorrel.h" /* interfacing gsort */ #include "gsort.h" #include "int_gsort.h" @@ -684,6 +695,9 @@ extern "C" { /* interfacing nanmedian */ #include "nanmedian.h" #include "int_nanmedian.h" +/* interfacing strange */ +#include "strange.h" +#include "int_strange.h" /* interfacing nanstdev */ #include "nanstdev.h" #include "int_nanstdev.h" diff --git a/jar/scilab_en_US_help.jar b/jar/scilab_en_US_help.jar Binary files differindex 7abb680..2f7977e 100644 --- a/jar/scilab_en_US_help.jar +++ b/jar/scilab_en_US_help.jar diff --git a/macros/ASTManagement/AST2Ccode.sci b/macros/ASTManagement/AST2Ccode.sci index 20aa999..d44a339 100644 --- a/macros/ASTManagement/AST2Ccode.sci +++ b/macros/ASTManagement/AST2Ccode.sci @@ -16,7 +16,6 @@ function AST2Ccode(FileInfoDatFile) // Copyright 2007 Raffaele Nutricato. // Contact: raffaele.nutricato@tiscali.it // ----------------------------------------------------------------- - // ------------------------------ // --- Check input arguments. --- // ------------------------------ @@ -75,7 +74,6 @@ FName = null ASTFileName = FileInfo.Funct(nxtscifunnumber).ASTFileName; - // ----------------------- // --- Initialization. --- // ----------------------- @@ -121,7 +119,6 @@ AST_PushASTStack('Dummy'); SharedInfo.UsedTempScalarVars = OrigUsedTempScalarVars; //NUT: put here a manageeol so that you can have all the save and load you want. SharedInfo.ASTReader.UsedTempVars = 0; - // ---------------------------------- // --- Main loop to read the AST. --- // ---------------------------------- @@ -137,7 +134,6 @@ while ~meof(fidAST) if STACKDEDUG == 1 disp('Read AST Line: '+treeline); end - // Analyze line. select treeline @@ -179,7 +175,6 @@ while ~meof(fidAST) end disp_isthere = 0; FName = null - case 'Equal' then SharedInfo.Equal.Enabled = 1; // 1 means enabled -> we are inside an equal AST block. AST_PushASTStack(treeline); @@ -218,7 +213,6 @@ while ~meof(fidAST) end AST_PushASTStack(treeline); end - // ---------------- // --- If/Else. --- // ---------------- @@ -237,7 +231,6 @@ while ~meof(fidAST) SharedInfo = C_IfElseBlocks(FileInfo,SharedInfo,'out'); end SharedInfo.CountNestedIf = 0; - // -------------- // --- Dummy. --- // -------------- @@ -254,7 +247,6 @@ while ~meof(fidAST) disp_isthere = 0; //NUT: per essere precisi si puo' pensare di mettere un check //NUT: alla fine dell'albero per accertarsi che c'e' end program li' dove ce lo aspettiamo - // ------------ // --- For. --- // ------------ @@ -316,7 +308,6 @@ SharedInfo.Function_list = SharedInfo.Function_list(1:SharedInfo.Function_list_i - // -------------------------------------- // --- End main loop to read the AST. --- // -------------------------------------- diff --git a/macros/ASTManagement/AST_HandleEndGenFun.sci b/macros/ASTManagement/AST_HandleEndGenFun.sci index 79ec976..455cd40 100644 --- a/macros/ASTManagement/AST_HandleEndGenFun.sci +++ b/macros/ASTManagement/AST_HandleEndGenFun.sci @@ -348,8 +348,8 @@ NOutArg_mod = NOutArg OutArg(1).FindLike = InArg(1).FindLike; OutArg(1).Scope = 'Number_d'; else - OutArg = FA_GetOutArgInfo(InArg,NInArg,OutArg,NOutArg,SharedInfo,FunPrecSpecifier,FunTypeAnnot,FunSizeAnnot,ReportFileName,ASTFunName); - end + OutArg = FA_GetOutArgInfo(InArg,NInArg,OutArg,NOutArg,SharedInfo,FunPrecSpecifier,FunTypeAnnot,FunSizeAnnot,ReportFileName,ASTFunName); +end // #RNU_RES_B // --- Generate the names for the output arguments. --- diff --git a/macros/FunctionAnnotation/FA_GetOutArgInfo.sci b/macros/FunctionAnnotation/FA_GetOutArgInfo.sci index 4d1113e..284f4a2 100644 --- a/macros/FunctionAnnotation/FA_GetOutArgInfo.sci +++ b/macros/FunctionAnnotation/FA_GetOutArgInfo.sci @@ -95,15 +95,15 @@ for counterout = 1:NOutArg UpdatedOutArg(counterout).FindLike = -1;
end
- // #RNU_RES_B
- // When the size is given by e IN(x).VAL annotation we can have two cases:
- // IN(x).VAL is a number or IN(x).VAL is %nan. When it is %nan the
- // size is equal to the name of IN(x).
- // This is a dynamic memory extension of a local variable and for the moment
- // we issue an error according to SCI2C specifications
- // #RNU_RES_E
- //disp(FunSizeAnnot(2),FunSizeAnnot(1))
- //Ukasha
+// #RNU_RES_B
+// When the size is given by e IN(x).VAL annotation we can have two cases:
+// IN(x).VAL is a number or IN(x).VAL is %nan. When it is %nan the
+// size is equal to the name of IN(x).
+// This is a dynamic memory extension of a local variable and for the moment
+// we issue an error according to SCI2C specifications
+// #RNU_RES_E
+// disp(FunSizeAnnot(2),FunSizeAnnot(1))
+// Ukasha
// if ASTFunName == svd
// x=1;
// for i=1:InArg(1).Size(1)
diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index 59ad956..a67a558 100644 --- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -2377,6 +2377,11 @@ PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file', INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+FunctionName = 'strange'; // 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);
@@ -11185,6 +11190,121 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,Ex //------------------------------------
+//---- Class KALM --------------------
+//------------------------------------
+ClassName = 'KALM';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+
+
+PrintStringInfo('NIN= 8',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 4',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(4).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(2).SZ(2)',ClassFileName,'file','y');
+
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= IN(4).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= IN(4).SZ(1)',ClassFileName,'file','y');
+
+PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(1)= IN(2).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(2)= IN(2).SZ(2)',ClassFileName,'file','y');
+
+PrintStringInfo('OUT(4).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(4).SZ(1)= IN(3).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(4).SZ(2)= IN(3).SZ(2)',ClassFileName,'file','y');
+
+
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d2d2d2d2d2d2d2d2'+ArgSeparator+'d2d2d2d2',ClassFileName,'file','y');
+PrintStringInfo('z2z2z2z2z2z2z2z2'+ArgSeparator+'z2z2z2z2',ClassFileName,'file','y');
+
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'kalm';
+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 = 'wiener';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+//------------------------------------
+//---- Class MVCORREL --------------------
+//------------------------------------
+ClassName = 'MVCORREL';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+
+
+PrintStringInfo('NIN= 1',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 1',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(1).SZ(2)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(1).SZ(2)',ClassFileName,'file','y');
+
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d2'+ArgSeparator+'d2',ClassFileName,'file','y');
+PrintStringInfo('d0'+ArgSeparator+'d0',ClassFileName,'file','y');
+PrintStringInfo('d2'+ArgSeparator+'d0',ClassFileName,'file','y');
+PrintStringInfo('s2'+ArgSeparator+'s2',ClassFileName,'file','y');
+PrintStringInfo('s0'+ArgSeparator+'s0',ClassFileName,'file','y');
+PrintStringInfo('s2'+ArgSeparator+'s0',ClassFileName,'file','y');
+
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'mvcorrel';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+//------------------------------------
+//---- Class FAURRE --------------------
+//------------------------------------
+ClassName = 'FAURRE';
+
+// --- Class Annotation. ---
+PrintStringInfo(' Adding Class: '+ClassName+'.',GeneralReport,'file','y');
+ClassFileName = fullfile(SCI2CLibCAnnClsDir,ClassName+ExtensionCAnnCls);
+
+
+PrintStringInfo('NIN= 5',ClassFileName,'file','y');
+PrintStringInfo('NOUT= 3',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(1)= IN(4).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(1).SZ(2)= IN(4).SZ(1)',ClassFileName,'file','y');
+
+PrintStringInfo('OUT(2).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(1)= IN(5).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(2).SZ(2)= IN(5).SZ(2)',ClassFileName,'file','y');
+
+PrintStringInfo('OUT(3).TP= IN(1).TP',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(1)= IN(4).SZ(1)',ClassFileName,'file','y');
+PrintStringInfo('OUT(3).SZ(2)= IN(5).SZ(1)',ClassFileName,'file','y');
+
+
+ClassFileName = fullfile(SCI2CLibCFLClsDir,ClassName+ExtensionCFuncListCls);
+PrintStringInfo('d0d2d2d2d2'+ArgSeparator+'d2d2d2',ClassFileName,'file','y');
+PrintStringInfo('z0z2z2z2z2'+ArgSeparator+'z2z2z2',ClassFileName,'file','y');
+
+
+// --- Annotation Function And Function List Function. ---
+FunctionName = 'faurre';
+PrintStringInfo(' Adding Function: '+FunctionName+'.',GeneralReport,'file','y');
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,ExtensionCAnnFun);
+INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCFLFunDir,ClassName,GeneralReport,ExtensionCFuncListFun);
+
+
+//------------------------------------
//---- Class CHEB1MAG --------------------
//------------------------------------
ClassName = 'CHEB1MAG';
diff --git a/macros/findDeps/getAllHeaders.sci b/macros/findDeps/getAllHeaders.sci index 6ffc9aa..d564c5b 100644 --- a/macros/findDeps/getAllHeaders.sci +++ b/macros/findDeps/getAllHeaders.sci @@ -157,7 +157,9 @@ 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/mvcorrel.h" "src/c/statisticsFunctions/includes/nanmedian.h" + "src/c/statisticsFunctions/includes/strange.h" "src/c/statisticsFunctions/includes/gsort.h" "src/c/statisticsFunctions/includes/nanstdev.h" "src/c/statisticsFunctions/includes/mad.h" @@ -203,6 +205,9 @@ function allHeaders = getAllHeaders(SharedInfo) "src/c/signalProcessing/includes/zpch1.h" "src/c/signalProcessing/includes/zpch2.h" "src/c/signalProcessing/includes/buttmag.h" + "src/c/signalProcessing/includes/kalm.h" + "src/c/signalProcessing/includes/wiener.h" + "src/c/signalProcessing/includes/faurre.h" "src/c/signalProcessing/includes/cheb1mag.h" "src/c/signalProcessing/includes/cheb2mag.h" "src/c/signalProcessing/includes/sincd.h" diff --git a/macros/findDeps/getAllInterfaces.sci b/macros/findDeps/getAllInterfaces.sci index 633365c..4ede91e 100644 --- a/macros/findDeps/getAllInterfaces.sci +++ b/macros/findDeps/getAllInterfaces.sci @@ -146,7 +146,9 @@ function allInterfaces = getAllInterfaces(SharedInfo) "src/c/graphics/transforms/interfaces/int_scaling.h" "src/c/statisticsFunctions/interfaces/int_mean.h" "src/c/statisticsFunctions/interfaces/int_median.h" + "src/c/statisticsFunctions/interfaces/int_mvcorrel.h" "src/c/statisticsFunctions/interfaces/int_nanmedian.h" + "src/c/statisticsFunctions/interfaces/int_strange.h" "src/c/statisticsFunctions/interfaces/int_gsort.h" "src/c/statisticsFunctions/interfaces/int_nanstdev.h" "src/c/statisticsFunctions/interfaces/int_mad.h" @@ -201,6 +203,9 @@ function allInterfaces = getAllInterfaces(SharedInfo) "src/c/signalProcessing/interfaces/int_zpch1.h" "src/c/signalProcessing/interfaces/int_zpch2.h" "src/c/signalProcessing/interfaces/int_buttmag.h" + "src/c/signalProcessing/interfaces/int_kalm.h" + "src/c/signalProcessing/interfaces/int_wiener.h" + "src/c/signalProcessing/interfaces/int_faurre.h" "src/c/signalProcessing/interfaces/int_cheb1mag.h" "src/c/signalProcessing/interfaces/int_cheb2mag.h" "src/c/signalProcessing/interfaces/int_sincd.h" diff --git a/macros/findDeps/getAllSources.sci b/macros/findDeps/getAllSources.sci index 64f57fb..0adf0e4 100644 --- a/macros/findDeps/getAllSources.sci +++ b/macros/findDeps/getAllSources.sci @@ -1026,6 +1026,10 @@ 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/mvcorrel/dmvcorrela.c" + "src/c/statisticsFunctions/mvcorrel/dmvcorrel1a.c" + "src/c/statisticsFunctions/mvcorrel/smvcorrela.c" + "src/c/statisticsFunctions/mvcorrel/smvcorrel1a.c" "src/c/statisticsFunctions/stdev/dstdeva.c" "src/c/statisticsFunctions/stdev/dstdevrowa.c" "src/c/statisticsFunctions/stdev/dstdevcola.c" @@ -1041,6 +1045,15 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/statisticsFunctions/nanmedian/znanmediana.c" "src/c/statisticsFunctions/nanmedian/znanmediancola.c" "src/c/statisticsFunctions/nanmedian/znanmedianrowa.c" + "src/c/statisticsFunctions/strange/dstrangea.c" + "src/c/statisticsFunctions/strange/dstrangerowa.c" + "src/c/statisticsFunctions/strange/dstrangecola.c" + "src/c/statisticsFunctions/strange/sstrangea.c" + "src/c/statisticsFunctions/strange/sstrangerowa.c" + "src/c/statisticsFunctions/strange/sstrangecola.c" + "src/c/statisticsFunctions/strange/u16strangea.c" + "src/c/statisticsFunctions/strange/u16strangerowa.c" + "src/c/statisticsFunctions/strange/u16strangecola.c" "src/c/statisticsFunctions/gsort/dgsorta.c" "src/c/statisticsFunctions/gsort/dgsortrowa.c" "src/c/statisticsFunctions/gsort/dgsortcola.c" @@ -1339,6 +1352,9 @@ function allSources = getAllSources(SharedInfo,BuildTool) "src/c/signalProcessing/zpch1/dzpch1s.c" "src/c/signalProcessing/zpch2/dzpch2s.c" "src/c/signalProcessing/buttmag/dbuttmags.c" + "src/c/signalProcessing/kalm/dkalma.c" + //"src/c/signalProcessing/wiener/dwienera.c" + "src/c/signalProcessing/faurre/dfaurrea.c" "src/c/signalProcessing/cheb1mag/dcheb1mags.c" "src/c/signalProcessing/cheb2mag/dcheb2mags.c" "src/c/signalProcessing/sincd/dsincds.c" diff --git a/src/c/interpolation/interpln/dinterplna.c b/src/c/interpolation/interpln/dinterplna.c new file mode 100644 index 0000000..76cd7f8 --- /dev/null +++ b/src/c/interpolation/interpln/dinterplna.c @@ -0,0 +1,29 @@ +/* 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 "interpln.h" +#include "stdio.h" +#include "matrixInversion.h" +#include "matrixTranspose.h" + +void dinterplna(double* xyd, int nd, double* x, int x_row, int x_col) +{ + int md=2; + int n= x_col*x_row; + + + + +} + + diff --git a/src/c/interpolation/interpln/sinterp13a.c b/src/c/interpolation/interpln/sinterp13a.c new file mode 100644 index 0000000..b8cb085 --- /dev/null +++ b/src/c/interpolation/interpln/sinterp13a.c @@ -0,0 +1,75 @@ +/* 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: Ukasha Noor + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + + +#include "interp1.h" +#include <string.h> + +void sinterp13a(float *x,int size1,float *fx,int size2,float *q,int size3,char *ch,int size4,float *out) +{ + int i,j,k,f; + float a,b; + if(strcmp(ch,"linear")==0) + { + for(i=0;i<size3;i++) + { + f=0; + for(j=0;j<size1;j++) + { + if(q[i]==x[j]) + { + out[i]=fx[j]; + f=1; + break; + } + } + if(f==0) + { + j=0; + while(q[i]>x[j]) + { + j++; + } + a=x[j-1]; + b=x[j]; + out[i]=fx[j-1]+(q[i]-a)*((fx[j]-fx[j-1])/(b-a)); + } + } + } + else if(strcmp(ch,"nearest")==0) + { + for(i=0;i<size3;i++) + { + f=0; + for(j=0;j<size1;j++) + { + if(q[i]==x[j]) + { + out[i]=fx[j]; + f=1; + break; + } + } + if(f==0) + { + j=0; + while(q[i]>x[j]) + { + j++; + } + out[i]=fx[j]; + } + } + } +} + + diff --git a/src/c/signalProcessing/faurre/dfaurrea.c b/src/c/signalProcessing/faurre/dfaurrea.c new file mode 100644 index 0000000..04d5a69 --- /dev/null +++ b/src/c/signalProcessing/faurre/dfaurrea.c @@ -0,0 +1,112 @@ +/* Copyright (C) 2017 - 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 + */ + +/*Funtion to find faurre */ + +#include "lapack.h" +#include "stdlib.h" +#include "string.h" +#include "faurre.h" +#include "matrixTranspose.h" +#include "matrixMultiplication.h" +#include "matrixInversion.h" +#include "addition.h" +#include "subtraction.h" +#include "eye.h" +#include "matrixDivision.h" + +void dfaurrea(int n, double* H, int H_row, int H_col, double* F, int F_row, int F_col, double* G, int G_row, int G_col, double * R0, int R0_row, int R0_col, double* P, double *R , double* T ) +{ + +/*Variable Declaration Start*/ + double R0_inv[R0_row* R0_col]; + double temp1[G_row* R0_col]; + double Pn[G_row* G_row]; + double Pn_temp[G_row*G_row]; + double G_trans[G_col*G_row]; + double H_trans[H_col*H_row]; + double F_trans[F_col*F_row]; + double A_trans[G_col*G_row]; + double temp2[F_row*G_row]; + double temp3[F_row*H_row]; + double A[G_row*G_col]; + double temp4[H_row*G_row]; + double temp5[H_row*H_row]; + double temp6[R0_row*R0_col]; + double temp7[G_row*R0_row]; + double temp8[G_row*G_row]; + double temp9[F_row*F_col]; + double temp10[H_row*G_row]; + double temp11[H_row*H_row]; + double temp12[F_row*G_row]; + double temp13[F_row*H_row]; + double temp14[G_row*G_col]; +/*Variable Declaration End*/ + + dinverma(R0, R0_inv, R0_row); //R0_inv= inv(R0) + dmulma(G, G_row, G_col, R0_inv, R0_row, R0_col, temp1); //temp1= G* inv(R0) + dtransposea(G, G_row, G_col, G_trans); //G_trans= G' + dmulma(temp1, G_row, R0_col, G_trans, G_col, G_row, Pn ); // Pn= G* inv(R0)* G' + dtransposea(H, H_row, H_col, H_trans); //H_trans= H' + dtransposea(F, F_row, F_col, F_trans); //F_trans= F' + +/*//Debug Only*/ +/* for(int i=0; i< G_row*G_row; i++)*/ +/* printf("Before loop Pn[%d]= %lf \t", i, Pn[i]);*/ +/* printf("\n");*/ + + for(int i=1;i <= n ; i++) + { + dmulma(F, F_row, F_col, Pn, G_row, G_row, temp2); //temp2= F*Pn; + dmulma(temp2, F_row, G_row, H_trans, H_col, H_row, temp3); //temp3= F*Pn*H' + ddiffa( G, G_row*G_col, temp3, F_row*H_row, A); //A = G- F*Pn*H' + dtransposea(A, G_row, G_col, A_trans); //A_trans= A' + dmulma(H, H_row, H_col, Pn, G_row, G_row, temp4); //temp4= H*Pn + dmulma(temp4, H_row, G_row, H_trans, H_col, H_row, temp5 ); //temp5= H*Pn*H' + ddiffa(R0, R0_row*R0_col, temp5, H_row*H_row,temp6 ); //temp6= R0-H*Pn*H' + drdivma(A,G_row, G_col, temp6, R0_row, R0_col, temp7); //temp7= A / (R0-H*Pn*H') + dmulma(temp7, G_row, R0_row, A_trans, G_col, G_row, temp8); //temp8 = A / (R0-H*Pn*H')*A' + dmulma(temp2, F_row, G_row, F_trans, F_col, F_row, temp9); //temp9= F*Pn*F' + dadda(temp9, F_row*F_col,temp8,G_row*G_row, Pn_temp); //Pn_temp = F*Pn*F'+ A / (R0-H*Pn*H')*A' + for(int j=0; j< G_row*G_row; j++) + Pn[j]= Pn_temp[j]; + + } + +/* //Debug Only*/ +/* for(int i=0; i< G_row*G_row; i++)*/ +/* printf("Afterloop Pn[%d]= %lf \t", i, Pn[i]);*/ +/* printf("\n");*/ + + for(int j=0; j< G_row*G_row; j++) + P[j]= Pn[j]; + + dmulma(H, H_row, H_col, P, G_row, G_row, temp10); //temp10= H*P + dmulma(temp10, H_row, G_row, H_trans, H_col, H_row, temp11 ); //temp11= H*P*H' + ddiffa(R0, R0_row*R0_col, temp11, H_row*H_row, R ); //R= R0-H*P*H' + +/* //Debug Only*/ +/* for(int i=0; i< H_row*H_row; i++)*/ +/* printf("R[%d]= %lf \t", i, R[i]);*/ +/* printf("\n");*/ + + dmulma(F, F_row, F_col, P, G_row, G_row, temp12); //temp12= F*P; + dmulma(temp12, F_row, G_row, H_trans, H_col, H_row, temp13); //temp13= F*P*H' + ddiffa( G, G_row*G_col, temp13, F_row*H_row, temp14); //temp14 = G- F*P*H' + drdivma(temp14,G_row, G_col, R, R0_row, R0_col, T); //T= (G-F*P*H')/ R + +/* //Debug Only*/ +/* for(int i=0; i< G_row*R0_row; i++)*/ +/* printf("T[%d]= %lf \t", i, T[i]);*/ +/* printf("\n");*/ + +} diff --git a/src/c/signalProcessing/hank/dhanka.c b/src/c/signalProcessing/hank/dhanka.c index 37008fd..5cef7f3 100644 --- a/src/c/signalProcessing/hank/dhanka.c +++ b/src/c/signalProcessing/hank/dhanka.c @@ -43,7 +43,7 @@ for(int i=1; i< mr+1; i= i+row) { temp1[j]=i; j++; - printf("%d", i); + //printf("%d", i); } for(int j=0;j< nr; j++) temp2[j]=j; @@ -65,7 +65,7 @@ for(int i=0; i< m*nr; i++) } } - +//Debug Only /* printf("ones1\n"); for(int k=0; k<1*nr; k++) diff --git a/src/c/signalProcessing/includes/faurre.h b/src/c/signalProcessing/includes/faurre.h new file mode 100644 index 0000000..e4a2de3 --- /dev/null +++ b/src/c/signalProcessing/includes/faurre.h @@ -0,0 +1,29 @@ +/* Copyright (C) 2017 - 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 __FAURRE_H__ +#define __FAURRE_H__ +#include "types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void dfaurrea(int n, double* H, int H_row, int H_col, double* F, int F_row, int F_col, double* G, int G_row, int G_col, double * R0, int R0_row, int R0_col, double * P, double* R, double* T); + + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* __FAURRE_H__ */ + diff --git a/src/c/signalProcessing/includes/kalm.h b/src/c/signalProcessing/includes/kalm.h new file mode 100644 index 0000000..6f73ac1 --- /dev/null +++ b/src/c/signalProcessing/includes/kalm.h @@ -0,0 +1,30 @@ +/* Copyright (C) 2017 - 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 __KALM_H__ +#define __KALM_H__ +#include "types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void dkalma(double* y, int y_row, int y_col, double* x0, int x0_row, int x0_col, double* p0, int p0_row, int p0_col, double* f, int f_row, int f_col, double* g, int g_row, int g_col, double* h, int h_row, int h_col, double* q, int q_row, int q_col, double* r, int r_row, int r_col, double* x1, double* p1, double* x, double* p); + + + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* __KALM_H__ */ + diff --git a/src/c/signalProcessing/includes/wiener.h b/src/c/signalProcessing/includes/wiener.h new file mode 100644 index 0000000..ba77526 --- /dev/null +++ b/src/c/signalProcessing/includes/wiener.h @@ -0,0 +1,30 @@ +/* Copyright (C) 2017 - 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 __WEINER_H__ +#define __WEINER_H__ +#include "types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void dwienera(double* y, int y_row, int y_col, double* x0, int x0_row, int x0_col, double* p0, int p0_row, int p0_col, double* f, int f_row, int f_col, double* g, int g_row, int g_col, double* h, int h_row, int h_col, double* q, int q_row, int q_col, double* r, int r_row, int r_col, double* xs, double* ps, double* xf, double* pf); + + + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /* __WEINER_H__ */ + diff --git a/src/c/signalProcessing/interfaces/int_faurre.h b/src/c/signalProcessing/interfaces/int_faurre.h new file mode 100644 index 0000000..e527a63 --- /dev/null +++ b/src/c/signalProcessing/interfaces/int_faurre.h @@ -0,0 +1,20 @@ +/* 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 __INT_FAURRE_H__ +#define __INT_FAURRE_H__ + +#define d0d2d2d2d2faurred2d2d2(in1,in2, size2, in3, size3, in4, size4, in5, size5,out1, out2, out3) \ + dfaurrea(in1,in2, size2[0], size2[1],in3, size3[0], size3[1],in4, size4[0], size4[1],in5, size5[0], size5[1], out1, out2, out3) + + +#endif /* !INT_FAURRE_H__! */ diff --git a/src/c/signalProcessing/interfaces/int_kalm.h b/src/c/signalProcessing/interfaces/int_kalm.h new file mode 100644 index 0000000..b4369c9 --- /dev/null +++ b/src/c/signalProcessing/interfaces/int_kalm.h @@ -0,0 +1,20 @@ +/* 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 __INT_KALM_H__ +#define __INT_KALM_H__ + +#define d2d2d2d2d2d2d2d2kalmd2d2d2d2(in1, size1, in2, size2, in3, size3, in4, size4, in5, size5, in6, size6, in7, size7, in8, size8, out1, out2, out3, out4) \ + dkalma(in1, size1[0], size1[1],in2, size2[0], size2[1],in3, size3[0], size3[1],in4, size4[0], size4[1],in5, size5[0], size5[1] ,\ + in6, size6[0], size6[1],in7, size7[0], size7[1],in8, size8[0], size8[1], out1, out2, out3, out4) + +#endif /* !INT_KALM_H__! */ diff --git a/src/c/signalProcessing/interfaces/int_weiner.h b/src/c/signalProcessing/interfaces/int_weiner.h new file mode 100644 index 0000000..daefcf0 --- /dev/null +++ b/src/c/signalProcessing/interfaces/int_weiner.h @@ -0,0 +1,20 @@ +/* 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 __INT_WIENER_H__ +#define __INT_WIENER_H__ + +#define d2d2d2d2d2d2d2d2wienerd2d2d2d2(in1, size1, in2, size2, in3, size3, in4, size4, in5, size5, in6, size6, in7, size7, in8, size8, out1, out2, out3, out4) \ + dwienera(in1, size1[0], size1[1],in2, size2[0], size2[1],in3, size3[0], size3[1],in4, size4[0], size4[1],in5, size5[0], size5[1] ,\ + in6, size6[0], size6[1],in7, size7[0], size7[1],in8, size8[0], size8[1], out1, out2, out3, out4) + +#endif /* !INT_WEINER_H__! */ diff --git a/src/c/signalProcessing/interfaces/int_wiener.h b/src/c/signalProcessing/interfaces/int_wiener.h new file mode 100644 index 0000000..daefcf0 --- /dev/null +++ b/src/c/signalProcessing/interfaces/int_wiener.h @@ -0,0 +1,20 @@ +/* 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 __INT_WIENER_H__ +#define __INT_WIENER_H__ + +#define d2d2d2d2d2d2d2d2wienerd2d2d2d2(in1, size1, in2, size2, in3, size3, in4, size4, in5, size5, in6, size6, in7, size7, in8, size8, out1, out2, out3, out4) \ + dwienera(in1, size1[0], size1[1],in2, size2[0], size2[1],in3, size3[0], size3[1],in4, size4[0], size4[1],in5, size5[0], size5[1] ,\ + in6, size6[0], size6[1],in7, size7[0], size7[1],in8, size8[0], size8[1], out1, out2, out3, out4) + +#endif /* !INT_WEINER_H__! */ diff --git a/src/c/signalProcessing/kalm/dkalma.c b/src/c/signalProcessing/kalm/dkalma.c new file mode 100644 index 0000000..d71a86a --- /dev/null +++ b/src/c/signalProcessing/kalm/dkalma.c @@ -0,0 +1,118 @@ +/* Copyright (C) 2017 - 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 + */ + +/*Function to find kalm */ + +#include "lapack.h" +#include "stdlib.h" +#include "stdio.h" +#include "string.h" +#include "kalm.h" +#include "matrixTranspose.h" +#include "matrixMultiplication.h" +#include "matrixInversion.h" +#include "addition.h" +#include "subtraction.h" +#include "eye.h" + +void dkalma(double* y, int y_row, int y_col, double* x0, int x0_row, int x0_col, double* p0, int p0_row, int p0_col, double* f, int f_row, int f_col, double* g, int g_row, int g_col, double* h, int h_row, int h_col, double* q, int q_row, int q_col, double* r, int r_row, int r_col, double* x1, double* p1, double* x, double* p) + +{ + double k[p0_row*h_row]; + double h_trans[h_col*h_row]; + double temp1[p0_row*h_row]; + double temp2[h_row*p0_col]; + double temp3[h_row*h_row]; + double temp4[h_row*h_row]; + double temp5[h_row*h_row]; + double temp6[p0_row*p0_col]; + double temp7[p0_row*h_col]; + double temp8[p0_row*p0_col]; + double f_trans[f_col*f_row]; + double g_trans[g_col*g_row]; + double temp9 [f_row*p0_col]; + double temp10[f_row*f_row]; + double temp11 [g_row*q_col]; + double temp12[g_row*g_row]; + double temp13[h_row*x0_col]; + double temp14[h_row*x0_col]; + double temp15[p0_row*x0_col]; + + + + dtransposea(h, h_row, h_col, h_trans); + dmulma(p0, p0_row, p0_col, h_trans, h_col, h_row, temp1); //temp1= p0*h' + dmulma(h, h_row, h_col, p0, p0_row, p0_col, temp2); //temp2= h*p0 + dmulma(temp2, h_row, p0_col, h_trans, h_col, h_row, temp3); //temp3= h*p0*h' + dadda(temp3, h_row*h_row, r, r_row*r_col, temp4); //temp4= h*p0*h'+r + +/*//Debug Only*/ +/* for(int i=0; i< h_row*h_row; i++)*/ +/* printf("temp4[%d] = %lf \t",i, temp4[i]);*/ +/* printf("\n");*/ + + dinverma(temp4, temp5, h_row); //temp5= (h*p0*h'+r)**(-1) + + dmulma(temp1, p0_row, h_row, temp5, h_row, h_row, k); //k=p0*h'*(h*p0*h'+r)**(-1) + +/*//Debug Only*/ +/* for(int i=0; i< p0_row*h_row; i++)*/ +/* printf("k[%d] = %lf \t",i, k[i]);*/ +/* printf("\n");*/ + + + deyea(temp6, p0_row, p0_col); //temp6 = eye(p0) + dmulma(k, p0_row, h_row, h, h_row, h_col, temp7); //temp7 = k*h + ddiffa(temp6, p0_row*p0_col, temp7, p0_row*h_col, temp8); //temp8= eye(p0)- k*h + dmulma(temp8, p0_row, p0_col, p0, p0_row, p0_col, p); //p=(eye(p0)-k*h)*p0 + +/*//Debug Only*/ +/* for(int i=0; i< p0_row*p0_col; i++)*/ +/* printf("p[%d] = %lf \t",i, p[i]);*/ +/* printf("\n");*/ + + + dtransposea(g, g_row, g_col, g_trans); + dtransposea(f, f_row, f_col, f_trans); + dmulma(f, f_row, f_col, p, p0_row, p0_col, temp9); //temp9= f*p + dmulma(temp9, f_row, p0_col, f_trans, f_col, f_row, temp10); //temp10= f*p*f' + dmulma(g, g_row, g_col, q, q_row, q_col, temp11); //temp11= g*q + dmulma(temp11, g_row, q_col, g_trans, g_col, g_row, temp12); //temp12= g*q*g' + dadda(temp10, f_row*f_row, temp12, g_row*g_row, p1); //p1=f*p*f'+g*q*g' + +/* //Debug Only*/ +/* for(int i=0; i< f_row*f_row; i++)*/ +/* printf("p1[%d] = %lf \t",i, p1[i]);*/ +/* printf("\n");*/ + + + dmulma(h, h_row, h_col, x0, x0_row, x0_col, temp13); //temp13= h*x0 + ddiffa(y, y_row*y_col, temp13, h_row*x0_col, temp14); //temp14= y-h*x0 + dmulma(k, p0_row, h_row, temp14, h_row, x0_col, temp15); //temp15= k*(y-h*x0) + dadda(x0, x0_row*x0_col, temp15, p0_row*x0_col, x); //x=x0+k*(y-h*x0) + +/* //Debug Only*/ +/* for(int i=0; i< x0_row*x0_col; i++)*/ +/* printf("x[%d] = %lf \t",i, x[i]);*/ +/* printf("\n");*/ + + + dmulma(f, f_row, f_col, x, x0_row, x0_col, x1) ; //x1= f*x + +/* //Debug Only*/ +/* for(int i=0; i< f_row*x0_col; i++)*/ +/* printf("x1[%d] = %lf \t",i, x1[i]);*/ +/* printf("\n");*/ + + + +} diff --git a/src/c/signalProcessing/wiener/dwienera.c b/src/c/signalProcessing/wiener/dwienera.c new file mode 100644 index 0000000..18f49bc --- /dev/null +++ b/src/c/signalProcessing/wiener/dwienera.c @@ -0,0 +1,166 @@ +/* Copyright (C) 2017 - 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 + */ + +/*Function to find kalm */ + +#include "lapack.h" +#include "stdlib.h" +#include "stdio.h" +#include "string.h" +#include "wiener.h" +#include "kalm.h" +#include "matrixTranspose.h" +#include "matrixMultiplication.h" +#include "matrixInversion.h" +#include "addition.h" +#include "subtraction.h" +#include "eye.h" + +void dwienera(double* y, int y_row, int y_col, double* x0, int x0_row, int x0_col, double* p0, int p0_row, int p0_col, double* f, int f_row, int f_col, double* g, int g_row, int g_col, double* h, int h_row, int h_col, double* q, int q_row, int q_col, double* r, int r_row, int r_col, double* xs, double* ps, double* xf, double* pf) + +{ + +/* dtransposea(h, h_row, h_col, h_trans);*/ +/* dmulma(p0, p0_row, p0_col, h_trans, h_col, h_row, temp1); //temp1= p0*h'*/ +/* dmulma(h, h_row, h_col, p0, p0_row, p0_col, temp2); //temp2= h*p0*/ +/* dmulma(temp2, h_row, p0_col, h_trans, h_col, h_row, temp3); //temp3= h*p0*h'*/ +/* dadda(temp3, h_row*h_row, r, r_row*r_col, temp4); //temp4= h*p0*h'+r*/ + + int n= x0_row, x0j= x0_col, m= y_row, tf= y_col, to=1, k; + double ind_nk[n]; + double ind_mk[m]; + double xf1[x0_row*x0_col]; + double pf1[p0_row*p0_col]; + double yk[y_row*1]; + double fk[f_row*n]; + double gk[g_row*n]; + double hk[h_row*n]; + double qk[q_row*n]; + double rk[r_row*m]; + double x1[f_row*x0_col]; + double p1[f_row*f_row]; + double x[x0_row*x0_col]; + double p[p0_row*p0_col]; + + +for(int i=0; i< x0_row*x0_col; i++) + xf1[i]= x0[i]; + +for(int i=0; i< p0_row*p0_col; i++) + pf1[i]= p0[i]; + +for(k=t0; k<=tf; k++) +{ + int j=0; + for(int i=1+(k-1)*n; i<= k*n; i++) + { + ind_nk[j]= i; + j++; + } + + int j=0; + for(int i=1+(k-1)*m; i<= k*m; i++) + { + ind_mk[j]= i; + j++; + } + + for(int i=0; i< y_row; y++) + { + int j=k-1; + + yk[i]= y[i+j*y_row]; + + } +int l=0; + for(int i=0; i<n; i++) + { + for(int j=0; j< f_row; j++) + { + int k=ind_nk[i]-1; + + fk[l]= f[j+k*y_row]; + l++; + } + + + } + +int l=0; + for(int i=0; i<n; i++) + { + for(int j=0; j< g_row; j++) + { + int k=ind_nk[i]-1; + + gk[l]= g[j+k*y_row]; + l++; + } + + + } + +int l=0; + for(int i=0; i<n; i++) + { + for(int j=0; j< h_row; j++) + { + int k=ind_nk[i]-1; + + hk[l]= h[j+k*y_row]; + l++; + } + + + } + +int l=0; + for(int i=0; i<n; i++) + { + for(int j=0; j< q_row; j++) + { + int k=ind_nk[i]-1; + + qk[l]= q[j+k*y_row]; + l++; + } + + + } + +int l=0; + for(int i=0; i<m; i++) + { + for(int j=0; j< r_row; j++) + { + int k=ind_mk[i]-1; + + rk[l]= r[j+k*y_row]; + l++; + } + + + } + + +dkalma(yk, y_row, 1, x0, x0_row, x0_col, p0, p0_row, p0_col, fk, f_row, n, gk, g_row, n, hk, h_row, n, qk, q_row, n, rk, r_row, m, x1, p1, x, p); + + + + +} + + + + + +} diff --git a/src/c/statisticsFunctions/includes/mvcorrel.h b/src/c/statisticsFunctions/includes/mvcorrel.h new file mode 100644 index 0000000..f1ed94c --- /dev/null +++ b/src/c/statisticsFunctions/includes/mvcorrel.h @@ -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 +*/ + + +#ifndef __MVCORREL_H__ +#define __MVCORREL_H__ + +#include "types.h" +#include "doubleComplex.h" +#include "uint16.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void dmvcorrela(double* , int, int, double* ); +double dmvcorrel1a( int, int); + +void smvcorrela(float* , int, int, float* ); +float smvcorrel1a( int, int); + + + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__MVCORREL_H__*/ diff --git a/src/c/statisticsFunctions/includes/strange.h b/src/c/statisticsFunctions/includes/strange.h new file mode 100644 index 0000000..0c783ad --- /dev/null +++ b/src/c/statisticsFunctions/includes/strange.h @@ -0,0 +1,43 @@ +/* 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 __STRANGE_H__ +#define __STRANGE_H__ + + +#include "types.h" +#include "doubleComplex.h" +#include "floatComplex.h" +#include "uint16.h" + +#ifdef __cplusplus +extern "C" { +#endif + +double dstrangea (double* , int); +void dstrangerowa (double*, int , int, double*); +void dstrangecola (double*, int , int, double*); + +float sstrangea (float* , int); +void sstrangerowa (float*, int , int, float*); +void sstrangecola (float*, int , int, float*); + +uint16 u16strangea (uint16* , int); +void u16strangerowa (uint16*, int , int, uint16*); +void u16strangecola (uint16*, int , int, uint16*); + + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif diff --git a/src/c/statisticsFunctions/interfaces/int_mvcorrel.h b/src/c/statisticsFunctions/interfaces/int_mvcorrel.h new file mode 100644 index 0000000..481841f --- /dev/null +++ b/src/c/statisticsFunctions/interfaces/int_mvcorrel.h @@ -0,0 +1,33 @@ +/* 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 __INT_MVCORREL_H__ +#define __INT_MVCORREL_H__ + + +#ifdef __cplusplus +extern "C" { +#endif + +#define d2mvcorreld2(in1, size, out) dmvcorrela(in1, size[0] ,size[1], out) +#define d2mvcorreld0(in1, size) dmvcorrel1a( size[0], size[1] ) +#define d0mvcorreld0(in1) dmvcorrel1a( 1,1 ) + +#define s2mvcorrels2(in1, size, out) smvcorrela(in1, size[0] ,size[1], out) +#define s2mvcorrels0(in1, size) smvcorrel1a( size[0], size[1] ) +#define s0mvcorrels0(in1) smvcorrel1a( 1,1 ) + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__INT_MVCORREL_H__*/ diff --git a/src/c/statisticsFunctions/interfaces/int_strange.h b/src/c/statisticsFunctions/interfaces/int_strange.h new file mode 100644 index 0000000..133ec2b --- /dev/null +++ b/src/c/statisticsFunctions/interfaces/int_strange.h @@ -0,0 +1,26 @@ + /*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_STRANGE_H__ +#define __INT_STRANGE_H__ + +#define d2stranged0(in1, size) dstrangea(in1,size[0]* size[1]) +#define d2g2stranged2(in1, size1, in2, size2, out) (in2[0]=='r') ? dstrangerowa(in1, size1[0], size1[1], out) : dstrangecola(in1, size1[0] , size1[1], out) + +#define s2stranges0(in1, size) sstrangea(in1,size[0]* size[1]) +#define s2g2stranges2(in1, size1, in2, size2, out) (in2[0]=='r') ? sstrangerowa(in1, size1[0], size1[1], out) : sstrangecola(in1, size1[0] , size1[1], out) + +#define u162strangeu160(in1, size) u16strangea(in1,size[0]* size[1]) +#define u162g2strangeu162(in1, size1, in2, size2, out) (in2[0]=='r') ? u16strangerowa(in1, size1[0], size1[1], out) : u16strangecola(in1, size1[0] , size1[1], out) + + +#endif diff --git a/src/c/statisticsFunctions/mvcorrel/dmvcorrel1a.c b/src/c/statisticsFunctions/mvcorrel/dmvcorrel1a.c new file mode 100644 index 0000000..9971e0f --- /dev/null +++ b/src/c/statisticsFunctions/mvcorrel/dmvcorrel1a.c @@ -0,0 +1,34 @@ +/* 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 "mvcorrel.h" +#include "stdlib.h" +#include "stdio.h" +#include "types.h" +#include "uint16.h" +#include "zeros.h" +#include "sum.h" +#include "ones.h" +#include "matrixMultiplication.h" +#include "matrixTranspose.h" +#include "subtraction.h" +#include "division.h" + +double dmvcorrel1a(int lx, int cx) +{ + if(lx==1 && cx==1) + return 0; + + else + return 1; +} diff --git a/src/c/statisticsFunctions/mvcorrel/dmvcorrela.c b/src/c/statisticsFunctions/mvcorrel/dmvcorrela.c new file mode 100644 index 0000000..a1bacfd --- /dev/null +++ b/src/c/statisticsFunctions/mvcorrel/dmvcorrela.c @@ -0,0 +1,87 @@ +/* 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 "mvcorrel.h" +#include "stdlib.h" +#include "stdio.h" +#include "pow.h" +#include "division.h" +#include "types.h" +#include "uint16.h" +#include "zeros.h" +#include "sum.h" +#include "ones.h" +#include "matrixMultiplication.h" +#include "matrixTranspose.h" +#include "subtraction.h" +#include "division.h" + +void dmvcorrela(double *in, int lx, int cx, double* r) +{ + double temp1[1* cx]; + double xbar[1* cx]; + double temp2[lx*1]; + double temp3[lx*cx]; + double temp4[lx*cx]; + double temp4_trans[cx*lx]; + double temp5[1* cx]; + double temp6[lx*cx]; + double std[1*cx]; + double std_trans[cx*1]; + double temp7[cx*cx]; + double temp8[cx*cx]; + + donesa ( temp2 , lx , 1 ); //temp2= ones(lx,1) + + if(lx==1) + { + dzerosa ( r , cx ,cx ); //out= zeros(lx,cx) + + } + + else + { + + drowsuma(in, lx, cx, temp1); //temp1= sum(x, "r") + + for(int i=0; i< 1*cx; i++) + xbar[i]= drdivs(temp1[i], lx); // xbar= sum(x, "r")/ lx +/* //Debug Only*/ +/* for(int i= 0; i< 1*cx; i++)*/ +/* printf("xbar[%d]= %lf\t", i, xbar[i]);*/ +/* printf("\n");*/ + + dmulma(temp2, lx,1, xbar, 1, cx, temp3 ); //temp3= ones(lx,1)*xbar + ddiffa(in, lx*cx, temp3, lx*cx, temp4); //temp4= r= x-ones(lx,1)*xbar + for(int i=0; i< lx*cx; i++) + temp6[i]= dpows(temp4[i], 2); //temp6= r.^2 + drowsuma(temp6, lx, cx, temp5); //temp5= sum(r.^2, "r") + for(int i=0; i< 1*cx; i++) + std[i]= dpows(temp5[i], 0.5); //std=(sum(r .^2,"r")) .^ (0.5) +/* //Debug Only*/ +/* for(int i= 0; i< 1*cx; i++)*/ +/* printf("std[%d]= %lf\t", i, std[i]);*/ +/* printf("\n"); */ + dtransposea ( temp4 , lx , cx, temp4_trans); //temp4_trans= r' + dtransposea ( std , 1 , cx, std_trans); //std_trans= std' + dmulma(temp4_trans, cx,lx, temp4, lx, cx, temp7 ); //temp7= r'*r + dmulma(std_trans, cx, 1, std, 1,cx, temp8); //temp8= std'*std + + drdiva (temp7, temp8, cx*cx, r); // r=(r'*r) ./ (std'*std) + + + } + + + +} diff --git a/src/c/statisticsFunctions/mvcorrel/smvcorrel1a.c b/src/c/statisticsFunctions/mvcorrel/smvcorrel1a.c new file mode 100644 index 0000000..345ce60 --- /dev/null +++ b/src/c/statisticsFunctions/mvcorrel/smvcorrel1a.c @@ -0,0 +1,34 @@ +/* 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 "mvcorrel.h" +#include "stdlib.h" +#include "stdio.h" +#include "types.h" +#include "uint16.h" +#include "zeros.h" +#include "sum.h" +#include "ones.h" +#include "matrixMultiplication.h" +#include "matrixTranspose.h" +#include "subtraction.h" +#include "division.h" + +float smvcorrel1a(int lx, int cx) +{ + if(lx==1 && cx==1) + return 0; + + else + return 1; +} diff --git a/src/c/statisticsFunctions/mvcorrel/smvcorrela.c b/src/c/statisticsFunctions/mvcorrel/smvcorrela.c new file mode 100644 index 0000000..8894cee --- /dev/null +++ b/src/c/statisticsFunctions/mvcorrel/smvcorrela.c @@ -0,0 +1,87 @@ +/* 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 "mvcorrel.h" +#include "stdlib.h" +#include "stdio.h" +#include "types.h" +#include "pow.h" +#include "uint16.h" +#include "zeros.h" +#include "sum.h" +#include "ones.h" +#include "matrixMultiplication.h" +#include "division.h" +#include "matrixTranspose.h" +#include "subtraction.h" +#include "division.h" + +void smvcorrela(float *in, int lx, int cx, float* r) +{ + float temp1[1* cx]; + float xbar[1* cx]; + float temp2[lx*1]; + float temp3[lx*cx]; + float temp4[lx*cx]; + float temp4_trans[cx*lx]; + float temp5[1* cx]; + float temp6[lx*cx]; + float std[1*cx]; + float std_trans[cx*1]; + float temp7[cx*cx]; + float temp8[cx*cx]; + + sonesa ( temp2 , lx , 1 ); //temp2= ones(lx,1) + + if(lx==1) + { + szerosa ( r , cx ,cx ); //out= zeros(lx,cx) + + } + + else + { + + srowsuma(in, lx, cx, temp1); //temp1= sum(x, "r") + + for(int i=0; i< 1*cx; i++) + xbar[i]= srdivs(temp1[i], lx); // xbar= sum(x, "r")/ lx +/* //Debug Only*/ +/* for(int i= 0; i< 1*cx; i++)*/ +/* printf("xbar[%d]= %lf\t", i, xbar[i]);*/ +/* printf("\n");*/ + + smulma(temp2, lx,1, xbar, 1, cx, temp3 ); //temp3= ones(lx,1)*xbar + sdiffa(in, lx*cx, temp3, lx*cx, temp4); //temp4= r= x-ones(lx,1)*xbar + for(int i=0; i< lx*cx; i++) + temp6[i]= spows(temp4[i], 2); //temp6= r.^2 + srowsuma(temp6, lx, cx, temp5); //temp5= sum(r.^2, "r") + for(int i=0; i< 1*cx; i++) + std[i]= spows(temp5[i], 0.5); //std=(sum(r .^2,"r")) .^ (0.5) +/* //Debug Only*/ +/* for(int i= 0; i< 1*cx; i++)*/ +/* printf("std[%d]= %lf\t", i, std[i]);*/ +/* printf("\n"); */ + stransposea ( temp4 , lx , cx, temp4_trans); //temp4_trans= r' + stransposea ( std , 1 , cx, std_trans); //std_trans= std' + smulma(temp4_trans, cx,lx, temp4, lx, cx, temp7 ); //temp7= r'*r + smulma(std_trans, cx, 1, std, 1,cx, temp8); //temp8= std'*std + + srdiva (temp7, temp8, cx*cx, r); // r=(r'*r) ./ (std'*std) + + + } + + + +} diff --git a/src/c/statisticsFunctions/strange/dstrangea.c b/src/c/statisticsFunctions/strange/dstrangea.c new file mode 100644 index 0000000..9dc94fe --- /dev/null +++ b/src/c/statisticsFunctions/strange/dstrangea.c @@ -0,0 +1,60 @@ +/* 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 "strange.h" +#include "types.h" +#include "uint16.h" +#include "subtraction.h" + +double dstrangea(double *in, int size) +{ + double a; double in_copy[size]; + + for(int i=0; i< size; i++) + + { + in_copy[i]= in[i]; + + } + + + + for (int i = 0; i < size; ++i) + + { + + for (int j = i + 1; j < size; ++j) + + { + + if (in_copy[i] > in_copy[j]) + + { + + a = in_copy[i]; + + in_copy[i] = in_copy[j]; + + in_copy[j] = a; + + } + + } + + } + + + +return ddiffs(in_copy[size-1],in_copy[0]); + +} diff --git a/src/c/statisticsFunctions/strange/dstrangecola.c b/src/c/statisticsFunctions/strange/dstrangecola.c new file mode 100644 index 0000000..d6a11e3 --- /dev/null +++ b/src/c/statisticsFunctions/strange/dstrangecola.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 "strange.h" +#include "types.h" +#include "uint16.h" +#include "stdio.h" + +void dstrangecola(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]= dstrangea(inter, col); + + } + + +} diff --git a/src/c/statisticsFunctions/strange/dstrangerowa.c b/src/c/statisticsFunctions/strange/dstrangerowa.c new file mode 100644 index 0000000..f63df35 --- /dev/null +++ b/src/c/statisticsFunctions/strange/dstrangerowa.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 "strange.h" +#include "types.h" +#include "uint16.h" + +void dstrangerowa(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]= dstrangea(inter, row); + } + + +} diff --git a/src/c/statisticsFunctions/strange/sstrangea.c b/src/c/statisticsFunctions/strange/sstrangea.c new file mode 100644 index 0000000..f79b00a --- /dev/null +++ b/src/c/statisticsFunctions/strange/sstrangea.c @@ -0,0 +1,60 @@ +/* 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 "strange.h" +#include "types.h" +#include "uint16.h" +#include "subtraction.h" + +float sstrangea(float *in, int size) +{ + float a; float in_copy[size]; + + for(int i=0; i< size; i++) + + { + in_copy[i]= in[i]; + + } + + + + for (int i = 0; i < size; ++i) + + { + + for (int j = i + 1; j < size; ++j) + + { + + if (in_copy[i] > in_copy[j]) + + { + + a = in_copy[i]; + + in_copy[i] = in_copy[j]; + + in_copy[j] = a; + + } + + } + + } + + + +return sdiffs(in_copy[size-1],in_copy[0]); + +} diff --git a/src/c/statisticsFunctions/strange/sstrangecola.c b/src/c/statisticsFunctions/strange/sstrangecola.c new file mode 100644 index 0000000..4c8e90a --- /dev/null +++ b/src/c/statisticsFunctions/strange/sstrangecola.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 "strange.h" +#include "types.h" +#include "uint16.h" +#include "stdio.h" + +void sstrangecola(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]= sstrangea(inter, col); + + } + + +} diff --git a/src/c/statisticsFunctions/strange/sstrangerowa.c b/src/c/statisticsFunctions/strange/sstrangerowa.c new file mode 100644 index 0000000..50c1165 --- /dev/null +++ b/src/c/statisticsFunctions/strange/sstrangerowa.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 "strange.h" +#include "types.h" +#include "uint16.h" + +void sstrangerowa(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]= sstrangea(inter, row); + } + + +} diff --git a/src/c/statisticsFunctions/strange/u16strangea.c b/src/c/statisticsFunctions/strange/u16strangea.c new file mode 100644 index 0000000..66b31fb --- /dev/null +++ b/src/c/statisticsFunctions/strange/u16strangea.c @@ -0,0 +1,60 @@ +/* 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 "strange.h" +#include "types.h" +#include "uint16.h" +#include "subtraction.h" + +uint16 u16strangea(uint16 *in, int size) +{ + uint16 a; uint16 in_copy[size]; + + for(int i=0; i< size; i++) + + { + in_copy[i]= in[i]; + + } + + + + for (int i = 0; i < size; ++i) + + { + + for (int j = i + 1; j < size; ++j) + + { + + if (in_copy[i] > in_copy[j]) + + { + + a = in_copy[i]; + + in_copy[i] = in_copy[j]; + + in_copy[j] = a; + + } + + } + + } + + + +return u16diffs(in_copy[size-1],in_copy[0]); + +} diff --git a/src/c/statisticsFunctions/strange/u16strangecola.c b/src/c/statisticsFunctions/strange/u16strangecola.c new file mode 100644 index 0000000..6978360 --- /dev/null +++ b/src/c/statisticsFunctions/strange/u16strangecola.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 "strange.h" +#include "types.h" +#include "uint16.h" +#include "stdio.h" + +void u16strangecola(uint16 *in, int row, int col, uint16* out) +{ + uint16 inter[col]; + + +for(int i=0; i< row; i++) + { + for(int j=0 ; j< col; j++) + { + inter[j]= in[i+ (j*row)]; + + } + + out[i]= u16strangea(inter, col); + + } + + +} diff --git a/src/c/statisticsFunctions/strange/u16strangerowa.c b/src/c/statisticsFunctions/strange/u16strangerowa.c new file mode 100644 index 0000000..b7f878d --- /dev/null +++ b/src/c/statisticsFunctions/strange/u16strangerowa.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 "strange.h" +#include "types.h" +#include "uint16.h" + +void u16strangerowa(uint16 *in, int row, int col, uint16* out) +{ + uint16 inter[row]; + + +for(int i=0; i< col; i++) + { + for(int j=0 ; j< row; j++) + { + inter[j]= in[j+ (i*row)]; + + } + + out[i]= u16strangea(inter, row); + } + + +} |