From 0f50214dd2cfead2dbd40c50ef811a23397b9767 Mon Sep 17 00:00:00 2001 From: Abhinav Dronamraju Date: Thu, 28 Sep 2017 23:07:23 +0530 Subject: Removed wiener- script not working --- .../ToolInitialization/INIT_FillSCI2LibCDirs.sci | 6 - macros/findDeps/getAllHeaders.sci | 1 - macros/findDeps/getAllInterfaces.sci | 1 - macros/findDeps/getAllSources.sci | 2 - src/c/signalProcessing/includes/wiener.h | 30 ---- src/c/signalProcessing/interfaces/int_wiener.h | 20 --- src/c/signalProcessing/wiener/dwienera.c | 166 --------------------- 7 files changed, 226 deletions(-) delete mode 100644 src/c/signalProcessing/includes/wiener.h delete mode 100644 src/c/signalProcessing/interfaces/int_wiener.h delete mode 100644 src/c/signalProcessing/wiener/dwienera.c diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci index daa5734..fad0560 100644 --- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci +++ b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci @@ -11341,12 +11341,6 @@ INIT_GenAnnFLFunctions(FunctionName,SCI2CLibCAnnFunDir,ClassName,GeneralReport,E 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 -------------------- //------------------------------------ diff --git a/macros/findDeps/getAllHeaders.sci b/macros/findDeps/getAllHeaders.sci index 849856c..9e82580 100644 --- a/macros/findDeps/getAllHeaders.sci +++ b/macros/findDeps/getAllHeaders.sci @@ -206,7 +206,6 @@ function allHeaders = getAllHeaders(SharedInfo) "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" diff --git a/macros/findDeps/getAllInterfaces.sci b/macros/findDeps/getAllInterfaces.sci index 04b2796..89f5f1a 100644 --- a/macros/findDeps/getAllInterfaces.sci +++ b/macros/findDeps/getAllInterfaces.sci @@ -204,7 +204,6 @@ function allInterfaces = getAllInterfaces(SharedInfo) "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" diff --git a/macros/findDeps/getAllSources.sci b/macros/findDeps/getAllSources.sci index 0dcf36a..1485c92 100644 --- a/macros/findDeps/getAllSources.sci +++ b/macros/findDeps/getAllSources.sci @@ -1352,8 +1352,6 @@ 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" diff --git a/src/c/signalProcessing/includes/wiener.h b/src/c/signalProcessing/includes/wiener.h deleted file mode 100644 index ba77526..0000000 --- a/src/c/signalProcessing/includes/wiener.h +++ /dev/null @@ -1,30 +0,0 @@ -/* 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_wiener.h b/src/c/signalProcessing/interfaces/int_wiener.h deleted file mode 100644 index daefcf0..0000000 --- a/src/c/signalProcessing/interfaces/int_wiener.h +++ /dev/null @@ -1,20 +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 - */ - -#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/wiener/dwienera.c b/src/c/signalProcessing/wiener/dwienera.c deleted file mode 100644 index 18f49bc..0000000 --- a/src/c/signalProcessing/wiener/dwienera.c +++ /dev/null @@ -1,166 +0,0 @@ -/* 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