diff options
Diffstat (limited to '2.3-1/src/c')
391 files changed, 1992 insertions, 12765 deletions
diff --git a/2.3-1/src/c/CACSD/includes/lqr.h b/2.3-1/src/c/CACSD/includes/lqr.h index 5b20ee83..062d6e41 100644 --- a/2.3-1/src/c/CACSD/includes/lqr.h +++ b/2.3-1/src/c/CACSD/includes/lqr.h @@ -17,7 +17,7 @@ extern "C" { #endif -void dlqra(double* sys, int sys_rows, int sys_cols, double* Q, double* R, double* S, double* X, double* K); +void dlqra(double* sys, int sys_rows, int sys_cols, double* X, double* K); #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/CACSD/interfaces/int_lqr.h b/2.3-1/src/c/CACSD/interfaces/int_lqr.h index 8deba90b..e6f534fc 100644 --- a/2.3-1/src/c/CACSD/interfaces/int_lqr.h +++ b/2.3-1/src/c/CACSD/interfaces/int_lqr.h @@ -16,14 +16,7 @@ extern "C" { #endif -#define ss2lqrd2d2(in1,size1,out1,out2) dlqra(in1,size1[0],size1[1],NULL,\ - NULL,NULL,out1,out2); - -#define ss2d2d2lqrd2d2(in1,size1,in2,size2,in3,size3,out1,out2) dlqra(in1,\ - size1[0],size1[1],in2,in3,NULL,out1,out2); - -#define ss2d2d2d2lqrd2d2(in1,size1,in2,size2,in3,size3,in4,size4,out1,out2) \ - dlqra(in1,size1[0],size1[1],in2,in3,in4,out1,out2); +#define ss2lqrd2d2(in1,size1,out1,out2) dlqra(in1,size1[0],size1[1],out1,out2); #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/CACSD/lqe/dlqea.c b/2.3-1/src/c/CACSD/lqe/dlqea.c index e0be5b34..63f8d62d 100644 --- a/2.3-1/src/c/CACSD/lqe/dlqea.c +++ b/2.3-1/src/c/CACSD/lqe/dlqea.c @@ -54,7 +54,7 @@ void dlqea(double* sys, int sys_rows, int sys_cols, double* X, double* K) /*Calculate LQR gain*/ K_lqr = (double*) malloc(no_of_ip*no_of_st*sizeof(double)); - dlqra(sys_lqr,sys_lqr_rows,sys_lqr_cols,NULL,NULL,NULL,X,K_lqr); + dlqra(sys_lqr,sys_lqr_rows,sys_lqr_cols,X,K_lqr); dtransposea(K_lqr,sys_rows - no_of_st,no_of_st,K); }
\ No newline at end of file diff --git a/2.3-1/src/c/CACSD/lqr/dlqra.c b/2.3-1/src/c/CACSD/lqr/dlqra.c index 1440c3a8..02ac1504 100644 --- a/2.3-1/src/c/CACSD/lqr/dlqra.c +++ b/2.3-1/src/c/CACSD/lqr/dlqra.c @@ -22,8 +22,7 @@ #include "schur.h" #include "matrixDivision.h" -void dlqra(double* sys, int sys_rows, int sys_cols, double* Q, double* R, \ - double* S, double* K, double* X) +void dlqra(double* sys, int sys_rows, int sys_cols, double* X, double* K) { int no_of_states, no_of_inputs, no_of_outputs, dom = 1; int row,col; @@ -33,7 +32,7 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* Q, double* R, \ double *A, *B, *C, *D; double *B_t, *C_t, *D_t; - //double *Q, *R, *S; + double *Q, *R, *S; double *Ri, *LA, *LE; double *BRi, *StRi, *S_t; double *buf1, *buf2, *buf3, *buf4, *buf5, *buf6; @@ -91,29 +90,20 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* Q, double* R, \ dom = (int)sys[(sys_rows*(sys_cols-2)) + no_of_states]; + Q = (double*) malloc (no_of_states*no_of_states*sizeof(double)); + R = (double*) malloc (no_of_inputs*no_of_inputs*sizeof(double)); + S = (double*) malloc (no_of_inputs*no_of_states*sizeof(double)); + dtransposea(B,no_of_states,no_of_inputs,B_t); dtransposea(C,no_of_outputs,no_of_states,C_t); dtransposea(D,no_of_outputs,no_of_inputs,D_t); - if(Q == NULL) - {/*If Q is not provided*/ - Q = (double*) malloc (no_of_states*no_of_states*sizeof(double)); - dmulma(C_t,no_of_states,no_of_outputs,C,no_of_outputs,no_of_states,Q); - } - - if(R == NULL) - {/*If R is not provided*/ - R = (double*) malloc (no_of_inputs*no_of_inputs*sizeof(double)); - dmulma(D_t,no_of_inputs,no_of_outputs,D,no_of_outputs,no_of_inputs,R); - } - - if(S == NULL) - {/*If Q is not provided*/ - S = (double*) malloc (no_of_inputs*no_of_states*sizeof(double)); - dmulma(D_t,no_of_inputs,no_of_outputs,C,no_of_outputs,no_of_states,S); - } + dmulma(C_t,no_of_states,no_of_outputs,C,no_of_outputs,no_of_states,Q); + dmulma(D_t,no_of_inputs,no_of_outputs,D,no_of_outputs,no_of_inputs,R); + dmulma(D_t,no_of_inputs,no_of_outputs,C,no_of_outputs,no_of_states,S); /*Free up unwanted variables*/ + free(C); free(C_t); free(D); @@ -187,8 +177,8 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* Q, double* R, \ /*Freeup umwanted variables*/ free(A); - //free(Q); - //free(R); + free(Q); + free(R); free(BRi); free(S_t); free(StRi); @@ -288,7 +278,7 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* Q, double* R, \ } - //free(Q); + free(Q); free(BRi); free(S_t); free(StRi); @@ -326,7 +316,7 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* Q, double* R, \ /*inv(B'XB+R)*/ dmulma(B_t,no_of_inputs,no_of_states,X,no_of_states,no_of_states,buf3); - dmulma(buf3,no_of_inputs,no_of_states,B,no_of_states,no_of_inputs,buf6); + dmulma(buf3,no_of_inputs,no_of_states,B_t,no_of_states,no_of_inputs,buf6); dadda(buf6,no_of_inputs*no_of_inputs,R,no_of_inputs*no_of_inputs,buf5); dinverma(buf5,buf6,no_of_inputs); /*B'XA+S*/ @@ -343,14 +333,14 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* Q, double* R, \ free(A); free(B); - //free(R); + free(R); free(buf5); free(buf6); } free(B_t); - //free(S); + free(S); free(wsmall); free(X12); free(phi12); diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/sinc/dsinca.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/sinc/dsinca.c deleted file mode 100644 index 0cd24e96..00000000 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/sinc/dsinca.c +++ /dev/null @@ -1,46 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#include<stdio.h> -#include<math.h> -#include "sinc.h" -#define PI 3.14159265358979 -void dsinca(double* sample,int size,double* oup) -{ - int j; - for(j=0;j<size;j++) - { - if(sample[j]==0) - { - oup[j]=1; - } - else - { - oup[j]=(sin(sample[j]))/(sample[j]); - } - } -} -/* -int main() -{ - int n; - printf("Enter the length of the array"); - scanf("%d",&n); - double arr[100000]; - int i; - printf("Now enter the element of the array"); - for(i=0;i<n;i++) - { - scanf("%ld",&arr[i]); - } - sinc(arr[],n); -} -*/ diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/sinc/int_sinc.h b/2.3-1/src/c/elementaryFunctions/Trigonometry/sinc/int_sinc.h deleted file mode 100644 index 0dc969de..00000000 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/sinc/int_sinc.h +++ /dev/null @@ -1,18 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_SINC_H__ -#define __INT_SINC_H__ - -#define d2sincd2(sample,size,oup) dsinca(sample,size,oup) - -#endif /* !__INT_SINC_H__! */ diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/sinc/sinc.h b/2.3-1/src/c/elementaryFunctions/Trigonometry/sinc/sinc.h deleted file mode 100644 index 6a5c315b..00000000 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/sinc/sinc.h +++ /dev/null @@ -1,27 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __SINC_H__ -#define __SINC_H__ -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void dsinca(double* sample,int size,double* oup); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __SINC_H__ */ diff --git a/2.3-1/src/c/elementaryFunctions/Trigonometry/sinc/zsinca.c b/2.3-1/src/c/elementaryFunctions/Trigonometry/sinc/zsinca.c deleted file mode 100644 index 1f6cf9ba..00000000 --- a/2.3-1/src/c/elementaryFunctions/Trigonometry/sinc/zsinca.c +++ /dev/null @@ -1,35 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#include<stdio.h> -#include<math.h> -#include "sinc.h" -#include "sin.h" -#include "doubleComplex.h" -#include "division.h" -void zsinca(doubleComplex* sample,int size,doubleComplex* oup) -{ - int j; - double r,i; - for(j=0;j<size;j++) - { - r=zreals(sample[j]); - i=zimags(sample[j]); - if(r==0 && i==0) - { - oup[j]=DoubleComplex(1,0); - } - else - { - oup[j]=zrdivs(zsins(sample[j]),sample[j]); - } - } -} diff --git a/2.3-1/src/c/elementaryFunctions/discrete_mathematics/gcd/dgcda.c b/2.3-1/src/c/elementaryFunctions/discrete_mathematics/gcd/dgcda.c deleted file mode 100644 index a32ed773..00000000 --- a/2.3-1/src/c/elementaryFunctions/discrete_mathematics/gcd/dgcda.c +++ /dev/null @@ -1,32 +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: Ukasha Noor - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "gcd.h" -#include "types.h" - -void dgcda(double *in,int size,double *out) -{ - double a=in[0]; - double b=in[1]; - while(a!=b && a!=0 && b!=0) - { - if(a>b) - { - a=a-b; - } - else - { - b=b-a; - } - } - out[0]=b; -} diff --git a/2.3-1/src/c/elementaryFunctions/discrete_mathematics/gcd/u8gcda.c b/2.3-1/src/c/elementaryFunctions/discrete_mathematics/gcd/u8gcda.c deleted file mode 100644 index 121d26ae..00000000 --- a/2.3-1/src/c/elementaryFunctions/discrete_mathematics/gcd/u8gcda.c +++ /dev/null @@ -1,62 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ -#include<stdio.h> -/* This is the "gcd" function , which takes two input. first - one is the array and the second one is the length of the array. - Now to calculate the gcd of two elements we fin the maximum of - the two elements, and then iterate from maximum value down to 1, - and check whether the particular value divides the two elements. - And in this way we can calculate the gcd of the whole array. -*/ -#include "gcd.h" -uint8 u8gcdua(uint8* in,int size) -{ - - int temp; - if(size==1) - { - temp=*in; - } - else - { - int x=*in; - int y=*(in+1); - int max=(x>y)?x:y; - int i; - for(i=max;i>=1;i--) - { - if(x%i==0 && y%i==0) - { - temp=i; - break; - } - } - int j; - for(j=2;j<size;j++) - { - x=temp; - y=*(in+j); - max=(x>y)?x:y; - for(i=max;i>=1;i--) - { - if(x%i==0 && y%i==0) - { - temp=i; - break; - } - } - } -} - - return temp; -} - diff --git a/2.3-1/src/c/elementaryFunctions/discrete_mathematics/gcd/u8gcds.c b/2.3-1/src/c/elementaryFunctions/discrete_mathematics/gcd/u8gcds.c deleted file mode 100644 index 75f831fc..00000000 --- a/2.3-1/src/c/elementaryFunctions/discrete_mathematics/gcd/u8gcds.c +++ /dev/null @@ -1,32 +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: Ukasha Noor - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "gcd.h" -#include "types.h" - -int8 u8gcds(int8 *in,int size) -{ - int a=in[0]; - int b=in[1]; - while(a!=b && a!=0 && b!=0) - { - if(a>b) - { - a=a-b; - } - else - { - b=b-a; - } - } - return b; -} diff --git a/2.3-1/src/c/elementaryFunctions/discrete_mathematics/lcm/u8lcma.c b/2.3-1/src/c/elementaryFunctions/discrete_mathematics/lcm/u8lcma.c deleted file mode 100644 index b01c8047..00000000 --- a/2.3-1/src/c/elementaryFunctions/discrete_mathematics/lcm/u8lcma.c +++ /dev/null @@ -1,69 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ -#include<stdio.h> -/* This is the "lcm" function, accepting two inputs which are the array of integers - and second the size of the array. The algorithm works like this: - We take a temproary variable and store the lcm of the first two elements of the - array in it. Now using this temproary variable we recursively fin the lcm of - the whole array. - Now to fin the lcm of two elements we fin the maximum of the two elements and - check whether it is divisible by both the elements, if the condition is true we - get the lcm, else increase the maximum value by itself unless we get the lcm. -*/ -#include "lcm.h" -uint8 u8lcma(uint8* in,int size) -{ - long long int lcm_temp; - if(size==1) - { - lcm_temp=*in; - } - else - { - - int x1=*in; - int x2=*(in+1); - long long int max=(x1>x2)?x1:x2; - long long int i=max; - while(1) - { - if(i%x1==0 && i%x2==0) - { - lcm_temp=i; - break; - } - else - i+=max; - } - int j; - for(j=2;j<size;j++) - { - x1=lcm_temp; - x2=*(in+j); - max=(x1>x2)?x1:x2; - i=max; - while(1) - { - if(i%x1==0 && i%x2==0) - { - lcm_temp=i; - break; - } - else - i+=max; - } - } - - } - return lcm_temp; -} - diff --git a/2.3-1/src/c/elementaryFunctions/includes/gcd.h b/2.3-1/src/c/elementaryFunctions/includes/gcd.h deleted file mode 100644 index 179eea0e..00000000 --- a/2.3-1/src/c/elementaryFunctions/includes/gcd.h +++ /dev/null @@ -1,26 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#ifndef __GCD_H__ -#define __GCD_H__ -#include "types.h" - - #ifdef __cplusplus - extern "C"{ - #endif - -uint8 u8gcda(uint8* in,int size); - - #ifdef __cplusplus - } /* extern "C" */ - #endif - -#endif /*__GCD_H__*/ diff --git a/2.3-1/src/c/elementaryFunctions/includes/int32.h b/2.3-1/src/c/elementaryFunctions/includes/int32.h deleted file mode 100644 index 26b7bcbf..00000000 --- a/2.3-1/src/c/elementaryFunctions/includes/int32.h +++ /dev/null @@ -1,62 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#ifndef __INT32_H__ -#define __INT32_H__ - -#include "dynlib_elementaryfunctions.h" -#include "floatComplex.h" -#include "doubleComplex.h" -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif -/* - int32(X) returns the signed int part of the double value -*/ - -EXTERN_ELEMFUNCT int32 sint32s(float in); - -EXTERN_ELEMFUNCT int32 dint32s(double in); - -EXTERN_ELEMFUNCT int32 u8int32s(uint8 in); - -EXTERN_ELEMFUNCT int32 i8int32s(int8 in); - -EXTERN_ELEMFUNCT int32 u16int32s(uint16 in); - -EXTERN_ELEMFUNCT int32 i16int32s(int16 in); - -EXTERN_ELEMFUNCT int32 u32int32s(uint32 in); - -EXTERN_ELEMFUNCT void sint32a(float* in, int size, int32* out); - -EXTERN_ELEMFUNCT void dint32a(double* in, int size, int32* out); - -EXTERN_ELEMFUNCT void u8int32a(uint8* in, int size, int32* out); - -EXTERN_ELEMFUNCT void i8int32a(int8* in, int size, int32* out); - -EXTERN_ELEMFUNCT void u16int32a(uint16* in, int size, int32* out); - -EXTERN_ELEMFUNCT void i16int32a(int16* in, int size, int32* out); - -EXTERN_ELEMFUNCT void u32int32a(uint32* in, int size, int32* out); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - - -#endif /* !__INT32_H__ */ - diff --git a/2.3-1/src/c/elementaryFunctions/includes/isreal.h b/2.3-1/src/c/elementaryFunctions/includes/isreal.h deleted file mode 100644 index 0183ebce..00000000 --- a/2.3-1/src/c/elementaryFunctions/includes/isreal.h +++ /dev/null @@ -1,30 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2007-2008 - INRIA - Bruno JOFRET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#ifndef __ISREAL_H__ -#define __ISREAL_H__ - -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -float sisreals(float a); - -double disreals(double a); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif diff --git a/2.3-1/src/c/elementaryFunctions/includes/lcm.h b/2.3-1/src/c/elementaryFunctions/includes/lcm.h deleted file mode 100644 index 3a3e66fb..00000000 --- a/2.3-1/src/c/elementaryFunctions/includes/lcm.h +++ /dev/null @@ -1,27 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#ifndef __LCM_H__ -#define __LCM_H__ -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -uint8 u8lcma(uint8* in,int size); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /*__LCM_H__*/ - diff --git a/2.3-1/src/c/elementaryFunctions/includes/linspace.h b/2.3-1/src/c/elementaryFunctions/includes/linspace.h index 62d45015..92fe10e5 100644 --- a/2.3-1/src/c/elementaryFunctions/includes/linspace.h +++ b/2.3-1/src/c/elementaryFunctions/includes/linspace.h @@ -21,11 +21,8 @@ extern "C" { EXTERN_ELEMFUNCT void dlinspaces(double low_limit,double up_limit,double range_num, double* out); -EXTERN_ELEMFUNCT void slinspaces(float low_limit,float up_limit,float range_num, float* out); - EXTERN_ELEMFUNCT void dlinspacea(double *low_limit,int row,double *up_limit,double range_num, double* out); -EXTERN_ELEMFUNCT void slinspacea(float *low_limit,int row,float *up_limit,float range_num, float* out); diff --git a/2.3-1/src/c/elementaryFunctions/includes/sec.h b/2.3-1/src/c/elementaryFunctions/includes/sec.h index a04c5f73..96061583 100644 --- a/2.3-1/src/c/elementaryFunctions/includes/sec.h +++ b/2.3-1/src/c/elementaryFunctions/includes/sec.h @@ -14,7 +14,7 @@ #include "dynlib_elementaryfunctions.h" #include "floatComplex.h" #include "doubleComplex.h" -//#include <complex.h> +#include <complex.h> #include "types.h" #ifdef __cplusplus diff --git a/2.3-1/src/c/elementaryFunctions/includes/sinc.h b/2.3-1/src/c/elementaryFunctions/includes/sinc.h deleted file mode 100644 index 8bc98d28..00000000 --- a/2.3-1/src/c/elementaryFunctions/includes/sinc.h +++ /dev/null @@ -1,29 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __SINC_H__ -#define __SINC_H__ -#include "types.h" -#include "doubleComplex.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void dsinca(double* sample,int size,double* oup); -void zsinca(doubleComplex* sample,int size,doubleComplex* oup); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __SINC_H__ */ diff --git a/2.3-1/src/c/elementaryFunctions/includes/uint32.h b/2.3-1/src/c/elementaryFunctions/includes/uint32.h deleted file mode 100644 index b90247bc..00000000 --- a/2.3-1/src/c/elementaryFunctions/includes/uint32.h +++ /dev/null @@ -1,62 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#ifndef __UINT32_H__ -#define __UINT32_H__ - -#include "dynlib_elementaryfunctions.h" -#include "floatComplex.h" -#include "doubleComplex.h" -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif -/* - uint32(X) returns the unsigned int part of the double value -*/ - -EXTERN_ELEMFUNCT uint32 suint32s(float in); - -EXTERN_ELEMFUNCT uint32 duint32s(double in); - -EXTERN_ELEMFUNCT uint32 u8uint32s(uint8 in); - -EXTERN_ELEMFUNCT uint32 i8uint32s(int8 in); - -EXTERN_ELEMFUNCT uint32 u16uint32s(uint16 in); - -EXTERN_ELEMFUNCT uint32 i16uint32s(int16 in); - -EXTERN_ELEMFUNCT uint32 i32uint32s(int32 in); - -EXTERN_ELEMFUNCT void suint32a(float* in, int size, uint32* out); - -EXTERN_ELEMFUNCT void duint32a(double* in, int size, uint32* out); - -EXTERN_ELEMFUNCT void u8uint32a(uint8* in, int size, uint32* out); - -EXTERN_ELEMFUNCT void i8uint32a(int8* in, int size, uint32* out); - -EXTERN_ELEMFUNCT void u16uint32a(uint16* in, int size, uint32* out); - -EXTERN_ELEMFUNCT void i16uint32a(int16* in, int size, uint32* out); - -EXTERN_ELEMFUNCT void i32uint32a(int32* in, int size, uint32* out); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - - -#endif /* !__UINT32_H__ */ - diff --git a/2.3-1/src/c/elementaryFunctions/int32/dint32a.c b/2.3-1/src/c/elementaryFunctions/int32/dint32a.c deleted file mode 100644 index f8b4b662..00000000 --- a/2.3-1/src/c/elementaryFunctions/int32/dint32a.c +++ /dev/null @@ -1,18 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "int32.h" - -void dint32a(double* x, int size, int32* out) { - int i = 0; - for (i=0;i<size;i++) out[i] = dint32s(x[i]); -} diff --git a/2.3-1/src/c/elementaryFunctions/int32/dint32s.c b/2.3-1/src/c/elementaryFunctions/int32/dint32s.c deleted file mode 100644 index 19366ef0..00000000 --- a/2.3-1/src/c/elementaryFunctions/int32/dint32s.c +++ /dev/null @@ -1,18 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - -#include "int32.h" - -int32 dint32s(double x) { - return (int32) x; -} diff --git a/2.3-1/src/c/elementaryFunctions/int32/i16int32a.c b/2.3-1/src/c/elementaryFunctions/int32/i16int32a.c deleted file mode 100644 index e970deb2..00000000 --- a/2.3-1/src/c/elementaryFunctions/int32/i16int32a.c +++ /dev/null @@ -1,17 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ -#include "int32.h" - -void i16int32a(int16* x, int size, int32* out) { - int i = 0; - for (i=0;i<size;i++) out[i] = i16int32s(x[i]); -} diff --git a/2.3-1/src/c/elementaryFunctions/int32/i16int32s.c b/2.3-1/src/c/elementaryFunctions/int32/i16int32s.c deleted file mode 100644 index ad079930..00000000 --- a/2.3-1/src/c/elementaryFunctions/int32/i16int32s.c +++ /dev/null @@ -1,17 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "int32.h" - -int32 i16int32s(int16 x) { - return (int32) x; -} diff --git a/2.3-1/src/c/elementaryFunctions/int32/i8int32a.c b/2.3-1/src/c/elementaryFunctions/int32/i8int32a.c deleted file mode 100644 index d046ba19..00000000 --- a/2.3-1/src/c/elementaryFunctions/int32/i8int32a.c +++ /dev/null @@ -1,17 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ -#include "int32.h" - -void i8int32a(int8* x, int size, int32* out) { - int i = 0; - for (i=0;i<size;i++) out[i] = i8int32s(x[i]); -} diff --git a/2.3-1/src/c/elementaryFunctions/int32/i8int32s.c b/2.3-1/src/c/elementaryFunctions/int32/i8int32s.c deleted file mode 100644 index c126662c..00000000 --- a/2.3-1/src/c/elementaryFunctions/int32/i8int32s.c +++ /dev/null @@ -1,17 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "int32.h" - -int32 i8int32s(int8 x) { - return (int32) x; -} diff --git a/2.3-1/src/c/elementaryFunctions/int32/sint32a.c b/2.3-1/src/c/elementaryFunctions/int32/sint32a.c deleted file mode 100644 index 14dbefec..00000000 --- a/2.3-1/src/c/elementaryFunctions/int32/sint32a.c +++ /dev/null @@ -1,18 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "int32.h" - -void sint32a(float* x, int size, int32* out) { - int i = 0; - for (i=0;i<size;i++) out[i] = sint32s(x[i]); -} diff --git a/2.3-1/src/c/elementaryFunctions/int32/sint32s.c b/2.3-1/src/c/elementaryFunctions/int32/sint32s.c deleted file mode 100644 index 8a4f8e7e..00000000 --- a/2.3-1/src/c/elementaryFunctions/int32/sint32s.c +++ /dev/null @@ -1,17 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "int32.h" - -int32 sint32s(float x) { - return (int32) x; -} diff --git a/2.3-1/src/c/elementaryFunctions/int32/u16int32a.c b/2.3-1/src/c/elementaryFunctions/int32/u16int32a.c deleted file mode 100644 index eaf90fda..00000000 --- a/2.3-1/src/c/elementaryFunctions/int32/u16int32a.c +++ /dev/null @@ -1,18 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "int32.h" - -void u16int32a(uint16* x, int size, int32* out) { - int i = 0; - for (i=0;i<size;i++) out[i] = u16int32s(x[i]); -} diff --git a/2.3-1/src/c/elementaryFunctions/int32/u16int32s.c b/2.3-1/src/c/elementaryFunctions/int32/u16int32s.c deleted file mode 100644 index be3909a2..00000000 --- a/2.3-1/src/c/elementaryFunctions/int32/u16int32s.c +++ /dev/null @@ -1,17 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "int32.h" - -int32 u16int32s(uint16 x) { - return (int32) x; -} diff --git a/2.3-1/src/c/elementaryFunctions/int32/u32int32a.c b/2.3-1/src/c/elementaryFunctions/int32/u32int32a.c deleted file mode 100644 index a135d12a..00000000 --- a/2.3-1/src/c/elementaryFunctions/int32/u32int32a.c +++ /dev/null @@ -1,18 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "int32.h" - -void u32int32a(uint32* x, int size, int32* out) { - int i = 0; - for (i=0;i<size;i++) out[i] = u32int32s(x[i]); -} diff --git a/2.3-1/src/c/elementaryFunctions/int32/u32int32s.c b/2.3-1/src/c/elementaryFunctions/int32/u32int32s.c deleted file mode 100644 index ee5a16aa..00000000 --- a/2.3-1/src/c/elementaryFunctions/int32/u32int32s.c +++ /dev/null @@ -1,17 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "int32.h" - -int32 u32int32s(uint32 x) { - return (int32) x; -} diff --git a/2.3-1/src/c/elementaryFunctions/int32/u8int32a.c b/2.3-1/src/c/elementaryFunctions/int32/u8int32a.c deleted file mode 100644 index 1361feab..00000000 --- a/2.3-1/src/c/elementaryFunctions/int32/u8int32a.c +++ /dev/null @@ -1,18 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "int32.h" - -void u8int32a(uint8* x, int size, int32* out) { - int i = 0; - for (i=0;i<size;i++) out[i] = u8int32s(x[i]); -} diff --git a/2.3-1/src/c/elementaryFunctions/int32/u8int32s.c b/2.3-1/src/c/elementaryFunctions/int32/u8int32s.c deleted file mode 100644 index c3b06903..00000000 --- a/2.3-1/src/c/elementaryFunctions/int32/u8int32s.c +++ /dev/null @@ -1,17 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "int32.h" - -int32 u8int32s(uint8 x) { - return (int32) x; -} diff --git a/2.3-1/src/c/elementaryFunctions/interfaces/int_gcd.h b/2.3-1/src/c/elementaryFunctions/interfaces/int_gcd.h deleted file mode 100644 index f3e117c5..00000000 --- a/2.3-1/src/c/elementaryFunctions/interfaces/int_gcd.h +++ /dev/null @@ -1,25 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#ifndef __INT_GCD_H__ -#define __INT_GCD_H__ - - #ifdef __cplusplus - extern "C" { - #endif - -#define u82gcdu80(in,size) u8gcda(in,size[1]) - - #ifdef __cplusplus - } /* extern "C" */ - #endif - -#endif /*__INT_GCD_H__*/ diff --git a/2.3-1/src/c/elementaryFunctions/interfaces/int_int32.h b/2.3-1/src/c/elementaryFunctions/interfaces/int_int32.h deleted file mode 100644 index 5da9bd25..00000000 --- a/2.3-1/src/c/elementaryFunctions/interfaces/int_int32.h +++ /dev/null @@ -1,46 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* THIS IS AN AUTOMATICALLY GENERATED FILE : DO NOT EDIT BY HAND. */ - -#ifndef __INT_INT32_H__ -#define __INT_INT32_H__ - -#define s0int32i320(in) sint32s(in) - -#define d0int32i320(in) dint32s(in) - -#define u80int32i320(in) u8int32s(in) - -#define i80int32i320(in) i8int32s(in) - -#define u160int32i320(in) u16int32s(in) - -#define i160int32i320(in) i16int32s(in) - -#define u320int32i320(in) u32int32s(in) - -#define s2int32i322(in,size,out) sint32a(in, size[0]*size[1], out) - -#define d2int32i322(in,size,out) dint32a(in, size[0]*size[1], out) - -#define u82int32i322(in,size,out) u8int32a(in, size[0]*size[1], out) - -#define i82int32i322(in,size,out) i8int32a(in, size[0]*size[1], out) - -#define u162int32i322(in,size,out) u16int32a(in, size[0]*size[1], out) - -#define i162int32i322(in,size,out) i16int32a(in, size[0]*size[1], out) - -#define u322int32i322(in,size,out) u32int32a(in, size[0]*size[1], out) - -#endif /* !__INT_INT32_H__ */ diff --git a/2.3-1/src/c/elementaryFunctions/interfaces/int_isreal.h b/2.3-1/src/c/elementaryFunctions/interfaces/int_isreal.h deleted file mode 100644 index cebbf6db..00000000 --- a/2.3-1/src/c/elementaryFunctions/interfaces/int_isreal.h +++ /dev/null @@ -1,22 +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: Ukasha Noor - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - - -#ifndef __INT_ISREAL_H__ -#define __INT_ISREAL_H__ - -#define s0isreals0(in) sisreals(in) - -#define d0isreald0(in) disreals(in) - -#endif diff --git a/2.3-1/src/c/elementaryFunctions/interfaces/int_lcm.h b/2.3-1/src/c/elementaryFunctions/interfaces/int_lcm.h deleted file mode 100644 index 2ef1a081..00000000 --- a/2.3-1/src/c/elementaryFunctions/interfaces/int_lcm.h +++ /dev/null @@ -1,27 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - - - -#ifndef __INT_LCM_H__ -#define __INT_LCM_H__ - #ifdef __cplusplus - extern "C" { - #endif - -#define u82lcmu80(in,size) u8lcma(in,size[1]) - - #ifdef __cplusplus - } /* extern "C" */ - #endif - -#endif /* !__INT_LCM_H__ */ diff --git a/2.3-1/src/c/elementaryFunctions/interfaces/int_linspace.h b/2.3-1/src/c/elementaryFunctions/interfaces/int_linspace.h index 15ea2696..f8af947a 100644 --- a/2.3-1/src/c/elementaryFunctions/interfaces/int_linspace.h +++ b/2.3-1/src/c/elementaryFunctions/interfaces/int_linspace.h @@ -15,10 +15,6 @@ #define d0d0d0linspaced2(in1,in2,in3,out) dlinspaces(in1,in2,in3,out) -#define s0s0s0linspaces2(in1,in2,in3,out) slinspaces(in1,in2,in3,out) - #define d2d2d0linspaced2(in1,size1,in2,size2,in3,out) dlinspacea(in1,size1[0],in2,in3,out) -#define s2s2s0linspaces2(in1,size1,in2,size2,in3,out) slinspacea(in1,size1[0],in2,in3,out) - #endif diff --git a/2.3-1/src/c/elementaryFunctions/interfaces/int_nextpow2.h b/2.3-1/src/c/elementaryFunctions/interfaces/int_nextpow2.h deleted file mode 100644 index 6ae4747b..00000000 --- a/2.3-1/src/c/elementaryFunctions/interfaces/int_nextpow2.h +++ /dev/null @@ -1,26 +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: Ukasha Noor - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* THIS IS AN AUTOMATICALLY GENERATED FILE : DO NOT EDIT BY HAND. */ - - -#ifndef __INT_NEXTPOW2_H__ -#define __INT_NEXTPOW2_H__ - - -#include "nextpow2.h" - -#define d0nextpow2d0(in,size,out) dnextpow2a(in,size[0]*size[1],out) - -#define d2nextpow2d2(in,size,out) dnextpow2a(in,size[0]*size[1],out) - -#endif diff --git a/2.3-1/src/c/elementaryFunctions/interfaces/int_sinc.h b/2.3-1/src/c/elementaryFunctions/interfaces/int_sinc.h deleted file mode 100644 index 35a519db..00000000 --- a/2.3-1/src/c/elementaryFunctions/interfaces/int_sinc.h +++ /dev/null @@ -1,19 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_SINC_H__ -#define __INT_SINC_H__ - -#define d2sincd2(sample,size,oup) dsinca(sample,size[1],oup) -#define z2sincz2(sample,size,oup) zsinca(sample,size[1],oup) - -#endif /* !__INT_SINC_H__! */ diff --git a/2.3-1/src/c/elementaryFunctions/interfaces/int_uint32.h b/2.3-1/src/c/elementaryFunctions/interfaces/int_uint32.h deleted file mode 100644 index 7c9353b3..00000000 --- a/2.3-1/src/c/elementaryFunctions/interfaces/int_uint32.h +++ /dev/null @@ -1,44 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#ifndef __INT_UINT32_H__ -#define __INT_UINT32_H__ - -#define s0uint32u320(in) suint32s(in) - -#define d0uint32u320(in) duint32s(in) - -#define u80uint32u320(in) u8uint32s(in) - -#define i80uint32u320(in) i8uint32s(in) - -#define u160uint32u320(in) u16uint32s(in) - -#define i160uint32u320(in) i16uint32s(in) - -#define i320uint32u320(in) i32uint32s(in) - -#define s2uint32u322(in,size,out) suint32a(in, size[0]*size[1], out) - -#define d2uint32u322(in,size,out) duint32a(in, size[0]*size[1], out) - -#define u82uint32u322(in,size,out) u8uint32a(in, size[0]*size[1], out) - -#define i82uint32u322(in,size,out) i8int32a(in, size[0]*size[1], out) - -#define u162uint32u322(in,size,out) u16uint32a(in, size[0]*size[1], out) - -#define i162uint32u322(in,size,out) i16uint32a(in, size[0]*size[1], out) - -#define i322uint32u322(in,size,out) i32uint32a(in, size[0]*size[1], out) - -#endif /* !__INT_UINT32_H__ */ diff --git a/2.3-1/src/c/elementaryFunctions/isreal/disreals.c b/2.3-1/src/c/elementaryFunctions/isreal/disreals.c deleted file mode 100644 index 8c7c8201..00000000 --- a/2.3-1/src/c/elementaryFunctions/isreal/disreals.c +++ /dev/null @@ -1,17 +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: Ukasha Noor - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "isreal.h" - -double disreals(double a){ - return 1; -} diff --git a/2.3-1/src/c/elementaryFunctions/isreal/sisreals.c b/2.3-1/src/c/elementaryFunctions/isreal/sisreals.c deleted file mode 100644 index 4b93c02c..00000000 --- a/2.3-1/src/c/elementaryFunctions/isreal/sisreals.c +++ /dev/null @@ -1,17 +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: Ukasha Noor - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "isreal.h" - -float sisreals(float a){ - return 1; -} diff --git a/2.3-1/src/c/elementaryFunctions/linspace/slinspacea.c b/2.3-1/src/c/elementaryFunctions/linspace/slinspacea.c deleted file mode 100644 index 38af3942..00000000 --- a/2.3-1/src/c/elementaryFunctions/linspace/slinspacea.c +++ /dev/null @@ -1,49 +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: Ukasha Noor - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ -#include <stdlib.h> -#include "linspace.h" - -void slinspacea(float *low_limit,int _row,float *up_limit,float range_num,float *out) -{ - int i,j,k; - float temp; - float *step_iterate; /* for each row the spacing between two values is different.*/ - step_iterate = (float*) malloc((float)_row*sizeof(float)); - for(i=0;i<_row;i++) - { - - step_iterate[i] = (up_limit[i]-low_limit[i])/(range_num-1); - - } - for(j=0;j < _row;j++) - { - out[j] = low_limit[j]; /* For every row first element is the first value of low_limit array*/ - temp = low_limit[j]; - for(k=1;k < (float)range_num;k++ ) - { - out[(_row*k)+j] = temp + step_iterate[j]; /* Output matrix positions for 3 X 5 matrix are [0 3 6 9 12;1 4 7 10 13;2 5 8 11 14] so (_row*k)+j) used*/ - temp = out[(_row*k)+j]; - if(k == (float)range_num-1 ) - { - out[(_row*k)+j] = (float)up_limit[j]; /* Last value of output is equal to first value of up_limit array*/ - } - - } - - - } - - - - -} - diff --git a/2.3-1/src/c/elementaryFunctions/linspace/slinspaces.c b/2.3-1/src/c/elementaryFunctions/linspace/slinspaces.c deleted file mode 100644 index 2404f4de..00000000 --- a/2.3-1/src/c/elementaryFunctions/linspace/slinspaces.c +++ /dev/null @@ -1,33 +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: Ukasha Noor - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "linspace.h" -void slinspaces(float low_limit,float up_limit,float range_num,float *out) -{ - int j; - float temp = low_limit; - float step_iterate = (up_limit-low_limit)/(range_num-1); - out[0] = low_limit; /*First value of output is equal to low_limit value*/ - for(j=1; j<(float)range_num; j++) - { - out[j] = temp + step_iterate; - temp = out[j]; - if(j == (float)range_num-1 ) - { - out[j] = (float)up_limit; /* Last value of output is equal to up_limit value*/ - } - } - - - -} - diff --git a/2.3-1/src/c/elementaryFunctions/nextpow2/dnextpow2a.c b/2.3-1/src/c/elementaryFunctions/nextpow2/dnextpow2a.c deleted file mode 100644 index 46f7eb80..00000000 --- a/2.3-1/src/c/elementaryFunctions/nextpow2/dnextpow2a.c +++ /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 - Organization: FOSSEE, IIT Bombay - Author: Ukasha Noor - Email: toolbox@scilab.in -*/ - -#include "nextpow2.h" -#include <math.h> - -void dnextpow2a(double *in,int size,double *out) -{ - int i,j,s; - double k; - i=2; - for(s=0;s<size;s++) - { - j=-1; - do{ - j++; - k=pow(i,j); - }while(in[s]>k); - out[s]=j; - } -} diff --git a/2.3-1/src/c/elementaryFunctions/uint32/duint32a.c b/2.3-1/src/c/elementaryFunctions/uint32/duint32a.c deleted file mode 100644 index 7cd0ea3e..00000000 --- a/2.3-1/src/c/elementaryFunctions/uint32/duint32a.c +++ /dev/null @@ -1,18 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "uint32.h" - -void duint32a(double* x, int size, uint32* out) { - int i = 0; - for (i=0;i<size;i++) out[i] = duint32s(x[i]); -} diff --git a/2.3-1/src/c/elementaryFunctions/uint32/duint32s.c b/2.3-1/src/c/elementaryFunctions/uint32/duint32s.c deleted file mode 100644 index f507305a..00000000 --- a/2.3-1/src/c/elementaryFunctions/uint32/duint32s.c +++ /dev/null @@ -1,18 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - -#include "uint32.h" - -uint32 duint32s(double x) { - return (uint32) x; -} diff --git a/2.3-1/src/c/elementaryFunctions/uint32/i16uint32a.c b/2.3-1/src/c/elementaryFunctions/uint32/i16uint32a.c deleted file mode 100644 index 84d0fa02..00000000 --- a/2.3-1/src/c/elementaryFunctions/uint32/i16uint32a.c +++ /dev/null @@ -1,18 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "uint32.h" - -void i16uint32a(int16* x, int size, uint32* out) { - int i = 0; - for (i=0;i<size;i++) out[i] = i16uint32s(x[i]); -} diff --git a/2.3-1/src/c/elementaryFunctions/uint32/i32uint32a.c b/2.3-1/src/c/elementaryFunctions/uint32/i32uint32a.c deleted file mode 100644 index 415711ed..00000000 --- a/2.3-1/src/c/elementaryFunctions/uint32/i32uint32a.c +++ /dev/null @@ -1,18 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "uint32.h" - -void i32uint32a(int32* x, int size, uint32* out) { - int i = 0; - for (i=0;i<size;i++) out[i] = i32uint32s(x[i]); -} diff --git a/2.3-1/src/c/elementaryFunctions/uint32/i32uint32s.c b/2.3-1/src/c/elementaryFunctions/uint32/i32uint32s.c deleted file mode 100644 index 63442f24..00000000 --- a/2.3-1/src/c/elementaryFunctions/uint32/i32uint32s.c +++ /dev/null @@ -1,18 +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: Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - -#include "uint32.h" - -uint32 i32uint32s(int32 x) { - return (uint32) x; -} diff --git a/2.3-1/src/c/elementaryFunctions/uint32/i8uint32a.c b/2.3-1/src/c/elementaryFunctions/uint32/i8uint32a.c deleted file mode 100644 index 0dca1b5b..00000000 --- a/2.3-1/src/c/elementaryFunctions/uint32/i8uint32a.c +++ /dev/null @@ -1,18 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "uint32.h" - -void i8uint32a(int8* x, int size, uint32* out) { - int i = 0; - for (i=0;i<size;i++) out[i] = i8uint32s(x[i]); -} diff --git a/2.3-1/src/c/elementaryFunctions/uint32/i8uint32s.c b/2.3-1/src/c/elementaryFunctions/uint32/i8uint32s.c deleted file mode 100644 index 46c0ecb5..00000000 --- a/2.3-1/src/c/elementaryFunctions/uint32/i8uint32s.c +++ /dev/null @@ -1,17 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "uint32.h" - -uint32 i8uint32s(int8 x) { - return (uint32) x; -} diff --git a/2.3-1/src/c/elementaryFunctions/uint32/suint32a.c b/2.3-1/src/c/elementaryFunctions/uint32/suint32a.c deleted file mode 100644 index 2478c021..00000000 --- a/2.3-1/src/c/elementaryFunctions/uint32/suint32a.c +++ /dev/null @@ -1,19 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - -#include "uint32.h" - -void suint32a(float* x, int size, uint32* out) { - int i = 0; - for (i=0;i<size;i++) out[i] = suint32s(x[i]); -} diff --git a/2.3-1/src/c/elementaryFunctions/uint32/suint32s.c b/2.3-1/src/c/elementaryFunctions/uint32/suint32s.c deleted file mode 100644 index 3578b428..00000000 --- a/2.3-1/src/c/elementaryFunctions/uint32/suint32s.c +++ /dev/null @@ -1,18 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - -#include "uint32.h" - -uint32 suint32s(float x) { - return (uint32) x; -} diff --git a/2.3-1/src/c/elementaryFunctions/uint32/u16uint32a.c b/2.3-1/src/c/elementaryFunctions/uint32/u16uint32a.c deleted file mode 100644 index 177bae24..00000000 --- a/2.3-1/src/c/elementaryFunctions/uint32/u16uint32a.c +++ /dev/null @@ -1,18 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "uint32.h" - -void u16uint32a(uint16* x, int size, uint32* out) { - int i = 0; - for (i=0;i<size;i++) out[i] = u16uint32s(x[i]); -} diff --git a/2.3-1/src/c/elementaryFunctions/uint32/u16uint32s.c b/2.3-1/src/c/elementaryFunctions/uint32/u16uint32s.c deleted file mode 100644 index df258b26..00000000 --- a/2.3-1/src/c/elementaryFunctions/uint32/u16uint32s.c +++ /dev/null @@ -1,18 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - -#include "uint32.h" - -uint32 u16uint32s(uint16 x) { - return (uint32) x; -} diff --git a/2.3-1/src/c/elementaryFunctions/uint32/u8uint32a.c b/2.3-1/src/c/elementaryFunctions/uint32/u8uint32a.c deleted file mode 100644 index a89541b1..00000000 --- a/2.3-1/src/c/elementaryFunctions/uint32/u8uint32a.c +++ /dev/null @@ -1,18 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "uint32.h" - -void u8uint32a(uint8* x, int size, uint32* out) { - int i = 0; - for (i=0;i<size;i++) out[i] = u8uint32s(x[i]); -} diff --git a/2.3-1/src/c/elementaryFunctions/uint32/u8uint32s.c b/2.3-1/src/c/elementaryFunctions/uint32/u8uint32s.c deleted file mode 100644 index ac48fe27..00000000 --- a/2.3-1/src/c/elementaryFunctions/uint32/u8uint32s.c +++ /dev/null @@ -1,18 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - -#include "uint32.h" - -uint32 u8uint32s(uint8 x) { - return (uint32) x; -} diff --git a/2.3-1/src/c/hardware/rasberrypi/I2C/u16RPI_I2CReadReg16s.c b/2.3-1/src/c/hardware/rasberrypi/I2C/u16RPI_I2CReadReg16s.c deleted file mode 100644 index 5d04f4b0..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/I2C/u16RPI_I2CReadReg16s.c +++ /dev/null @@ -1,19 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralI2C.h" - -int8 u16RPI_I2CReadReg16s(uint16 fd,uint16 reg){ - int8 out; - out=wiringPiI2CReadReg16(fd,reg); - return (out); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/I2C/u16RPI_I2CReadReg8s.c b/2.3-1/src/c/hardware/rasberrypi/I2C/u16RPI_I2CReadReg8s.c deleted file mode 100644 index 2f4f1f74..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/I2C/u16RPI_I2CReadReg8s.c +++ /dev/null @@ -1,19 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralI2C.h" - -int8 u16RPI_I2CReadReg8s(uint16 fd,uint16 reg){ - int8 out; - out=wiringPiI2CReadReg8(fd,reg); - return (out); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/I2C/u16RPI_I2CReads.c b/2.3-1/src/c/hardware/rasberrypi/I2C/u16RPI_I2CReads.c deleted file mode 100644 index 49c36737..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/I2C/u16RPI_I2CReads.c +++ /dev/null @@ -1,19 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralI2C.h" - -int8 u16RPI_I2CReads(uint16 fd){ - int8 out; - out=wiringPiI2CRead(fd); - return (out); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/I2C/u16RPI_I2CSetups.c b/2.3-1/src/c/hardware/rasberrypi/I2C/u16RPI_I2CSetups.c deleted file mode 100644 index f533a1f2..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/I2C/u16RPI_I2CSetups.c +++ /dev/null @@ -1,19 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralI2C.h" - -int8 u16RPI_I2CSetups(uint8 arrd){ - int8 out; - out=wiringPiI2CSetup(arrd); - return (out); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/I2C/u16RPI_I2CWriteReg16s.c b/2.3-1/src/c/hardware/rasberrypi/I2C/u16RPI_I2CWriteReg16s.c deleted file mode 100644 index b30c106f..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/I2C/u16RPI_I2CWriteReg16s.c +++ /dev/null @@ -1,19 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralI2C.h" - -int8 u16RPI_I2CWriteReg16s(uint16 fd,uint16 data,uint16 reg){ - int8 out; - out=wiringPiI2CWriteReg16(fd,data,reg); - return (out); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/I2C/u16RPI_I2CWriteReg8s.c b/2.3-1/src/c/hardware/rasberrypi/I2C/u16RPI_I2CWriteReg8s.c deleted file mode 100644 index d2ebf3d9..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/I2C/u16RPI_I2CWriteReg8s.c +++ /dev/null @@ -1,19 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralI2C.h" - -int8 u16RPI_I2CWriteReg8s(uint16 fd,uint16 data,uint16 reg){ - int8 out; - out=wiringPiI2CWriteReg8(fd,data,reg); - return (out); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/I2C/u16RPI_I2CWrites.c b/2.3-1/src/c/hardware/rasberrypi/I2C/u16RPI_I2CWrites.c deleted file mode 100644 index 133ed659..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/I2C/u16RPI_I2CWrites.c +++ /dev/null @@ -1,19 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralI2C.h" - -int8 u16RPI_I2CWrites(uint16 fd,uint16 data){ - int8 out; - wiringPiI2CWrite(fd,data); - return (out); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/Digital/u8RPI_digitalWriteBytes.c b/2.3-1/src/c/hardware/rasberrypi/ISR/i16RPIPinISRs.c index 6d0e4cdd..6e398a17 100644 --- a/2.3-1/src/c/hardware/rasberrypi/Digital/u8RPI_digitalWriteBytes.c +++ b/2.3-1/src/c/hardware/rasberrypi/ISR/i16RPIPinISRs.c @@ -5,15 +5,21 @@ 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: Jorawar Singh + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ +/* Function to declare interrupt on pins and corresponding ISRs */ + +#include "types.h" +#include "RPIPeripheralPinISR.h" #include "RPIPeripheralDigital.h" -/* Function to change the output state of the first eight gpio pins */ +int16 i16RPIPinISRs(uint8 pin, uint8 edgetype, void (*ISRFunction)(void)) +{ + int status; + status = wiringPiISR((int)phy_pin[pin-1], (int) edgetype, ISRFunction); + return status; +} -void u8RPI_digitalWriteBytes(uint8 value){ - digitalWriteByte(value); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/Interrupt/u8RPI_waitForInterrupts.c b/2.3-1/src/c/hardware/rasberrypi/Interrupt/u8RPI_waitForInterrupts.c deleted file mode 100644 index ab15b8de..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/Interrupt/u8RPI_waitForInterrupts.c +++ /dev/null @@ -1,44 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralInterrupt.h" -#include "RPI_wfi.h" -#include <sys/time.h> -#include <math.h> -#include <stdlib.h> - -int8 u8RPI_waitForInterrupts(uint8 pin,int16 time){ - __RPI_wfi=0; - if (wiringPiISR(pin,3,&RPI_wfi)<0){ - return -1; - } - if (time==-1){ - while (__RPI_wfi==0){;} - return 1; - } - else{ - struct timeval time1,time2; - int nDigits; - double t1,t2; - gettimeofday(&time1, NULL); - nDigits=floor(log10(abs(time1.tv_usec)))+1; - t1=time1.tv_sec+time1.tv_usec/nDigits; - t2=t1; - while (__RPI_wfi==0 && t2-t1<time){ - gettimeofday(&time2,NULL); - nDigits=floor(log10(abs(time2.tv_usec)))+1; - t2=time2.tv_sec+time2.tv_usec/nDigits; - } - if (__RPI_wfi==0){return 0;} - else{return 1;} - } -} diff --git a/2.3-1/src/c/hardware/rasberrypi/Misc/RPI_boardRev.c b/2.3-1/src/c/hardware/rasberrypi/Misc/RPI_boardRev.c deleted file mode 100644 index c8ecf705..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/Misc/RPI_boardRev.c +++ /dev/null @@ -1,19 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralMisc.h" - -uint8 RPI_boardRev(){ - uint8 out; - out=piBoardRev(); - return out; -} diff --git a/2.3-1/src/c/hardware/rasberrypi/Misc/u16RPI_sn3218Setups.c b/2.3-1/src/c/hardware/rasberrypi/Misc/u16RPI_sn3218Setups.c deleted file mode 100644 index ab229907..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/Misc/u16RPI_sn3218Setups.c +++ /dev/null @@ -1,19 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralMisc.h" - -int8 u16RPI_sn3218Setups(uint16 pinBase){ - int8 out; - out=sn3218Setup(pinBase); - return (out); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/Misc/u8RPI_padDrives.c b/2.3-1/src/c/hardware/rasberrypi/Misc/u8RPI_padDrives.c deleted file mode 100644 index ce13e08a..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/Misc/u8RPI_padDrives.c +++ /dev/null @@ -1,17 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralMisc.h" - -void u8RPI_padDrives(uint8 group,uint8 strength){ - setPadDrive(group,strength); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/Serial/u8RPI_serialGetchars.c b/2.3-1/src/c/hardware/rasberrypi/Serial/u8RPI_serialGetchars.c deleted file mode 100644 index c1dabfd1..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/Serial/u8RPI_serialGetchars.c +++ /dev/null @@ -1,17 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralSerial.h" - -void u8RPI_serialGetchars(uint8 fd,char* out){ - out=serialGetchar(fd); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/Serial/u8RPI_serialPutchars.c b/2.3-1/src/c/hardware/rasberrypi/Serial/u8RPI_serialPutchars.c deleted file mode 100644 index 3309317e..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/Serial/u8RPI_serialPutchars.c +++ /dev/null @@ -1,17 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralSerial.h" - -void u8RPI_serialPutchars(uint8 fd,uint8 character){ - serialPutchar(fd,character); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/Serial/u8RPI_serialPutss.c b/2.3-1/src/c/hardware/rasberrypi/Serial/u8RPI_serialPutss.c deleted file mode 100644 index 581e15ac..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/Serial/u8RPI_serialPutss.c +++ /dev/null @@ -1,17 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralSerial.h" - -void u8RPI_serialPutss(uint8 fd,char* character,int size){ - serialPuts(fd,character); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/Setup/gRPI_pinNumberinga.c b/2.3-1/src/c/hardware/rasberrypi/Setup/gRPI_pinNumberinga.c deleted file mode 100644 index 4170f4c1..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/Setup/gRPI_pinNumberinga.c +++ /dev/null @@ -1,28 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralSetup.h" -#include "stdio.h" - -int8 gRPI_pinNumberinga(char* seq,int size){ - uint8 out; - if (seq[0]=='w'){ - out=wiringPiSetup(); - } - else if (seq[0]=='G'){ - out=wiringPiSetupGpio(); - } - else if (seq[0]=='P'){ - out=wiringPiSetupPhys(); - } - return (out); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/Setup/u8RPI_getAlts.c b/2.3-1/src/c/hardware/rasberrypi/Setup/u8RPI_getAlts.c deleted file mode 100644 index 0a5c4764..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/Setup/u8RPI_getAlts.c +++ /dev/null @@ -1,19 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralSetup.h" - -uint8 u8RPI_getAlts(uint8 pin){ - uint8 out; - out=getAlt(pin); - return (out); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/Setup/u8RPI_pinModeAlts.c b/2.3-1/src/c/hardware/rasberrypi/Setup/u8RPI_pinModeAlts.c deleted file mode 100644 index 153b88ee..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/Setup/u8RPI_pinModeAlts.c +++ /dev/null @@ -1,17 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralSetup.h" - -void u8RPI_pinModeAlts(uint8 pin,uint8 mode){ - pinModeAlt(pin,mode); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/Setup/u8RPI_pinModes.c b/2.3-1/src/c/hardware/rasberrypi/Setup/u8RPI_pinModes.c deleted file mode 100644 index 76601f8d..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/Setup/u8RPI_pinModes.c +++ /dev/null @@ -1,31 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include <stdio.h> -#include "types.h" -#include "RPIPeripheralSetup.h" - -void u8RPI_pinModes(uint8 pin,char* mode,int size){ - if (mode[0]=='i'){ - pinMode(pin,INPUT); - } - else if (mode[0]=='o'){ - pinMode(pin,OUTPUT); - } - else if (mode[0]=='p'){ - pinMode(pin,PWM_OUTPUT); - } - else if (mode[0]=='c'){ - pinMode(pin,GPIO_CLOCK); - } - -} diff --git a/2.3-1/src/c/hardware/rasberrypi/Setup/u8RPI_pullControls.c b/2.3-1/src/c/hardware/rasberrypi/Setup/u8RPI_pullControls.c deleted file mode 100644 index 4e95aac5..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/Setup/u8RPI_pullControls.c +++ /dev/null @@ -1,25 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralSetup.h" - -void u8RPI_pullControls(uint8 pin,char* mode,int size){ - if (mode[0]=='d'){ - pullUpDnControl(pin,1); - } - else if (mode[0]=='u'){ - pullUpDnControl(pin,2); - } - else if (mode[0]=='o'){ - pullUpDnControl(pin,0); - } -} diff --git a/2.3-1/src/c/hardware/rasberrypi/Shift/u16RPI_sr595Setups.c b/2.3-1/src/c/hardware/rasberrypi/Shift/u16RPI_sr595Setups.c deleted file mode 100644 index 3f0a6493..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/Shift/u16RPI_sr595Setups.c +++ /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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralShift.h" - -int8 u16RPI_sr595Setups(uint16 pinBase,uint8 nPins,uint8 dP,uint8 cP,uint8 lP) -{ - int8 out; - out=sr595Setup(pinBase,nPins,dP,cP,lP); - return (out); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/Shift/u8RPI_shiftIns.c b/2.3-1/src/c/hardware/rasberrypi/Shift/u8RPI_shiftIns.c deleted file mode 100644 index 6a264b6a..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/Shift/u8RPI_shiftIns.c +++ /dev/null @@ -1,19 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralShift.h" - -uint8 u8RPI_shiftIns(uint8 dpin,uint8 cpin,uint8 order){ - uint8 out; - out=shiftIn(dpin,cpin,order); - return out; -} diff --git a/2.3-1/src/c/hardware/rasberrypi/Shift/u8RPI_shiftOuts.c b/2.3-1/src/c/hardware/rasberrypi/Shift/u8RPI_shiftOuts.c deleted file mode 100644 index 5d24c2b9..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/Shift/u8RPI_shiftOuts.c +++ /dev/null @@ -1,17 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralShift.h" - -void u8RPI_shiftOuts(uint8 dpin,uint8 cpin,uint8 order,uint8 val){ - shiftOut(dpin,cpin,order,val); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/gertBoard/RPI_gertboardSPISetup.c b/2.3-1/src/c/hardware/rasberrypi/gertBoard/RPI_gertboardSPISetup.c deleted file mode 100644 index 5724ebb4..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/gertBoard/RPI_gertboardSPISetup.c +++ /dev/null @@ -1,19 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralGertboard.h" - -int8 RPI_gertboardSPISetup(){ - int8 out; - out=gertboardSPISetup(); - return (out); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/gertBoard/u16RPI_gertboardAnalogReads.c b/2.3-1/src/c/hardware/rasberrypi/gertBoard/u16RPI_gertboardAnalogReads.c deleted file mode 100644 index 433bed29..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/gertBoard/u16RPI_gertboardAnalogReads.c +++ /dev/null @@ -1,19 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralGertboard.h" - -uint16 u16RPI_gertboardAnalogReads(uint16 pin){ - uint16 out; - out=gertboardAnalogRead(pin); - return (out); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/gertBoard/u16RPI_gertboardAnalogSetups.c b/2.3-1/src/c/hardware/rasberrypi/gertBoard/u16RPI_gertboardAnalogSetups.c deleted file mode 100644 index a19aa6d0..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/gertBoard/u16RPI_gertboardAnalogSetups.c +++ /dev/null @@ -1,19 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralGertboard.h" - -int8 u16RPI_gertboardAnalogSetups(uint16 pinBase){ - int8 out; - out=gertboardAnalogSetup(pinBase); - return (out); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/gertBoard/u16RPI_gertboardAnalogWrites.c b/2.3-1/src/c/hardware/rasberrypi/gertBoard/u16RPI_gertboardAnalogWrites.c deleted file mode 100644 index 2c8aa338..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/gertBoard/u16RPI_gertboardAnalogWrites.c +++ /dev/null @@ -1,17 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralGertboard.h" - -void u16RPI_gertboardAnalogWrites(uint16 pin,uint16 value){ - gertboardAnalogWrite(pin,value); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/Digital/RPI_digitalReadByte.c b/2.3-1/src/c/hardware/rasberrypi/gpio/u8RPIDigitalIns.c index 70fb6858..7b84350f 100644 --- a/2.3-1/src/c/hardware/rasberrypi/Digital/RPI_digitalReadByte.c +++ b/2.3-1/src/c/hardware/rasberrypi/gpio/u8RPIDigitalIns.c @@ -5,17 +5,20 @@ 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: Jorawar Singh, Siddhesh Wani + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ -#include "RPIPeripheralDigital.h" +/* Function to read the state of the gpio pin */ -/* Function to read the state of the first eight gpio pins */ +#include "types.h" +#include "RPIPeripheralDigital.h" -uint8 RPI_digitalReadByte(){ - uint8 state=0; - state=digitalReadByte(); - return (state); +/*pin is reduced by one as array index starts from 0 and pin no starts from 1*/ +uint8 u8RPIDigitalIns(uint8 pin) +{ + uint8 state = 0; + state = digitalRead(phy_pin[pin-1]); + return (state); } diff --git a/2.3-1/src/c/hardware/rasberrypi/Digital/u8RPI_digitalWrites.c b/2.3-1/src/c/hardware/rasberrypi/gpio/u8RPIDigitalOuts.c index 02dce554..f828f77e 100644 --- a/2.3-1/src/c/hardware/rasberrypi/Digital/u8RPI_digitalWrites.c +++ b/2.3-1/src/c/hardware/rasberrypi/gpio/u8RPIDigitalOuts.c @@ -5,18 +5,22 @@ 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: Siddhesh Wani, Jorawar Singh + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ + +/* Function to change the output state of the gpio pin */ -#include "RPIPeripheralDigital.h" -/* Function to change the output state of the gpio pin */ +#include "types.h" +#include "RPIPeripheralDigital.h" -void u8RPI_digitalWrites(uint8 pin, uint8 state){ +/*pin is reduced by one as array index starts from 0 and pin no starts from 1*/ +void u8RPIDigitalOuts(uint8 pin, uint8 state) +{ if (state == 0) /*low output*/ - digitalWrite(pin,0); - else if (state == 1) /*high output*/ - digitalWrite(pin,1); + digitalWrite(phy_pin[pin-1], LOW); + if (state == 1) /*high output*/ + digitalWrite(phy_pin[pin-1], HIGH); } diff --git a/2.3-1/src/c/hardware/rasberrypi/gpio/u8RPIDigitalSetups.c b/2.3-1/src/c/hardware/rasberrypi/gpio/u8RPIDigitalSetups.c new file mode 100644 index 00000000..f5fefe08 --- /dev/null +++ b/2.3-1/src/c/hardware/rasberrypi/gpio/u8RPIDigitalSetups.c @@ -0,0 +1,39 @@ +/* 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: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/* Function to setup digital pins + direction = 1 -> output + direction = 0 -> input +*/ + +#include "types.h" +#include "RPIPeripheralDigital.h" + + +/*This array maps pin numbers on RPi board, with pin numbers corrsponding +to WiringPi library*/ +int phy_pin[] = {17, 17, 8, 17, 9, 17, 7, 15, 17, 16, /*Pin 1 to 10*/ + 0, 1, 2, 17, 3, 4, 17, 5, 12, 17, /*Pin 11 to 20*/ + 13, 6, 14, 10, 17, 11, 30, 31, 21, 17, /*Pin 21 to 30*/ + 22, 26, 23, 17, 24, 27, 25, 28, 17, 29 }; /*Pin 31 to 40*/ + +/*pin is reduced by one as arrayiindex starts from 0 and pin no starts from 1*/ +void u8RPIDigitalSetups(uint8 pin, uint8 direction) +{ + if(direction == 1) /*Pin to be used as output*/ + pinMode(phy_pin[pin-1], OUTPUT); + else if(direction == 2) + pinMode(phy_pin[pin-1], PWM_OUTPUT); + else + pinMode(phy_pin[pin-1], INPUT); + +} diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h index 22d470a2..2f40ffb2 100644 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h +++ b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralDigital.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2017 - IIT Bombay - FOSSEE +/* 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 @@ -19,12 +19,15 @@ extern "C" { #endif + #include "types.h" +#include "wiringPi.h" + +extern int phy_pin[]; -uint8 u8RPI_digitalReads(uint8 pin); -uint8 RPI_digitalReadByte(); -void u8RPI_digitalWrites(uint8 pin, uint8 state); -void u8RPI_digitalWriteBytes(uint8 value); +void u8RPIDigitalSetups(uint8 pin, uint8 direction); +void u8RPIDigitalOuts(uint8 pin, uint8 state); +uint8 u8RPIDigitalIns(uint8 pin); #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralGertboard.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralGertboard.h deleted file mode 100644 index 3594d0a1..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralGertboard.h +++ /dev/null @@ -1,32 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#ifndef __RPIPERIPHERALGERTBOARD_H__ -#define __RPIPERIPHERALGERTBOARD_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -#include "types.h" -#include "gertboard.h" - -int8 RPI_gertboardSPISetup(); -uint16 u16RPI_gertboardAnalogReads(uint16 pin); -int8 u16RPI_gertboardAnalogSetups(uint16 pinBase); -void u16RPI_gertboardAnalogWrites(uint16 pin,uint16 value); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /*__RPIPERIPHERALGERTBOARD_H__*/ diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralI2C.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralI2C.h deleted file mode 100644 index 6c8dfe14..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralI2C.h +++ /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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* This file declares functions and constants related to rasberrypi*/ - -#ifndef __RPIPERIPHERALI2C_H__ -#define __RPIPERIPHERALI2C_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -#include "types.h" -#include "wiringPiI2C.h" - -int8 u16RPI_I2CSetups(uint8 arrd); -int8 u16RPI_I2CReads(uint16 fd); -int8 u16RPI_I2CReadReg8s(uint16 fd,uint16 reg); -int8 u16RPI_I2CReadReg16s(uint16 fd,uint16 reg); -int8 u16RPI_I2CWrites(uint16 fd,uint16 data); -int8 u16RPI_I2CWriteReg8s(uint16 fd,uint16 reg,uint16 data); -int8 u16RPI_I2CWriteReg16s(uint16 fd,uint16 reg,uint16 data); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /*__RPIPERIPHERALI2C_H__*/ diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralLCD.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralLCD.h deleted file mode 100644 index 654a31a3..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralLCD.h +++ /dev/null @@ -1,39 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#ifndef __RPIPERIPHERALLCD_H__ -#define __RPIPERIPHERALLCD_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -#include "types.h" -#include "lcd.h" - -void u8RPI_lcdCharDefs(uint8 fd,uint8 index,uint8 d0,uint8 d1,uint8 d2,uint8 d3, uint8 d4,uint8 d5,uint8 d6,uint8 d7); -void u8RPI_lcdClears(uint8 fd); -void u8RPI_lcdCursorBlinks(uint8 fd,uint8 state); -void u8RPI_lcdCursors(uint8 fd,uint8 state); -void u8RPI_lcdDisplays(uint8 fd,uint8 state); -void u8RPI_lcdHomes(uint8 fd); -int8 u8RPI_lcdInits(uint8 rows,uint8 cols,uint8 bits,uint8 rs,uint8 strb,uint8 d0,uint8 d1,uint8 d2,uint8 d3,uint8 d4,uint8 d5,uint8 d6,uint8 d7); -void u8RPI_lcdPositions(uint8 fd,uint8 row,uint8 col); -void u8RPI_lcdPutchars(uint8 fd,uint8 character); -void u8RPI_lcdSendCommands(uint8 fd,uint8 cmd); -void u8RPI_lcdPutss(uint8 fd,char* msg,int size); -void u8RPI_lcdPrintfs(uint8 fd,char* data,int size); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /*__RPIPERIPHERALLCD_H__*/ diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralLCD128x64.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralLCD128x64.h deleted file mode 100644 index d541c9fd..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralLCD128x64.h +++ /dev/null @@ -1,43 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#ifndef __RPIPERIPHERALLCD128x64_H__ -#define __RPIPERIPHERALLCD128x64_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -#include "types.h" -#include "lcd128x64.h" - -int8 RPI_lcd128x64setup(void); -void u8RPI_lcd128x64clears(uint8 colour); -void u8RPI_lcd128x64Orientations(uint8 orientation); -void u8RPI_lcd128x64setOrigins(uint8 x, uint8 y); -void u8RPI_lcd128x64points(uint8 x, uint8 y, uint8 colour); -void u8RPI_lcd128x64lineTos(uint8 x, uint8 y, uint8 colour); -void u8RPI_lcd128x64lines(uint8 x0, uint8 y0, uint8 x1, uint8 y1, uint8 colour); -void u8RPI_lcd128x64circles(uint8 x, uint8 y, uint8 r, uint8 colour, uint8 filled); -void u8RPI_lcd128x64putchars(uint8 x, uint8 y, uint8 c, uint8 bgCol, uint8 fgCol); -void u8RPI_lcd128x64putss(uint8 x, uint8 y, char *str,int size, uint8 bgCol, uint8 fgCol); -void u8RPI_lcd128x64rectangles(uint8 x1, uint8 y1, uint8 x2, uint8 y2, uint8 colour, uint8 filled); -void u8RPI_lcd128x64ellipses(uint8 cx, uint8 cy, uint8 xRadius, uint8 yRadius, uint8 colour, uint8 filled); - -//void u8RPI_lcd128x64orientCoordinatess(uint8 *x, uint8 *y); -//void u8RPI_lcd128x64getScreenSizes(uint8 *x, uint8 *y); -//void RPI_lcd128x64update(void); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /*__RPIPERIPHERALLCD128x64_H__*/ diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralMcp.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralMcp.h deleted file mode 100644 index 5304f14b..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralMcp.h +++ /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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#ifndef __RPIPERIPHERALMCP_H__ -#define __RPIPERIPHERALMCP_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -#include "types.h" -#include "mcp23016.h" -#include "mcp23017.h" -#include "mcp23008.h" -#include "mcp23s17.h" -#include "mcp23s08.h" - -uint8 u16RPI_mcp23008Setups(uint16 pinBase,uint8 addr); -uint8 u16RPI_mcp23016Setups(uint16 pinBase,uint8 addr); -uint8 u16RPI_mcp23017Setups(uint16 pinBase,uint8 addr); -uint8 u16RPI_mcp23s08Setups(uint16 pinBase,uint8 spiport,uint8 devId); -uint8 u16RPI_mcp23s17Setups(uint16 pinBase,uint8 spiport,uint8 devId); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /*__RPIPERIPHERALMCP_H__*/ diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralMisc.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralMisc.h deleted file mode 100644 index 0ef5acc1..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralMisc.h +++ /dev/null @@ -1,31 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#ifndef __RPIPERIPHERALMISC_H__ -#define __RPIPERIPHERALMISC_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -#include "types.h" -#include "sn3218.h" - -uint8 RPI_boardRev(); -void u8RPI_padDrives(uint8 group,uint8 strength); -int8 u16RPI_sn3218Setups(uint16 pinBase); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /*__RPIPERIPHERALMISC_H__*/ diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPWM.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPWM.h index f1d3024e..d463d9c9 100644 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPWM.h +++ b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPWM.h @@ -5,24 +5,24 @@ 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: Siddhesh Wani, Jorawar Singh + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ #ifndef __RPIPERIPHERALPWM_H__ #define __RPIPERIPHERALPWM_H__ +#include "types.h" +#include "wiringPi.h" + #ifdef __cplusplus extern "C" { #endif -#include "types.h" - -void u8RPI_pwmWrites(uint8 pin,uint16 value); -void u32RPI_pwmRanges(uint32 value); -void gRPI_pwmModea(char* mode,int size); -void u16RPI_pwmClocks(uint16 divisor); -void u8RPI_pwmToneWrites(uint8 pin,uint16 value); +void u8RPIHardPWMWrites(uint8 pin, uint16 value); +void u8RPIHardPWMSetRanges(uint16 value); +void u8RPIHardPWMSetModes(uint8 mode); +void u8RPIHardPWMSetClocks(uint16 clk_divisor); #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPcf.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPcf.h deleted file mode 100644 index 55459332..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPcf.h +++ /dev/null @@ -1,30 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#ifndef __RPIPERIPHERALPCF_H__ -#define __RPIPERIPHERALPCF_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -#include "types.h" -#include "pcf8574.h" -#include "pcf8591.h" - -uint8 u16RPI_pcf8574Setups(uint16 pinBase,uint8 addr); -uint8 u16RPI_pcf8591Setups(uint16 pinBase,uint8 addr); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /*__RPIPERIPHERALPCF_H__*/ diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPiGlow.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPiGlow.h deleted file mode 100644 index d2dcd13c..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPiGlow.h +++ /dev/null @@ -1,31 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#ifndef __RPIPERIPHERALPIGLOW_H__ -#define __RPIPERIPHERALPIGLOW_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -#include "types.h" -#include "piGlow.h" - -void u8RPI_piGlowSetups(uint8 clear); -void u8RPI_piGlow1s(uint8 leg,uint8 ring,uint8 intensity); -void u8RPI_piGlowLegs(uint8 leg,uint8 intensity); -void u8RPI_piGlowRings(uint8 ring,uint8 intensity); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /*__RPIPERIPHERALPIGLOW_H__*/ diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralInterrupt.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPinISR.h index d9fc30f3..fc5a8d04 100644 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralInterrupt.h +++ b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPinISR.h @@ -5,23 +5,22 @@ 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: Siddhesh Wani, Jorawar Singh + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ -#ifndef __RPIPERIPHERALINTERRUPT_H__ -#define __RPIPERIPHERALINTERRUPT_H__ +#ifndef __RPIPERIPHERALPINISR_H__ +#define __RPIPERIPHERALPINISR_H__ + #ifdef __cplusplus extern "C" { #endif -#include "types.h" - -int8 u8RPI_waitForInterrupts(uint8 pin,int16 time); +int16 i16RPIPinISRs(uint8 pin, uint8 edgetype, void (*ISRFunction)(void)); #ifdef __cplusplus } /* extern "C" */ #endif -#endif /*__RPIPERIPHERALINTERRUPT_H__*/ +#endif /*__RPIPERIPHERALPINISR_H__*/ diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralSerial.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralSerial.h index 67284bd0..14df95b4 100644 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralSerial.h +++ b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralSerial.h @@ -5,28 +5,42 @@ 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: Siddhesh Wani, Jorawar Singh + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ #ifndef __RPIPERIPHERALSERIAL_H__ #define __RPIPERIPHERALSERIAL_H__ +#include "types.h" +#include "wiringSerial.h" + #ifdef __cplusplus extern "C" { #endif -#include "types.h" -#include "wiringSerial.h" +int u8RPISerialSetups(char* port, int baudrate); +void u8RPISerialCloses(int fd); + +void u8RPISerialSendChars(int fd, uint8 data); +void u8RPISerialSendDatas(int fd, uint8 data); +void i8RPISerialSendDatas(int fd, int8 data); +void u16RPISerialSendDatas(int fd, uint16 data); +void i16RPISerialSendDatas(int fd, int16 data); +void sRPISerialSendDatas(int fd, float data); +void dRPISerialSendDatas(int fd, double data); +void u8RPISerialSendDataa(int fd, uint8* data, int size); +void i8RPISerialSendDataa(int fd, int8* data, int size); +void u16RPISerialSendDataa(int fd, uint16* data, int size); +void i16RPISerialSendDataa(int fd, int16* data, int size); +void sRPISerialSendDataa(int fd, float* data, int size); +void dRPISerialSendDataa(int fd, double* data, int size); +void gRPISerialSendDatas(int fd, uint8* data, int size); + +int16 i16RPISerialDataAvails(int fd); +int16 i16RPISerialGetChars(int fd); -int8 gRPI_serialOpena(char* device,int size,uint32 baud); -void u8RPI_serialCloses(uint8 fd); -uint8 u8RPI_serialDataAvails(uint8 fd); -void u8RPI_serialFlushs(uint8 fd); -void u8RPI_serialGetchars(uint8 fd,char* out); -void u8RPI_serialPrintfs(uint8 fd,char* msg,int size); -void u8RPI_serialPutchars(uint8 fd,uint8 character); -void u8RPI_serialPutss(uint8 fd,char* character,int size); +void u8RPISerialFlushs(int fd); #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralSetup.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralSetup.h deleted file mode 100644 index 373f0648..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralSetup.h +++ /dev/null @@ -1,35 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* This file declares functions and constants related to Setup*/ - -#ifndef __RPIPERIPHERALSETUP_H__ -#define __RPIPERIPHERALSETUP_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -#include "types.h" -#include "wiringPi.h" - -int8 gRPI_pinNumberinga(char* seq,int size); -uint8 u8RPI_getAlts(uint8 pin); -void u8RPI_pinModeAlts(uint8 pin,uint8 mode); -void u8RPI_pinModes(uint8 pin,char* mode,int size); -void u8RPI_pullControls(uint8 pin,char* mode,int size); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /*__RPIPERIPHERALSETUP_H__*/ diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralShift.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralShift.h deleted file mode 100644 index 4c58bb77..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralShift.h +++ /dev/null @@ -1,31 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#ifndef __RPIPERIPHERALSHIFT_H__ -#define __RPIPERIPHERALSHIFT_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -#include "types.h" -#include "wiringShift.h" -#include "sr595.h" - -uint8 u8RPI_shiftIns(uint8 dpin,uint8 cpin,uint8 order); -void u8RPI_shiftOuts(uint8 dpin,uint8 cpin,uint8 order,uint8 val); -int8 u16RPI_sr595Setups(uint16 pinBase,uint8 nPins,uint8 dP,uint8 cP,uint8 lP); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /*__RPIPERIPHERALSHIFT_H__*/ diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralSoft.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralSoft.h deleted file mode 100644 index 9494506e..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralSoft.h +++ /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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* This file declares functions and constants related to Setup*/ - -#ifndef __RPIPERIPHERALSOFT_H__ -#define __RPIPERIPHERALSOFT_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -#include "types.h" -#include "softPwm.h" -#include "softTone.h" - -uint8 u8RPI_softPwmCreates(uint8 pin,uint16 ival,uint16 range); -void u8RPI_softPwmStops(uint8 pin); -void u8RPI_softPwmWrites(uint8 pin,uint16 value); -uint8 u8RPI_softToneCreates(uint8 pin); -void u8RPI_softToneStops(uint8 pin); -void u8RPI_softToneWrites(uint8 pin,uint32 value); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /*__RPIPERIPHERALSOFT_H__*/ diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPinMap.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralThreading.h index 39c2379d..a7b2adb4 100644 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralPinMap.h +++ b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralThreading.h @@ -5,24 +5,24 @@ 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: Siddhesh Wani, Jorawar Singh + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ -#ifndef __RPIPERIPHERALPINMAP_H__ -#define __RPIPERIPHERALPINMAP_H__ +#ifndef __RPIPERIPHERALTHREADING_H__ +#define __RPIPERIPHERALTHREADING_H__ + +#include "types.h" +#include "wiringPi.h" #ifdef __cplusplus extern "C" { #endif -#include "types.h" - -int8 u8RPI_physToGpios(uint8 pin); -int8 u8RPI_wpiToGpios(uint8 pin); +uint16 RPIThreadCreate(void *(*threadFunction)(void*)); #ifdef __cplusplus } /* extern "C" */ #endif -#endif /*__RPIPERIPHERALPINMAP_H__*/ +#endif /*__RPIPERIPHERALTHREADING_H__*/ diff --git a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h index e75a5394..854073f3 100644 --- a/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h +++ b/2.3-1/src/c/hardware/rasberrypi/includes/RPIPeripheralTiming.h @@ -5,7 +5,7 @@ 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: Siddhesh Wani, Jorawar Singh + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ @@ -22,10 +22,10 @@ extern "C" { #include "types.h" #include "wiringPi.h" -void u32RPI_delays(uint32 time); -void u32RPI_delayMicros(uint32 time); -uint32 RPI_millis(); -uint32 RPI_micros(); +void u16RPIDelayMillis(uint16 time); +void u16RPIDelayMicros(uint16 time); +uint32 u32RPIGetMillis(); +uint32 u32RPIGetMicros(); #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralDigital.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralDigital.h index 096fed08..40a8e1a4 100644 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralDigital.h +++ b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralDigital.h @@ -5,7 +5,7 @@ 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: Siddhesh Wani, Jorawar Singh + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ @@ -20,17 +20,14 @@ extern "C" { #endif -#define u80RPI_digitalReadu80(pin) u8RPI_digitalReads(pin); -#define d0RPI_digitalReadd0(pin) u8RPI_digitalReads(pin); +#define RPI_DigitalSetup(in1,in2) u8RPIDigitalSetups((uint8) in1, (uint8) in2); -#define RPI_digitalReadByteu80() RPI_digitalReadByte(); -#define u80u80RPI_digitalWrite(pin,state) u8RPI_digitalWrites(pin,state); -#define d0d0RPI_digitalWrite(pin,state) u8RPI_digitalWrites(pin,state); +#define RPI_DigitalIn(in1) u8RPIDigitalIns((uint8) in1); -#define u80RPI_digitalWriteByte(value) u8RPI_digitalWriteBytes(value); +#define RPI_DigitalOut(in1,in2) u8RPIDigitalOuts((uint8) in1, (uint8) in2); #ifdef __cplusplus } /* extern "C" */ #endif -#endif /* !__INT_RPIPERIPHERALGPIO_H__ */ +#endif /* !__RPIPERIPHERALGPIO_H__ */ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralGertboard.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralGertboard.h deleted file mode 100644 index cea8bb6e..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralGertboard.h +++ /dev/null @@ -1,32 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#ifndef __INT_RPIPERIPHERALGERTBOARD_H__ -#define __INT_RPIPERIPHERALGERTBOARD_H__ - -#include "types.h" -#include "RPIPeripheralGertboard.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define RPI_gertboardSPISetupi80() RPI_gertboardSPISetup(); -#define u160RPI_gertboardAnalogSetupi80(pinBase) u16RPI_gertboardAnalogSetups(pinBase); -#define u160RPI_gertboardAnalogReadu160(pin) u160RPI_gertboardAnalogReads(pin); -#define u160u160RPI_gertboardAnalogWrite(pin,value) u160RPI_gertboardAnalogWrites(pin,value); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* !__INT_RPIPERIPHERALGERTBOARD_H__ */ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralI2C.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralI2C.h deleted file mode 100644 index f18fd57c..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralI2C.h +++ /dev/null @@ -1,35 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#ifndef __INT_RPIPERIPHERALI2C_H__ -#define __INT_RPIPERIPHERALI2C_H__ - -#include "types.h" -#include "RPIPeripheralI2C.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define u160RPI_I2CSetupi80(arrd) u16RPI_I2CSetups(arrd); -#define u160RPI_I2CReadi80(fd) u16RPI_I2CReads(fd); -#define u160u160RPI_I2CReadReg8i80(fd,reg) u16RPI_I2CReadReg8s(fd,reg); -#define u160u160RPI_I2CReadReg16i80(fd,reg) u16RPI_I2CReadReg16s(fd,reg); -#define u160u160RPI_I2CWritei80(fd,data) u16RPI_I2CWrites(fd,data); -#define u160u160u160RPI_I2CWriteReg8i80(fd,reg,data) u16RPI_I2CWriteReg8s(fd,reg,data); -#define u160u160u160RPI_I2CWriteReg16i80(fd,reg,data) u16RPI_I2CWriteReg16s(fd,reg,data); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* !__INT_RPIPERIPHERALI2C_H__ */ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralInterrupt.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralInterrupt.h deleted file mode 100644 index 572d028d..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralInterrupt.h +++ /dev/null @@ -1,30 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#ifndef __INT_RPIPERIPHERALINTERRUPT_H__ -#define __INT_RPIPERIPHERALINTERRUPT_H__ - -#include "types.h" -#include "RPIPeripheralInterrupt.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define u80i160RPI_waitForInterrupti80(pin,time) u8RPI_waitForInterrupts(pin,time); -#define d0d0RPI_waitForInterrupti80(pin,time) u8RPI_waitForInterrupts(pin,time); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* !__INT_RPIPERIPHERALINTERRUPT_H__ */ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralLCD.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralLCD.h deleted file mode 100644 index e4f3ca29..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralLCD.h +++ /dev/null @@ -1,40 +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: Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#ifndef __INT_RPIPERIPHERALLCD_H__ -#define __INT_RPIPERIPHERALLCD_H__ - -#include "types.h" -#include "RPIPeripheralLCD.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define u80u80u80u80u80u80u80u80u80u80RPI_lcdCharDef(fd,index,d0,d1,d2,d3,d4,d5,d6,d7) u8RPI_lcdCharDefs(fd,index,d0,d1,d2,d3,d4,d5,d6,d7); -#define u80RPI_lcdClear(fd) u8RPI_lcdClears(fd); -#define u80u80RPI_lcdCursorBlink(fd,state) u8RPI_lcdCursorBlinks(fd,state); -#define u80u80RPI_lcdCursor(fd,state) u8RPI_lcdCursors(fd,state); -#define u80u80RPI_lcdDisplay(fd,state) u8RPI_lcdDisplays(fd,state); -#define u80RPI_lcdHome(fd) u8RPI_lcdHomes(fd); -#define u80u80u80u80u80u80u80u80u80u80u80u80u80RPI_lcdIniti80(rows,cols,bits,rs,strb,d0,d1,d2,d3,d4,d5,d6,d7) u8RPI_lcdInits(rows,cols,bits,rs,strb,d0,d1,d2,d3,d4,d5,d6,d7); -#define u80u80u80RPI_lcdPosition(fd,row,col) u8RPI_lcdPositions(fd,row,col); -#define u80u80RPI_lcdPutchar(fd,char) u8RPI_lcdPutchars(fd,char); -#define u80u80RPI_lcdSendCommand(fd,cmd) u8RPI_lcdSendCommands(fd,cmd); -#define u80g2RPI_lcdPuts(fd,msg,size) u8RPI_lcdPutss(fd,msg,size[1]);; -#define u80g2RPI_lcdPrintf(fd,data,size) u8RPI_lcdPrintfs(fd,data,size[1]); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* !__INT_RPIPERIPHERALLCD_H__ */ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralLCD128x64.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralLCD128x64.h deleted file mode 100644 index 46b63286..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralLCD128x64.h +++ /dev/null @@ -1,58 +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: Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#ifndef __INT_RPIPERIPHERALLCD128x64_H__ -#define __INT_RPIPERIPHERALLCD128x64_H__ - -#include "types.h" -#include "RPIPeripheralLCD128x64.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define RPI_lcd128x64setupi80() RPI_lcd128x64setup(); - -#define u80RPI_lcd128x64clear(colour) u8RPI_lcd128x64clears(colour); -#define d0RPI_lcd128x64clear(colour) u8RPI_lcd128x64clears(colour); - -#define u80RPI_lcd128x64Orientation(orientation) u8RPI_lcd128x64Orientations(orientation); -#define d0RPI_lcd128x64Orientation(orientation) u8RPI_lcd128x64Orientations(orientation); - -#define u80u80RPI_lcd128x64setOrigin(x,y) u8RPI_lcd128x64setOrigins(x,y); -#define d0d0RPI_lcd128x64setOrigin(x,y) u8RPI_lcd128x64setOrigins(x,y); - -#define u80u80u80RPI_lcd128x64point(x,y,colour) u8RPI_lcd128x64points(x,y,colour); -#define d0d0d0RPI_lcd128x64point(x,y,colour) u8RPI_lcd128x64points(x,y,colour); -#define u80u80u80RPI_lcd128x64lineTo(x,y,colour) u8RPI_lcd128x64lineTos(x,y,colour); -#define d0d0d0RPI_lcd128x64lineTo(x,y,colour) u8RPI_lcd128x64lineTos(x,y,colour); - -#define u80u80u80u80u80RPI_lcd128x64line(x0,y0,x1,y1,colour) u8RPI_lcd128x64lines(x0,y0,x1,y1,colour); -#define d0d0d0d0d0RPI_lcd128x64line(x0,y0,x1,y1,colour) u8RPI_lcd128x64lines(x0,y0,x1,y1,colour); -#define u80u80u80u80u80RPI_lcd128x64circle(x,y,r,colour,filled) u8RPI_lcd128x64circles(x,y,r,colour,filled); -#define d0d0d0d0d0RPI_lcd128x64circle(x,y,r,colour,filled) u8RPI_lcd128x64circles(x,y,r,colour,filled); -#define u80u80u80u80u80RPI_lcd128x64putchar(x,y,c,bgCol,fgCol) u8RPI_lcd128x64putchars(x,y,c,bgCol,fgCol); -#define d0d0d0d0u80RPI_lcd128x64putchar(x,y,c,bgCol,fgCol) u8RPI_lcd128x64putchars(x,y,c,bgCol,fgCol); - -#define u80u80g2u80u80RPI_lcd128x64puts(x,y,str,size,bgCol,fgCol) u8RPI_lcd128x64putss(x,y,str,size[1],bgCol,fgCol); -#define d0d0g2d0d0RPI_lcd128x64puts(x,y,str,size,bgCol,fgCol) u8RPI_lcd128x64putss(x,y,str,size[1],bgCol,fgCol); - -#define u80u80u80u80u80u80RPI_lcd128x64rectangle(x1,y1,x2,y2,colour,filled) u8RPI_lcd128x64rectangles(x1,y1,x2,y2,colour,filled); -#define d0d0d0d0d0d0RPI_lcd128x64rectangle(x1,y1,x2,y2,colour,filled) u8RPI_lcd128x64rectangles(x1,y1,x2,y2,colour,filled); -#define u80u80u80u80u80u80RPI_lcd128x64ellipse(cx,cy,xRadius,yRadius,colour,filled) u8RPI_lcd128x64ellipses(cx,cy,xRadius,yRadius,colour,filled); -#define d0d0d0d0d0d0RPI_lcd128x64ellipse(cx,cy,xRadius,yRadius,colour,filled) u8RPI_lcd128x64ellipses(cx,cy,xRadius,yRadius,colour,filled); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* !__INT_RPIPERIPHERALLCD128x64_H__ */ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralMcp.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralMcp.h deleted file mode 100644 index c044cf7f..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralMcp.h +++ /dev/null @@ -1,33 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#ifndef __INT_RPIPERIPHERALMCP_H__ -#define __INT_RPIPERIPHERALMCP_H__ - -#include "types.h" -#include "RPIPeripheralMcp.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define u160u80RPI_mcp23008Setupu80(pinBase,addr) u16RPI_mcp23008Setups(pinBase,addr); -#define u160u80RPI_mcp23016Setupu80(pinBase,addr) u16RPI_mcp23016Setups(pinBase,addr); -#define u160u80RPI_mcp23017Setupu80(pinBase,addr) u16RPI_mcp23017Setups(pinBase,addr); -#define u160u80u80RPI_mcp23s08Setupu80(pinBase,spiport,devId) u16RPI_mcp23s08Setups(pinBase,spiport,devId); -#define u160u80u80RPI_mcp23s17Setupu80(pinBase,spiport,devId) u16RPI_mcp23s17Setups(pinBase,spiport,devId); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* !__INT_RPIPERIPHERALMCP_H__ */ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralMisc.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralMisc.h deleted file mode 100644 index b836d683..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralMisc.h +++ /dev/null @@ -1,31 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#ifndef __INT_RPIPERIPHERALMISC_H__ -#define __INT_RPIPERIPHERALMISC_H__ - -#include "types.h" -#include "RPIPeripheralMisc.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define RPI_boardRevu80() RPI_boardRev(); -#define u80u80RPI_padDrive(group,strength) u8RPI_padDrives(group,strength); -#define u160RPI_sn3218Setupi80(pinBase) u16RPI_sn3218Setups(pinBase); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* !__INT_RPIPERIPHERALMISC_H__ */ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPWM.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPWM.h index 49c58c04..8c8f4c62 100644 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPWM.h +++ b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPWM.h @@ -1,33 +1,30 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE + /* 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: Jorawar Singh, Siddhesh Wani + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in -*/ - + */ #ifndef __INT_RPIPERIPHERALPWM_H__ #define __INT_RPIPERIPHERALPWM_H__ #include "types.h" -#include "RPIPeripheralPWM.h" #ifdef __cplusplus extern "C" { #endif -#define u80u160RPI_pwmWrite(pin,value) u8RPI_pwmWrites(pin,value); -#define u320RPI_pwmRange(value) u32RPI_pwmRanges(value); -#define g2RPI_pwmMode(mode) gRPI_pwmModea(mode); -#define u160RPI_pwmClock(divisor) u16RPI_pwmClocks(divisor); -#define u80u160RPI_pwmToneWrite(pin,value) u8RPI_pwmToneWrites(pin,value); +#define RPI_HardPWMWrite(pin,value) u8RPIHardPWMWrites((uint8)pin,(uint16)value) +#define RPI_HardPWMSetRange(value) u8RPIHardPWMSetRanges((uint16)value) +#define RPI_HardPWMSetMode(mode) u8RPIHardPWMSetModes((uint8)mode) +#define RPI_HardPWMSetClock(clk_divisor) u8RPIHardPWMSetClocks((uint16)clk_divisor) #ifdef __cplusplus } /* extern "C" */ #endif -#endif /* !__INT_RPIPERIPHERALPWM_H__ */ +#endif /*__INT_RPIPERIPHERALPWM_H__*/ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPcf.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPcf.h deleted file mode 100644 index e3d2009d..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPcf.h +++ /dev/null @@ -1,30 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#ifndef __INT_RPIPERIPHERALPCF_H__ -#define __INT_RPIPERIPHERALPCF_H__ - -#include "types.h" -#include "RPIPeripheralPcf.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define u160u80RPI_pcf8574Setupu80(pinBase,addr) u16RPI_pcf8574Setups(pinBase,addr); -#define u160u80RPI_pcf8591Setupu80(pinBase,addr) u16RPI_pcf8591Setups(pinBase,addr); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* !__INT_RPIPERIPHERALPCF_H__ */ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPiGlow.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPiGlow.h deleted file mode 100644 index 08056f94..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPiGlow.h +++ /dev/null @@ -1,32 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#ifndef __INT_RPIPERIPHERALPIGLOW_H__ -#define __INT_RPIPERIPHERALPIGLOW_H__ - -#include "types.h" -#include "RPIPeripheralPiGlow.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define u80RPI_piGlowSetup(clear) u8RPI_piGlowSetups(clear); -#define u80u80u80RPI_piGlow1(leg,ring,intensity) u8RPI_piGlow1s(leg,ring,intensity); -#define u80u80RPI_piGlowLeg(leg,intensity) u8RPI_piGlowLegs(leg,intensity); -#define u80u80RPI_piGlowRing(ring,intensity) u8RPI_piGlowRings(ring,intensity); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* !__INT_RPIPERIPHERALPIGLOW_H__ */ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPinISR.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPinISR.h new file mode 100644 index 00000000..b2c1ed16 --- /dev/null +++ b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPinISR.h @@ -0,0 +1,25 @@ + /* 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: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ +#ifndef __INT_RPIPERIPHERALPINISR_H__ +#define __INT_RPIPERIPHERALPINISR_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +#define RPI_PinISR(pin,edge,funname) i16RPIPinISRs((uint8)pin,(uint8)edge,funname) + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__INT_RPIPERIPHERALPINISR_H__*/ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPinMap.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPinMap.h deleted file mode 100644 index 39c5c011..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralPinMap.h +++ /dev/null @@ -1,30 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#ifndef __INT_RPIPERIPHERALPINMAP_H__ -#define __INT_RPIPERIPHERALPINMAP_H__ - -#include "types.h" -#include "RPIPeripheralPinMap.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define u80RPI_physToGpioi80(pin) u8RPI_physToGpios(pin); -#define u80RPI_wpiToGpioi80(pin) u8RPI_wpiToGpios(pin); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* !__INT_RPIPERIPHERALPINMAP_H__ */ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralSerial.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralSerial.h index e0832f97..5d53b98b 100644 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralSerial.h +++ b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralSerial.h @@ -1,36 +1,47 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE + /* 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: Jorawar Singh, Siddhesh Wani + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in -*/ - + */ #ifndef __INT_RPIPERIPHERALSERIAL_H__ #define __INT_RPIPERIPHERALSERIAL_H__ #include "types.h" -#include "RPIPeripheralSerial.h" #ifdef __cplusplus extern "C" { #endif -#define g2u320RPI_serialOpeni80(device,size,baud) gRPI_serialOpena(device,size[1],baud); -#define u80RPI_serialClose(fd) u8RPI_serialCloses(fd); -#define u80RPI_serialDataAvailu80(fd) u8RPI_serialDataAvails(fd); -#define u80RPI_serialFlush(fd) u8RPI_serialFlushs(fd); -#define u80RPI_serialGetcharg2(fd,out) u8RPI_serialGetchars(fd,out); -#define u80g2RPI_serialPrintf(fd,msg,size) u8RPI_serialPrintfs(fd,msg,size[1]); -#define u80u80RPI_serialPutchar(fd,character) u8RPI_serialPutchars(fd,character); -#define u80g2RPI_serialPutsg2(fd,character,size) u8RPI_serialPutss(fd,character,size[1]); +#define RPI_SerialSetup(port,size,baudrate) u16RPISerialSetups(port,baudrate) +#define RPI_SerialClose(fd) u8RPISerialCloses(fd) + +#define u80u80RPI_SerialSendData(fd,data) u8RPISerialSendDatas(fd,data) +#define u80i80RPI_SerialSendData(fd,data) i8RPISerialSendDatas(fd,data) +#define u80u160RPI_SerialSendData(fd,data) u16RPISerialSendDatas(fd,data) +#define u80i160RPI_SerialSendData(fd,data) i16RPISerialSendDatas(fd,data) +#define u80s0RPI_SerialSendData(fd,data) sRPISerialSendDatas(fd,data) +#define u80d0RPI_SerialSendData(fd,data) dRPISerialSendDatas(fd,data) + +#define u80u82RPI_SerialSendData(fd,data,size) u8RPISerialSendDataa(fd,data,size[0]*size[1]); +#define u80i82RPI_SerialSendData(fd,data,size) i8RPISerialSendDataa(fd,data,size[0]*size[1]); +#define u80u162RPI_SerialSendData(fd,data,size) u16RPISerialSendDataa(fd,data,size[0]*size[1]); +#define u80i162RPI_SerialSendData(fd,data,size) i16RPISerialSendDataa(fd,data,size[0]*size[1]); +#define u80s2RPI_SerialSendData(fd,data,size) sRPISerialSendDataa(fd,data,size[0]*size[1]); +#define u80d2RPI_SerialSendData(fd,data,size) dRPISerialSendDataa(fd,data,size[0]*size[1]); +#define u80g2RPI_SerialSendData(fd,data,size) gRPISerialSendDatas(fd,data,size[0]*size[1]); + +#define RPI_SerialDataAvail(fd) i16RPISerialDataAvails(fd) +#define RPI_SerialGetChar(fd) i16RPISerialGetChars(fd) +#define RPI_SerialFlush(fd) u8RPISerialFlushs(fd) #ifdef __cplusplus } /* extern "C" */ #endif -#endif /* !__INT_RPIPERIPHERALSERIAL_H__ */ +#endif /*__INT_RPIPERIPHERALSERIAL_H__*/ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralSetup.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralSetup.h deleted file mode 100644 index bd82702d..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralSetup.h +++ /dev/null @@ -1,47 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#ifndef __INT_RPIPERIPHERALSETUP_H__ -#define __INT_RPIPERIPHERALSETUP_H__ - -#include "RPIPeripheralSetup.h" - -#ifdef __cplusplus -extern "C" { -#endif - -//pinNumbering -#define g2RPI_pinNumberingi80(seq,size) gRPI_pinNumberinga(seq,size[1]); -//getAlt -#define u80RPI_getAltu80(pin) u8RPI_getAlts(pin); -#define u160RPI_getAltu80(pin) u8RPI_getAlts(pin); -#define u320RPI_getAltu80(pin) u8RPI_getAlts(pin); -#define d0RPI_getAltu80(pin) u8RPI_getAlts(pin); -//pinModeAlt -#define u80u80RPI_pinModeAlt(pin,mode) u8RPI_pinModeAlts(pin,mode); -#define u160u160RPI_pinModeAlt(pin,mode) u8RPI_pinModeAlts(pin,mode); -#define u320u320RPI_pinModeAlt(pin,mode) u8RPI_pinModeAlts(pin,mode); -#define d0d0RPI_pinModeAlt(pin,mode) u8RPI_pinModeAlts(pin,mode); -//pinMode -#define u80g2RPI_pinMode(pin,mode,size) u8RPI_pinModes(pin,mode,size[1]); -#define u160g2RPI_pinMode(pin,mode,size) u8RPI_pinModes(pin,mode,size[1]); -#define u320g2RPI_pinMode(pin,mode,size) u8RPI_pinModes(pin,mode,size[1]); -#define d0g2RPI_pinMode(pin,mode,size) u8RPI_pinModes(pin,mode,size[1]); -//pullControl -#define u80g2RPI_pullControl(pin,mode,size) u8RPI_pullControls(pin,mode,size[1]); -#define d0g2RPI_pullControl(pin,mode,size) u8RPI_pullControls(pin,mode,size[1]); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* !__INT_RPIPERIPHERALSETUP_H__ */ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralShift.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralShift.h deleted file mode 100644 index 6b142bd5..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralShift.h +++ /dev/null @@ -1,31 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#ifndef __INT_RPIPERIPHERALSHIFT_H__ -#define __INT_RPIPERIPHERALSHIFT_H__ - -#include "types.h" -#include "RPIPeripheralShift.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define u80u80u80RPI_shiftInu80(dpin,cpin,order) u8RPI_shiftIns(dpin,cpin,order); -#define u80u80u80u80RPI_shiftOut(dpin,cpin,order,val) u8RPI_shiftOuts(dpin,cpin,order,val); -#define u160u80u80u80u80RPI_sr595Setupi80(pinBase,nPins,dP,cP,lP) u16RPI_sr595Setups(pinBase,nPins,dP,cP,lP); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* !__INT_RPIPERIPHERALSHIFT_H__ */ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralSoft.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralSoft.h deleted file mode 100644 index 80372b26..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralSoft.h +++ /dev/null @@ -1,34 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#ifndef __INT_RPIPERIPHERALSOFT_H__ -#define __INT_RPIPERIPHERALSOFT_H__ - -#include "types.h" -#include "RPIPeripheralSoft.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define u80u160u160RPI_softPwmCreateu80(pin,ival,range) u8RPI_softPwmCreates(pin,ival,range); -#define u80RPI_softPwmStop(pin) u8RPI_softPwmStops(pin); -#define u80u160RPI_softPwmWrite(pin,value) u8RPI_softPwmWrites(pin,value); -#define u80RPI_softToneCreateu80(pin) u8RPI_softToneCreates(pin); -#define u80RPI_softToneStop(pin) u8RPI_softToneStops(pin); -#define u80u320RPI_softToneWrite(pin,value) u8RPI_softToneWrites(pin,value); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* !__INT_RPIPERIPHERALSOFT_H__ */ diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_analog_in_volt.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralThreading.h index ec471426..68ed6e0e 100644 --- a/2.3-1/src/c/scilab-arduino/includes/cmd_analog_in_volt.h +++ b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralThreading.h @@ -1,28 +1,25 @@ -/* Copyright (C) 2017 - IIT Bombay - FOSSEE + /* 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: Yash Pratap Singh Tomar + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in -*/ - -#ifndef __CMD_ANALOG_IN_VOLT_H__ -#define __CMD_ANALOG_IN_VOLT_H__ - -#include "types.h" + */ +#ifndef __INT_RPIPERIPHERALTHREADING_H__ +#define __INT_RPIPERIPHERALTHREADING_H__ #ifdef __cplusplus extern "C" { #endif - -float u8cmd_analog_in_volts(uint8 board_no, uint8 pin); + +#define RPI_ThreadCreate(fn) RPIThreadCreate(fn); #ifdef __cplusplus } /* extern "C" */ #endif -#endif /* __CMD_ANALOG_IN_VOLT_H__ */ +#endif /*__INT_RPIPERIPHERALTHREADING_H__*/ diff --git a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h index d2fae234..1a704655 100644 --- a/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h +++ b/2.3-1/src/c/hardware/rasberrypi/interfaces/int_RPIPeripheralTiming.h @@ -5,11 +5,12 @@ 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: Jorawar Singh, Siddhesh Wani + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ + #ifndef __INT_RPIPERIPHERALTIMING_H__ #define __INT_RPIPERIPHERALTIMING_H__ @@ -20,15 +21,14 @@ extern "C" { #endif -#define u320RPI_delay(time) u32RPI_delays(time); -#define d0RPI_delay(time) u32RPI_delays(time); +#define RPI_DelayMicro(in1) u16RPIDelayMicros((uint16) in1) +#define RPI_DelayMilli(in1) u16RPIDelayMillis((uint16) in1) +#define RPI_GetMicro() u32RPIGetMicros() +#define RPI_GetMillis() u32RPIGetMillis() -#define u320RPI_delayMicro(time) u32RPI_delayMicros(time); -#define RPI_millisu320() RPI_millis(); -#define RPI_microsu320() RPI_micros(); #ifdef __cplusplus } /* extern "C" */ #endif -#endif /* !__INT_RPIPERIPHERALTIMING_H__ */ +#endif /* !__RPIPERIPHERALTIMING_H__ */ diff --git a/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdCharDefs.c b/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdCharDefs.c deleted file mode 100644 index b85d82fd..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdCharDefs.c +++ /dev/null @@ -1,18 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralLCD.h" - -void u8RPI_lcdCharDefs(uint8 fd,uint8 index,uint8 d0,uint8 d1,uint8 d2,uint8 d3, uint8 d4,uint8 d5,uint8 d6,uint8 d7){ - uint8 data[8]={d0,d1,d2,d3,d4,d5,d6,d7}; - lcdCharDef(fd,index,data); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdClears.c b/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdClears.c deleted file mode 100644 index 659cdf07..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdClears.c +++ /dev/null @@ -1,17 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralLCD.h" - -void u8RPI_lcdClears(uint8 fd){ - lcdClear(fd); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdCursorBlinks.c b/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdCursorBlinks.c deleted file mode 100644 index bf0c48e3..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdCursorBlinks.c +++ /dev/null @@ -1,17 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralLCD.h" - -void u8RPI_lcdCursorBlinks(uint8 fd,uint8 state){ - lcdCursorBlink(fd,state); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdCursors.c b/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdCursors.c deleted file mode 100644 index 8bb02715..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdCursors.c +++ /dev/null @@ -1,17 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralLCD.h" - -void u8RPI_lcdCursors(uint8 fd,uint8 state){ - lcdCursor(fd,state); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdDisplays.c b/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdDisplays.c deleted file mode 100644 index 7425ebe9..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdDisplays.c +++ /dev/null @@ -1,17 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralLCD.h" - -void u8RPI_lcdDisplays(uint8 fd,uint8 state){ - lcdDisplay(fd,state); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdHomes.c b/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdHomes.c deleted file mode 100644 index 98762de4..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdHomes.c +++ /dev/null @@ -1,17 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralLCD.h" - -void u8RPI_lcdHomes(uint8 fd){ - lcdHome(fd); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdInits.c b/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdInits.c deleted file mode 100644 index b69f311c..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdInits.c +++ /dev/null @@ -1,19 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralLCD.h" - -int8 u8RPI_lcdInits(uint8 rows,uint8 cols,uint8 bits,uint8 rs,uint8 strb,uint8 d0,uint8 d1,uint8 d2,uint8 d3,uint8 d4,uint8 d5,uint8 d6,uint8 d7){ - uint8 fd; - fd=lcdInit(rows,cols,bits,rs,strb,d0,d1,d2,d3,d4,d5,d6,d7); - return (fd); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdPositions.c b/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdPositions.c deleted file mode 100644 index 3188a972..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdPositions.c +++ /dev/null @@ -1,17 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralLCD.h" - -void u8RPI_lcdPositions(uint8 fd,uint8 row,uint8 col){ - lcdPosition(fd,row,col); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdPrintfs.c b/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdPrintfs.c deleted file mode 100644 index 58d01fa8..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdPrintfs.c +++ /dev/null @@ -1,17 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralLCD.h" - -void u8RPI_lcdPrintfs(uint8 fd,char* data,int size){ - lcdPrintf(fd,data); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdPutchars.c b/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdPutchars.c deleted file mode 100644 index c50a177b..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdPutchars.c +++ /dev/null @@ -1,17 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralLCD.h" - -void u8RPI_lcdPutchars(uint8 fd,uint8 character){ - lcdPutchar(fd,character); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdPutss.c b/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdPutss.c deleted file mode 100644 index a7f492ba..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdPutss.c +++ /dev/null @@ -1,17 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralLCD.h" - -void u8RPI_lcdPutss(uint8 fd,char* msg,int size){ - lcdPuts(fd,msg); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdSendCommands.c b/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdSendCommands.c deleted file mode 100644 index 7097d696..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/lcd/u8RPI_lcdSendCommands.c +++ /dev/null @@ -1,17 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralLCD.h" - -void u8RPI_lcdSendCommands(uint8 fd,uint8 cmd){ - lcdSendCommand(fd,cmd); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64Orientation.c b/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64Orientation.c deleted file mode 100644 index 52391029..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64Orientation.c +++ /dev/null @@ -1,17 +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: Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralLCD128x64.h" - -void u8RPI_lcd128x64Orientations(uint8 orientation){ - lcd128x64setOrientation(orientation); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64circle.c b/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64circle.c deleted file mode 100644 index 9019d8f4..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64circle.c +++ /dev/null @@ -1,17 +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: Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralLCD128x64.h" - -void u8RPI_lcd128x64circles(uint8 x,uint8 y,uint8 r,uint8 colour,uint8 filled){ - lcd128x64circle(x,y,r,colour,filled); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64clear.c b/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64clear.c deleted file mode 100644 index a83cef25..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64clear.c +++ /dev/null @@ -1,17 +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: Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralLCD128x64.h" - -void u8RPI_lcd128x64clears(uint8 colour){ - lcd128x64clear(colour); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64ellipse.c b/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64ellipse.c deleted file mode 100644 index d2e2f542..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64ellipse.c +++ /dev/null @@ -1,17 +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: Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralLCD128x64.h" - -void u8RPI_lcd128x64ellipses(uint8 cx, uint8 cy, uint8 xRadius, uint8 yRadius, uint8 colour, uint8 filled){ - lcd128x64ellipse(cx,cy,xRadius,yRadius,colour,filled); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64line.c b/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64line.c deleted file mode 100644 index f5850808..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64line.c +++ /dev/null @@ -1,17 +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: Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralLCD128x64.h" - -void u8RPI_lcd128x64lines(uint8 x0, uint8 y0, uint8 x1, uint8 y1, uint8 colour){ - lcd128x64line(x0,y0,x1,y1,colour); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64lineTo.c b/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64lineTo.c deleted file mode 100644 index 3f791f64..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64lineTo.c +++ /dev/null @@ -1,17 +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: Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralLCD128x64.h" - -void u8RPI_lcd128x64lineTos(uint8 x, uint8 y, uint8 colour){ - lcd128x64lineTo(x,y,colour); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64point.c b/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64point.c deleted file mode 100644 index a23cdddc..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64point.c +++ /dev/null @@ -1,17 +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: Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralLCD128x64.h" - -void u8RPI_lcd128x64points(uint8 x,uint8 y,uint8 colour){ - lcd128x64point(x,y,colour); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64putchar.c b/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64putchar.c deleted file mode 100644 index 2dadb448..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64putchar.c +++ /dev/null @@ -1,17 +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: Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralLCD128x64.h" - -void u8RPI_lcd128x64putchars(uint8 x, uint8 y, uint8 c, uint8 bgCol, uint8 fgCol){ - lcd128x64putchar(x,y,c,bgCol,fgCol); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64puts.c b/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64puts.c deleted file mode 100644 index 15c54da3..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64puts.c +++ /dev/null @@ -1,17 +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: Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralLCD128x64.h" - -void u8RPI_lcd128x64putss(uint8 x, uint8 y, char* str,int size, uint8 bgCol, uint8 fgCol){ - lcd128x64puts(x,y,str,bgCol,fgCol); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64rectangle.c b/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64rectangle.c deleted file mode 100644 index 78239d9f..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64rectangle.c +++ /dev/null @@ -1,17 +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: Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralLCD128x64.h" - -void u8RPI_lcd128x64rectangles(uint8 x1,uint8 y1,uint8 x2,uint8 y2,uint8 colour,uint8 filled){ - lcd128x64rectangle(x1,y1,x2,y2,colour,filled); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64setOrigin.c b/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64setOrigin.c deleted file mode 100644 index c4b19391..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64setOrigin.c +++ /dev/null @@ -1,17 +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: Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralLCD128x64.h" - -void u8RPI_lcd128x64setOrigins(uint8 x,uint8 y){ - lcd128x64setOrigin(x,y); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64setup.c b/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64setup.c deleted file mode 100644 index 8f6e6b6f..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/lcd128x64/RPI_lcd128x64setup.c +++ /dev/null @@ -1,19 +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: Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralLCD128x64.h" - -int8 RPI_lcd128x64setup(){ - int8 out; - out=lcd128x64setup(); - return (out); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/mcp/u16RPI_mcp23008Setups.c b/2.3-1/src/c/hardware/rasberrypi/mcp/u16RPI_mcp23008Setups.c deleted file mode 100644 index c7d73268..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/mcp/u16RPI_mcp23008Setups.c +++ /dev/null @@ -1,19 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralMcp.h" - -uint8 u16RPI_mcp23008Setups(uint16 pinBase,uint8 addr){ - uint8 out; - out=mcp23008Setup(pinBase,addr); - return (out); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/mcp/u16RPI_mcp23016Setups.c b/2.3-1/src/c/hardware/rasberrypi/mcp/u16RPI_mcp23016Setups.c deleted file mode 100644 index 2e35e5c2..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/mcp/u16RPI_mcp23016Setups.c +++ /dev/null @@ -1,19 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralMcp.h" - -uint8 u16RPI_mcp23016Setups(uint16 pinBase,uint8 addr){ - uint8 out; - out=mcp23016Setup(pinBase,addr); - return (out); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/mcp/u16RPI_mcp23017Setups.c b/2.3-1/src/c/hardware/rasberrypi/mcp/u16RPI_mcp23017Setups.c deleted file mode 100644 index 35ed5477..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/mcp/u16RPI_mcp23017Setups.c +++ /dev/null @@ -1,19 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralMcp.h" - -uint8 u16RPI_mcp23017Setups(uint16 pinBase,uint8 addr){ - uint8 out; - out=mcp23017Setup(pinBase,addr); - return (out); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/mcp/u16RPI_mcp23s08Setups.c b/2.3-1/src/c/hardware/rasberrypi/mcp/u16RPI_mcp23s08Setups.c deleted file mode 100644 index e1bdab60..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/mcp/u16RPI_mcp23s08Setups.c +++ /dev/null @@ -1,19 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralMcp.h" - -uint8 u16RPI_mcp23s08Setups(uint16 pinBase,uint8 spiport,uint8 devId){ - uint8 out; - out=mcp23s08Setup(pinBase,spiport,devId); - return (out); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/mcp/u16RPI_mcp23s17Setups.c b/2.3-1/src/c/hardware/rasberrypi/mcp/u16RPI_mcp23s17Setups.c deleted file mode 100644 index 5ba30d23..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/mcp/u16RPI_mcp23s17Setups.c +++ /dev/null @@ -1,19 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralMcp.h" - -uint8 u16RPI_mcp23s17Setups(uint16 pinBase,uint8 spiport,uint8 devId){ - uint8 out; - out=mcp23s17Setup(pinBase,spiport,devId); - return (out); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/pcf/u16RPI_pcf8574Setups.c b/2.3-1/src/c/hardware/rasberrypi/pcf/u16RPI_pcf8574Setups.c deleted file mode 100644 index f7e38df0..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/pcf/u16RPI_pcf8574Setups.c +++ /dev/null @@ -1,19 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralPcf.h" - -uint8 u16RPI_pcf8574Setups(uint16 pinBase,uint8 addr){ - uint8 out; - out=pcf8574Setup(pinBase,addr); - return (out); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/pcf/u16RPI_pcf8591Setups.c b/2.3-1/src/c/hardware/rasberrypi/pcf/u16RPI_pcf8591Setups.c deleted file mode 100644 index de26a926..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/pcf/u16RPI_pcf8591Setups.c +++ /dev/null @@ -1,19 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralPcf.h" - -uint8 u16RPI_pcf8591Setups(uint16 pinBase,uint8 addr){ - uint8 out; - out=pcf8591Setup(pinBase,addr); - return (out); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/piGlow/u8RPI_piGlow1s.c b/2.3-1/src/c/hardware/rasberrypi/piGlow/u8RPI_piGlow1s.c deleted file mode 100644 index 792cda1c..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/piGlow/u8RPI_piGlow1s.c +++ /dev/null @@ -1,17 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralPiGlow.h" - -void u8RPI_piGlow1s(uint8 leg,uint8 ring,uint8 intensity){ - piGlow1(leg,ring,intensity); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/piGlow/u8RPI_piGlowLegs.c b/2.3-1/src/c/hardware/rasberrypi/piGlow/u8RPI_piGlowLegs.c deleted file mode 100644 index f4ef5b50..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/piGlow/u8RPI_piGlowLegs.c +++ /dev/null @@ -1,17 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralPiGlow.h" - -void u8RPI_piGlowLegs(uint8 leg,uint8 intensity){ - piGlowLeg(leg,intensity); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/piGlow/u8RPI_piGlowRings.c b/2.3-1/src/c/hardware/rasberrypi/piGlow/u8RPI_piGlowRings.c deleted file mode 100644 index 985696df..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/piGlow/u8RPI_piGlowRings.c +++ /dev/null @@ -1,17 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralPiGlow.h" - -void u8RPI_piGlowRings(uint8 ring,uint8 intensity){ - piGlowRing(ring,intensity); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/piGlow/u8RPI_piGlowSetups.c b/2.3-1/src/c/hardware/rasberrypi/piGlow/u8RPI_piGlowSetups.c deleted file mode 100644 index 2037a9b5..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/piGlow/u8RPI_piGlowSetups.c +++ /dev/null @@ -1,17 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralPiGlow.h" - -void u8RPI_piGlowSetups(uint8 clear){ - piGlowSetup(clear); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/pinMap/u8RPI_physToGpios.c b/2.3-1/src/c/hardware/rasberrypi/pinMap/u8RPI_physToGpios.c deleted file mode 100644 index 09a57132..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/pinMap/u8RPI_physToGpios.c +++ /dev/null @@ -1,19 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralPinMap.h" - -int8 u8RPI_physToGpios(uint8 pin){ - int8 out; - out=physPinToGpio(pin); - return (pin); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/pinMap/u8RPI_wpiToGpios.c b/2.3-1/src/c/hardware/rasberrypi/pinMap/u8RPI_wpiToGpios.c deleted file mode 100644 index 5f65f34c..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/pinMap/u8RPI_wpiToGpios.c +++ /dev/null @@ -1,19 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralPinMap.h" - -int8 u8RPI_wpiToGpios(uint8 pin){ - int8 out; - out=wpiPinToGpio(pin); - return (out); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/pwm/u16RPI_pwmClocks.c b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetClocks.c index 85e1fb2b..d06b135c 100644 --- a/2.3-1/src/c/hardware/rasberrypi/pwm/u16RPI_pwmClocks.c +++ b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetClocks.c @@ -5,19 +5,23 @@ 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: Siddhesh Wani, Jorawar Singh + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ -#include "RPIPeripheralPWM.h" - /*Function to set clock for pwm channel. Default clock is 19.2 MHz. 'clk_divisor' along with range decides frequency for PWM PWM frequency = 19.2 MHz / clk_divisor/ range - Range for clk_divisor = 1-2048 -*/ + Range for clk_divisor = 1-2048 + */ + +#include "types.h" +#include "RPIPeripheralPWM.h" -void u16RPI_pwmClocks(uint16 divisor){ - pwmSetClock(divisor); +void u8RPIHardPWMSetClocks(uint16 clk_divisor) +{ + pwmSetClock(clk_divisor); + + } diff --git a/2.3-1/src/c/hardware/rasberrypi/pwm/gRPI_pwmModea.c b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetModes.c index da67a15c..0cca7a70 100644 --- a/2.3-1/src/c/hardware/rasberrypi/pwm/gRPI_pwmModea.c +++ b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetModes.c @@ -5,21 +5,24 @@ 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: Siddhesh Wani, Jorawar Singh + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ -#include "RPIPeripheralPWM.h" - /*Function to set mode for PWM channel. Two modes are available - "bal" --> balanced mode - "ms" --> mark/space mode + 0 --> balanced mode + 1 --> mark/space mode */ - -void gRPI_pwmModea(char* mode,int size){ - if (mode[0] == 'm') /*mark/space mode*/ - pwmSetMode(0); - else if (mode[0] == 'b') - pwmSetMode(1); + +#include "types.h" +#include "RPIPeripheralPWM.h" + +void u8RPIHardPWMSetModes(uint8 mode) +{ + if (mode == 1) /*mark/space mode*/ + pwmSetMode(PWM_MODE_MS); + else + pwmSetMode(PWM_MODE_BAL); + } diff --git a/2.3-1/src/c/hardware/rasberrypi/pwm/u32RPI_pwmRanges.c b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetRanges.c index 1fb22963..b2489f59 100644 --- a/2.3-1/src/c/hardware/rasberrypi/pwm/u32RPI_pwmRanges.c +++ b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMSetRanges.c @@ -5,18 +5,21 @@ 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: Siddhesh Wani, Jorawar Singh + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ -#include "RPIPeripheralPWM.h" - -/*Function to assign pwm duty to specified pin. PWM duty is decided by 'value' +/*Function to assigne pwm duty to specified pin. PWM duty is decided by 'value' and 'range' specified using corresponding function. PWM duty = value/range */ - -void u32RPI_pwmRanges(uint32 value){ - pwmSetRange(value); -} + +#include "types.h" +#include "RPIPeripheralPWM.h" + +void u8RPIHardPWMSetRanges(uint16 value) +{ + pwmSetRange(value); + +} diff --git a/2.3-1/src/c/hardware/rasberrypi/Digital/u8RPI_digitalReads.c b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMWrites.c index 05594066..ae02bf0d 100644 --- a/2.3-1/src/c/hardware/rasberrypi/Digital/u8RPI_digitalReads.c +++ b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPIHardPWMWrites.c @@ -5,17 +5,22 @@ 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: Siddhesh Wani, Jorawar Singh + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ +/*Function to set range for pwm channel. PWM duty is decided by 'range' + and 'value' specified using corresponding function. + PWM duty = value/range + */ + +#include "types.h" +#include "RPIPeripheralPWM.h" #include "RPIPeripheralDigital.h" -/* Function to read the state of a gpio pin */ - -uint8 u8RPI_digitalReads(uint8 pin){ - uint8 state=0; - state=digitalRead(pin); - return (state); -} +void u8RPIHardPWMWrites(uint8 pin, uint16 value) +{ + pwmWrite((int)phy_pin[pin-1], value); + +} diff --git a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPI_pwmToneWrites.c b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPI_pwmToneWrites.c deleted file mode 100644 index fe1b8cd2..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPI_pwmToneWrites.c +++ /dev/null @@ -1,17 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralPWM.h" - -void u8RPI_pwmToneWrites(uint8 pin, uint16 value){ - pwmToneWrite(pin, value); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPI_pwmWrites.c b/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPI_pwmWrites.c deleted file mode 100644 index be94e73e..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/pwm/u8RPI_pwmWrites.c +++ /dev/null @@ -1,19 +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: Siddhesh Wani, Jorawar Singh - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralPWM.h" - -/*Function to write the given value to the pwm pin*/ - -void u8RPI_pwmWrites(uint8 pin, uint16 value){ - pwmWrite(pin, value); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/dRPISerialSendDataa.c b/2.3-1/src/c/hardware/rasberrypi/serial/dRPISerialSendDataa.c new file mode 100644 index 00000000..f9902550 --- /dev/null +++ b/2.3-1/src/c/hardware/rasberrypi/serial/dRPISerialSendDataa.c @@ -0,0 +1,27 @@ +/* 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: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/* Function to send double data array/matrix on specified serial port. */ + +#include "types.h" +#include "RPIPeripheralSerial.h" + +void dRPISerialSendDataa(int fd, double* data, int size) +{ + int count = 0; + + for (count = 0; count < size; count++) + { + dRPISerialSendDatas(fd, data[count]); + } + +} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/dRPISerialSendDatas.c b/2.3-1/src/c/hardware/rasberrypi/serial/dRPISerialSendDatas.c new file mode 100644 index 00000000..39112fc2 --- /dev/null +++ b/2.3-1/src/c/hardware/rasberrypi/serial/dRPISerialSendDatas.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: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/* Function to send double data on specified serial port. */ + +#include "types.h" +#include "RPIPeripheralSerial.h" + +void dRPISerialSendDatas(int fd, double data) +{ + uint8 count; + + union double_bytes{ + double double_data; + unsigned char bytes[sizeof(double)]; + } in_data; + + in_data.double_data = data; + + for(count=0; count<sizeof(double); count++) + { + /*Send lsb first*/ + serialPutchar(fd, (uint8) in_data.bytes[count]); + } + +} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/gRPISerialSendDatas.c b/2.3-1/src/c/hardware/rasberrypi/serial/gRPISerialSendDatas.c new file mode 100644 index 00000000..f4ec8a85 --- /dev/null +++ b/2.3-1/src/c/hardware/rasberrypi/serial/gRPISerialSendDatas.c @@ -0,0 +1,27 @@ +/* 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: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/* Function to send string on specified serial port. */ + +#include "types.h" +#include "RPIPeripheralSerial.h" + +void gRPISerialSendDatas(int fd, uint8* data, int size) +{ + int count = 0; + + while(data[count] != '\0') + { + serialPutchar(fd, data[count]); + } + +} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialDataAvails.c b/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialDataAvails.c new file mode 100644 index 00000000..b56a8196 --- /dev/null +++ b/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialDataAvails.c @@ -0,0 +1,25 @@ +/* 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: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/* Function to check for data availability at specified port. Returns no of + bytes to be read */ + +#include "types.h" +#include "RPIPeripheralSerial.h" + +int16 i16RPISerialDataAvails(int fd) +{ + int bytes = 0; + bytes = serialDataAvail(fd); + + return bytes; +} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialGetChars.c b/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialGetChars.c new file mode 100644 index 00000000..18ca2a7a --- /dev/null +++ b/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialGetChars.c @@ -0,0 +1,27 @@ +/* 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: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/* Function to read character from spcified serial port (file descriptor). + This function will block execution for 10 secs if no character is available, + and will return -1 in that case*/ + +#include "types.h" +#include "RPIPeripheralSerial.h" + +int16 i16RPISerialGetChars(int fd) +{ + int data = 0; + + data = serialGetchar(fd); + + return data; +} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialSendDataa.c b/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialSendDataa.c new file mode 100644 index 00000000..24180f41 --- /dev/null +++ b/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialSendDataa.c @@ -0,0 +1,27 @@ +/* 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: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/* Function to send signed 16-bit data array/matrix on specified serial port. */ + +#include "types.h" +#include "RPIPeripheralSerial.h" + +void i16RPISerialSendDataa(int fd, int16* data, int size) +{ + int count = 0; + + for (count = 0; count < size; ++count) + { + i16RPISerialSendDatas(fd, data[count]); + } + +} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialSendDatas.c b/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialSendDatas.c new file mode 100644 index 00000000..fe6fe6f4 --- /dev/null +++ b/2.3-1/src/c/hardware/rasberrypi/serial/i16RPISerialSendDatas.c @@ -0,0 +1,24 @@ +/* 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: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/* Function to send signed 16-bit byte on specified serial port. */ + +#include "types.h" +#include "RPIPeripheralSerial.h" + +void i16RPISerialSendDatas(int fd, int16 data) +{ + /*Send lsb first*/ + serialPutchar(fd, (uint8) data); + serialPutchar(fd, (uint8) (data>>8)); + +} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/i8RPISerialSendDataa.c b/2.3-1/src/c/hardware/rasberrypi/serial/i8RPISerialSendDataa.c new file mode 100644 index 00000000..c4dd199c --- /dev/null +++ b/2.3-1/src/c/hardware/rasberrypi/serial/i8RPISerialSendDataa.c @@ -0,0 +1,26 @@ +/* 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: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/* Function to send signed 8-bit byte array/matrix on specified serial port. */ + +#include "types.h" +#include "RPIPeripheralSerial.h" + +void i8RPISerialSendDataa(int fd, int8* data, int size) +{ + int count = 0; + + for (count = 0; count < size; ++count) + { + i8RPISerialSendDatas(fd, data[count]); + } +} diff --git a/2.3-1/src/c/hardware/rasberrypi/Serial/u8RPI_serialCloses.c b/2.3-1/src/c/hardware/rasberrypi/serial/i8RPISerialSendDatas.c index d20aa541..e637871f 100644 --- a/2.3-1/src/c/hardware/rasberrypi/Serial/u8RPI_serialCloses.c +++ b/2.3-1/src/c/hardware/rasberrypi/serial/i8RPISerialSendDatas.c @@ -5,13 +5,18 @@ 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: Jorawar Singh, Siddhesh Wani + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ +/* Function to send signed 8-bit byte on specified serial port. */ + +#include "types.h" #include "RPIPeripheralSerial.h" -void u8RPI_serialCloses(uint8 fd){ - serialClose(fd); -} +void i8RPISerialSendDatas(int fd, int8 data) +{ + serialPutchar(fd, (uint8) data); + +} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/sRPISerialSendDataa.c b/2.3-1/src/c/hardware/rasberrypi/serial/sRPISerialSendDataa.c new file mode 100644 index 00000000..14c0bc70 --- /dev/null +++ b/2.3-1/src/c/hardware/rasberrypi/serial/sRPISerialSendDataa.c @@ -0,0 +1,27 @@ +/* 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: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/* Function to send float data array/matrix on specified serial port. */ + +#include "types.h" +#include "RPIPeripheralSerial.h" + +void sRPISerialSendDataa(int fd, float* data, int size) +{ + int count = 0; + + for (count = 0; count < size; ++count) + { + sRPISerialSendDatas(fd, data[count]); + } + +} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/sRPISerialSendDatas.c b/2.3-1/src/c/hardware/rasberrypi/serial/sRPISerialSendDatas.c new file mode 100644 index 00000000..ff78dd1f --- /dev/null +++ b/2.3-1/src/c/hardware/rasberrypi/serial/sRPISerialSendDatas.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: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/* Function to send float data on specified serial port. */ + +#include "types.h" +#include "RPIPeripheralSerial.h" + +void sRPISerialSendDatas(int fd, float data) +{ + uint8 count; + + union float_bytes{ + float float_data; + unsigned char bytes[sizeof(float)]; + } in_data; + in_data.float_data = data; + + for(count=0; count<sizeof(float); count++) + { + /*Send lsb first*/ + serialPutchar(fd, (uint8) in_data.bytes[count]); + } + +} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/u16RPISerialSendDataa.c b/2.3-1/src/c/hardware/rasberrypi/serial/u16RPISerialSendDataa.c new file mode 100644 index 00000000..b444047b --- /dev/null +++ b/2.3-1/src/c/hardware/rasberrypi/serial/u16RPISerialSendDataa.c @@ -0,0 +1,28 @@ +/* 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: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/* Function to send unsigned 16-bit data array/matrix on specified serial port. */ + +#include "types.h" +#include "RPIPeripheralSerial.h" + +void u16RPISerialSendDataa(int fd, uint16* data, int size) +{ + int count = 0; + + for (count = 0; count < size; ++count) + { + u16RPISerialSendDatas(fd, data[count]); + } + + +} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/u16RPISerialSendDatas.c b/2.3-1/src/c/hardware/rasberrypi/serial/u16RPISerialSendDatas.c new file mode 100644 index 00000000..b4a90c29 --- /dev/null +++ b/2.3-1/src/c/hardware/rasberrypi/serial/u16RPISerialSendDatas.c @@ -0,0 +1,23 @@ +/* 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: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/* Function to send unsigned 16-bit data on specified serial port. */ + +#include "types.h" +#include "RPIPeripheralSerial.h" + +void u16RPISerialSendDatas(int fd, uint16 data) +{ + /*Send lsb first*/ + serialPutchar(fd, (uint8) data); + serialPutchar(fd, (uint8) (data>>8)); +} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/u16RPISerialSetups.c b/2.3-1/src/c/hardware/rasberrypi/serial/u16RPISerialSetups.c new file mode 100644 index 00000000..cde4cba2 --- /dev/null +++ b/2.3-1/src/c/hardware/rasberrypi/serial/u16RPISerialSetups.c @@ -0,0 +1,25 @@ +/* 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: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/* Function to setup port with desired baud rate. */ + +#include "types.h" +#include "RPIPeripheralSerial.h" + +int u16RPISerialSetups(char* port, int baudrate) +{ + int fd; + + fd = serialOpen (port, baudrate); + + return fd; +} diff --git a/2.3-1/src/c/hardware/rasberrypi/Serial/u8RPI_serialPrintfs.c b/2.3-1/src/c/hardware/rasberrypi/serial/u8RPISerialCloses.c index d1672003..5162d15e 100644 --- a/2.3-1/src/c/hardware/rasberrypi/Serial/u8RPI_serialPrintfs.c +++ b/2.3-1/src/c/hardware/rasberrypi/serial/u8RPISerialCloses.c @@ -5,13 +5,17 @@ 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: Jorawar Singh, Siddhesh Wani + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ +/* Function to close serial port opened. */ + +#include "types.h" #include "RPIPeripheralSerial.h" -void u8RPI_serialPrintfs(uint8 fd,char* msg,int size){ - serialPrintf(fd,msg); -} +void u8RPISerialCloses(int fd) +{ + serialClose (fd); +} diff --git a/2.3-1/src/c/hardware/rasberrypi/Serial/u8RPI_serialFlushs.c b/2.3-1/src/c/hardware/rasberrypi/serial/u8RPISerialFlushs.c index 4d150637..c80a92c5 100644 --- a/2.3-1/src/c/hardware/rasberrypi/Serial/u8RPI_serialFlushs.c +++ b/2.3-1/src/c/hardware/rasberrypi/serial/u8RPISerialFlushs.c @@ -5,13 +5,17 @@ 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: Jorawar Singh, Siddhesh Wani + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ +/* Function to discards data serial buffer (received as well as waiting to be sent */ + +#include "types.h" #include "RPIPeripheralSerial.h" -void u8RPI_serialFlushs(uint8 fd){ - serialFlush(fd); -} +void u8RPISerialFlushs(int fd) +{ + serialFlush(fd); +} diff --git a/2.3-1/src/c/hardware/rasberrypi/Serial/u8RPI_serialDataAvails.c b/2.3-1/src/c/hardware/rasberrypi/serial/u8RPISerialSendChars.c index cf256070..e3813514 100644 --- a/2.3-1/src/c/hardware/rasberrypi/Serial/u8RPI_serialDataAvails.c +++ b/2.3-1/src/c/hardware/rasberrypi/serial/u8RPISerialSendChars.c @@ -5,15 +5,17 @@ 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: Jorawar Singh, Siddhesh Wani + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ +/* Function to send 8-bit char on specified serial port. */ + +#include "types.h" #include "RPIPeripheralSerial.h" -uint8 u8RPI_serialDataAvails(uint8 fd){ - uint8 out; - out=serialDataAvail(fd); - return(out); -} +void u8RPISerialSendChars(int fd, uint8 data) +{ + serialPutchar(fd, data); +} diff --git a/2.3-1/src/c/hardware/rasberrypi/serial/u8RPISerialSendDataa.c b/2.3-1/src/c/hardware/rasberrypi/serial/u8RPISerialSendDataa.c new file mode 100644 index 00000000..9d097141 --- /dev/null +++ b/2.3-1/src/c/hardware/rasberrypi/serial/u8RPISerialSendDataa.c @@ -0,0 +1,27 @@ +/* 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: Siddhesh Wani + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in +*/ + +/* Function to send unsigned 8-bit byte array/matrix on specified serial port. */ + +#include "types.h" +#include "RPIPeripheralSerial.h" + +void u8RPISerialSendDataa(int fd, uint8* data, int size) +{ + int count = 0; + + for (count = 0; count < size; ++count) + { + u8RPISerialSendDatas(fd, data[count]); + } + +} diff --git a/2.3-1/src/c/hardware/rasberrypi/Serial/gRPI_serialOpena.c b/2.3-1/src/c/hardware/rasberrypi/serial/u8RPISerialSendDatas.c index 31543afe..9edb439f 100644 --- a/2.3-1/src/c/hardware/rasberrypi/Serial/gRPI_serialOpena.c +++ b/2.3-1/src/c/hardware/rasberrypi/serial/u8RPISerialSendDatas.c @@ -5,15 +5,18 @@ 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: Jorawar Singh, Siddhesh Wani + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ +/* Function to send unsigned 8-bit byte on specified serial port. */ + +#include "types.h" #include "RPIPeripheralSerial.h" -int8 gRPI_serialOpena(char* device,int size,uint32 baud){ - int8 fd; - fd = serialOpen(device,baud); - return fd; -} +void u8RPISerialSendDatas(int fd, uint8 data) +{ + serialPutchar(fd, data); + +} diff --git a/2.3-1/src/c/hardware/rasberrypi/soft/u8RPI_softPwmCreates.c b/2.3-1/src/c/hardware/rasberrypi/soft/u8RPI_softPwmCreates.c deleted file mode 100644 index d6977798..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/soft/u8RPI_softPwmCreates.c +++ /dev/null @@ -1,19 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralSoft.h" - -uint8 u8RPI_softPwmCreates(uint8 pin,uint16 ival,uint16 range){ - uint8 out; - out=softPwmCreate(pin,ival,range); - return (out); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/soft/u8RPI_softPwmStops.c b/2.3-1/src/c/hardware/rasberrypi/soft/u8RPI_softPwmStops.c deleted file mode 100644 index 761fdc23..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/soft/u8RPI_softPwmStops.c +++ /dev/null @@ -1,17 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralSoft.h" - -void u8RPI_softPwmStops(uint8 pin){ - softPwmStop(pin); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/soft/u8RPI_softPwmWrites.c b/2.3-1/src/c/hardware/rasberrypi/soft/u8RPI_softPwmWrites.c deleted file mode 100644 index 2b76d148..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/soft/u8RPI_softPwmWrites.c +++ /dev/null @@ -1,17 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralSoft.h" - -void u8RPI_softPwmWrites(uint8 pin,uint16 value){ - softPwmWrite(pin,value); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/soft/u8RPI_softToneCreates.c b/2.3-1/src/c/hardware/rasberrypi/soft/u8RPI_softToneCreates.c deleted file mode 100644 index dfcbb1fb..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/soft/u8RPI_softToneCreates.c +++ /dev/null @@ -1,19 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralSoft.h" - -uint8 u8RPI_softToneCreates(uint8 pin){ - uint8 out; - out=softToneCreate(pin); - return (out); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/soft/u8RPI_softToneStops.c b/2.3-1/src/c/hardware/rasberrypi/soft/u8RPI_softToneStops.c deleted file mode 100644 index 664fbda4..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/soft/u8RPI_softToneStops.c +++ /dev/null @@ -1,17 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralSoft.h" - -void u8RPI_softToneStops(uint8 pin){ - softToneStop(pin); -} diff --git a/2.3-1/src/c/hardware/rasberrypi/soft/u8RPI_softToneWrites.c b/2.3-1/src/c/hardware/rasberrypi/soft/u8RPI_softToneWrites.c deleted file mode 100644 index be04b476..00000000 --- a/2.3-1/src/c/hardware/rasberrypi/soft/u8RPI_softToneWrites.c +++ /dev/null @@ -1,17 +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: Jorawar Singh, Siddhesh Wani - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "RPIPeripheralSoft.h" - -void u8RPI_softToneWrites(uint8 pin,uint32 value){ - softToneWrite(pin,value); -} diff --git a/2.3-1/src/c/elementaryFunctions/uint32/i16uint32s.c b/2.3-1/src/c/hardware/rasberrypi/threading/u16RPIThreadCreates.c index 7d9ccef7..c05c959c 100644 --- a/2.3-1/src/c/elementaryFunctions/uint32/i16uint32s.c +++ b/2.3-1/src/c/hardware/rasberrypi/threading/u16RPIThreadCreates.c @@ -9,10 +9,16 @@ Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ - -#include "uint32.h" +/* Function to create thread for given function */ + +#include "types.h" +#include "RPIPeripheralThreading.h" + +uint16 RPIThreadCreate(void *(*threadFunction)(void*)) +{ + int status; + status = piThreadCreate (threadFunction); + return status; +} -uint32 i16uint32s(int16 x) { - return (uint32) x; -} diff --git a/2.3-1/src/c/hardware/rasberrypi/Timing/u32RPI_delayMicros.c b/2.3-1/src/c/hardware/rasberrypi/timing/u16RPIDelayMicros.c index 1ffdda7e..9aeeab7d 100644 --- a/2.3-1/src/c/hardware/rasberrypi/Timing/u32RPI_delayMicros.c +++ b/2.3-1/src/c/hardware/rasberrypi/timing/u16RPIDelayMicros.c @@ -5,15 +5,18 @@ 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: Siddhesh Wani, Jorawar Singh + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ -#include "RPIPeripheralTiming.h" - /* Function to insert some delay in code execution. */ + +#include "types.h" +#include "RPIPeripheralTiming.h" -void u32RPI_delayMicros(uint32 time){ +void u16RPIDelayMicros(uint16 time) +{ delayMicroseconds(time); } + diff --git a/2.3-1/src/c/hardware/rasberrypi/Timing/u32RPI_delays.c b/2.3-1/src/c/hardware/rasberrypi/timing/u16RPIDelayMillis.c index 7802d6bf..26790861 100644 --- a/2.3-1/src/c/hardware/rasberrypi/Timing/u32RPI_delays.c +++ b/2.3-1/src/c/hardware/rasberrypi/timing/u16RPIDelayMillis.c @@ -5,15 +5,21 @@ 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: Siddhesh Wani, Jorawar Singh + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ -#include "RPIPeripheralTiming.h" - /* Function to insert some delay in code execution. */ -void u32RPI_delays(uint32 time){ + + +#include "types.h" +#include "RPIPeripheralTiming.h" + +void u16RPIDelayMillis(uint16 time) +{ delay(time); + } + diff --git a/2.3-1/src/c/hardware/rasberrypi/Timing/RPI_micros.c b/2.3-1/src/c/hardware/rasberrypi/timing/u32RPIGetMicros.c index a7a84503..eb086a9f 100644 --- a/2.3-1/src/c/hardware/rasberrypi/Timing/RPI_micros.c +++ b/2.3-1/src/c/hardware/rasberrypi/timing/u32RPIGetMicros.c @@ -5,17 +5,17 @@ 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: Siddhesh Wani, Jorawar Singh + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ -#include "RPIPeripheralTiming.h" - /* Function to get time in microsecond since first setup function called */ -uint32 RPI_micros(){ - uint32 out; - out=micros(); - return (out); -} +#include "types.h" +#include "RPIPeripheralTiming.h" + +uint32 u32RPIGetMicros() +{ + return(micros()); +}
\ No newline at end of file diff --git a/2.3-1/src/c/hardware/rasberrypi/Timing/RPI_millis.c b/2.3-1/src/c/hardware/rasberrypi/timing/u32RPIGetMillis.c index b383f2a9..c1189753 100644 --- a/2.3-1/src/c/hardware/rasberrypi/Timing/RPI_millis.c +++ b/2.3-1/src/c/hardware/rasberrypi/timing/u32RPIGetMillis.c @@ -5,17 +5,17 @@ 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: Siddhesh Wani, Jorawar Singh + Author: Siddhesh Wani Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ -#include "RPIPeripheralTiming.h" - /* Function to get time in millisecond since first setup function called */ -uint32 RPI_millis(){ - uint32 out; - out=millis(); - return (out); -} +#include "types.h" +#include "RPIPeripheralTiming.h" + +uint32 u32RPIGetMillis() +{ + return(millis()); +}
\ No newline at end of file diff --git a/2.3-1/src/c/interpolation/includes/interp1.h b/2.3-1/src/c/interpolation/includes/interp1.h deleted file mode 100644 index 738bfe67..00000000 --- a/2.3-1/src/c/interpolation/includes/interp1.h +++ /dev/null @@ -1,32 +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: Ukasha Noor - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#ifndef __INTERP1_H__ -#define __INTERP1_H__ - -#include <string.h> - -#ifdef __cplusplus -extern "C" { -#endif - - -//void dinterp13a(double *x,double *fx,double *q,int size,double *out); -void dinterp13a(double *x,int size1,double *fx,int size2,double *q,int size3,char *a,int size4,double *out); - -void sinterp13a(float *x,int size1,float *fx,int size2,float *q,int size3,char *a,int size4,float *out); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif diff --git a/2.3-1/src/c/interpolation/interfaces/int_interp1.h b/2.3-1/src/c/interpolation/interfaces/int_interp1.h deleted file mode 100644 index 07d8ece4..00000000 --- a/2.3-1/src/c/interpolation/interfaces/int_interp1.h +++ /dev/null @@ -1,32 +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: Ukasha Noor - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -/* THIS IS AN AUTOMATICALLY GENERATED FILE : DO NOT EDIT BY HAND. */ - - -#ifndef __INT_INTERP1_H__ -#define __INT_INTERP1_H__ - -#include "interp1.h" -#include <string.h> - -#define d2d2d2interp1d2(x,size1,fx,size2,q,size3,out) dinterp13a(x,size1[0]*size1[1],fx,size2[0]*size2[1],q,size3[0]*size3[1],"linear",6,out) - -#define d2d2d2g2interp1d2(x,size1,fx,size2,q,size3,ch,size4,out) dinterp13a(x,size1[0]*size1[1],fx,size2[0]*size2[1],q,size3[0]*size3[1],ch,size4[0]*size4[1],out) - -#define s2s2s2interp1s2(x,size1,fx,size2,q,size3,out) sinterp13a(x,size1[0]*size1[1],fx,size2[0]*size2[1],q,size3[0]*size3[1],"linear",6,out) - -#define s2s2s2g2interp1s2(x,size1,fx,size2,q,size3,ch,size4,out) sinterp13a(x,size1[0]*size1[1],fx,size2[0]*size2[1],q,size3[0]*size3[1],ch,size4[0]*size4[1],out) - - -#endif - diff --git a/2.3-1/src/c/interpolation/interp1/dinterp13a.c b/2.3-1/src/c/interpolation/interp1/dinterp13a.c deleted file mode 100644 index 7b755e1c..00000000 --- a/2.3-1/src/c/interpolation/interp1/dinterp13a.c +++ /dev/null @@ -1,75 +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: Ukasha Noor - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - -#include "interp1.h" -#include <string.h> - -void dinterp13a(double *x,int size1,double *fx,int size2,double *q,int size3,char *ch,int size4,double *out) -{ - int i,j,k,f; - double 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/2.3-1/src/c/interpolation/interp1/sinterp13a.c b/2.3-1/src/c/interpolation/interp1/sinterp13a.c deleted file mode 100644 index b8cb0851..00000000 --- a/2.3-1/src/c/interpolation/interp1/sinterp13a.c +++ /dev/null @@ -1,75 +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: 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/2.3-1/src/c/linearAlgebra/fullrf/dfullrfa.c b/2.3-1/src/c/linearAlgebra/fullrf/dfullrfa.c new file mode 100644 index 00000000..a409ae35 --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/fullrf/dfullrfa.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: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +/* FULL Rank factorization function in scilab */ + +/* + //[Q,M,rk]=fullrf(A) + //Full rank factorization : A=Q.M + //with range(Q)=range(A) and ker(M)=ker(A), + //Q full column rank , M full row rank + // rk = rank(A) = #columns(Q) = #rows(M) + //F.D. +*/ + +#include "fullrf.h" +#include <stdio.h> +#include <stdlib.h> +#include "svd.h" +#include <math.h> +#include "norm.h" +#include "matrixTranspose.h" +#include "matrixMultiplication.h" + +double dfullrfa(int ninp,double *inp1,int row,int col,double tol,double *out1,double *out2){ + + int i,j; + /* norm inp1 - norm(inp1,1)*/ + double na1; + na1 = dnorma(inp1,row,col,1); + + if(ninp == 1){ + tol = sqrt(pow(2,-52)); + } + + if(na1 < pow(1,-10)){ + out1 = NULL; + out2 = NULL; + return 0; + } + + double tol1; + tol1 = tol*na1; + + double *U,*S,*V; + U = (double *)malloc(row*row*sizeof(double)); + S = (double *)malloc(row*col*sizeof(double)); + V = (double *)malloc(col*col*sizeof(double)); + + double rk; + rk = dsvda(tol1,inp1,row,col,0,4,U,S,V); + + /* sq = sqrt(s) */ + for(i=0;i<row;i++){ + for(j=0;j<col;j++){ + if(i == j){ + S[i*row+j] = pow(S[i*row+j],0.5); + } + else{ + S[i*row+j] = 0; + } + } + } + + double *Q; + Q = (double *)malloc(row*col*sizeof(double)); + dmulma(U,row,row,S,row,col,Q); + + double *VT; + VT = (double *)malloc(col*col*sizeof(double)); + dtransposea(V,col,col,VT); + + /* multiplication of sq*V' or S*VT */ + double *M; + M = (double *)malloc(row*col*sizeof(double)); + dmulma(S,row,col,VT,col,col,M); + + /* This Program is not yet completed properly, as it outputs the whole matrix, instead of the exact output. + + if anyone finds, how to fix the size in INITFILLscidir.sci +please change there and change below few lines of codes accordingly. + +*/ + for(i=0;i<row;i++){ + for(j=0;j<col;j++){ + //if(j < rk) + out1[i*col+j] = Q[i*col+j]; + //else + // out1[i*col+j] = 0; + } + //printf("\n"); + } + + for(i=0;i<row;i++){ + for(j=0;j<col;j++){ + //if(i < rk) + out2[i*col+j] = M[i*col+j]; + //else + // out2[i*col+j] = 0; + } + } + + return rk; +} diff --git a/2.3-1/src/c/linearAlgebra/givens/dgivensa.c b/2.3-1/src/c/linearAlgebra/givens/dgivensa.c new file mode 100644 index 00000000..9bf0637b --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/givens/dgivensa.c @@ -0,0 +1,76 @@ +/* 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: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +/* GIVENS scilab function + Syntax : u=givens(xy) + u=givens(x,y) + xy = [x;y], u=givens(xy) + returns a 2*2 matrix u such that u*xy=[r;0]. + c is equal to u*xy + givens(x,y)=givens([x;y]) +*/ + +#include "givens.h" +#include <stdio.h> +#include <math.h> +#include "norm.h" + +/* All variable names are according to scilab code */ + +void dgivensa(int ninp,double *inp1,int row,int col,double *inp2,int row1,int col1,int nout,double *out1,double *out2){ + double *x; + double r; + x = (double *)malloc((double)2*sizeof(double)); + if(ninp == 2){ + if(row != 1 || col != 1 || row1 != 1 || col1 != 1){ + printf("Wrong size for input argument: A column vector expected.\n"); + return; + } + *(x) = *(inp1); + *(x+1) = *(inp2); + } + else{ + //printf("(%d %d)",row,col); + if(row != 2 || col != 1){ + printf("Wrong size for input argument: A column vector expected.\n"); + return; + } + //printf("(%lf %lf)",inp1[0],inp1[1]); + x[0] = inp1[0]; + x[1] = inp1[1]; + } + if(*(x+1) != 0){ + //printf("(%lf %lf)",x[0],x[1]); + /*Norm of type 2 - find the maximum singular value*/ + r = dnorma(x,2,1,2); + //printf("%lf \n",r); + *(out1) = (*(x))/r; + *(out1+1) = -(*(x+1))/r; + *(out1+2) = (*(x+1))/r; + *(out1+3) = (*(x))/r; + if(nout == 2){ + *(out2) = r; + *(out2+1) = 0; + } + + } + else{ + *(out1) = 1; + *(out1+1) = 0; + *(out1+2) = 1; + *(out1+3) = 0; + if(nout == 2){ + *(out2) = *(x); + *(out2+1) = *(x+1); + } + } +} diff --git a/2.3-1/src/c/linearAlgebra/hess/dhessa.c b/2.3-1/src/c/linearAlgebra/hess/dhessa.c index 57f81b35..e1f2e2d1 100644 --- a/2.3-1/src/c/linearAlgebra/hess/dhessa.c +++ b/2.3-1/src/c/linearAlgebra/hess/dhessa.c @@ -20,11 +20,13 @@ #include "matrixTranspose.h" #include "matrixMultiplication.h" +/* Lapack subroutines - which are used*/ extern int dgehrd_(int *, int *,int *,double *,int *,double *,double *,int *,int *); extern int dorghr_(int *, int *,int *,double *,int *,double *,double *,int *,int *); - +/* All the vairbale names are given exactly the same name as scilab source code */ void dhessa(double *in1,int size,int nout,double *out1, double *out2){ +/* Variables names are done through, Lapack library. */ int i,j,k; int N = size; int ILO=1; @@ -41,11 +43,11 @@ void dhessa(double *in1,int size,int nout,double *out1, double *out2){ WORK = (double *)malloc((double)LWORK*sizeof(double)); dgehrd_(&N,&ILO,&IHI,A,&LDA,TAU,WORK,&N,&INFO); - for(i=0;i<N;i++) + for(i=0;i<N;i++) /* copying it in output */ for(j=0;j<N;j++) out2[i+j*N] = A[i+j*N]; - for(j=1;j<=N-2;j++){ + for(j=1;j<=N-2;j++){ /* copying it in output */ for(i=j+2;i<=N;i++){ out2[(i-1)+(j-1)*N] = 0; } diff --git a/2.3-1/src/c/linearAlgebra/householder/dhouseholdera.c b/2.3-1/src/c/linearAlgebra/householder/dhouseholdera.c new file mode 100644 index 00000000..5a98bfae --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/householder/dhouseholdera.c @@ -0,0 +1,90 @@ +/* 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: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +/* Householder orthogonal reflexion matrix */ + +/* +Syntax :- + //u=householder(v [,w]) + //Description + //given 2 column vectors v w of same size householder(v,w) returns a unitary + //column vector u, such that (eye-2*u*u')*v is proportional to w. + //(eye-2*u*u') is the orthogonal Householder reflexion matrix + // + // w default value is eye(v). In this case vector (eye-2*u*u')*v is the + // vector eye(v)*(+-norm(v)) +*/ +#include <stdio.h> +#include <stdlib.h> +#include "householder.h" +#include "eye.h" +#include "matrixTranspose.h" +#include "matrixMultiplication.h" +#include <math.h> +#include "norm.h" + +void dhouseholdera(int ninp,double *inp1,int row,double *inp2,double *out1){ + + int i,j; + double *x; + x = (double *)malloc(row*sizeof(double)); + + for(i=0;i<row;i++) + x[i] = inp1[i]; + + if(ninp < 2){ + deyea(x,row,1); + } + else{ + for(i=0;i<row;i++){ + x[i] = inp2[i]; + } + } + + /* vt transpose of inp1 */ + + double *vt; + vt = (double *)malloc(row*sizeof(double)); + dtransposea(inp1,row,1,vt); + + /*wt transpose of inp2 */ + double *wt; + wt = (double *)malloc(row*sizeof(double)); + dtransposea(x,row,1,wt); + + /* vvt = inp1*vt */ + double *vvt; + vvt = (double *)malloc(1*1*sizeof(double)); + dmulma(vt,1,row,inp1,row,1,vvt); + + /* wwt = inp2*wt */ + double *wwt; + wwt = (double *)malloc(1*1*sizeof(double)); + dmulma(wt,1,row,x,row,1,wwt); + + /* a=-sqrt((v'*v)/(w'*w)) */ + double a; + //a = (double *)malloc(1*1*sizeof(double)); + a = -sqrt(vvt[0]/wwt[0]); + + for(i=0;i<row;i++){ + out1[i] = x[i]*a+inp1[i]; + } + + /* norm of out1 */ + double r; + r = dnorma(out1,row,1,2); + + for(i=0;i<row;i++){ + out1[i]=out1[i]/r; + } +} diff --git a/2.3-1/src/c/linearAlgebra/includes/fullrf.h b/2.3-1/src/c/linearAlgebra/includes/fullrf.h new file mode 100644 index 00000000..cc0a33d0 --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/includes/fullrf.h @@ -0,0 +1,26 @@ + /* 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: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ +#ifndef __FULLRF_H__ +#define __FULLRF_H__ +#include "types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +double dfullrfa(int ninp,double *in1,int row,int col,double tol,double *out1,double *out2); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__FULLRF_H__*/ diff --git a/2.3-1/src/c/linearAlgebra/includes/givens.h b/2.3-1/src/c/linearAlgebra/includes/givens.h new file mode 100644 index 00000000..4aac91b2 --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/includes/givens.h @@ -0,0 +1,25 @@ + /* 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: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ +#ifndef __GIVENS_H__ +#define __GIVENS_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +void dgivensa(int ninp,double *inp1,int row,int col,double *inp2,int row1,int col1,int nout,double *out1,double *out2); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__givens_H__*/ diff --git a/2.3-1/src/c/linearAlgebra/includes/householder.h b/2.3-1/src/c/linearAlgebra/includes/householder.h new file mode 100644 index 00000000..64350a15 --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/includes/householder.h @@ -0,0 +1,26 @@ + /* 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: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ +#ifndef __HOUSEHOLDER_H__ +#define __HOUSEHOLDER_H__ +#include "types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +void dhouseholdera(int ninp,double *inp1,int row,double *inp2,double *out1); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__HOUSEHOLDER_H__*/ diff --git a/2.3-1/src/c/linearAlgebra/includes/qr.h b/2.3-1/src/c/linearAlgebra/includes/qr.h new file mode 100644 index 00000000..2ed12e3a --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/includes/qr.h @@ -0,0 +1,26 @@ + /* 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: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ +#ifndef __QR_H__ +#define __QR_H__ +#include "types.h" + +#ifdef __cplusplus +extern "C" { +#endif + +double dqra(int ninp,int nout,double *inp1,int M,int N,double tol,double *out1,double *out2,double *out3); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__QR_H__*/ diff --git a/2.3-1/src/c/signalProcessing/includes/zpbutt.h b/2.3-1/src/c/linearAlgebra/includes/rowcomp.h index 9eb88ad4..faf5a2a7 100644 --- a/2.3-1/src/c/signalProcessing/includes/zpbutt.h +++ b/2.3-1/src/c/linearAlgebra/includes/rowcomp.h @@ -1,29 +1,26 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE + /* 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: Ankit Raj + Author: Sandeep Gupta Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ - -#ifndef __ZPBUTT_H__ -#define __ZPBUTT_H__ +#ifndef __ROWCOMP_H__ +#define __ROWCOMP_H__ #include "types.h" -#include "doubleComplex.h" -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif -double dzpbutts(double n,double fl,doubleComplex* out); +double drowcompa(int ninp,double *A,int row,int col,char *flag,double tol,double *w); -#ifdef __cplusplus +#ifdef __cplusplus } /* extern "C" */ #endif -#endif /* __ZPBUTT_H__ */ - +#endif /*__ROWCOMP_H__*/ diff --git a/2.3-1/src/c/signalProcessing/zpbutt/zpbutt.h b/2.3-1/src/c/linearAlgebra/includes/sqroot.h index 6883942c..9c1d9652 100644 --- a/2.3-1/src/c/signalProcessing/zpbutt/zpbutt.h +++ b/2.3-1/src/c/linearAlgebra/includes/sqroot.h @@ -1,27 +1,26 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE + /* 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: Ankit Raj + Author: Sandeep Gupta Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ - -#ifndef __ZPBUTT_H__ -#define __ZPBUTT_H__ +#ifndef __SQROOT_H__ +#define __SQROOT_H__ #include "types.h" -#include "doubleComplex.h" -#ifdef __cplusplus +#ifdef __cplusplus extern "C" { #endif -void dzpbutts(double* n,double* fl,doublecomplex* out,double* gain); +void dsqroota(double *inp,int row,int col,double *out); -#ifdef __cplusplus +#ifdef __cplusplus } /* extern "C" */ #endif +#endif /*__SQROOT_H__*/ diff --git a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_analog_in_volt.h b/2.3-1/src/c/linearAlgebra/interfaces/int_fullrf.h index e8fe65d7..1b8a067b 100644 --- a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_analog_in_volt.h +++ b/2.3-1/src/c/linearAlgebra/interfaces/int_fullrf.h @@ -1,30 +1,28 @@ -/* Copyright (C) 2017 - IIT Bombay - FOSSEE + /* 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: Yash Pratap Singh Tomar + Author: Sandeep Gupta Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in -*/ + */ - -#ifndef __INT_CMD_ANALOG_IN_VOLT_H__ -#define __INT_CMD_ANALOG_IN_VOLT_H__ - -#include "types.h" +#ifndef __INT_FULLRF_H__ +#define __INT_FULLRF_H__ #ifdef __cplusplus extern "C" { #endif -#define d0d0cmd_analog_in_volts0(in1,in2) u8cmd_analog_in_volts((uint8)in1,(uint8)in2) - +#define d2fullrfd2d2d0(in1,size,out1,out2) dfullrfa(1,in1,size[0],size[1],0,out1,out2); +#define d2d0fullrfd2d2d0(in1,size,in2,out1,out2) dfullrfa(2,in1,size[0],size[1],in2,out1,out2); #ifdef __cplusplus } /* extern "C" */ #endif -#endif /* __INT_CMD_ANALOG_IN_VOLT_H__ */ +#endif /*__INT_FULLRF_H__*/ + diff --git a/2.3-1/src/c/linearAlgebra/interfaces/int_givens.h b/2.3-1/src/c/linearAlgebra/interfaces/int_givens.h new file mode 100644 index 00000000..ba30dbce --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/interfaces/int_givens.h @@ -0,0 +1,32 @@ + /* 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: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +#ifndef __INT_GIVENS_H__ +#define __INT_GIVENS_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +#define d2givensd2(in1,size,out1) dgivensa(1,in1,size[0],size[1],NULL,0,0,1,out1,NULL); +#define d2givensd2d2(in1,size,out1,out2) dgivensa(1,in1,size[0],size[1],NULL,0,0,2,out1,out2); + +#define d0d0givensd2d2(in1,in2,out1,out2) dgivensa(2,&in1,1,1,&in2,1,1,2,out1,out2); +#define d0d0givensd2(in1,out1) dgivensa(2,&in1,1,1,&in2,1,1,1,out1,NULL); + + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__INT_GIVENS_H__*/ + diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_dcmotor_release.h b/2.3-1/src/c/linearAlgebra/interfaces/int_householder.h index d185fb5e..f8637197 100644 --- a/2.3-1/src/c/scilab-arduino/includes/cmd_dcmotor_release.h +++ b/2.3-1/src/c/linearAlgebra/interfaces/int_householder.h @@ -1,30 +1,28 @@ -/* Copyright (C) 2017 - IIT Bombay - FOSSEE + /* 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: Yash Pratap Singh Tomar + Author: Sandeep Gupta Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in -*/ + */ -#ifndef __CMD_DCMOTOR_RELEASE_H__ -#define __CMD_DCMOTOR_RELEASE_H__ - -#include "types.h" +#ifndef __INT_HOUSEHOLDER_H__ +#define __INT_HOUSEHOLDER_H__ #ifdef __cplusplus extern "C" { #endif -extern uint8 dcm_pin_1[4], dcm_pin_2[4], dcm_mode[4]; - -void u8cmd_dcmotor_releases(uint8 board_no, uint8 motor_no); +#define d2householderd2(in1,size,out1) dhouseholdera(1,in1,size[0],NULL,out2); +#define d2d2householderd2(in1,size1,in2,size2,out1) dhouseholdera(2,in1,size1[0],in2,out1); #ifdef __cplusplus } /* extern "C" */ #endif -#endif /* __CMD_DCMOTOR_RELEASE_H__ */ +#endif /*__INT_HOUSEHOLDER_H__*/ + diff --git a/2.3-1/src/c/linearAlgebra/interfaces/int_qr.h b/2.3-1/src/c/linearAlgebra/interfaces/int_qr.h new file mode 100644 index 00000000..d34d8f41 --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/interfaces/int_qr.h @@ -0,0 +1,34 @@ + /* 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: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +#ifndef __INT_QR_H__ +#define __INT_QR_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +#define d2qrd2d2(in1,size,out1,out2) dqra(1,2,in1,size[0],size[1],0,out1,out2,NULL); +#define d2qrd2d2d2(in1,size,out1,out2,out3) dqra(1,3,in1,size[0],size[1],0,out1,out2,out3); +#define d2g2qrd2d2(in1,size,in2,size1,out1,out2) dqra(2,2,in1,size[0],size[1],0,out1,out2,NULL); +#define d2g2qrd2d2d2(in1,size,in2,size1,out1,out2,out3) dqra(2,3,in1,size[0],size[1],0,out1,out2,out3); +#define d2d0qrd2d2d0d2(in1,size,in2,out1,out2,out3) dqra(2,4,in1,size[0],size[1],in2,out1,out2,out3); +#define d2qrd2d2d0d2(in1,size,out1,out2,out3) dqra(1,4,in1,size[0],size[1],0,out1,out2,out3); + + + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__INT_HESS_H__*/ + diff --git a/2.3-1/src/c/linearAlgebra/interfaces/int_rowcomp.h b/2.3-1/src/c/linearAlgebra/interfaces/int_rowcomp.h new file mode 100644 index 00000000..b72687d5 --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/interfaces/int_rowcomp.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: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +#ifndef __INT_ROWCOMP_H__ +#define __INT_ROWCOMP_H__ + +#ifdef __cplusplus +extern "C" { +#endif + +#define d2rowcompd2d0(in1,size,out1) drowcompa(1,in1,size[0],size[1],NULL,0,out1); +#define d2g2rowcompd2d0(in1,size,flag,size1,out1) drowcompa(2,in1,size[0],size[1],flag,0,out1); +#define d2g2d0rowcompd2d0(in1,size,flag,size1,tol,out1) drowcompa(2,in1,size[0],size[1],flag,tol,out1); + +#ifdef __cplusplus +} /* extern "C" */ +#endif + +#endif /*__INT_ROWCOMP_H__*/ + diff --git a/2.3-1/src/c/elementaryFunctions/includes/nextpow2.h b/2.3-1/src/c/linearAlgebra/interfaces/int_sqroot.h index c86bea01..57af2c08 100644 --- a/2.3-1/src/c/elementaryFunctions/includes/nextpow2.h +++ b/2.3-1/src/c/linearAlgebra/interfaces/int_sqroot.h @@ -1,28 +1,27 @@ -/* Copyright (C) 2016 - IIT Bombay - FOSSEE + /* 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: Ukasha Noor + Author: Sandeep Gupta Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in -*/ + */ - -#ifndef __NEXTPOW2_H__ -#define __NEXTPOW2_H__ +#ifndef __INT_SQROOT_H__ +#define __INT_SQROOT_H__ #ifdef __cplusplus extern "C" { #endif -void dnextpow2a(double *in,int size,double *out); +#define d2sqrootd2(inp,size,out) dsqroota(inp,size[0],size[1],out); #ifdef __cplusplus } /* extern "C" */ #endif -#endif +#endif /*__INT_HESS_H__*/ diff --git a/2.3-1/src/c/linearAlgebra/proj/dproja.c b/2.3-1/src/c/linearAlgebra/proj/dproja.c new file mode 100644 index 00000000..e27cd6f2 --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/proj/dproja.c @@ -0,0 +1,73 @@ +/* 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: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +/* Scilab function proj code in C */ + +#include <stdio.h> +#include <stdlib.h> +#include "proj.h" +#include "eye.h" +#include "matrixTranspose.h" +#include "matrixMultiplication.h" +#include <math.h> +#include "norm.h" + + +double dproja(double *x1,int l,int k,double *x2,int m2,int n2,double *y){ + int i,j; + double *w; + w = (double *)malloc(l*l*sizeof(double)); + double rk; + rk = drowcompa(1,x1,l,k,NULL,0,w); + + double *w1; + w1 = (double *)malloc(rk*l*sizeof(double)); + + for(i=0;i<l*rk;i++){ + w1[i]=w[i]; + } + + double *x1t; + x1t = (double *)malloc((l-n)*l*sizeof(double); + + for(i=n;i<l;i++){ + for(j=0;j<l;j++){ + x1t[i-n+j*l] = w1[i+j*l]; + } + } + + double x1x2; + x1x2 = (double *)malloc((l-n+1)*n2*sizeof(double)); + dmulma(x1t,l-n+1,l,x2,m2,n2,x1x2); + + double *inx1x2; + inx1x2 = (double *)malloc(); + + + + + + + + + + + + + + + + + + + +} diff --git a/2.3-1/src/c/linearAlgebra/projspec/dprojspeca.c b/2.3-1/src/c/linearAlgebra/projspec/dprojspeca.c new file mode 100644 index 00000000..aea9713e --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/projspec/dprojspeca.c @@ -0,0 +1,67 @@ +/* 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: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +/* PROJSPEC function in scilab */ + +/* + //[S,P,D,index]=projspec(A) + //Spectral characteristics of A at 0 + //S = reduced resolvent at 0 (S=-Drazin_inverse(A)) + //P = spectral projection at 0 + //D = Nilpotent operator at 0 + //index = index of the 0 eigenvalue + //! + +*/ + +#include <stdio.h> +#include <stdlib.h> +#include <math.h> +#include "norm.h" +#include "eye.h" + +#define eps pow(2,-52) + +double dprojspeca(double *inp1,int row,int col,double *out1,double *out2,double *out3){ + double tol = pow(10,-6); + int i,j,index; + /*norm(A,1)*/ + double nor; + nor = dnorma(inp1,row,col,1); + + /* P=eye(A),D=A,S=0*P;index=1; */ + if(nor < eps*row*row){ + memcpy(out2,inp1,row*col*sizeof(double)); + deyea(out2,row,col); + memcpy(out3,inp1,row*col*sizeof(double)); + for(i=0;i<row;i++){ + for(j=0;j<row;j++){ + out1[i*row+j] = 0; + } + } + index = 1; + } + + /* rcond(A) */ + double *rcon; + rcon = rcond(inp1,row); + if(rcon > tol){ + dinverma(inp1,out1,row); + for(i=0;i<row*col;i++){ + out2[i]=0; + out3[i]=0; + } + index = 0; + return index; + } + index = 1; +} diff --git a/2.3-1/src/c/linearAlgebra/qr/dqra.c b/2.3-1/src/c/linearAlgebra/qr/dqra.c new file mode 100644 index 00000000..bae4bc27 --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/qr/dqra.c @@ -0,0 +1,298 @@ +/* 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: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +/* This C code is used to generate function for QR decomposition */ + +#include <stdio.h> +#include <stdlib.h> +#include <math.h> +#include "qr.h" +#include "lapack.h" +#include "string.h" +#include "matrixTranspose.h" + +/*For reference check Scilab source code & lapack library websites +Names of variable are almost same for convience. +*/ +/* +int min(int M,int N){ + if(M > N) return N; + return M; +} + +int max(int M,int N){ + if(M > N) return N; + return N; +}*/ + +/* External Function used of lapack library */ +extern double dgeqrf_(int *,int *,double *,int *,double *,double *,int *,int *); +extern double dlacpy_(char *,int *,int *,double *,int *,double *,int *); +extern double dgeqpf_(int *,int *,double *,int *,int *,double *,double *,int *); +extern double dorgqr_(int *,int *,int *,double *,int *,double *,double *,int *,int *); +extern void dlaset_(char *,int *,int *,double *,double *,double *,int *); + +/* function for finding qr */ +double dqra(int ninp,int nout,double *inp1,int M,int N,double tol,double *out1,double *out2,double *out3){ + int i,j; + char choice; + double alpha=0.0,beta=0.0; + int minMN = min(M,N); + + double *A; + A = (double *)malloc(M*N*sizeof(double)); + memcpy(A,inp1,M*N*sizeof(double)); + + if(M <= 0 || N <= 0){ + out1 = NULL; + out2 = NULL; + return 0; + } + /* doldqr */ + if(nout == 4){ /* [Q,R,rk,E]=qr(X [,tol]) */ + if(ninp == 1){ + tol = -1; + } + + int INFO,rk; + + int *JPVT; + JPVT = ( int *)malloc(N*sizeof(int)); + + double *TAU; + TAU = (double *)malloc(minMN*sizeof(double)); + + int LWORK = 3*N; + + double *WORK; + WORK = (double *)malloc(LWORK*sizeof(double)); + + for(i=1;i<=M;i++){ + JPVT[i-1]=0.0; + } + dgeqpf_(&M,&N,A,&M,JPVT,TAU,WORK,&INFO); + + choice = 'U'; + dlacpy_(&choice,&M,&N,A,&M,out2,&M); + + if(M > N){ + for(j=1;j<=N;j++){ + for(i=j+1;i<=M;i++){ + out2[i-1+(j-1)*M] = 0.0; + } + } + } + else{ + for(j=1;j<=M-1;j++){ + for(i=j+1;i<=M;i++){ + out2[i-1+(j-1)*M] = 0.0; + } + } + } + + if(M > N){ + choice = 'F'; + dlacpy_(&choice,&M,&N,A,&M,out1,&M); + for(j=N+1;j<=M;j++){ + for(i=1;i<=M;i++){ + out1[i-1+(j-1)*M] = 0.0; + } + } + } + else{ + choice = 'F'; + dlacpy_(&choice,&M,&M,A,&M,out1,&M); + } + + dorgqr_(&M,&M,&minMN,out1,&M,TAU,WORK,&LWORK,&INFO); + + choice = 'F'; + dlaset_(&choice,&N,&N,&alpha,&beta,out3,&N); + + for(j=1;j<=N;j++){ + i = JPVT[j-1]; + out3[i-1+(j-1)*N] = 1.0; + } + + double tt = abs(out2[0]); + + if(tol == -1){ + tol = (double)max(M,N)*pow(2,-52)*tt; + } + double ch; + //printf("%lf ",tol); + for(j=1;j<=minMN;j++){ + //printf("%e ",out2[(j-1)+(j-1)*M]); + if(out2[(j-1)+(j-1)*M] < 0){ + ch = -out2[(j-1)+(j-1)*M]; + } + else{ + ch = out2[(j-1)+(j-1)*M]; + } + if(ch > tol){ + rk = j; + } + else{ + break; + } + } + //printf("\n"); + return rk; + } + else if(ninp == 1){ + /* (intdgeqpf3) + [Q,R]=qr(A) + [Q,R,E]=qr(A) + */ + int LDA = M; + + double *TAU; + TAU = (double *)malloc(min(M,N)*sizeof(double)); + + int LWORK; + if(nout <= 2) + LWORK = N; + else + LWORK = 3*N; + + double *WORK; + WORK = (double *)malloc((LWORK+1)*sizeof(double)); + + int INFO; + + int *JPVT; + JPVT = (int *)malloc(N*sizeof(int)); + + if(nout <= 2){ + dgeqrf_(&M,&N,A,&M,TAU,WORK,&LWORK,&INFO); + } + else{ + for(i=0;i<N;i++){ + *(JPVT+i)=0.0; + } + dgeqpf_(&M,&N,A,&M,JPVT,TAU,WORK,&INFO); + } + + /* Copying code from A to R */ + choice = 'U'; + dlacpy_(&choice,&M,&N,A,&M,out2,&M); + /*for(i=0;i<M;i++){ + for(j=0;j<N-i;j++){ + out2[i+j*M] = A[i+j*M]; + } + }*/ + + if(M > N){ + for(j=1;j<=N;j++){ + for(i=j+1;i<=M;i++){ + out2[i-1+(j-1)*M] = 0.0; + } + } + } + else{ + for(j=1;j<=M-1;j++){ + for(i=j+1;i<=M;i++){ + out2[i-1+(j-1)*M] = 0.0; + } + } + } + /* lQ - out1 */ + if(M > N){ + choice = 'F'; + dlacpy_(&choice,&M,&N,A,&M,out1,&M); + /*for(i=0;i<M*N;i++){ + out1[i]=A[i]; + }*/ + for(j=N+1;j<=M;j++){ + for(i=1;i<=M;i++){ + out1[i+(j-1)*M] = 0.0; + } + } + } + else{ + choice = 'F'; + dlacpy_(&choice,&M,&M,A,&M,out1,&M); + /*for(i=0;i<M;i++){ + for(j=0;j<M;j++){ + out1 + } + }*/ + } + dorgqr_(&M,&M,&minMN,out1,&M,TAU,WORK,&LWORK,&INFO); + + if(nout > 2){ + choice = 'F'; + dlaset_(&choice,&N,&N,&alpha,&beta,out3,&N); + for(j=1;j<=N;j++){ + i = *(JPVT+j-1); + //printf("%d ",i-1+(j-1)*N); + *(out3+i-1+(j-1)*N) = 1.0; + } + //printf("\n"); + } + } + else{/* + [[Q,R]=qr(A,'e') + [Q,R,E]=qr(A,'e') ] */ + int *JPVT; + JPVT = (int *)malloc(N*sizeof(int)); + + double *TAU; + TAU = (double *)malloc(min(M,N)*sizeof(double)); + int LWORK; + if(nout <= 2){ + LWORK = N; + } + else{ + LWORK = 3*N; + } + + double *WORK; + WORK = (double *)malloc(LWORK*sizeof(double)); + + int INFO; + if(nout <= 2) + dgeqrf_(&M,&N,A,&M,TAU,WORK,&LWORK,&INFO); + else{ + for(i=1;i<=N;i++){ + JPVT[i-1]=0.0; + } + dgeqpf_(&M,&N,A,&M,JPVT,TAU,WORK,&INFO); + } + choice = 'U'; + + dlacpy_(&choice,&minMN,&N,A,&M,out2,&minMN); + + if(N >= 2){ + for(j=1;j<=N-1;j++){ + if(j+1 <= minMN){ + for(i=j+1;i<=minMN;i++){ + out2[i-1+(j-1)*minMN] = 0.0; + } + } + } + } + choice = 'F'; + dlacpy_(&choice,&M,&minMN,A,&M,out1,&M); + dorgqr_(&M,&minMN,&minMN,out1,&M,TAU,WORK,&LWORK,&INFO); + + if(nout > 2){ + choice = 'F'; + dlaset_(&choice,&N,&N,&alpha,&beta,out3,&N); + for(j=1;j<=N;j++){ + i = JPVT[j-1]; + out3[i-1+(j-1)*N] = 1.0; + } + } + } + return 0; +} diff --git a/2.3-1/src/c/linearAlgebra/rowcomp/drowcompa.c b/2.3-1/src/c/linearAlgebra/rowcomp/drowcompa.c new file mode 100644 index 00000000..3161a2d6 --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/rowcomp/drowcompa.c @@ -0,0 +1,79 @@ +/* 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: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +/* This function is used to find row compression, range */ + +#include "rowcomp.h" +#include <stdio.h> +#include <stdlib.h> +#include <math.h> +#include "svd.h" +#include "norm.h" +#include "eye.h" +#include "matrixTranspose.h" +#include "qr.h" + +/* All variable names, are in consideration of scilab documentation. for reference please check the scilab code.*/ + +double drowcompa(int ninp,double *A,int row,int col,char *flag,double tol,double *w){ + double rk; + double *U; + double *S; + double *V; + double *q,*r,*e; + if(row == 0 || col == 0){ + w = NULL; + return 0; + } + + double nA1 = dnorma(A,row,col,1); + if(nA1 < sqrt(pow(2,-52))/10){ + deyea(w,row,col); + return 0; + } + if(ninp == 1){ + flag = "svd"; + tol = sqrt(pow(2,-52))*nA1; + } + else if(ninp == 2){ + tol = sqrt(pow(2,-52))*nA1; + } + else{ + if(tol < 0){ /* if tolerance is negative */ + printf(" Wrong values for input argument #: Non-negative scalar expected"); + } + } + int M = row,N=col; + int minMN = min(M,N); + char check[3]="qr"; + //printf(" %s ",flag); + if(strcmp(check,flag) == 0){ + /* calling qr function*/ + //printf(" * "); + q = (double *)malloc(M*min(M,N)*sizeof(double)); + r = (double *)malloc(minMN*N*sizeof(double)); + e = (double *)malloc(N*N*sizeof(double)); + rk = dqra(2,4,A,M,N,tol,q,r,e); + memcpy(w,q,row*col*sizeof(double)); + dtransposea(q,row,row,w); + return rk; + } + else{ + /* svd function type */ + U = (double *)malloc(row*row*sizeof(double)); + S = (double *)malloc(row*col*sizeof(double)); + V = (double *)malloc(col*col*sizeof(double)); + rk = dsvda(tol,A,row,col,0,4,U,S,V); + dtransposea(U,row,row,w); + return rk; + } +} diff --git a/2.3-1/src/c/linearAlgebra/sqroot/dsqroota.c b/2.3-1/src/c/linearAlgebra/sqroot/dsqroota.c new file mode 100644 index 00000000..a9062e65 --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/sqroot/dsqroota.c @@ -0,0 +1,130 @@ +/* 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: Sandeep Gupta + Organization: FOSSEE, IIT Bombay + Email: toolbox@scilab.in + */ + +/* Function - sqroot of scilab, W*W' hermitian factorization */ + +#include <stdio.h> +#include "stdlib.h" +#include "string.h" +#include <math.h> +#include "matrixTranspose.h" +#include "svd.h" +#include "matrixMultiplication.h" + +#define eps 2.22044604925e-16 + +/*It would be good, if you are doing conversoins for only valid inputs before + running the program, check all the conditions before hand. +*/ + +void dsqroota(double *inp,int row,int col, double *out){ + if(row != col){ + printf("Enter valid inputs only - matrix should be symetric\n"); + return; + } + int i,j; + double *U,*S,*V; + double *A,*B; + int rk; + + U = (double *)malloc((double)row*row*sizeof(double)); + S = (double *)malloc((double)Min(row,col)*Min(row,col)*sizeof(double)); + V = (double *)malloc((double)col*col*sizeof(double)); + A = (double *)malloc(rk*rk*sizeof(double)); + B = (double *)malloc(rk*row*sizeof(double)); + + double *Q1; + Q1 = (double *)malloc(row*col*sizeof(double)); + + dtransposea(inp,row,col,Q1); + + double *Q2; + Q2 = (double *)malloc(col*row*sizeof(double)); + + /* Q2 = (inp+inp1')/2; */ + for(i=0;i<row;i++){ + for(j=0;j<row;j++){ + Q2[i+j*row] = ((inp[i+j*row]+Q1[i+j*row])/2); + } + } + + /* norm(Q2-Q1,1) - finding the max value from sum of columns */ + double sum = 0; + double maxi=0; + for(i=0;i<row;i++){ + sum = 0; + for(j=0;j<col;j++) sum+=(Q2[i*row+j]-inp[i*row+j]); + if(maxi < sum){ + maxi = sum; + } + } + + /* if norm(Q1-Q,1) > 100*%eps then */ + if(maxi > 100*eps){ + printf("Warning: Wrong size for input argument and Symmetric expected\n"); + } + maxi = 0; + for(i=0;i<col;i++){ + sum=0; + for(j=0;j<row;j++) sum+=Q1[i*row+j]; + if(maxi < sum){ + maxi = sum; + } + } + + /*if norm(Q,1) < sqrt(%eps) then S=[];return;end*/ + + if(maxi < sqrt(eps)){ + out = NULL; + } + else{ + rk = dsvda(0,inp,row,col,0,4,U,S,V); + + /*Will be used in complex numbers*/ + //C = (double *)malloc(rk*row*sizeof(double)); + + /*for(i=0;i<row;i++){ + for(j=0;j<row;j++){ + printf("%lf ",S[i*row+j]); + } + printf("\n"); + }*/ + /*sqrt of S*/ + printf("%d ",rk); + for(i=0;i<rk;i++){ + for(j=0;j<rk;j++){ + A[i*rk+j] = sqrt(S[i*row+j]); + //printf("%lf ",A[i*rk+j]); + } + } + for(i=0;i<col*rk;i++){ + B[i] = V[i]; + //printf("%lf ",B[i]); + } + //printf("\n"); + /*for(i=0;i<rk;i++){ + for(j=0;j<rk;j++){ + //A[i*rk+j] = sqrt(S[i*row+j]); + printf("%lf ",A[i*rk+j]); + } + printf("\n"); + }*/ + /*for(i=0;i<col;i++){ + for(j=0;j<rk;j++){ + //B[i*col+j] = VT[i*col+j]; + printf("%lf ",B[i*col+j]); + } + printf("\n"); + }*/ + dmulma(B,col,rk,A,rk,rk,out); + } +} diff --git a/2.3-1/src/c/linearAlgebra/sva/dsvaa.c b/2.3-1/src/c/linearAlgebra/sva/dsvaa.c index b7d07d8c..691694e4 100644 --- a/2.3-1/src/c/linearAlgebra/sva/dsvaa.c +++ b/2.3-1/src/c/linearAlgebra/sva/dsvaa.c @@ -20,6 +20,7 @@ #define eps 2.22044604925e-16 +/* Ref: Scilab source code */ void dsvaa(int ninp,double *in1,int row,int col,double in2,double *out1, \ double *out2,double *out3){ @@ -33,14 +34,14 @@ void dsvaa(int ninp,double *in1,int row,int col,double in2,double *out1, \ /* Calculation of svd of a given matrix */ double *U,*S,*V; - U = (double *)malloc((double)row*min(row,col)*sizeof(double)); - S = (double *)malloc((double)min(row,col)*min(row,col)*sizeof(double)); - V = (double *)malloc((double)col*min(row,col)*sizeof(double)); + U = (double *)malloc((double)row*Min(row,col)*sizeof(double)); + S = (double *)malloc((double)Min(row,col)*Min(row,col)*sizeof(double)); + V = (double *)malloc((double)col*Min(row,col)*sizeof(double)); dsvda(0,in1,M,N,1,3,U,S,V); if (ninp == 1){ /* [u,s,v] = sva(A) when input is only matrix */ - tol = max(row,col)*S[0]*eps; + tol = Max(row,col)*S[0]*eps; rk = 0; for(i=0;i<col;i++){ if(S[i+i*row] > tol){ @@ -52,7 +53,7 @@ void dsvaa(int ninp,double *in1,int row,int col,double in2,double *out1, \ tol = in2; if(tol > 1){ rk = tol; - if(rk > min(row,col)){ + if(rk > Min(row,col)){ printf("ERROR: Wrong value for input argument !"); out1 = NULL; out2 = NULL; @@ -70,21 +71,21 @@ void dsvaa(int ninp,double *in1,int row,int col,double in2,double *out1, \ } } arow = M; - acol = min(M,N); + acol = Min(M,N); /* Copying, the output in required format */ for(i=0;i<arow;i++){ for(j=0;j<rk;j++){ out1[i+j*row]=U[i+j*arow]; } } - arow = min(M,N); - for(i=0;i<rk;i++){ + arow = Min(M,N); + for(i=0;i<rk;i++){ /* Copying, the output in required format */ for(j=0;j<rk;j++){ out2[i+j*(int)rk] = S[i+j*arow]; } } arow = N; - acol = min(M,N); - for(i=0;i<arow;i++){ + acol = Min(M,N); + for(i=0;i<arow;i++){ /* Copying, the output in required format */ for(j=0;j<rk;j++){ out3[i+j*arow] = V[i+j*arow]; } diff --git a/2.3-1/src/c/linearAlgebra/svd/.1.c.swp b/2.3-1/src/c/linearAlgebra/svd/.1.c.swp Binary files differnew file mode 100644 index 00000000..81d9e9cf --- /dev/null +++ b/2.3-1/src/c/linearAlgebra/svd/.1.c.swp diff --git a/2.3-1/src/c/linearAlgebra/svd/zsvda.c b/2.3-1/src/c/linearAlgebra/svd/zsvda.c index 0d360222..12a07aaf 100644 --- a/2.3-1/src/c/linearAlgebra/svd/zsvda.c +++ b/2.3-1/src/c/linearAlgebra/svd/zsvda.c @@ -113,7 +113,16 @@ void zsvda(doubleComplex *in1,int row,int col,int in2,int nout, doubleComplex *o out3[i+j*N] = zconjs(VT[j+i*N]); out3[j+i*N] = zconjs(VT[i+j*N]); } - } + } + /* output from zgesvd is copied to out2 variables in required format*/ + for(j=0;j<M;j++){ + for(k=0;k<N;k++){ + if(j == k) + out2[j*(Min(M,N))+k] = DoubleComplex(S[j],0); + else + out2[j*(Min(M,N))+k] = DoubleComplex(0,0); + } + } //ztransposea(VT,LDVT,Min(M,N),out3); /*for(i=0;i<N;i++){ for(j=0;j<N;j++){ @@ -124,7 +133,7 @@ void zsvda(doubleComplex *in1,int row,int col,int in2,int nout, doubleComplex *o //free(U); //free(VT); } - else{ + else{ /*svd(x,'e')*/ LDA = M; LDU = M; if(M > N){ @@ -156,18 +165,18 @@ void zsvda(doubleComplex *in1,int row,int col,int in2,int nout, doubleComplex *o for(j=0;j<N;j++){ out3[j+i*N] = zconjs(VT[i+j*Min(M,N)]); } - } + } + /* output from zgesvd is copied to out2 variables in required format*/ + for(j=0;j<Min(M,N);j++){ + for(k=0;k<Min(M,N);k++){ + if(j == k) + out2[j*(Min(M,N))+k] = DoubleComplex(S[j],0); + else + out2[j*(Min(M,N))+k] = DoubleComplex(0,0); + } + } //free(U); //free(VT); } - /* output from zgesvd is copied to out2 variables in required format*/ - for(j=0;j<Min(M,N);j++){ - for(k=0;k<Min(M,N);k++){ - if(j == k) - out2[j*(Min(M,N))+k] = DoubleComplex(S[j],0); - else - out2[j*(Min(M,N))+k] = DoubleComplex(0,0); - } - } } } diff --git a/2.3-1/src/c/string/strchr/gstrchra.c b/2.3-1/src/c/matrixOperations/Slash/dslasha.c index f2f54359..cb2007b7 100644 --- a/2.3-1/src/c/string/strchr/gstrchra.c +++ b/2.3-1/src/c/matrixOperations/Slash/dslasha.c @@ -5,29 +5,28 @@ 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: Sandeep Gupta Organization: FOSSEE, IIT Bombay - Author: Ankit Raj Email: toolbox@scilab.in -*/ + */ + +/*This function finds the A/B. */ + +/* X = slash(A,B) <=> X = A/B */ + #include <stdio.h> -#include <string.h> -#include "strchr.h" +#include "string.h" +#include "stdlib.h" +#include "lapack.h" +#include "matrixTranspose.h" +#include "matrixMultiplication.h" -void gstrchra(char* str,int size,char* key,int size2,char* out) -{ - int ind,i=0,j,k; - for(j=0;j<size;j++) - { - if(str[j]==key[0]) - { - ind=j; - break; - } - } - for(k=ind;k<size;k++) - { - out[i]=str[k]; - i++; - } -} +void dslasha(double *A,int m1,int n1,double *B,int m2,int n2,double *out){ + if(m1 != n1 && m1 != m2 && m2 != n2){ + return; + } + + double AF; + AF = (double *)malloc(); +} diff --git a/2.3-1/src/c/matrixOperations/cat/ccata.c b/2.3-1/src/c/matrixOperations/cat/ccata.c index cd2b4c92..a6ac6cf0 100644 --- a/2.3-1/src/c/matrixOperations/cat/ccata.c +++ b/2.3-1/src/c/matrixOperations/cat/ccata.c @@ -26,7 +26,7 @@ void crowcata(floatComplex *in1, int lines1, int columns1, floatComplex *in2, i { for (j = 0 ; j < lines1 ; ++j) { - out[i*(lines1 + lines2) + j] = in1[i*lines1 + j]; + /*out[i*(lines1 + lines2) + j] = in1[i*lines1 + j];*/ } for (j = 0 ; j < lines2 ; ++j) { diff --git a/2.3-1/src/c/matrixOperations/cat/zcata.c b/2.3-1/src/c/matrixOperations/cat/zcata.c index 485553d7..455fea0e 100644 --- a/2.3-1/src/c/matrixOperations/cat/zcata.c +++ b/2.3-1/src/c/matrixOperations/cat/zcata.c @@ -43,7 +43,7 @@ void zrowcata(doubleComplex *in1, int lines1, int columns1, doubleComplex *in2, ** A1=[1 2 3;4 5 6]; A2=[7 8 9 ;10 11 12]; y=cat(2,A1,A2) => y=[1 2 3 7 8 9 ; 4 5 6 10 11 12] ** */ -void zcolumncata(doubleComplex *in1, int lines1, int columns1, doubleComplex *in2, int lines2, int columns2, doubleComplex* out) { +void zcolumncata(doubleComplex *in1, int lines1, int columns1, doubleComplex *in2, int lines2, int columns2, doubleComplex* out) { int i = 0; for (i = 0 ; i < lines1 * columns1 ; ++i) { out[i] = in1[i]; diff --git a/2.3-1/src/c/matrixOperations/includes/spec.h b/2.3-1/src/c/matrixOperations/includes/spec.h deleted file mode 100644 index b7b7d35c..00000000 --- a/2.3-1/src/c/matrixOperations/includes/spec.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008 - INRIA - Arnaud TORSET - * - * 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 - * - */ - - -#ifndef __SPEC_H__ -#define __SPEC_H__ - -#include "dynlib_matrixoperations.h" -#include "doubleComplex.h" -#include "floatComplex.h" - -#ifdef __cplusplus -extern "C" { -#endif - -/* spec gives only the eigenvalues - If you want the eigenvalues and the eigenvectors, use spec2 */ - -/* spec */ -#define sspecs(in) in -#define dspecs(in) in -#define cspecs(in) in -#define zspecs(in) in - -EXTERN_MATOPS void sspeca(float* in, int rows, float* out); -EXTERN_MATOPS void dspeca(double* in, int rows, double* out); -EXTERN_MATOPS void cspeca(floatComplex* in, int rows, floatComplex* out); -EXTERN_MATOPS void zspeca(doubleComplex* in, int rows,doubleComplex* out); - - - -/* spec2 */ -#define sspec2s(in,out) sspecs(1);*out=in; -#define dspec2s(in,out) dspecs(1);*out=in; -#define cspec2s(in,out) cspecs(FloatComplex(1,0));*out=FloatComplex(creals(in),cimags(in)); -#define zspec2s(in,out) zspecs(DoubleComplex(1,0));*out=DoubleComplex(zreals(in),zimags(in)); - -EXTERN_MATOPS void sspec2a(float* in, int rows, float* eigenvalues,float* eigenvectors); -EXTERN_MATOPS void dspec2a(double* in, int rows, double* eigenvalues,double* eigenvectors); -EXTERN_MATOPS void cspec2a(floatComplex* in, int rows, floatComplex* eigenvalues,floatComplex* eigenvectors); -EXTERN_MATOPS void zspec2a(doubleComplex* in, int rows,doubleComplex* eigenvalues,doubleComplex* eigenvectors); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __SPEC_H__ */ diff --git a/2.3-1/src/c/matrixOperations/interfaces/int_spec.h b/2.3-1/src/c/matrixOperations/interfaces/int_spec.h deleted file mode 100644 index 77ab55e7..00000000 --- a/2.3-1/src/c/matrixOperations/interfaces/int_spec.h +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008-2008 - INRIA - Bruno JOFRET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -/* THIS IS AN AUTOMATICALLY GENERATED FILE : DO NOT EDIT BY HAND. */ - -#ifndef __INT_SPEC_H__ -#define __INT_SPEC_H__ - -/* Only eigenvalues */ - -#define s0specc0(in) FloatComplex (sspecs(in) , 0) - -#define d0specz0(in) DoubleComplex ( dspecs(in) , 0) - -#define c0specc0(in) cspecs(in) - -#define z0specz0(in) zspecs(in) - -#define s2specc2(in,size,out) {float* ZEROS;\ - ZEROS=malloc((uint)(size[0]*size[0]*sizeof(float)));\ - szerosa(ZEROS,size[0],size[0]);\ - cspeca(FloatComplexMatrix(in,ZEROS,size[0]*size[0]), size[0], out);\ - } - -#define d2specz2(in,size,out) {double* ZEROS;\ - ZEROS=malloc((uint)(size[0]*size[0]*sizeof(double)));\ - dzerosa(ZEROS,size[0],size[0]);\ - zspeca(DoubleComplexMatrix(in,ZEROS,size[0]*size[0]), size[0] , out);\ - } - -#define c2specc2(in,size,out) cspeca(in, size[0], out) - -#define z2specz2(in,size,out) zspeca(in, size[0], out) - -/* Eigenvalues and eigenvectors */ - -#define s0specc0c0(in,out) cspec2s(FloatComplex( in,0) ,out) - -#define d0specz0z0(in,out) zspec2s(DoubleComplex(in,0) ,out) - -#define c0specc0c0(in,out) cspec2s(in,out) - -#define z0specz0z0(in,out) zspec2s(in,out) - -#define s2specc2c2(in,size,out1,out2) {float* ZEROS;\ - ZEROS=malloc((uint)(size[0]*size[0]*sizeof(float)));\ - szerosa(ZEROS,size[0],size[0]);\ - cspec2a(FloatComplexMatrix(in,ZEROS,size[0]*size[0]), size[0] , out1 , out2 );\ - } - -#define d2specz2z2(in,size,out1,out2) {double* ZEROS;\ - ZEROS=malloc((uint)(size[0]*size[0]*sizeof(double)));\ - dzerosa(ZEROS,size[0],size[0]);\ - zspec2a(DoubleComplexMatrix(in,ZEROS,size[0]*size[0]), size[0] , out1 , out2 );\ - } - - -#define c2specc2c2(in,size,out1,out2) cspec2a(in, size[0], out2, out1) - -#define z2specz2z2(in,size,out1,out2) zspec2a(in, size[0], out2, out1) - -#endif /* !__INT_SPEC_H__ */ diff --git a/2.3-1/src/c/matrixOperations/norm/dnorma.c b/2.3-1/src/c/matrixOperations/norm/dnorma.c index c912f857..2bb9b8b7 100644 --- a/2.3-1/src/c/matrixOperations/norm/dnorma.c +++ b/2.3-1/src/c/matrixOperations/norm/dnorma.c @@ -6,6 +6,8 @@ are also available at http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt Author: Siddhesh Wani + + Edited by: Sandeep Gupta Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ @@ -14,13 +16,17 @@ /*Acceptable norms are: 1, 2, 'inf', 'fro', */ #include "norm.h" +#include "svd.h" #include <math.h> +#include <stdio.h> +#include<stdlib.h> double dnorma (double *in, int row, int col, int norm) { double res = 0, sum = 0; int col_count, row_count; - + double *S; + S = (double *)malloc(min(row,col)*sizeof(double)); switch (norm) { case 1: /*largest column sum*/ @@ -37,6 +43,8 @@ double dnorma (double *in, int row, int col, int norm) break; case 2: /*Largest singular value of the matrix*/ + dsvda(0,in,row,col,0,1,S,NULL,NULL); + res = S[0]; break; case 3: /*inf: largest row sum*/ @@ -69,4 +77,4 @@ double dnorma (double *in, int row, int col, int norm) return res; -}
\ No newline at end of file +} diff --git a/2.3-1/src/c/matrixOperations/spec/Makefile.am b/2.3-1/src/c/matrixOperations/spec/Makefile.am deleted file mode 100644 index 90dbd0aa..00000000 --- a/2.3-1/src/c/matrixOperations/spec/Makefile.am +++ /dev/null @@ -1,70 +0,0 @@ -## -## Scilab ( http://www.scilab.org/ ) - This file is part of Scilab -## Copyright (C) 2006-2008 - INRIA - Bruno JOFRET -## -## This file must be used under the terms of the CeCILL. -## This source file is licensed as described in the file COPYING, which -## you should have received as part of this distribution. The terms -## are also available at -## http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -## -## - -libSpec_la_CFLAGS = -I $(top_builddir)/src/c/type \ - -I $(top_builddir)/src/c/matrixOperations/includes \ - -I $(top_builddir)/src/c/operations/includes \ - -I $(top_builddir)/src/c/elementaryFunctions/includes\ - -I $(top_builddir)/src/c/auxiliaryFunctions/includes - - -instdir = $(top_builddir)/lib - -pkglib_LTLIBRARIES = libSpec.la - -HEAD = ../includes/spec.h - -libSpec_la_SOURCES = $(HEAD) \ - sspeca.c \ - dspeca.c \ - cspeca.c \ - zspeca.c - - -############ -## CHECK -############ - - -check_PROGRAMS = testDoubleSpec testFloatSpec - -check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ - $(top_builddir)/src/c/type/libFloatComplex.la \ - $(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \ - $(top_builddir)/src/fortran/lapack/libscilapack.la \ - $(top_builddir)/src/fortran/blas/libsciblas.la \ - $(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \ - $(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \ - $(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/src/c/operations/addition/libAddition.la \ - $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ - $(top_builddir)/src/c/matrixOperations/inversion/libMatrixInversion.la\ - $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la\ - libSpec.la - -check_INCLUDES = -I $(top_builddir)/src/c/type \ - -I $(top_builddir)/src/c/matrixOperations/includes \ - -I $(top_builddir)/src/c/operations/includes \ - -I $(top_builddir)/src/c/elementaryFunctions/includes\ - -I $(top_builddir)/src/c/auxiliaryFunctions/includes - -testDoubleSpec_SOURCES = testDoubleSpec.c -testDoubleSpec_LDADD = $(check_LDADD) -testDoubleSpec_CFLAGS = $(check_INCLUDES) - -testFloatSpec_SOURCES = testFloatSpec.c -testFloatSpec_LDADD = $(check_LDADD) -testFloatSpec_CFLAGS = $(check_INCLUDES) - -TESTS = testDoubleSpec testFloatSpec - diff --git a/2.3-1/src/c/matrixOperations/spec/Makefile.in b/2.3-1/src/c/matrixOperations/spec/Makefile.in deleted file mode 100644 index 9c34c9e6..00000000 --- a/2.3-1/src/c/matrixOperations/spec/Makefile.in +++ /dev/null @@ -1,755 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -check_PROGRAMS = testDoubleSpec$(EXEEXT) testFloatSpec$(EXEEXT) -TESTS = testDoubleSpec$(EXEEXT) testFloatSpec$(EXEEXT) -subdir = src/c/matrixOperations/spec -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/includes/machine.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkglibdir)" -LTLIBRARIES = $(pkglib_LTLIBRARIES) -libSpec_la_LIBADD = -am__objects_1 = -am_libSpec_la_OBJECTS = $(am__objects_1) libSpec_la-sspeca.lo \ - libSpec_la-dspeca.lo libSpec_la-cspeca.lo libSpec_la-zspeca.lo -libSpec_la_OBJECTS = $(am_libSpec_la_OBJECTS) -libSpec_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libSpec_la_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -am_testDoubleSpec_OBJECTS = testDoubleSpec-testDoubleSpec.$(OBJEXT) -testDoubleSpec_OBJECTS = $(am_testDoubleSpec_OBJECTS) -testDoubleSpec_DEPENDENCIES = $(check_LDADD) -testDoubleSpec_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleSpec_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -am_testFloatSpec_OBJECTS = testFloatSpec-testFloatSpec.$(OBJEXT) -testFloatSpec_OBJECTS = $(am_testFloatSpec_OBJECTS) -testFloatSpec_DEPENDENCIES = $(check_LDADD) -testFloatSpec_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testFloatSpec_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/includes -depcomp = $(SHELL) $(top_srcdir)/config/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libSpec_la_SOURCES) $(testDoubleSpec_SOURCES) \ - $(testFloatSpec_SOURCES) -DIST_SOURCES = $(libSpec_la_SOURCES) $(testDoubleSpec_SOURCES) \ - $(testFloatSpec_SOURCES) -ETAGS = etags -CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FGREP = @FGREP@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBMATH = @LIBMATH@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -ac_ct_F77 = @ac_ct_F77@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -libSpec_la_CFLAGS = -I $(top_builddir)/src/c/type \ - -I $(top_builddir)/src/c/matrixOperations/includes \ - -I $(top_builddir)/src/c/operations/includes \ - -I $(top_builddir)/src/c/elementaryFunctions/includes\ - -I $(top_builddir)/src/c/auxiliaryFunctions/includes - -instdir = $(top_builddir)/lib -pkglib_LTLIBRARIES = libSpec.la -HEAD = ../includes/spec.h -libSpec_la_SOURCES = $(HEAD) \ - sspeca.c \ - dspeca.c \ - cspeca.c \ - zspeca.c - -check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ - $(top_builddir)/src/c/type/libFloatComplex.la \ - $(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \ - $(top_builddir)/src/fortran/lapack/libscilapack.la \ - $(top_builddir)/src/fortran/blas/libsciblas.la \ - $(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \ - $(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \ - $(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/src/c/operations/addition/libAddition.la \ - $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ - $(top_builddir)/src/c/matrixOperations/inversion/libMatrixInversion.la\ - $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la\ - libSpec.la - -check_INCLUDES = -I $(top_builddir)/src/c/type \ - -I $(top_builddir)/src/c/matrixOperations/includes \ - -I $(top_builddir)/src/c/operations/includes \ - -I $(top_builddir)/src/c/elementaryFunctions/includes\ - -I $(top_builddir)/src/c/auxiliaryFunctions/includes - -testDoubleSpec_SOURCES = testDoubleSpec.c -testDoubleSpec_LDADD = $(check_LDADD) -testDoubleSpec_CFLAGS = $(check_INCLUDES) -testFloatSpec_SOURCES = testFloatSpec.c -testFloatSpec_LDADD = $(check_LDADD) -testFloatSpec_CFLAGS = $(check_INCLUDES) -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/matrixOperations/spec/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/c/matrixOperations/spec/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } - -uninstall-pkglibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ - done - -clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) - @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libSpec.la: $(libSpec_la_OBJECTS) $(libSpec_la_DEPENDENCIES) - $(libSpec_la_LINK) -rpath $(pkglibdir) $(libSpec_la_OBJECTS) $(libSpec_la_LIBADD) $(LIBS) - -clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list -testDoubleSpec$(EXEEXT): $(testDoubleSpec_OBJECTS) $(testDoubleSpec_DEPENDENCIES) - @rm -f testDoubleSpec$(EXEEXT) - $(testDoubleSpec_LINK) $(testDoubleSpec_OBJECTS) $(testDoubleSpec_LDADD) $(LIBS) -testFloatSpec$(EXEEXT): $(testFloatSpec_OBJECTS) $(testFloatSpec_DEPENDENCIES) - @rm -f testFloatSpec$(EXEEXT) - $(testFloatSpec_LINK) $(testFloatSpec_OBJECTS) $(testFloatSpec_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSpec_la-cspeca.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSpec_la-dspeca.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSpec_la-sspeca.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSpec_la-zspeca.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testDoubleSpec-testDoubleSpec.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testFloatSpec-testFloatSpec.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -libSpec_la-sspeca.lo: sspeca.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec_la_CFLAGS) $(CFLAGS) -MT libSpec_la-sspeca.lo -MD -MP -MF $(DEPDIR)/libSpec_la-sspeca.Tpo -c -o libSpec_la-sspeca.lo `test -f 'sspeca.c' || echo '$(srcdir)/'`sspeca.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libSpec_la-sspeca.Tpo $(DEPDIR)/libSpec_la-sspeca.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sspeca.c' object='libSpec_la-sspeca.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec_la_CFLAGS) $(CFLAGS) -c -o libSpec_la-sspeca.lo `test -f 'sspeca.c' || echo '$(srcdir)/'`sspeca.c - -libSpec_la-dspeca.lo: dspeca.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec_la_CFLAGS) $(CFLAGS) -MT libSpec_la-dspeca.lo -MD -MP -MF $(DEPDIR)/libSpec_la-dspeca.Tpo -c -o libSpec_la-dspeca.lo `test -f 'dspeca.c' || echo '$(srcdir)/'`dspeca.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libSpec_la-dspeca.Tpo $(DEPDIR)/libSpec_la-dspeca.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dspeca.c' object='libSpec_la-dspeca.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec_la_CFLAGS) $(CFLAGS) -c -o libSpec_la-dspeca.lo `test -f 'dspeca.c' || echo '$(srcdir)/'`dspeca.c - -libSpec_la-cspeca.lo: cspeca.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec_la_CFLAGS) $(CFLAGS) -MT libSpec_la-cspeca.lo -MD -MP -MF $(DEPDIR)/libSpec_la-cspeca.Tpo -c -o libSpec_la-cspeca.lo `test -f 'cspeca.c' || echo '$(srcdir)/'`cspeca.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libSpec_la-cspeca.Tpo $(DEPDIR)/libSpec_la-cspeca.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cspeca.c' object='libSpec_la-cspeca.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec_la_CFLAGS) $(CFLAGS) -c -o libSpec_la-cspeca.lo `test -f 'cspeca.c' || echo '$(srcdir)/'`cspeca.c - -libSpec_la-zspeca.lo: zspeca.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec_la_CFLAGS) $(CFLAGS) -MT libSpec_la-zspeca.lo -MD -MP -MF $(DEPDIR)/libSpec_la-zspeca.Tpo -c -o libSpec_la-zspeca.lo `test -f 'zspeca.c' || echo '$(srcdir)/'`zspeca.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libSpec_la-zspeca.Tpo $(DEPDIR)/libSpec_la-zspeca.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='zspeca.c' object='libSpec_la-zspeca.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec_la_CFLAGS) $(CFLAGS) -c -o libSpec_la-zspeca.lo `test -f 'zspeca.c' || echo '$(srcdir)/'`zspeca.c - -testDoubleSpec-testDoubleSpec.o: testDoubleSpec.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testDoubleSpec_CFLAGS) $(CFLAGS) -MT testDoubleSpec-testDoubleSpec.o -MD -MP -MF $(DEPDIR)/testDoubleSpec-testDoubleSpec.Tpo -c -o testDoubleSpec-testDoubleSpec.o `test -f 'testDoubleSpec.c' || echo '$(srcdir)/'`testDoubleSpec.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/testDoubleSpec-testDoubleSpec.Tpo $(DEPDIR)/testDoubleSpec-testDoubleSpec.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testDoubleSpec.c' object='testDoubleSpec-testDoubleSpec.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testDoubleSpec_CFLAGS) $(CFLAGS) -c -o testDoubleSpec-testDoubleSpec.o `test -f 'testDoubleSpec.c' || echo '$(srcdir)/'`testDoubleSpec.c - -testDoubleSpec-testDoubleSpec.obj: testDoubleSpec.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testDoubleSpec_CFLAGS) $(CFLAGS) -MT testDoubleSpec-testDoubleSpec.obj -MD -MP -MF $(DEPDIR)/testDoubleSpec-testDoubleSpec.Tpo -c -o testDoubleSpec-testDoubleSpec.obj `if test -f 'testDoubleSpec.c'; then $(CYGPATH_W) 'testDoubleSpec.c'; else $(CYGPATH_W) '$(srcdir)/testDoubleSpec.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/testDoubleSpec-testDoubleSpec.Tpo $(DEPDIR)/testDoubleSpec-testDoubleSpec.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testDoubleSpec.c' object='testDoubleSpec-testDoubleSpec.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testDoubleSpec_CFLAGS) $(CFLAGS) -c -o testDoubleSpec-testDoubleSpec.obj `if test -f 'testDoubleSpec.c'; then $(CYGPATH_W) 'testDoubleSpec.c'; else $(CYGPATH_W) '$(srcdir)/testDoubleSpec.c'; fi` - -testFloatSpec-testFloatSpec.o: testFloatSpec.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFloatSpec_CFLAGS) $(CFLAGS) -MT testFloatSpec-testFloatSpec.o -MD -MP -MF $(DEPDIR)/testFloatSpec-testFloatSpec.Tpo -c -o testFloatSpec-testFloatSpec.o `test -f 'testFloatSpec.c' || echo '$(srcdir)/'`testFloatSpec.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/testFloatSpec-testFloatSpec.Tpo $(DEPDIR)/testFloatSpec-testFloatSpec.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testFloatSpec.c' object='testFloatSpec-testFloatSpec.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFloatSpec_CFLAGS) $(CFLAGS) -c -o testFloatSpec-testFloatSpec.o `test -f 'testFloatSpec.c' || echo '$(srcdir)/'`testFloatSpec.c - -testFloatSpec-testFloatSpec.obj: testFloatSpec.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFloatSpec_CFLAGS) $(CFLAGS) -MT testFloatSpec-testFloatSpec.obj -MD -MP -MF $(DEPDIR)/testFloatSpec-testFloatSpec.Tpo -c -o testFloatSpec-testFloatSpec.obj `if test -f 'testFloatSpec.c'; then $(CYGPATH_W) 'testFloatSpec.c'; else $(CYGPATH_W) '$(srcdir)/testFloatSpec.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/testFloatSpec-testFloatSpec.Tpo $(DEPDIR)/testFloatSpec-testFloatSpec.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testFloatSpec.c' object='testFloatSpec-testFloatSpec.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFloatSpec_CFLAGS) $(CFLAGS) -c -o testFloatSpec-testFloatSpec.obj `if test -f 'testFloatSpec.c'; then $(CYGPATH_W) 'testFloatSpec.c'; else $(CYGPATH_W) '$(srcdir)/testFloatSpec.c'; fi` - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ - fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ - else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ - fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ - else \ - skipped="($$skip tests were not run)"; \ - fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) - $(MAKE) $(AM_MAKEFLAGS) check-TESTS -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: - for dir in "$(DESTDIR)$(pkglibdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ - clean-pkglibLTLIBRARIES mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: install-pkglibLTLIBRARIES - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-pkglibLTLIBRARIES - -.MAKE: check-am install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool \ - clean-pkglibLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-pkglibLTLIBRARIES install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-pkglibLTLIBRARIES - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/2.3-1/src/c/matrixOperations/spec/cspeca.c b/2.3-1/src/c/matrixOperations/spec/cspeca.c deleted file mode 100644 index a2b6548b..00000000 --- a/2.3-1/src/c/matrixOperations/spec/cspeca.c +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008 - INRIA - Arnaud TORSET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include <stdlib.h> -#include "spec.h" - - - -void cspeca(floatComplex* in, int rows, floatComplex* out){ - /* As we use Lapack to find the eigenvalues, we must cast the floatComplex input into doubleComplex - and the doubleComplex output of dspeca into floatComplex*/ - - int i; - doubleComplex* dblin; - doubleComplex* dblout; - - dblin=(doubleComplex*)malloc((unsigned int)(rows*rows)*sizeof(doubleComplex)); - dblout=(doubleComplex*)malloc((unsigned int)rows*sizeof(doubleComplex)); - - for (i=0;i<rows*rows;i++) dblin[i]=DoubleComplex((double)creals(in[i]),(double)cimags(in[i])); - - zspeca(dblin,rows,dblout); - - for (i=0;i<rows;i++) out[i]=FloatComplex((float)zreals(dblout[i]),(float)zimags(dblout[i])); -} diff --git a/2.3-1/src/c/matrixOperations/spec/dspeca.c b/2.3-1/src/c/matrixOperations/spec/dspeca.c deleted file mode 100644 index 1131ecf2..00000000 --- a/2.3-1/src/c/matrixOperations/spec/dspeca.c +++ /dev/null @@ -1,71 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008 - INRIA - Arnaud TORSET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include <stdlib.h> -#include "spec.h" -#include "lapack.h" -#include "zeros.h" -#include "max.h" - -void dspeca(double* in, int rows,double* out){ - int i=0, j=0; - int symmetric=0; - int INFO=0; - int iWorkSize = 0; - double* pdblWork; - double* outReal; - double* outImag; - double* pdblLeftvectors; - double* pdblRightvectors; - double* inCopy; - - inCopy = (double*)malloc((unsigned int)(rows*rows) * sizeof(double)); - outReal = (double*)malloc((unsigned int)rows * sizeof(double)); - outImag = (double*)malloc((unsigned int)rows * sizeof(double)); - pdblLeftvectors=NULL; - pdblRightvectors=NULL; - - - iWorkSize = 3*rows; - pdblWork = (double*)malloc((unsigned int)iWorkSize * sizeof(double)); - - for(i=0;i<rows*rows;i++) inCopy[i]=in[i]; - /* look if the matrix is symmetric */ - for (i=0;i<rows;i++) - for (j=0;j<rows;j++) - if (in[i*rows+j]!=in[i+j*rows]) break; - - /* the matrix is symmetric if the 2 loops goes to end i.e - i==rows and j==rows */ - if ((i==rows)&&(j==rows)) symmetric=1; - - - /* apply lapack function according to symmetry */ - if(symmetric){ - C2F(dsyev)( "N", "U", &rows, in, &rows, outReal, pdblWork, &iWorkSize, &INFO ); - } - else { - C2F(dgeev)( "N", "N", &rows, inCopy, &rows, outReal, outImag, - pdblLeftvectors, &rows, pdblRightvectors, &rows, pdblWork, &iWorkSize, &INFO ); - } - - for (i=0;i<rows;i++) out[i]=outReal[i]; - - - free(inCopy); - free(outReal); - free(outImag); - free(pdblWork); - free(pdblLeftvectors); - free(pdblRightvectors); -} - diff --git a/2.3-1/src/c/matrixOperations/spec/sspeca.c b/2.3-1/src/c/matrixOperations/spec/sspeca.c deleted file mode 100644 index 50751a29..00000000 --- a/2.3-1/src/c/matrixOperations/spec/sspeca.c +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008 - INRIA - Arnaud TORSET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include <stdlib.h> -#include "spec.h" - - - -void sspeca(float* in, int rows, float* out){ - /* As we use Lapack to find the eigenvalues, we must cast the float input into double - and the doubleComplex output of dspeca into floatComplex*/ - - int i; - double* dblin; - double* dblout; - - dblin=(double*)malloc((unsigned int)(rows*rows)*sizeof(double)); - dblout=(double*)malloc((unsigned int)rows*sizeof(double)); - - for (i=0;i<rows*rows;i++) dblin[i]=(double)in[i]; - - dspeca(dblin,rows,dblout); - - for (i=0;i<rows;i++) out[i]=(float)dblout[i]; -} diff --git a/2.3-1/src/c/matrixOperations/spec/testDoubleSpec.c b/2.3-1/src/c/matrixOperations/spec/testDoubleSpec.c deleted file mode 100644 index 25c88065..00000000 --- a/2.3-1/src/c/matrixOperations/spec/testDoubleSpec.c +++ /dev/null @@ -1,116 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008 - INRIA - Arnaud TORSET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include <stdlib.h> -#include "spec.h" -#include "stdio.h" -#include "assert.h" -#include "math.h" - -static void dspecaTest(void){ - double in[4]={1,1,1,3}; - double resultR[2]={0.5857864376269050765700,3.4142135623730949234300}; - - - double *out; - - int i; - - out=(double*)malloc((unsigned int)2*sizeof(double)); - - dspeca(in,2,out); - for(i=0;i<2;i++){ - if (out[i]>1e-16) assert( fabs(out[i]-resultR[i]) / fabs(out[i]) <3e-16); - else assert(1); - } - -} - - - - -static void zspecaTest(void){ - double inR[4]={1,1,1,3}; - double inI[4]={0,0,0,0}; - double resultR[2]={0.5857864376269050765700,3.4142135623730949234300}; - double resultI[2]={0,0}; - - double in2R[4]={1,1,-2,3}; - double in2I[4]={0,0,0,0}; - double result2R[2]={1.9999999999999997779554,1.9999999999999997779554}; - double result2I[2]={0.9999999999999997779554,-0.9999999999999997779554}; - - double in3R[16]={0.0603054538369178771973,0.631347181741148233414 ,0.0241030259057879447937,0.1527438252232968807221, - 0.9481177683919668197632,0.2744265575893223285675,0.4794727200642228126526,0.485576837789267301559, - 0.676400367170572280884,0.8321249918080866336823,0.0125875836238265037537,0.5453779897652566432953, - 0.8426716942340135574341,0.9029165101237595081329,0.4409482078626751899719,0.8332359003834426403046 }; - double in3I[16]={0.7233976423740386962891,0.4377150186337530612946,0.3080607382580637931824,0.8749813153408467769623, - 0.5355882328003644943237 ,0.3085998897440731525421,0.3354632416740059852600,0.2342486302368342876434, - 0.2589411698281764984131,0.8521509231068193912506,0.4821739485487341880798,0.6095217890106141567230, - 0.9872822705656290054321,0.9811426815576851367950,0.3303113700821995735169,0.3589145573787391185761}; - double result3R[4]={1.9486046375762748894545,0.2315060459861970343365,- 0.7694743345806510648188,- 0.2300808535483104266817}; - double result3I[4]={2.1242015857341254303492,- 0.4115101262891645017561,- 0.1980716835789462781925,0.3584662621795701720195}; - - doubleComplex *in,*in2,*in3,out[2],out2[4]; - - int i; - - in=DoubleComplexMatrix(inR,inI,4); - in2=DoubleComplexMatrix(in2R,in2I,4); - in3=DoubleComplexMatrix(in3R,in3I,16); - - zspeca(in,2,out); - for(i=0;i<2;i++){ - if (zreals(out[i])>1e-16) assert( fabs(zreals(out[i])-resultR[i]) / fabs(zreals(out[i])) <3e-16); - else assert(1); - if (zimags(out[i])>1e-16) assert( fabs(zimags(out[i])-resultI[i]) / fabs(zimags(out[i])) <1e-16); - else assert(1); - } - - - zspeca(in2,2,out); - for(i=0;i<2;i++){ - if (zreals(out[i])>1e-16) assert( fabs(zreals(out[i])-result2R[i]) / fabs(zreals(out[i])) <3e-16); - else assert(1); - if (zimags(out[i])>1e-16) assert( fabs(zimags(out[i])-result2I[i]) / fabs(zimags(out[i])) <3e-15); - else assert(1); - } - - - zspeca(in3,4,out2); - for(i=0;i<4;i++){ - if (zreals(out2[i])>1e-16) assert( fabs(zreals(out2[i])-result3R[i]) / fabs(zreals(out2[i])) <3e-15); - else assert(1); - if (zimags(out2[i])>1e-16) assert( fabs(zimags(out2[i])-result3I[i]) / fabs(zimags(out2[i])) <3e-15); - else assert(1); - } - - -} - - -static int testSpec(void){ - printf(">>> Double Spec Tests <<<\n"); - printf(">>> Double <<<\n"); - dspecaTest(); - printf(">>> DoubleComplex <<<\n"); - zspecaTest(); - return 0; -} - - -int main(void){ - assert (testSpec()==0); - - - return 0; -} diff --git a/2.3-1/src/c/matrixOperations/spec/testFloatSpec.c b/2.3-1/src/c/matrixOperations/spec/testFloatSpec.c deleted file mode 100644 index 9bd46adc..00000000 --- a/2.3-1/src/c/matrixOperations/spec/testFloatSpec.c +++ /dev/null @@ -1,110 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008 - INRIA - Arnaud TORSET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include <stdlib.h> -#include "spec.h" -#include "stdio.h" -#include "assert.h" -#include "math.h" - -static void sspecaTest(void){ - float in[4]={1.0f,1.0f,1.0f,3.0f}; - float resultR[2]={0.5857864376269050765700f,3.4142135623730949234300f}; - - float in1[4]={0.0f,4.0f,1.0f,0.0f}; - float result[2]={2.0f,-2.0f}; - - float in2[4]={1.0f,1.0f,-2.0f,3.0f}; - - float *out; - - int i; - - out=(float *)malloc((unsigned int)2*sizeof(float)); - - sspeca(in,2,out); - for (i=0;i<2;i++) printf("%f\n",out[i]); - for(i=0;i<2;i++){ - if (out[i]>1e-16) assert( fabs(out[i]-resultR[i]) / fabs(out[i]) <1e-16); - else assert(1); - } - - - sspeca(in1,2,out); - for (i=0;i<2;i++) printf("%f\n",out[i]); - for(i=0;i<2;i++){ - if (out[i]>1e-16) assert( fabs(out[i]-result[i]) / fabs(out[i]) <1e-16); - else assert(1); - } - - sspeca(in2,2,out); - for (i=0;i<2;i++) printf("%f\n",out[i]); - -} - - -static void cspecaTest(void){ - float inR[4]={1.0f,1.0f,1.0f,3.0f}; - float inI[4]={0.0f,0.0f,0.0f,0.0f}; - float resultR[2]={0.5857864376269050765700f,3.4142135623730949234300f}; - float resultI[2]={0,0}; - - float in2R[4]={1.0f,1.0f,-2.0f,3.0f}; - float in2I[4]={0.0f,0.0f,0.0f,0.0f}; - float result2R[2]={1.9999999999999997779554f,1.9999999999999997779554f}; - float result2I[2]={0.9999999999999997779554f,-0.9999999999999997779554f}; - - floatComplex *in,*in2,out[4]; - - int i; - - in=FloatComplexMatrix(inR,inI,4); - in2=FloatComplexMatrix(in2R,in2I,4); - - cspeca(in,2,out); - for(i=0;i<2;i++){ - if (creals(out[i])>1e-16) assert( fabs(creals(out[i])-resultR[i]) / fabs(creals(out[i])) <1e-15); - else assert(1); - if (cimags(out[i])>1e-16) assert( fabs(cimags(out[i])-resultI[i]) / fabs(cimags(out[i])) <1e-16); - else assert(1); - } - - - cspeca(in2,2,out); - for(i=0;i<2;i++){ - if (creals(out[i])>1e-16) assert( fabs(creals(out[i])-result2R[i]) / fabs(creals(out[i])) <1e-15); - else assert(1); - if (cimags(out[i])>1e-16) assert( fabs(cimags(out[i])-result2I[i]) / fabs(cimags(out[i])) <1e-15); - else assert(1); - } - -} - - - - -static int testSpec(void){ - printf(">>> Float Spec Tests <<<\n"); - printf(">>> Float <<<\n"); - sspecaTest(); - printf(">>> FloatComplex <<<\n"); - cspecaTest(); - return 0; -} - - -int main(void){ - assert (testSpec()==0); - - - return 0; -} diff --git a/2.3-1/src/c/matrixOperations/spec/test_DoubleSpec/testDoubleSpec.vcxproj b/2.3-1/src/c/matrixOperations/spec/test_DoubleSpec/testDoubleSpec.vcxproj deleted file mode 100644 index f696bff4..00000000 --- a/2.3-1/src/c/matrixOperations/spec/test_DoubleSpec/testDoubleSpec.vcxproj +++ /dev/null @@ -1,178 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{651B0E61-1047-4575-BE31-D9CB28062CBA}</ProjectGuid>
- <RootNamespace>testDoubleSpec</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\testDoubleSpec.c">
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\type\type.vcxproj">
- <Project>{9b1bd750-1fef-4d6b-9422-782d16181cee}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="..\..\matrixOperations.vcxproj">
- <Project>{fd335544-52bf-4736-a34e-77f591d158d5}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file diff --git a/2.3-1/src/c/matrixOperations/spec/test_DoubleSpec/testDoubleSpec.vcxproj.filters b/2.3-1/src/c/matrixOperations/spec/test_DoubleSpec/testDoubleSpec.vcxproj.filters deleted file mode 100644 index dcdaea5c..00000000 --- a/2.3-1/src/c/matrixOperations/spec/test_DoubleSpec/testDoubleSpec.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\testDoubleSpec.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
-</Project>
\ No newline at end of file diff --git a/2.3-1/src/c/matrixOperations/spec/test_FloatSpec/testFloatSpec.vcxproj b/2.3-1/src/c/matrixOperations/spec/test_FloatSpec/testFloatSpec.vcxproj deleted file mode 100644 index 0631bb40..00000000 --- a/2.3-1/src/c/matrixOperations/spec/test_FloatSpec/testFloatSpec.vcxproj +++ /dev/null @@ -1,178 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{B7BEF8A2-3E42-4FA3-94A7-22618594057D}</ProjectGuid>
- <RootNamespace>testFloatSpec</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\testFloatSpec.c">
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\type\type.vcxproj">
- <Project>{9b1bd750-1fef-4d6b-9422-782d16181cee}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="..\..\matrixOperations.vcxproj">
- <Project>{fd335544-52bf-4736-a34e-77f591d158d5}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file diff --git a/2.3-1/src/c/matrixOperations/spec/test_FloatSpec/testFloatSpec.vcxproj.filters b/2.3-1/src/c/matrixOperations/spec/test_FloatSpec/testFloatSpec.vcxproj.filters deleted file mode 100644 index 2ba2e59f..00000000 --- a/2.3-1/src/c/matrixOperations/spec/test_FloatSpec/testFloatSpec.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\testFloatSpec.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
-</Project>
\ No newline at end of file diff --git a/2.3-1/src/c/matrixOperations/spec/zspeca.c b/2.3-1/src/c/matrixOperations/spec/zspeca.c deleted file mode 100644 index a2b1c25a..00000000 --- a/2.3-1/src/c/matrixOperations/spec/zspeca.c +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008 - INRIA - Arnaud TORSET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include <stdlib.h> -#include "spec.h" -#include "lapack.h" -#include "zeros.h" -#include "conj.h" - -void zspeca(doubleComplex* in, int rows,doubleComplex* out){ - int i = 0, j = 0; - int hermitian = 0; - int INFO = 0; - int iWorkSize = 0; - doubleComplex* pdblWork; - doubleComplex* pdblLeftvectors; - doubleComplex* pdblRightvectors; - doubleComplex* pdblRWork; - double* outReal; - double* outImag; - doubleComplex* inCopy; - - inCopy = (doubleComplex*)malloc((unsigned int)(rows*rows) * sizeof(doubleComplex)); - outReal = (double*)malloc((unsigned int)rows * sizeof(double)); - outImag = (double*)malloc((unsigned int)rows * sizeof(double)); - pdblLeftvectors=NULL; - pdblRightvectors=NULL; - - iWorkSize = 2*rows; - pdblWork = (doubleComplex*)malloc((unsigned int)iWorkSize * sizeof(doubleComplex)); - pdblRWork = (doubleComplex*)malloc((unsigned int)(3*rows) * sizeof(doubleComplex)); - - for(i=0;i<rows*rows;i++) inCopy[i]=DoubleComplex(zreals(in[i]),zimags(in[i])); - - /* look if the matrix is symmetric */ - for (i=0;i<rows;i++){ - for (j=0;j<rows;j++) - if ( (zreals(in[i*rows+j])!=zreals(zconjs(in[i+j*rows]))) || - (zimags(in[i*rows+j])!=zimags(zconjs(in[i+j*rows]))) ) - break; - if (j!=rows) break; - } - - - /* the matrix is symmetric if the 2 loops goes to end i.e - i==rows and j==rows */ - if ((i==rows)&&(j==rows)) hermitian=1; - - - /* apply lapack function according to symmetry */ - if(hermitian){ - C2F(zheev)( "N", "U", &rows, inCopy, &rows, outReal, pdblWork, &iWorkSize, outImag, &INFO ); - dzerosa(outImag,1,rows); - for (i=0;i<rows;i++) out[i]=DoubleComplex(outReal[i],outImag[i]); - } - else { - C2F(zgeev)( "N", "N", &rows, inCopy, &rows, out, - pdblLeftvectors, &rows, pdblRightvectors, &rows, pdblWork, &iWorkSize, - pdblRWork, &INFO ); - } - - - - free(inCopy); - free(outReal); - free(outImag); - free(pdblWork); - free(pdblRWork); - free(pdblLeftvectors); - free(pdblRightvectors); -} diff --git a/2.3-1/src/c/matrixOperations/spec2/Makefile.am b/2.3-1/src/c/matrixOperations/spec2/Makefile.am deleted file mode 100644 index 5a357fa5..00000000 --- a/2.3-1/src/c/matrixOperations/spec2/Makefile.am +++ /dev/null @@ -1,70 +0,0 @@ -## -## Scilab ( http://www.scilab.org/ ) - This file is part of Scilab -## Copyright (C) 2006-2008 - INRIA - Bruno JOFRET -## -## This file must be used under the terms of the CeCILL. -## This source file is licensed as described in the file COPYING, which -## you should have received as part of this distribution. The terms -## are also available at -## http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt -## -## - -libSpec2_la_CFLAGS = -I $(top_builddir)/src/c/type \ - -I $(top_builddir)/src/c/matrixOperations/includes \ - -I $(top_builddir)/src/c/operations/includes \ - -I $(top_builddir)/src/c/elementaryFunctions/includes\ - -I $(top_builddir)/src/c/auxiliaryFunctions/includes - - -instdir = $(top_builddir)/lib - -pkglib_LTLIBRARIES = libSpec2.la - -HEAD = ../includes/spec.h - -libSpec2_la_SOURCES = $(HEAD) \ - sspec2a.c \ - dspec2a.c \ - cspec2a.c \ - zspec2a.c - - -############ -## CHECK -############ - - -check_PROGRAMS = testDoubleSpec2 testFloatSpec2 - -check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ - $(top_builddir)/src/c/type/libFloatComplex.la \ - $(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \ - $(top_builddir)/src/fortran/lapack/libscilapack.la \ - $(top_builddir)/src/fortran/blas/libsciblas.la \ - $(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \ - $(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \ - $(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/src/c/operations/addition/libAddition.la \ - $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ - $(top_builddir)/src/c/matrixOperations/inversion/libMatrixInversion.la\ - $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la\ - libSpec2.la - -check_INCLUDES = -I $(top_builddir)/src/c/type \ - -I $(top_builddir)/src/c/matrixOperations/includes \ - -I $(top_builddir)/src/c/operations/includes \ - -I $(top_builddir)/src/c/elementaryFunctions/includes\ - -I $(top_builddir)/src/c/auxiliaryFunctions/includes - -testDoubleSpec2_SOURCES = testDoubleSpec2.c -testDoubleSpec2_LDADD = $(check_LDADD) -testDoubleSpec2_CFLAGS = $(check_INCLUDES) - -testFloatSpec2_SOURCES = testFloatSpec2.c -testFloatSpec2_LDADD = $(check_LDADD) -testFloatSpec2_CFLAGS = $(check_INCLUDES) - -TESTS = testDoubleSpec2 testFloatSpec2 - diff --git a/2.3-1/src/c/matrixOperations/spec2/Makefile.in b/2.3-1/src/c/matrixOperations/spec2/Makefile.in deleted file mode 100644 index 6e46c059..00000000 --- a/2.3-1/src/c/matrixOperations/spec2/Makefile.in +++ /dev/null @@ -1,757 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -check_PROGRAMS = testDoubleSpec2$(EXEEXT) testFloatSpec2$(EXEEXT) -TESTS = testDoubleSpec2$(EXEEXT) testFloatSpec2$(EXEEXT) -subdir = src/c/matrixOperations/spec2 -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/configure.ac -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/includes/machine.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; -am__vpath_adj = case $$p in \ - $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \ - *) f=$$p;; \ - esac; -am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`; -am__install_max = 40 -am__nobase_strip_setup = \ - srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'` -am__nobase_strip = \ - for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||" -am__nobase_list = $(am__nobase_strip_setup); \ - for p in $$list; do echo "$$p $$p"; done | \ - sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \ - $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \ - if (++n[$$2] == $(am__install_max)) \ - { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \ - END { for (dir in files) print dir, files[dir] }' -am__base_list = \ - sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \ - sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g' -am__installdirs = "$(DESTDIR)$(pkglibdir)" -LTLIBRARIES = $(pkglib_LTLIBRARIES) -libSpec2_la_LIBADD = -am__objects_1 = -am_libSpec2_la_OBJECTS = $(am__objects_1) libSpec2_la-sspec2a.lo \ - libSpec2_la-dspec2a.lo libSpec2_la-cspec2a.lo \ - libSpec2_la-zspec2a.lo -libSpec2_la_OBJECTS = $(am_libSpec2_la_OBJECTS) -libSpec2_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(libSpec2_la_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -am_testDoubleSpec2_OBJECTS = \ - testDoubleSpec2-testDoubleSpec2.$(OBJEXT) -testDoubleSpec2_OBJECTS = $(am_testDoubleSpec2_OBJECTS) -testDoubleSpec2_DEPENDENCIES = $(check_LDADD) -testDoubleSpec2_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testDoubleSpec2_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -am_testFloatSpec2_OBJECTS = testFloatSpec2-testFloatSpec2.$(OBJEXT) -testFloatSpec2_OBJECTS = $(am_testFloatSpec2_OBJECTS) -testFloatSpec2_DEPENDENCIES = $(check_LDADD) -testFloatSpec2_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \ - $(LIBTOOLFLAGS) --mode=link $(CCLD) $(testFloatSpec2_CFLAGS) \ - $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/includes -depcomp = $(SHELL) $(top_srcdir)/config/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -CCLD = $(CC) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(libSpec2_la_SOURCES) $(testDoubleSpec2_SOURCES) \ - $(testFloatSpec2_SOURCES) -DIST_SOURCES = $(libSpec2_la_SOURCES) $(testDoubleSpec2_SOURCES) \ - $(testFloatSpec2_SOURCES) -ETAGS = etags -CTAGS = ctags -am__tty_colors = \ -red=; grn=; lgn=; blu=; std= -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -CC = @CC@ -CCDEPMODE = @CCDEPMODE@ -CFLAGS = @CFLAGS@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CXX = @CXX@ -CXXCPP = @CXXCPP@ -CXXDEPMODE = @CXXDEPMODE@ -CXXFLAGS = @CXXFLAGS@ -CYGPATH_W = @CYGPATH_W@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -F77 = @F77@ -FFLAGS = @FFLAGS@ -FGREP = @FGREP@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LIBMATH = @LIBMATH@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJDUMP = @OBJDUMP@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CXX = @ac_ct_CXX@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -ac_ct_F77 = @ac_ct_F77@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target_alias = @target_alias@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -libSpec2_la_CFLAGS = -I $(top_builddir)/src/c/type \ - -I $(top_builddir)/src/c/matrixOperations/includes \ - -I $(top_builddir)/src/c/operations/includes \ - -I $(top_builddir)/src/c/elementaryFunctions/includes\ - -I $(top_builddir)/src/c/auxiliaryFunctions/includes - -instdir = $(top_builddir)/lib -pkglib_LTLIBRARIES = libSpec2.la -HEAD = ../includes/spec.h -libSpec2_la_SOURCES = $(HEAD) \ - sspec2a.c \ - dspec2a.c \ - cspec2a.c \ - zspec2a.c - -check_LDADD = $(top_builddir)/src/c/type/libDoubleComplex.la \ - $(top_builddir)/src/c/type/libFloatComplex.la \ - $(top_builddir)/src/c/elementaryFunctions/sqrt/libSqrt.la \ - $(top_builddir)/src/fortran/lapack/libscilapack.la \ - $(top_builddir)/src/fortran/blas/libsciblas.la \ - $(top_builddir)/src/c/auxiliaryFunctions/abs/libAbs.la \ - $(top_builddir)/src/c/auxiliaryFunctions/conj/libConj.la \ - $(top_builddir)/src/c/auxiliaryFunctions/sign/libSign.la \ - $(top_builddir)/src/c/auxiliaryFunctions/pythag/libPythag.la \ - $(top_builddir)/src/c/operations/addition/libAddition.la \ - $(top_builddir)/src/c/operations/multiplication/libMultiplication.la \ - $(top_builddir)/src/c/matrixOperations/inversion/libMatrixInversion.la\ - $(top_builddir)/src/c/matrixOperations/zeros/libMatrixZeros.la\ - libSpec2.la - -check_INCLUDES = -I $(top_builddir)/src/c/type \ - -I $(top_builddir)/src/c/matrixOperations/includes \ - -I $(top_builddir)/src/c/operations/includes \ - -I $(top_builddir)/src/c/elementaryFunctions/includes\ - -I $(top_builddir)/src/c/auxiliaryFunctions/includes - -testDoubleSpec2_SOURCES = testDoubleSpec2.c -testDoubleSpec2_LDADD = $(check_LDADD) -testDoubleSpec2_CFLAGS = $(check_INCLUDES) -testFloatSpec2_SOURCES = testFloatSpec2.c -testFloatSpec2_LDADD = $(check_LDADD) -testFloatSpec2_CFLAGS = $(check_INCLUDES) -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/c/matrixOperations/spec2/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/c/matrixOperations/spec2/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -install-pkglibLTLIBRARIES: $(pkglib_LTLIBRARIES) - @$(NORMAL_INSTALL) - test -z "$(pkglibdir)" || $(MKDIR_P) "$(DESTDIR)$(pkglibdir)" - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - list2=; for p in $$list; do \ - if test -f $$p; then \ - list2="$$list2 $$p"; \ - else :; fi; \ - done; \ - test -z "$$list2" || { \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(pkglibdir)'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(pkglibdir)"; \ - } - -uninstall-pkglibLTLIBRARIES: - @$(NORMAL_UNINSTALL) - @list='$(pkglib_LTLIBRARIES)'; test -n "$(pkglibdir)" || list=; \ - for p in $$list; do \ - $(am__strip_dir) \ - echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f '$(DESTDIR)$(pkglibdir)/$$f'"; \ - $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=uninstall rm -f "$(DESTDIR)$(pkglibdir)/$$f"; \ - done - -clean-pkglibLTLIBRARIES: - -test -z "$(pkglib_LTLIBRARIES)" || rm -f $(pkglib_LTLIBRARIES) - @list='$(pkglib_LTLIBRARIES)'; for p in $$list; do \ - dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \ - test "$$dir" != "$$p" || dir=.; \ - echo "rm -f \"$${dir}/so_locations\""; \ - rm -f "$${dir}/so_locations"; \ - done -libSpec2.la: $(libSpec2_la_OBJECTS) $(libSpec2_la_DEPENDENCIES) - $(libSpec2_la_LINK) -rpath $(pkglibdir) $(libSpec2_la_OBJECTS) $(libSpec2_la_LIBADD) $(LIBS) - -clean-checkPROGRAMS: - @list='$(check_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list -testDoubleSpec2$(EXEEXT): $(testDoubleSpec2_OBJECTS) $(testDoubleSpec2_DEPENDENCIES) - @rm -f testDoubleSpec2$(EXEEXT) - $(testDoubleSpec2_LINK) $(testDoubleSpec2_OBJECTS) $(testDoubleSpec2_LDADD) $(LIBS) -testFloatSpec2$(EXEEXT): $(testFloatSpec2_OBJECTS) $(testFloatSpec2_DEPENDENCIES) - @rm -f testFloatSpec2$(EXEEXT) - $(testFloatSpec2_LINK) $(testFloatSpec2_OBJECTS) $(testFloatSpec2_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSpec2_la-cspec2a.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSpec2_la-dspec2a.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSpec2_la-sspec2a.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libSpec2_la-zspec2a.Plo@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testDoubleSpec2-testDoubleSpec2.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/testFloatSpec2-testFloatSpec2.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -libSpec2_la-sspec2a.lo: sspec2a.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec2_la_CFLAGS) $(CFLAGS) -MT libSpec2_la-sspec2a.lo -MD -MP -MF $(DEPDIR)/libSpec2_la-sspec2a.Tpo -c -o libSpec2_la-sspec2a.lo `test -f 'sspec2a.c' || echo '$(srcdir)/'`sspec2a.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libSpec2_la-sspec2a.Tpo $(DEPDIR)/libSpec2_la-sspec2a.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sspec2a.c' object='libSpec2_la-sspec2a.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec2_la_CFLAGS) $(CFLAGS) -c -o libSpec2_la-sspec2a.lo `test -f 'sspec2a.c' || echo '$(srcdir)/'`sspec2a.c - -libSpec2_la-dspec2a.lo: dspec2a.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec2_la_CFLAGS) $(CFLAGS) -MT libSpec2_la-dspec2a.lo -MD -MP -MF $(DEPDIR)/libSpec2_la-dspec2a.Tpo -c -o libSpec2_la-dspec2a.lo `test -f 'dspec2a.c' || echo '$(srcdir)/'`dspec2a.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libSpec2_la-dspec2a.Tpo $(DEPDIR)/libSpec2_la-dspec2a.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='dspec2a.c' object='libSpec2_la-dspec2a.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec2_la_CFLAGS) $(CFLAGS) -c -o libSpec2_la-dspec2a.lo `test -f 'dspec2a.c' || echo '$(srcdir)/'`dspec2a.c - -libSpec2_la-cspec2a.lo: cspec2a.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec2_la_CFLAGS) $(CFLAGS) -MT libSpec2_la-cspec2a.lo -MD -MP -MF $(DEPDIR)/libSpec2_la-cspec2a.Tpo -c -o libSpec2_la-cspec2a.lo `test -f 'cspec2a.c' || echo '$(srcdir)/'`cspec2a.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libSpec2_la-cspec2a.Tpo $(DEPDIR)/libSpec2_la-cspec2a.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='cspec2a.c' object='libSpec2_la-cspec2a.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec2_la_CFLAGS) $(CFLAGS) -c -o libSpec2_la-cspec2a.lo `test -f 'cspec2a.c' || echo '$(srcdir)/'`cspec2a.c - -libSpec2_la-zspec2a.lo: zspec2a.c -@am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec2_la_CFLAGS) $(CFLAGS) -MT libSpec2_la-zspec2a.lo -MD -MP -MF $(DEPDIR)/libSpec2_la-zspec2a.Tpo -c -o libSpec2_la-zspec2a.lo `test -f 'zspec2a.c' || echo '$(srcdir)/'`zspec2a.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/libSpec2_la-zspec2a.Tpo $(DEPDIR)/libSpec2_la-zspec2a.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='zspec2a.c' object='libSpec2_la-zspec2a.lo' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(libSpec2_la_CFLAGS) $(CFLAGS) -c -o libSpec2_la-zspec2a.lo `test -f 'zspec2a.c' || echo '$(srcdir)/'`zspec2a.c - -testDoubleSpec2-testDoubleSpec2.o: testDoubleSpec2.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testDoubleSpec2_CFLAGS) $(CFLAGS) -MT testDoubleSpec2-testDoubleSpec2.o -MD -MP -MF $(DEPDIR)/testDoubleSpec2-testDoubleSpec2.Tpo -c -o testDoubleSpec2-testDoubleSpec2.o `test -f 'testDoubleSpec2.c' || echo '$(srcdir)/'`testDoubleSpec2.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/testDoubleSpec2-testDoubleSpec2.Tpo $(DEPDIR)/testDoubleSpec2-testDoubleSpec2.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testDoubleSpec2.c' object='testDoubleSpec2-testDoubleSpec2.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testDoubleSpec2_CFLAGS) $(CFLAGS) -c -o testDoubleSpec2-testDoubleSpec2.o `test -f 'testDoubleSpec2.c' || echo '$(srcdir)/'`testDoubleSpec2.c - -testDoubleSpec2-testDoubleSpec2.obj: testDoubleSpec2.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testDoubleSpec2_CFLAGS) $(CFLAGS) -MT testDoubleSpec2-testDoubleSpec2.obj -MD -MP -MF $(DEPDIR)/testDoubleSpec2-testDoubleSpec2.Tpo -c -o testDoubleSpec2-testDoubleSpec2.obj `if test -f 'testDoubleSpec2.c'; then $(CYGPATH_W) 'testDoubleSpec2.c'; else $(CYGPATH_W) '$(srcdir)/testDoubleSpec2.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/testDoubleSpec2-testDoubleSpec2.Tpo $(DEPDIR)/testDoubleSpec2-testDoubleSpec2.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testDoubleSpec2.c' object='testDoubleSpec2-testDoubleSpec2.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testDoubleSpec2_CFLAGS) $(CFLAGS) -c -o testDoubleSpec2-testDoubleSpec2.obj `if test -f 'testDoubleSpec2.c'; then $(CYGPATH_W) 'testDoubleSpec2.c'; else $(CYGPATH_W) '$(srcdir)/testDoubleSpec2.c'; fi` - -testFloatSpec2-testFloatSpec2.o: testFloatSpec2.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFloatSpec2_CFLAGS) $(CFLAGS) -MT testFloatSpec2-testFloatSpec2.o -MD -MP -MF $(DEPDIR)/testFloatSpec2-testFloatSpec2.Tpo -c -o testFloatSpec2-testFloatSpec2.o `test -f 'testFloatSpec2.c' || echo '$(srcdir)/'`testFloatSpec2.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/testFloatSpec2-testFloatSpec2.Tpo $(DEPDIR)/testFloatSpec2-testFloatSpec2.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testFloatSpec2.c' object='testFloatSpec2-testFloatSpec2.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFloatSpec2_CFLAGS) $(CFLAGS) -c -o testFloatSpec2-testFloatSpec2.o `test -f 'testFloatSpec2.c' || echo '$(srcdir)/'`testFloatSpec2.c - -testFloatSpec2-testFloatSpec2.obj: testFloatSpec2.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFloatSpec2_CFLAGS) $(CFLAGS) -MT testFloatSpec2-testFloatSpec2.obj -MD -MP -MF $(DEPDIR)/testFloatSpec2-testFloatSpec2.Tpo -c -o testFloatSpec2-testFloatSpec2.obj `if test -f 'testFloatSpec2.c'; then $(CYGPATH_W) 'testFloatSpec2.c'; else $(CYGPATH_W) '$(srcdir)/testFloatSpec2.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/testFloatSpec2-testFloatSpec2.Tpo $(DEPDIR)/testFloatSpec2-testFloatSpec2.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='testFloatSpec2.c' object='testFloatSpec2-testFloatSpec2.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(testFloatSpec2_CFLAGS) $(CFLAGS) -c -o testFloatSpec2-testFloatSpec2.obj `if test -f 'testFloatSpec2.c'; then $(CYGPATH_W) 'testFloatSpec2.c'; else $(CYGPATH_W) '$(srcdir)/testFloatSpec2.c'; fi` - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -check-TESTS: $(TESTS) - @failed=0; all=0; xfail=0; xpass=0; skip=0; \ - srcdir=$(srcdir); export srcdir; \ - list=' $(TESTS) '; \ - $(am__tty_colors); \ - if test -n "$$list"; then \ - for tst in $$list; do \ - if test -f ./$$tst; then dir=./; \ - elif test -f $$tst; then dir=; \ - else dir="$(srcdir)/"; fi; \ - if $(TESTS_ENVIRONMENT) $${dir}$$tst; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xpass=`expr $$xpass + 1`; \ - failed=`expr $$failed + 1`; \ - col=$$red; res=XPASS; \ - ;; \ - *) \ - col=$$grn; res=PASS; \ - ;; \ - esac; \ - elif test $$? -ne 77; then \ - all=`expr $$all + 1`; \ - case " $(XFAIL_TESTS) " in \ - *[\ \ ]$$tst[\ \ ]*) \ - xfail=`expr $$xfail + 1`; \ - col=$$lgn; res=XFAIL; \ - ;; \ - *) \ - failed=`expr $$failed + 1`; \ - col=$$red; res=FAIL; \ - ;; \ - esac; \ - else \ - skip=`expr $$skip + 1`; \ - col=$$blu; res=SKIP; \ - fi; \ - echo "$${col}$$res$${std}: $$tst"; \ - done; \ - if test "$$all" -eq 1; then \ - tests="test"; \ - All=""; \ - else \ - tests="tests"; \ - All="All "; \ - fi; \ - if test "$$failed" -eq 0; then \ - if test "$$xfail" -eq 0; then \ - banner="$$All$$all $$tests passed"; \ - else \ - if test "$$xfail" -eq 1; then failures=failure; else failures=failures; fi; \ - banner="$$All$$all $$tests behaved as expected ($$xfail expected $$failures)"; \ - fi; \ - else \ - if test "$$xpass" -eq 0; then \ - banner="$$failed of $$all $$tests failed"; \ - else \ - if test "$$xpass" -eq 1; then passes=pass; else passes=passes; fi; \ - banner="$$failed of $$all $$tests did not behave as expected ($$xpass unexpected $$passes)"; \ - fi; \ - fi; \ - dashes="$$banner"; \ - skipped=""; \ - if test "$$skip" -ne 0; then \ - if test "$$skip" -eq 1; then \ - skipped="($$skip test was not run)"; \ - else \ - skipped="($$skip tests were not run)"; \ - fi; \ - test `echo "$$skipped" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$skipped"; \ - fi; \ - report=""; \ - if test "$$failed" -ne 0 && test -n "$(PACKAGE_BUGREPORT)"; then \ - report="Please report to $(PACKAGE_BUGREPORT)"; \ - test `echo "$$report" | wc -c` -le `echo "$$banner" | wc -c` || \ - dashes="$$report"; \ - fi; \ - dashes=`echo "$$dashes" | sed s/./=/g`; \ - if test "$$failed" -eq 0; then \ - echo "$$grn$$dashes"; \ - else \ - echo "$$red$$dashes"; \ - fi; \ - echo "$$banner"; \ - test -z "$$skipped" || echo "$$skipped"; \ - test -z "$$report" || echo "$$report"; \ - echo "$$dashes$$std"; \ - test "$$failed" -eq 0; \ - else :; fi - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am - $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) - $(MAKE) $(AM_MAKEFLAGS) check-TESTS -check: check-am -all-am: Makefile $(LTLIBRARIES) -installdirs: - for dir in "$(DESTDIR)$(pkglibdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-checkPROGRAMS clean-generic clean-libtool \ - clean-pkglibLTLIBRARIES mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: install-pkglibLTLIBRARIES - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-pkglibLTLIBRARIES - -.MAKE: check-am install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-TESTS check-am clean \ - clean-checkPROGRAMS clean-generic clean-libtool \ - clean-pkglibLTLIBRARIES ctags distclean distclean-compile \ - distclean-generic distclean-libtool distclean-tags distdir dvi \ - dvi-am html html-am info info-am install install-am \ - install-data install-data-am install-dvi install-dvi-am \ - install-exec install-exec-am install-html install-html-am \ - install-info install-info-am install-man install-pdf \ - install-pdf-am install-pkglibLTLIBRARIES install-ps \ - install-ps-am install-strip installcheck installcheck-am \ - installdirs maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \ - uninstall-am uninstall-pkglibLTLIBRARIES - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/2.3-1/src/c/matrixOperations/spec2/cspec2a.c b/2.3-1/src/c/matrixOperations/spec2/cspec2a.c deleted file mode 100644 index d3a4312f..00000000 --- a/2.3-1/src/c/matrixOperations/spec2/cspec2a.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008 - INRIA - Arnaud TORSET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include <stdlib.h> -#include "spec.h" - - - -void cspec2a(floatComplex* in, int rows, floatComplex* eigenvalues,floatComplex* eigenvectors){ - /* As we use Lapack to find the eigenvalues, we must cast the floatComplex input into doubleComplex - and the doubleComplex outputs of dspeca into floatComplex*/ - - int i; - doubleComplex* dblin; - doubleComplex* dbleigenvalues,*dbleigenvectors; - - dblin=(doubleComplex*)malloc((unsigned int)(rows*rows)*sizeof(doubleComplex)); - dbleigenvalues=(doubleComplex*)malloc((unsigned int)(rows*rows)*sizeof(doubleComplex)); - dbleigenvectors=(doubleComplex*)malloc((unsigned int)(rows*rows)*sizeof(doubleComplex)); - - for (i=0;i<rows*rows;i++) dblin[i]=DoubleComplex((double)creals(in[i]),(double)cimags(in[i])); - - zspec2a(dblin,rows,dbleigenvalues,dbleigenvectors); - - for (i=0;i<rows*rows;i++) eigenvalues[i]=FloatComplex((float)zreals(dbleigenvalues[i]),(float)zimags(dbleigenvalues[i])); - for (i=0;i<rows*rows;i++) eigenvectors[i]=FloatComplex((float)zreals(dbleigenvectors[i]),(float)zimags(dbleigenvectors[i])); -} diff --git a/2.3-1/src/c/matrixOperations/spec2/dspec2a.c b/2.3-1/src/c/matrixOperations/spec2/dspec2a.c deleted file mode 100644 index 98b2c5ad..00000000 --- a/2.3-1/src/c/matrixOperations/spec2/dspec2a.c +++ /dev/null @@ -1,113 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008 - INRIA - Arnaud TORSET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include <stdlib.h> -#include "spec.h" -#include "lapack.h" -#include "zeros.h" -#include "max.h" - -void dspec2a(double* in, int rows,double* eigenvalues,double* eigenvectors){ - int i=0, j=0, ij=0, ij1=0; - int symmetric=0; - int INFO=0; - int iWorkSize = 0; - double* pdblWork; - double* outReal; - double* outImag; - double* pdblLeftvectors; - double* pdblRightvectors; - double* inCopy; - - /* FIXME : malloc here */ - inCopy = (double*)malloc((unsigned int)(rows*rows) * sizeof(double)); - outReal = (double*)malloc((unsigned int)rows * sizeof(double)); - outImag = NULL; - pdblLeftvectors=NULL; - pdblRightvectors=NULL; - - - iWorkSize = 4*rows; - pdblWork = (double*)malloc((unsigned int)iWorkSize * sizeof(double)); - - for(i=0;i<rows*rows;i++) inCopy[i]=in[i]; - - - - /* look if the matrix is symmetric */ - for (i=0;i<rows;i++){ - for (j=0;j<rows;j++) - if (in[i*rows+j]!=in[i+j*rows]) break; - if (j!=rows) break; - - } - - /* the matrix is symmetric if the 2 loops goes to end i.e - i==rows and j==rows */ - if ((i==rows)&&(j==rows)) symmetric=1; - - /* apply lapack function according to symmetry */ - if(symmetric){ - C2F(dsyev)( "V", "U", &rows, inCopy, &rows, outReal, pdblWork, &iWorkSize, &INFO ); - - /* Computation of eigenvectors */ - for (i=0;i<rows*rows;i++) eigenvectors[i] = inCopy[i]; - } - else { - pdblRightvectors=(double*)malloc((unsigned int)(rows*rows) * sizeof(double)); - outImag = (double*)malloc((unsigned int)rows * sizeof(double)); - C2F(dgeev)( "N", "V", &rows, inCopy, &rows, outReal, outImag, - pdblLeftvectors, &rows, pdblRightvectors, &rows, pdblWork, &iWorkSize, &INFO ); - - /* Computation of eigenvectors */ - j=0; - while (j<rows) - { - if (outImag[j]==0) - { - for(i = 0 ; i < rows ; i++) - { - ij = i + j * rows; - eigenvectors[ij] = pdblRightvectors[ij]; - } - j = j + 1; - } - else - { - for(i = 0 ; i < rows ; i++) - { - ij = i + j * rows; - ij1 = i + (j + 1) * rows; - eigenvectors[ij] = pdblRightvectors[ij]; - eigenvectors[ij1] = pdblRightvectors[ij]; - } - j = j + 2; - } - } - } - - /* Computation of eigenvalues */ - dzerosa(eigenvalues,1,rows*rows); - for (i=0;i<rows;i++) eigenvalues[i+i*rows]=outReal[i]; - - - - - free(inCopy); - free(outReal); - free(outImag); - free(pdblLeftvectors); - free(pdblRightvectors); - free(pdblWork); - -} - diff --git a/2.3-1/src/c/matrixOperations/spec2/sspec2a.c b/2.3-1/src/c/matrixOperations/spec2/sspec2a.c deleted file mode 100644 index d3ab00d5..00000000 --- a/2.3-1/src/c/matrixOperations/spec2/sspec2a.c +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008 - INRIA - Arnaud TORSET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include <stdlib.h> -#include "spec.h" - - - -void sspec2a(float* in, int rows, float* eigenvalues,float* eigenvectors){ - /* As we use Lapack to find the eigenvalues, we must cast the float input into double - and the doubleComplex outputs of dspec2a into floatComplex*/ - - int i; - double* dblin; - double *dbleigenvalues,*dbleigenvectors; - - dblin=(double*)malloc((unsigned int)(rows*rows)*sizeof(double)); - dbleigenvalues = (double*)malloc((unsigned int)(rows*rows)*sizeof(double)); - dbleigenvectors = (double*)malloc((unsigned int)(rows*rows)*sizeof(double)); - - for (i=0;i<rows*rows;i++) dblin[i]=(double)in[i]; - - dspec2a(dblin,rows,dbleigenvalues,dbleigenvectors); - - for (i=0;i<rows*rows;i++) eigenvalues[i]=(float)dbleigenvalues[i]; - for (i=0;i<rows*rows;i++) eigenvectors[i]=(float)dbleigenvectors[i]; -} diff --git a/2.3-1/src/c/matrixOperations/spec2/testDoubleSpec2.c b/2.3-1/src/c/matrixOperations/spec2/testDoubleSpec2.c deleted file mode 100644 index a090f028..00000000 --- a/2.3-1/src/c/matrixOperations/spec2/testDoubleSpec2.c +++ /dev/null @@ -1,261 +0,0 @@ -/* - * Copyright (C) 2008 - INRIA - Arnaud TORSET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - - -#include "spec.h" -#include "stdio.h" -#include "assert.h" -#include "math.h" - -static void dspec2aTest(void){ - double in[4]={1,1,1,3}; - double resultValuesR[4]={0.5857864376269050765700,0,0,3.4142135623730949234300}; - double resultVectorsR[4]={- 0.9238795325112867384831,0.3826834323650897817792, - 0.3826834323650897817792,0.9238795325112867384831}; - - - double in2[4]={1,1,-2,3}; - double resultValues2R[4]={1.9999999999999997779554,0,0,1.9999999999999997779554}; - double resultVectors2R[4]={0.8164965809277261454824,- 0.4082482904638631282523, - 0.8164965809277261454824,- 0.4082482904638631282523}; - - double in3[9]={0,-1,0,1,0,0,0,0,0}; - double resultValues3R[9]={0}; - double resultVectors3R[9]={0.7071067811865474617150,0,0,0.7071067811865474617150,0,0,0,0,1}; - - - double out1[4],out2[4],out3[9],out4[9]; - - int i; - dspec2a(in3,3,out3,out4); - for(i=0;i<9;i++){ - if (out3[i]>1e-16) assert( fabs(out3[i]-resultValues3R[i]) / fabs(out3[i]) <3e-16); - else assert(1); - } - for(i=0;i<9;i++){ - if (out4[i]>1e-16) assert( fabs(out4[i]-resultVectors3R[i]) / fabs(out4[i]) <3e-16); - else assert(1); - } - - - dspec2a(in,2,out1,out2); - for(i=0;i<4;i++) printf("%f\n",out1[i]); - for(i=0;i<4;i++){ - if (out1[i]>1e-16) assert( fabs(out1[i]-resultValuesR[i]) / fabs(out1[i]) <3e-16); - else assert(1); - } - for(i=0;i<4;i++){ - if (out2[i]>1e-16) assert( fabs(out2[i]-resultVectorsR[i]) / fabs(out2[i]) <3e-16); - else assert(1); - } - - - dspec2a(in2,2,out1,out2); - - for(i=0;i<4;i++){ - if (out1[i]>1e-16) assert( fabs(out1[i]-resultValues2R[i]) / fabs(out1[i]) <1e-16); - else assert(1); - } - for(i=0;i<4;i++){ - if (out2[i]>1e-16) assert( fabs(out2[i]-resultVectors2R[i]) / fabs(out2[i]) <3e-16); - else assert(1); - } - -} - - - - -static void zspec2aTest(void){ - double inR[4]={1,1,1,3}; - double inI[4]={0,0,0,0}; - double resultValuesR[4]={0.5857864376269050765700,0,0,3.4142135623730949234300}; - double resultValuesI[4]={0,0,0,0}; - double resultVectorsR[4]={- 0.9238795325112867384831,0.3826834323650897817792, - 0.3826834323650897817792,0.9238795325112867384831}; - double resultVectorsI[4]={0,0,0,0}; - - double in2R[4]={1,1,-2,3}; - double in2I[4]={0,0,0,0}; - double resultValues2R[4]={1.9999999999999997779554,0,0,1.9999999999999997779554}; - double resultValues2I[4]={0.9999999999999997779554,0,0,-0.9999999999999997779554}; - double resultVectors2R[4]={0.8164965809277261454824,- 0.4082482904638631282523, - 0.8164965809277261454824,- 0.4082482904638631282523}; - double resultVectors2I[4]={0,- 0.4082482904638629062077,0,0.4082482904638629062077}; - - - double in3R[16]={ 0.4685934986919164657593, 0.4262020816095173358917, 0.4217656338587403297424, 0.1034853602759540081024 , - 0.4279759414494037628174, 0.7860729382373392581940, 0.8568082069978117942810, 0.1993437460623681545258 , - 0.7131301630288362503052, 0.5208952468819916248322, 0.9311723159626126289368, 0.4143836158327758312225, - 0.5980196148157119750977, 0.5549105503596365451813, 0.8552952585741877555847, 0.3097750707529485225678}; - double in3I[16]={0.9446128141134977340698, 0.2442680452950298786163, 0.8760446915403008460999, 0.4874215493910014629364, - 0.3844018988311290740967, 0.0922345430590212345123, 0.0705418726429343223572, 0.7338807261548936367035, - 0.7792180571705102920532, 0.7827638057060539722443, 0.2161567779257893562317, 0.3420197847299277782440, - 0.430093832314014434814 , 0.6261752569116652011871, 0.9554250938817858695984, 0.45415506651625037193 }; - double resultValues3R[16]={2.0556597713281337114211 , 0. , 0. , 0. , - 0. , - 0.3025728286579054682193 , 0. , 0. , - 0. , 0. , 0.1432776981289703988054 , 0. , - 0. , 0. , 0. , 0.59924918284561956571821}; - double resultValues3I[16]={2.0772175543447914947137 , 0. , 0. , 0. , - 0. , - 0.5223086999196728807959 , 0. , 0. , - 0. , 0. , 0.3871735516160564882782 , 0. , - 0. , 0. , 0. , - 0.2349232044266161556489 }; - double resultVectors3R[16]={ 0.5762578366606958546470 , 0.4529873647084416976583 , 0.5438116534400605495137 , 0.3599855200589946457868 , - - 0.3285074902800487195442, - 0.0923654569732548225147, 0.6473744750124794666846, - 0.1812302216765642182139 , - 0.7395301236826927748780, - 0.4588526195219964631811, 0.0997916953568371567496, - 0.3603263850824164338249 , - 0.0717862182160008133192, 0.6967198304315765922112, - 0.1153149977500917411355 , - 0.3232658081022470875077 }; - double resultVectors3I[16]={ 0. , - 0.1082260232744242933745, - 0.1403164362264210929254 , 0.0775054168635924967123 , - 0.0347047096401541868560, - 0.4780157518240965019984, 0. , 0.4493438228998393735303, - 0. , - 0.0484367977162360741072 , 0.0664282497469102783949 , - 0.3098340648435350952461 , - 0.1768623397230159322024, 0. , - 0.4621680558325051979551 , 0.3830799998945915163517}; - - - double in4R[49]={0.0292230211198329925537, 0.1069206790998578071594, 9.7463708464056253433228, 7.7042609406635165214539 , 6.3966313377022743225098, 9.5358861843124032020569, 4.1484833415597677230835, - 4.6615396952256560325623, 2.2384551353752613067627, 3.4569733263924717903137, 2.3406236339360475540161, 6.6193414805456995964050,2.6911795139312744140625,9.8302489006891846656799 , - 7.3933512251824140548706, 2.9021358629688620567322 , 3.9959496073424816131592 , 9.792278115637600421906 , 0.0755135808140039443970, 7.0210226578637957572937 , 8.9075061306357383728027 , - 6.5269742021337151527405 , 4.136228552088141441345 , 8.5816909139975905418396 , 2.3960896767675876617432 , 4.8200417729094624519348, 9.848585547879338264465 , 4.4697216479107737541199, - 2.3298137634992599487305, 2.2345139319077134132385, 8.0025654565542936325073, 7.7507343282923102378845, 4.8250066302716732025146, 7.8448831336572766304016 , 1.5346793178468942642212 , - 7.7228771103546023368835 , 8.9520217850804328918457, 9.4673257926478981971741, 6.9818257447332143783569, 9.5591608202084898948669, 0.4840173013508319854736, 5.3235206427052617073059, - 2.9468670953065156936646, 6.9771366892382502555847 , 9.3762038648128509521484 , 1.0755608463659882545471 , 7.7634243946522474288940, 6.3734178384765982627869 , 0.6630615703761577606201 }; - double in4I[49]={8.1694598542526364326477, 3.5473910067230463027954, 5.860544512979686260223, 3.4610254690051078796387, 4.4247510144487023353577, 8.8226650562137365341187, 7.6436930662021040916443 , - 7.764139864593744277954, 2.8076809318736195564270, 6.9086006004363298416138, 7.1747286943718791007996, 3.7201813608407974243164 , 9.3254965776577591896057, 2.2566775511950254440308, - 7.5211019208654761314392 , 3.0747506581246852874756 , 5.9793261485174298286438, 1.9238903466612100601196, 2.3870888305827975273132 , 7.4708331003785133361816, 9.7131536761298775672913, - 4.3703553732484579086304, 6.2248750543221831321716, 3.2913279719650745391846, 3.2963873865082859992981, 2.7686371374875307083130 , 4.8729835031554102897644, 7.7320465445518493652344 , - 9.0775218093767762184143, 5.0122931879013776779175, 5.1595458528026938438416, 5.79267887398600578308 , 1.5463936375454068183899 , 7.6111377868801355361938, 6.9079177780076861381531 , - 2.8732293471693992614746, 9.64253133628517389297 , 5.6607243325561285018921, 5.7821379369124770164490, 2.6634209789335727691650 , 4.7470985027030110359192, 6.0735465306788682937622, - 0.4097307054325938224793, 5.0125684589147567749023 , 5.2959309751167893409729, 6.2594583164900541305542, 2.2193526616320013999939 , 3.467419948428869247437, 3.9511676924303174018860 }; - double resultValues4R[49]={39.018457752476393807228 ,0,0,0,0,0,0, - 0,2.2455352415739073812517,0,0,0,0,0, - 0,0,- 8.4848591657394489828903,0,0,0,0, - 0,0,0,- 9.617033196016185669919,0,0,0, - 0,0,0,0,- 3.7815852014367528077798,0,0, - 0,0,0,0,0,- 4.44858427601393291440,0, - 0,0,0,0,0,0,- 0.3001282122401837670900}; - double resultValues4I[49]={36.525725390582877594170,0,0,0,0,0,0, - 0,- 5.9058762755733944516123,0,0,0,0,0, - 0,0,- 3.5959527108686115681735,0,0,0,0, - 0,0,0,1.8928051444081777088257,0,0,0, - 0,0,0,0,- 3.1889864758923365251064,0,0, - 0,0,0,0,0,3.2418188738592150777151,0, - 0,0,0,0,0,0,1.5279802073147508156836}; - - double resultVectors4R[49]={ 0.3499995148567048852684, 0.3131141942665225941234, 0.4518966551544936205431, 0.3429358568207974133912, 0.3073919828504245721490, 0.4236868694783915145763, 0.3928739146959387973368 , - 0.2654822689469810148566 , - 0.3607918093136298631762, 0.0473515544359270068586 , 0.5097969509656486986060 , -0.3771134435310480315096 , 0.2011534205484152293408, - 0.4415200724898113993078, - 0.5454886553461798515130, - 0.2173248800239625522224, - 0.2171708216301463378883 , - 0.2460117034233289534662 , -0.3694743444265859433351 , 0.3601018742104445391483, 0.1530612374027510713681, - 0.6385835932752577104310, - 0.0013906755423099548263, - 0.3368505708673739662551 , 0.1394203608831885433 , -0.2292783363046769218308 , -0.2740379414191142504187, 0.1926279946047058377889 , - - 0.6106238336849327819067, 0.0128604884735820379493, 0.2248434453925002574071, - 0.0955950290268089419854 , 0.6322383898844411431739 , - 0.1362122761803175874373, - 0.0030545591332723984190, - 0.5431360047322275619308, 0.1304324282476526930541, - 0.3713242513274904177401, - 0.2693820083406764376299 , - 0.1431429883314006001882 , 0.0533021313694299267438, 0.0071247423818797811501 , - - 0.156705245229635081738, 0.0034676864415526253982 , - 0.3351413975178426096768 , 0.2927797449896782921996 , 0.5714932440406852443005 , 0.0738366305178744797288, - 0.4509415569247051669422 }; - double resultVectors4I[49]={ 0.0720991445669864616796 , 0.0844739028302603361942 , 0. , 0.0173431366502564965337, -0.0428710162141596462515, 0.0695226101295536302871, 0.0999385617869267273150, - 0.2510960793336660668018 , - 0.1123901435582568414384, 0.0091069807153507792430, 0. , - 0.2545493692188907641771, 0.1149714203529902251111, 0.0762796210842419941667, - 0. , 0.0611827470444509316505, 0.2295643426501567385678, - 0.2950878328821502361024, 0.198556748820033573955, 0.0646801132828138114483, - 0.2660572521172601678785, - 0. , 0.2688905463703794573860, 0.2230635356255223633593 , - 0.2013432448241845862391, - 0.0386922946770884290668, 0.0358963301038670995480, - 0.3593711366897305303780 , - - 0.1386717901043315326337, 0.0600994116374372472356, - 0.1167558596038882207102 , 0.317965599565130263571, 0. , -0.0642522754144960878131, - 0.0853665514099945371695, - 0. , 0.2715431731544318272320, - 0.1184277560110737481658 , 0.3655618467608299226868, - 0.4598766797780974302512 , 0.0188698345957667955319, - 0.1446429340244405892246, - 0.346095581161616094867 , 0.0750882555805542639682, - 0.2494867985551498246188, - 0.2328934592128872882455, 0. , -0.0047307828167728396829, - 0.0078254955461786041004}; - - - - - doubleComplex *in,*in2,*in3,*in4,out1[4],out2[4],out3[16],out4[16],out5[49],out6[49]; - - int i; - - in=DoubleComplexMatrix(inR,inI,4); - in2=DoubleComplexMatrix(in2R,in2I,4); - in3=DoubleComplexMatrix(in3R,in3I,16); - in4=DoubleComplexMatrix(in4R,in4I,49); - zspec2a(in,2,out1,out2); - - - for(i=0;i<4;i++){ - if (zreals(out1[i])>1e-16) assert( fabs(zreals(out1[i])-resultValuesR[i]) / fabs(zreals(out1[i])) <3e-16); - else assert(1); - if (zimags(out1[i])>1e-16) assert( fabs(zimags(out1[i])-resultValuesI[i]) / fabs(zimags(out1[i])) <1e-16); - else assert(1); - } - - for(i=0;i<4;i++){ - if (zreals(out2[i])>1e-16) assert( fabs(zreals(out2[i])-resultVectorsR[i]) / fabs(zreals(out2[i])) <3e-16); - else assert(1); - if (zimags(out2[i])>1e-16) assert( fabs(zimags(out2[i])-resultVectorsI[i]) / fabs(zimags(out2[i])) <1e-16); - else assert(1); - } - - - zspec2a(in2,2,out1,out2); - for(i=0;i<4;i++){ - if (zreals(out1[i])>1e-16) assert( fabs(zreals(out1[i])-resultValues2R[i]) / fabs(zreals(out1[i])) <3e-16); - else assert(1); - if (zimags(out1[i])>1e-16) assert( fabs(zimags(out1[i])-resultValues2I[i]) / fabs(zimags(out1[i])) <3e-15); - else assert(1); - } - - for(i=0;i<4;i++){ - if (zreals(out2[i])>1e-16) assert( fabs(zreals(out2[i])-resultVectors2R[i]) / fabs(zreals(out2[i])) <3e-16); - else assert(1); - if (zimags(out2[i])>1e-16) assert( fabs(zimags(out2[i])-resultVectors2I[i]) / fabs(zimags(out2[i])) <3e-15); - else assert(1); - } - - - - zspec2a(in3,4,out3,out4); - for(i=0;i<16;i++){ - if (zreals(out3[i])>1e-16) assert( fabs(zreals(out3[i])-resultValues3R[i]) / fabs(zreals(out3[i])) <3e-15); - else assert(1); - if (zimags(out3[i])>1e-16) assert( fabs(zimags(out3[i])-resultValues3I[i]) / fabs(zimags(out3[i])) <3e-15); - else assert(1); - } - for(i=0;i<16;i++){ - if (zreals(out4[i])>1e-16) assert( fabs(zreals(out4[i])-resultVectors3R[i]) / fabs(zreals(out4[i])) <3e-15); - else assert(1); - if (zimags(out4[i])>1e-16) assert( fabs(zimags(out4[i])-resultVectors3I[i]) / fabs(zimags(out4[i])) <3e-14); - else assert(1); - } - - /* FIXME : assert : 3e-16 maybe du to little values like 0.001... */ - zspec2a(in4,7,out5,out6); - - for(i=0;i<49;i++){ - if (zreals(out5[i])>1e-16) assert( fabs(zreals(out5[i])-resultValues4R[i]) / fabs(zreals(out5[i])) <3e-15); - else assert(1); - if (zimags(out5[i])>1e-16) assert( fabs(zimags(out5[i])-resultValues4I[i]) / fabs(zimags(out5[i])) <3e-14); - else assert(1); - } - for(i=0;i<49;i++){ - if (zreals(out6[i])>1e-16) assert( fabs(zreals(out6[i])-resultVectors4R[i]) / fabs(zreals(out6[i])) <3e-14); - else assert(1); - if (zimags(out6[i])>1e-16) assert( fabs(zimags(out6[i])-resultVectors4I[i]) / fabs(zimags(out6[i])) <3e-13); - else assert(1); - } - - - -} - - -static int testSpec2(void){ - printf(">>> Double Spec2 Tests <<<\n"); - printf(">>> Double <<<\n"); - dspec2aTest(); - printf(">>> DoubleComplex <<<\n"); - zspec2aTest(); - return 0; -} - - -int main(void){ - assert (testSpec2()==0); - - - return 0; -} diff --git a/2.3-1/src/c/matrixOperations/spec2/testFloatSpec2.c b/2.3-1/src/c/matrixOperations/spec2/testFloatSpec2.c deleted file mode 100644 index fb2bc255..00000000 --- a/2.3-1/src/c/matrixOperations/spec2/testFloatSpec2.c +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008 - INRIA - Arnaud TORSET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - - -#include "spec.h" -#include "stdio.h" -#include "assert.h" -#include "math.h" - -static void sspec2aTest(void){ - float in[4]={1.0f,1.0f,1.0f,3.0f}; - float resultValuesR[4]={0.5857864376269050765700f,0,0,3.4142135623730949234300f}; - float resultVectorsR[4]={- 0.9238795325112867384831f,0.3826834323650897817792f, - 0.3826834323650897817792f,0.9238795325112867384831f}; - - float in2[4]={1.0f,1.0f,-2.0f,3.0f}; - float resultValues2R[4]={1.9999999999999997779554f,0,0,1.9999999999999997779554f}; - float resultVectors2R[4]={0.8164965809277261454824f,- 0.4082482904638631282523f, - 0.8164965809277261454824f,- 0.4082482904638631282523f}; - float eigenvalues[4],eigenvectors[4]; - - int i; - - sspec2a(in,2,eigenvalues,eigenvectors); - - for(i=0;i<4;i++){ - if (eigenvalues[i]>1e-6) assert( fabs(eigenvalues[i]-resultValuesR[i]) / fabs(eigenvalues[i]) <1e-16); - else assert(1); - } - for(i=0;i<4;i++){ - if (eigenvectors[i]>1e-6) assert( fabs(eigenvectors[i]-resultVectorsR[i]) / fabs(eigenvectors[i]) <1e-16); - else assert(1); - } - - - sspec2a(in2,2,eigenvalues,eigenvectors); - - - - for(i=0;i<4;i++){ - if (eigenvalues[i]>1e-6) assert( fabs(eigenvalues[i]-resultValues2R[i]) / fabs(eigenvalues[i]) <1e-16); - else assert(1); - } - for(i=0;i<4;i++){ - if (eigenvectors[i]>1e-6) assert( fabs(eigenvectors[i]-resultVectors2R[i]) / fabs(eigenvectors[i]) <1e-16); - else assert(1); - } -} - - - - -static void cspec2aTest(void){ - float inR[4]={1.0f,1.0f,1.0f,3.0f}; - float inI[4]={0.0f,0.0f,0.0f,0.0f}; - float resultValuesR[4]={0.5857864376269050765700f,0,0,3.4142135623730949234300f}; - float resultValuesI[4]={0,0,0,0}; - float resultVectorsR[4]={- 0.9238795325112867384831f,0.3826834323650897817792f, - 0.3826834323650897817792f,0.9238795325112867384831f}; - float resultVectorsI[4]={0,0,0,0}; - - float in2R[4]={1.0f,1.0f,-2.0f,3.0f}; - float in2I[4]={0.0f,0.0f,0.0f,0.0f}; - float resultValues2R[4]={1.9999999999999997779554f,0,0,1.9999999999999997779554f}; - float resultValues2I[4]={0.9999999999999997779554f,0,0,-0.9999999999999997779554f}; - float resultVectors2R[4]={0.8164965809277261454824f,- 0.4082482904638631282523f, - 0.8164965809277261454824f,- 0.4082482904638631282523f}; - float resultVectors2I[4]={0,- 0.4082482904638629062077f,0,0.4082482904638629062077f}; - - floatComplex *in,*in2,out1[4],out2[4]; - - int i; - - in=FloatComplexMatrix(inR,inI,4); - in2=FloatComplexMatrix(in2R,in2I,4); - - cspec2a(in,2,out1,out2); - for(i=0;i<4;i++){ - if (creals(out1[i])>1e-16) assert( fabs(creals(out1[i])-resultValuesR[i]) / fabs(creals(out1[i])) <1e-15); - else assert(1); - if (cimags(out1[i])>1e-16) assert( fabs(cimags(out1[i])-resultValuesI[i]) / fabs(cimags(out1[i])) <1e-16); - else assert(1); - } - for(i=0;i<4;i++){ - if (creals(out2[i])>1e-16) assert( fabs(creals(out2[i])-resultVectorsR[i]) / fabs(creals(out2[i])) <1e-15); - else assert(1); - if (cimags(out2[i])>1e-16) assert( fabs(cimags(out2[i])-resultVectorsI[i]) / fabs(cimags(out2[i])) <1e-16); - else assert(1); - } - - - cspec2a(in2,2,out1,out2); - for(i=0;i<4;i++){ - if (creals(out1[i])>1e-16) assert( fabs(creals(out1[i])-resultValues2R[i]) / fabs(creals(out1[i])) <1e-15); - else assert(1); - if (cimags(out1[i])>1e-16) assert( fabs(cimags(out1[i])-resultValues2I[i]) / fabs(cimags(out1[i])) <1e-15); - else assert(1); - } - for(i=0;i<4;i++){ - if (creals(out2[i])>1e-16) assert( fabs(creals(out2[i])-resultVectors2R[i]) / fabs(creals(out2[i])) <1e-15); - else assert(1); - if (cimags(out2[i])>1e-16) assert( fabs(cimags(out2[i])-resultVectors2I[i]) / fabs(cimags(out2[i])) <1e-16); - else assert(1); - } -} - - - - -static int testSpec2(void){ - printf(">>> Float Spec2 Tests <<<\n"); - printf(">>> Float <<<\n"); - sspec2aTest(); - printf(">>> FloatComplex <<<\n"); - cspec2aTest(); - return 0; -} - - -int main(void){ - assert (testSpec2()==0); - - - return 0; -} diff --git a/2.3-1/src/c/matrixOperations/spec2/test_DoubleSpec2/testDoubleSpec2.vcxproj b/2.3-1/src/c/matrixOperations/spec2/test_DoubleSpec2/testDoubleSpec2.vcxproj deleted file mode 100644 index 7c36943b..00000000 --- a/2.3-1/src/c/matrixOperations/spec2/test_DoubleSpec2/testDoubleSpec2.vcxproj +++ /dev/null @@ -1,178 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{FD0A4495-C372-41EF-B8EF-0A0939DA6C1E}</ProjectGuid>
- <RootNamespace>testDoubleSpec2</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\testDoubleSpec2.c">
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\type\type.vcxproj">
- <Project>{9b1bd750-1fef-4d6b-9422-782d16181cee}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="..\..\matrixOperations.vcxproj">
- <Project>{fd335544-52bf-4736-a34e-77f591d158d5}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file diff --git a/2.3-1/src/c/matrixOperations/spec2/test_DoubleSpec2/testDoubleSpec2.vcxproj.filters b/2.3-1/src/c/matrixOperations/spec2/test_DoubleSpec2/testDoubleSpec2.vcxproj.filters deleted file mode 100644 index 04f409dc..00000000 --- a/2.3-1/src/c/matrixOperations/spec2/test_DoubleSpec2/testDoubleSpec2.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\testDoubleSpec2.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
-</Project>
\ No newline at end of file diff --git a/2.3-1/src/c/matrixOperations/spec2/test_FloatSpec2/testFloatSpec2.vcxproj b/2.3-1/src/c/matrixOperations/spec2/test_FloatSpec2/testFloatSpec2.vcxproj deleted file mode 100644 index f4154eb1..00000000 --- a/2.3-1/src/c/matrixOperations/spec2/test_FloatSpec2/testFloatSpec2.vcxproj +++ /dev/null @@ -1,178 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup Label="ProjectConfigurations">
- <ProjectConfiguration Include="Debug|Win32">
- <Configuration>Debug</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Debug|x64">
- <Configuration>Debug</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|Win32">
- <Configuration>Release</Configuration>
- <Platform>Win32</Platform>
- </ProjectConfiguration>
- <ProjectConfiguration Include="Release|x64">
- <Configuration>Release</Configuration>
- <Platform>x64</Platform>
- </ProjectConfiguration>
- </ItemGroup>
- <PropertyGroup Label="Globals">
- <ProjectGuid>{E20D0BC2-B28A-412C-9715-5B93B319A4A3}</ProjectGuid>
- <RootNamespace>testFloatSpec2</RootNamespace>
- <Keyword>Win32Proj</Keyword>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- <WholeProgramOptimization>true</WholeProgramOptimization>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
- <ConfigurationType>Application</ConfigurationType>
- <CharacterSet>Unicode</CharacterSet>
- </PropertyGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
- <ImportGroup Label="ExtensionSettings">
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="PropertySheets">
- <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
- </ImportGroup>
- <PropertyGroup Label="UserMacros" />
- <PropertyGroup>
- <_ProjectFileVersion>10.0.40219.1</_ProjectFileVersion>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(SolutionDir)bin\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(SolutionDir)bin\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(ProjectDir)$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</LinkIncremental>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(SolutionDir)bin\</OutDir>
- <OutDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(SolutionDir)bin\</OutDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(ProjectDir)$(Configuration)\</IntDir>
- <IntDir Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(ProjectDir)$(Configuration)\</IntDir>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</LinkIncremental>
- <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</LinkIncremental>
- </PropertyGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <MinimalRebuild>true</MinimalRebuild>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
- <ClCompile>
- <Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
- <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- <TargetMachine>MachineX86</TargetMachine>
- </Link>
- </ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
- <ClCompile>
- <Optimization>MaxSpeed</Optimization>
- <IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>../../../includes;../../../type;../../includes;../../../operations/includes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
- <FunctionLevelLinking>true</FunctionLevelLinking>
- <PrecompiledHeader>
- </PrecompiledHeader>
- <WarningLevel>Level3</WarningLevel>
- <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
- </ClCompile>
- <Link>
- <OutputFile>$(SolutionDir)bin\$(ProjectName).exe</OutputFile>
- <GenerateDebugInformation>true</GenerateDebugInformation>
- <SubSystem>Console</SubSystem>
- <OptimizeReferences>true</OptimizeReferences>
- <EnableCOMDATFolding>true</EnableCOMDATFolding>
- </Link>
- </ItemDefinitionGroup>
- <ItemGroup>
- <ClCompile Include="..\testFloatSpec2.c">
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
- <CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
- </ClCompile>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\type\type.vcxproj">
- <Project>{9b1bd750-1fef-4d6b-9422-782d16181cee}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- <ProjectReference Include="..\..\matrixOperations.vcxproj">
- <Project>{fd335544-52bf-4736-a34e-77f591d158d5}</Project>
- <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
- </ProjectReference>
- </ItemGroup>
- <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <ImportGroup Label="ExtensionTargets">
- </ImportGroup>
-</Project>
\ No newline at end of file diff --git a/2.3-1/src/c/matrixOperations/spec2/test_FloatSpec2/testFloatSpec2.vcxproj.filters b/2.3-1/src/c/matrixOperations/spec2/test_FloatSpec2/testFloatSpec2.vcxproj.filters deleted file mode 100644 index 0c38d2f2..00000000 --- a/2.3-1/src/c/matrixOperations/spec2/test_FloatSpec2/testFloatSpec2.vcxproj.filters +++ /dev/null @@ -1,22 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav</Extensions>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="..\testFloatSpec2.c">
- <Filter>Source Files</Filter>
- </ClCompile>
- </ItemGroup>
-</Project>
\ No newline at end of file diff --git a/2.3-1/src/c/matrixOperations/spec2/zspec2a.c b/2.3-1/src/c/matrixOperations/spec2/zspec2a.c deleted file mode 100644 index e33ed897..00000000 --- a/2.3-1/src/c/matrixOperations/spec2/zspec2a.c +++ /dev/null @@ -1,96 +0,0 @@ -/* - * Scilab ( http://www.scilab.org/ ) - This file is part of Scilab - * Copyright (C) 2008 - INRIA - Arnaud TORSET - * - * This file must be used under the terms of the CeCILL. - * This source file is licensed as described in the file COPYING, which - * you should have received as part of this distribution. The terms - * are also available at - * http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt - * - */ - -#include <stdlib.h> -#include "spec.h" -#include "lapack.h" -#include "zeros.h" -#include "stdio.h" -#include "conj.h" - -void zspec2a(doubleComplex* in, int rows,doubleComplex* eigenvalues, doubleComplex* eigenvectors){ - int i = 0, j = 0; - int hermitian = 0; - int INFO = 0; - int iWorkSize = 0; - doubleComplex* pdblWork; - doubleComplex* pdblLeftvectors; - doubleComplex* pdblRightvectors; - doubleComplex* pdblRWork; - double* pdblRWork2; - double* outReal; - double* outImag; - doubleComplex* inCopy; - - inCopy = (doubleComplex*)malloc((unsigned int)(rows*rows) * sizeof(doubleComplex)); - outReal = (double*)malloc((unsigned int)rows * sizeof(double)); - outImag = (double*)malloc((unsigned int)rows * sizeof(double)); - pdblLeftvectors=NULL; - pdblRightvectors=NULL; - - iWorkSize = 2*rows; - pdblWork = (doubleComplex*)malloc((unsigned int)iWorkSize * sizeof(doubleComplex)); - pdblRWork = NULL; - pdblRWork2 = NULL; - - for(i=0;i<rows*rows;i++) { - inCopy[i]=DoubleComplex(zreals(in[i]),zimags(in[i])); - eigenvectors[i]=DoubleComplex(zreals(in[i]),zimags(in[i])); - } - zzerosa(eigenvalues,1,rows*rows); - - - /* look if the matrix is symmetric */ - for (i=0;i<rows;i++){ - for (j=0;j<rows;j++) - if ( (zreals(in[i*rows+j])!=zreals(zconjs(in[i+j*rows]))) || - (zimags(in[i*rows+j])!=zimags(zconjs(in[i+j*rows]))) ) - break; - if (j!=rows) break; - } - - - /* the matrix is symmetric if the 2 loops goes to end i.e - i==rows and j==rows */ - if ((i==rows)&&(j==rows)) hermitian=1; - - - /* apply lapack function according to symmetry */ - if(hermitian){ - pdblRWork2 = (double*)malloc((unsigned int)(3*rows) * sizeof(double)); - C2F(zheev)( "V", "U", &rows, eigenvectors, &rows, outReal, pdblWork, &iWorkSize, pdblRWork2, &INFO ); - dzerosa(outImag,1,rows); - for (i=0;i<rows;i++) eigenvalues[i+i*rows]=DoubleComplex(outReal[i],outImag[i]); - } - else { - pdblRWork = (doubleComplex*)malloc((unsigned int)(3*rows) * sizeof(doubleComplex)); - C2F(zgeev)( "N", "V", &rows, inCopy, &rows, eigenvalues, - pdblLeftvectors, &rows, eigenvectors, &rows, pdblWork, &iWorkSize, - pdblRWork, &INFO ); - for (i=1;i<rows;i++) { - eigenvalues[i+i*rows]=DoubleComplex(zreals(eigenvalues[i]),zimags(eigenvalues[i])); - eigenvalues[i]=DoubleComplex(0,0); - } - } - - - - - free(inCopy); - free(outReal); - free(outImag); - free(pdblWork); - free(pdblRWork); - free(pdblRWork2); - free(pdblLeftvectors); - free(pdblRightvectors); -} diff --git a/2.3-1/src/c/matrixOperations/transpose/ztransposea.c b/2.3-1/src/c/matrixOperations/transpose/ztransposea.c index e42d74d2..c0e91844 100644 --- a/2.3-1/src/c/matrixOperations/transpose/ztransposea.c +++ b/2.3-1/src/c/matrixOperations/transpose/ztransposea.c @@ -17,11 +17,11 @@ void ztransposea ( doubleComplex* in , int lines , int columns, doubleComplex* o int i = 0 ; int j = 0 ; - for(i = 0 ; i < lines ; i++) + for(i = 0 ; i<lines ; i++) { - for(j = 0 ; j < columns ; j++) + for(j = 0 ; j < columns ; j++) - out[j+i*columns] = in[i+j*lines]; + out[j+i*columns] = in[i+j*lines]; } } diff --git a/2.3-1/src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c b/2.3-1/src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c deleted file mode 100644 index 7018df2c..00000000 --- a/2.3-1/src/c/scilab-arduino/cmd_analog_in_volt/u8cmd_analog_in_volts.c +++ /dev/null @@ -1,22 +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: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "cmd_analog_in_volt.h" -#include "Arduino.h" - -float u8cmd_analog_in_volts(uint8 board_no, uint8 pin) -{ - float a; - a = ((5*(float)analogRead(pin))/1023); - return(a); -} - diff --git a/2.3-1/src/c/scilab-arduino/cmd_analog_out_volt/u8cmd_analog_out_volts.c b/2.3-1/src/c/scilab-arduino/cmd_analog_out_volt/u8cmd_analog_out_volts.c deleted file mode 100644 index 2dd82e41..00000000 --- a/2.3-1/src/c/scilab-arduino/cmd_analog_out_volt/u8cmd_analog_out_volts.c +++ /dev/null @@ -1,22 +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: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "cmd_analog_out_volt.h" -#include "Arduino.h" - -void u8cmd_analog_out_volts(uint8 board_no, uint8 pin, float value) -{ - int a; - a = ((value*255)/5); - analogWrite(pin,a); - -} diff --git a/2.3-1/src/c/scilab-arduino/cmd_dcmotor_release/u8cmd_dcmotor_releases.c b/2.3-1/src/c/scilab-arduino/cmd_dcmotor_release/u8cmd_dcmotor_releases.c deleted file mode 100644 index 349bcb17..00000000 --- a/2.3-1/src/c/scilab-arduino/cmd_dcmotor_release/u8cmd_dcmotor_releases.c +++ /dev/null @@ -1,29 +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: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include "cmd_dcmotor_release.h" -#include "Arduino.h" - -void u8cmd_dcmotor_releases(uint8 board_no, uint8 motor_no) -{ - if (dcm_mode[motor_no] == 3) - { - analogWrite(dcm_pin_1[motor_no],0); - analogWrite(dcm_pin_2[motor_no],0); - } - - else - { - digitalWrite(dcm_pin_1[motor_no],LOW); - digitalWrite(dcm_pin_2[motor_no],LOW); - } -} diff --git a/2.3-1/src/c/scilab-arduino/cmd_dcmotor_run/u8cmd_dcmotor_runs.c b/2.3-1/src/c/scilab-arduino/cmd_dcmotor_run/u8cmd_dcmotor_runs.c index e8fa8b3c..6e1c2caa 100644 --- a/2.3-1/src/c/scilab-arduino/cmd_dcmotor_run/u8cmd_dcmotor_runs.c +++ b/2.3-1/src/c/scilab-arduino/cmd_dcmotor_run/u8cmd_dcmotor_runs.c @@ -6,7 +6,6 @@ are also available at http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt Author: Siddhesh Wani - Revised by: Yash Pratap Singh Tomar Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ diff --git a/2.3-1/src/c/scilab-arduino/cmd_dcmotor_setup/u8cmd_dcmotor_setups.c b/2.3-1/src/c/scilab-arduino/cmd_dcmotor_setup/u8cmd_dcmotor_setups.c index 0d04e748..389f9111 100644 --- a/2.3-1/src/c/scilab-arduino/cmd_dcmotor_setup/u8cmd_dcmotor_setups.c +++ b/2.3-1/src/c/scilab-arduino/cmd_dcmotor_setup/u8cmd_dcmotor_setups.c @@ -6,7 +6,6 @@ are also available at http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt Author: Siddhesh Wani - Revised by: Yash Pratap Singh Tomar Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ diff --git a/2.3-1/src/c/scilab-arduino/cmd_i2c_dev/u8cmd_i2c_devs.cpp b/2.3-1/src/c/scilab-arduino/cmd_i2c_dev/u8cmd_i2c_devs.cpp deleted file mode 100644 index adc1a6e5..00000000 --- a/2.3-1/src/c/scilab-arduino/cmd_i2c_dev/u8cmd_i2c_devs.cpp +++ /dev/null @@ -1,10 +0,0 @@ -#include "cmd_i2c_dev.h" -#include "Arduino.h" -#include "Wire.h" - - -uint8 u8cmd_i2c_devs(uint8 address) -{ - Wire.begin(); - return((uint8)address); -} diff --git a/2.3-1/src/c/scilab-arduino/cmd_i2c_read/u8cmd_i2c_reads.cpp b/2.3-1/src/c/scilab-arduino/cmd_i2c_read/u8cmd_i2c_reads.cpp deleted file mode 100644 index 8f02a87e..00000000 --- a/2.3-1/src/c/scilab-arduino/cmd_i2c_read/u8cmd_i2c_reads.cpp +++ /dev/null @@ -1,18 +0,0 @@ -#include "cmd_i2c_read.h" -#include "Arduino.h" -#include "Wire.h" - -float u8cmd_i2c_reads(uint8 address, uint8 bytes) -{ - - float c; //variable declaration to save received data - - // request reading from sensor - Wire.requestFrom(address, bytes); // request no. of bytes(given) from slave device with address - - // receive reading from sensor - while (Wire.available()) //If data is received - c = Wire.read(); //Save received data in variable - return(c); - -} diff --git a/2.3-1/src/c/scilab-arduino/cmd_i2c_read_register/u8cmd_i2c_read_registers.cpp b/2.3-1/src/c/scilab-arduino/cmd_i2c_read_register/u8cmd_i2c_read_registers.cpp deleted file mode 100644 index 0a2ec2ed..00000000 --- a/2.3-1/src/c/scilab-arduino/cmd_i2c_read_register/u8cmd_i2c_read_registers.cpp +++ /dev/null @@ -1,26 +0,0 @@ -#include "cmd_i2c_read_register.h" -#include "Arduino.h" -#include "Wire.h" - -uint16 u8cmd_i2c_read_registers(uint8 address, uint8 reg_adrs) -{ - long int reading; - - Wire.beginTransmission(address); // transmit to device address - Wire.write(reg_adrs); // sets register pointer to reg_adrs position - Wire.endTransmission(); // stop transmitting - - // request reading from sensor - Wire.requestFrom(address, 2); // request 2 bytes from slave device with address - - // receive reading from sensor - if (2 <= Wire.available()) // if two bytes were received - { - reading = Wire.read(); // receive high byte (overwrites previous reading) - reading = reading << 8; // shift high byte to be high 8 bits - reading |= Wire.read(); // receive low byte as lower 8 bits - } - - return(reading); - -} diff --git a/2.3-1/src/c/scilab-arduino/cmd_i2c_write/u8cmd_i2c_writes.cpp b/2.3-1/src/c/scilab-arduino/cmd_i2c_write/u8cmd_i2c_writes.cpp deleted file mode 100644 index 0239097a..00000000 --- a/2.3-1/src/c/scilab-arduino/cmd_i2c_write/u8cmd_i2c_writes.cpp +++ /dev/null @@ -1,13 +0,0 @@ -#include "cmd_i2c_write.h" -#include "Arduino.h" -#include "Wire.h" - -void u8cmd_i2c_writes(uint8 address, uint8 data) -{ - - Wire.beginTransmission(address); //Begins transmission to the device connected to given address - Wire.write(data); //sends data to slave device - Wire.endTransmission(); //Transmission ends - -} - diff --git a/2.3-1/src/c/scilab-arduino/cmd_i2c_write_register/u8cmd_i2c_write_registers.cpp b/2.3-1/src/c/scilab-arduino/cmd_i2c_write_register/u8cmd_i2c_write_registers.cpp deleted file mode 100644 index 63cc7c7a..00000000 --- a/2.3-1/src/c/scilab-arduino/cmd_i2c_write_register/u8cmd_i2c_write_registers.cpp +++ /dev/null @@ -1,16 +0,0 @@ -#include "cmd_i2c_write_register.h" -#include "Arduino.h" -#include "Wire.h" - -void u8cmd_i2c_write_registers(uint8 address, uint8 reg_adrs, uint8 data) -{ - - - Wire.beginTransmission(address); //Begins transmission to the device connected to given address - Wire.write(reg_adrs); //sets register pointer to reg_adrs position - Wire.write(data); //writes given data on reg_adrs position - Wire.endTransmission(); //Transmission ends - - -} - diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_analog_out_volt.h b/2.3-1/src/c/scilab-arduino/includes/cmd_analog_out_volt.h deleted file mode 100644 index 51580fbb..00000000 --- a/2.3-1/src/c/scilab-arduino/includes/cmd_analog_out_volt.h +++ /dev/null @@ -1,27 +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: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#ifndef __CMD_ANALOG_OUT_VOLT_H__ -#define __CMD_ANALOG_OUT_VOLT_H__ - -#include "types.h" -#ifdef __cplusplus -extern "C" { -#endif - -void u8cmd_analog_out_volts(uint8 board_no, uint8 pin, float value); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __CMD_ANALOG_OUT_VOLT_H__ */ diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_dcmotor_run.h b/2.3-1/src/c/scilab-arduino/includes/cmd_dcmotor_run.h index 1b5d41c1..2b69c99b 100644 --- a/2.3-1/src/c/scilab-arduino/includes/cmd_dcmotor_run.h +++ b/2.3-1/src/c/scilab-arduino/includes/cmd_dcmotor_run.h @@ -22,7 +22,7 @@ extern "C" { extern uint8 dcm_pin_1[4], dcm_pin_2[4], dcm_mode[4]; -void u8cmd_dcmotor_runs(uint8 board_no, uint8 motor_no, int16 duty); +void u8cmd_dc_motor_runs(uint8 board_no, uint8 motor_no, int16 duty); #ifdef __cplusplus } /* extern "C" */ diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_dcmotor_setup.h b/2.3-1/src/c/scilab-arduino/includes/cmd_dcmotor_setup.h index 45854ffb..cecd4659 100644 --- a/2.3-1/src/c/scilab-arduino/includes/cmd_dcmotor_setup.h +++ b/2.3-1/src/c/scilab-arduino/includes/cmd_dcmotor_setup.h @@ -22,7 +22,7 @@ extern "C" { extern uint8 dcm_pin_1[4], dcm_pin_2[4], dcm_mode[4]; -void u8cmd_dcmotor_setups(uint8 board_no, uint8 driver_type, uint8 motor_no,\ +void u8cmd_dc_motor_setups(uint8 board_no, uint8 driver_type, uint8 motor_no,\ uint8 pin_1, uint8 pin_2); #ifdef __cplusplus diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_dev.h b/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_dev.h deleted file mode 100644 index 861a8e7b..00000000 --- a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_dev.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef __CMD_I2C_DEV_H__ -#define __CMD_I2C_DEV_H__ - -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -uint8 u8cmd_i2c_devs(uint8 address); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __CMD_I2C_DEV_H__ */ diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_read.h b/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_read.h deleted file mode 100644 index 791bdd38..00000000 --- a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_read.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef __CMD_I2C_READ_H__ -#define __CMD_I2C_READ_H__ - -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -float u8cmd_i2c_reads(uint8 address, uint8 bytes); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __CMD_I2C_READ_H__ */ diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_read_register.h b/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_read_register.h deleted file mode 100644 index ea203adf..00000000 --- a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_read_register.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef __CMD_I2C_READ_REGISTER_H__ -#define __CMD_I2C_READ_REGISTER_H__ - -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -uint16 u8cmd_i2c_read_registers(uint8 address, uint8 reg_adrs); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __CMD_I2C_READ_REGISTER_H__ */ diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_write.h b/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_write.h deleted file mode 100644 index 6a57222b..00000000 --- a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_write.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef __CMD_I2C_WRITE_H__ -#define __CMD_I2C_WRITE_H__ - -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void u8cmd_i2c_writes(uint8 address, uint8 data); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __CMD_I2C_WRITE_H__ */ diff --git a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_write_register.h b/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_write_register.h deleted file mode 100644 index ff1b9ec0..00000000 --- a/2.3-1/src/c/scilab-arduino/includes/cmd_i2c_write_register.h +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef __CMD_I2C_WRITE_REGISTER_H__ -#define __CMD_I2C_WRITE_REGISTER_H__ - -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void u8cmd_i2c_write_registers(uint8 address, uint8 reg_adrs, uint8 data); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __CMD_I2C_WRITE_REGISTER_H__ */ diff --git a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_analog_out_volt.h b/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_analog_out_volt.h deleted file mode 100644 index 283f8fa0..00000000 --- a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_analog_out_volt.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: Yash Pratap Singh Tomar - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#ifndef __INT_CMD_ANALOG_OUT_VOLT_H__ -#define __INT_CMD_ANALOG_OUT_VOLT_H__ - -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define d0d0d0cmd_analog_out_volt(in1,in2,in3) u8cmd_analog_out_volts((uint8)in1,(uint8)in2,(float)in3) - -#define d0d0s0cmd_analog_out_volt(in1,in2,in3) u8cmd_analog_out_volts((uint8)in1,(uint8)in2,(float)in3) - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __INT_CMD_ANALOG_OUT_VOLT_H__ */ diff --git a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_dcmotor.h b/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_dcmotor.h index d465ff6f..61e0d2e3 100644 --- a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_dcmotor.h +++ b/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_dcmotor.h @@ -6,7 +6,6 @@ are also available at http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt Author: Siddhesh Wani - Revised by: Yash Pratap Singh Tomar Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ @@ -21,16 +20,16 @@ extern "C" { #endif -#define d0d0d0d0d0cmd_dcmotor_setup(in1,in2,in3,in4,in5) u8cmd_dcmotor_setups((uint8)in1,(uint8)in2,(uint8)in3,(uint8)in4,(uint8)in5) +#define d0d0d0d0d0cmd_dcmotor_setup(in1,in2,in3,in4,in5)\ + u8cmd_dcmotor_setups((uint8)in1,(uint8)in2,(uint8)in3,\ + (uint8)in4,(uint8)in5) #define d0d0d0cmd_dcmotor_run(in1,in2,in3) u8cmd_dcmotor_runs((uint8)in1,\ (uint8)in2, (int16)in3); #define d0d0u160cmd_dcmotor_run(in1,in2,in3) u8cmd_dcmotor_runs((uint8)in1,\ - (uint8)in2, (int16)in3); - -#define d0d0cmd_dcmotor_release(in1,in2) u8cmd_dcmotor_releases((uint8)in1,(uint8)in2) + (uint8)in2, (int16)in3); #ifdef __cplusplus diff --git a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_dev.h b/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_dev.h deleted file mode 100644 index c4d93d74..00000000 --- a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_dev.h +++ /dev/null @@ -1,17 +0,0 @@ -#ifndef __INT_CMD_I2C_DEV_H__ -#define __INT_CMD_I2C_DEV_H__ - -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define d0cmd_i2c_devu80(in1) u8cmd_i2c_devs((uint8)in1) - - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __INT_CMD_I2C_DEV_H__ */ diff --git a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_read.h b/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_read.h deleted file mode 100644 index b0633a07..00000000 --- a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_read.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef __INT_CMD_I2C_READ_H__ -#define __INT_CMD_I2C_READ_H__ - -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define d0d0cmd_i2c_reads0(in1, in2) u8cmd_i2c_reads((uint8)in1, (uint8)in2) - -#define u80d0cmd_i2c_reads0(in1, in2) u8cmd_i2c_reads((uint8)in1, (uint8)in2) - - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __INT_CMD_I2C_READ_H__ */ diff --git a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_read_register.h b/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_read_register.h deleted file mode 100644 index 5f4c5298..00000000 --- a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_read_register.h +++ /dev/null @@ -1,18 +0,0 @@ -#ifndef __INT_CMD_I2C_READ_REGISTER_H__ -#define __INT_CMD_I2C_READ_REGISTER_H__ - -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define d0d0cmd_i2c_read_registeru160(in1, in2) u8cmd_i2c_read_registers((uint8)in1, (uint8)in2) - -#define u80d0cmd_i2c_read_registeru160(in1, in2) u8cmd_i2c_read_registers((uint8)in1, (uint8)in2) - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __INT_CMD_I2C_READ_REGISTER_H__ */ diff --git a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_write.h b/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_write.h deleted file mode 100644 index a7705a89..00000000 --- a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_write.h +++ /dev/null @@ -1,20 +0,0 @@ -#ifndef __INT_CMD_I2C_WRITE_H__ -#define __INT_CMD_I2C_WRITE_H__ - -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define d0d0cmd_i2c_write(in1, in2) u8cmd_i2c_writes((uint8)in1, (uint8)in2) - -#define u80d0cmd_i2c_write(in1, in2) u8cmd_i2c_writes((uint8)in1, (uint8)in2) - - - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __INT_CMD_I2C_WRITE_H__ */ diff --git a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_write_register.h b/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_write_register.h deleted file mode 100644 index 35c0527e..00000000 --- a/2.3-1/src/c/scilab-arduino/interfaces/int_cmd_i2c_write_register.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef __INT_CMD_I2C_WRITE_REGISTER_H__ -#define __INT_CMD_I2C_WRITE_REGISTER_H__ - -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -#define d0d0d0cmd_i2c_write_register(in1, in2, in3) u8cmd_i2c_write_registers((uint8)in1, (uint8)in2, (uint8)in3) - -#define u80d0d0cmd_i2c_write_register(in1, in2, in3) u8cmd_i2c_write_registers((uint8)in1, (uint8)in2, (uint8)in3) - - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __INT_CMD_I2C_WRITE_REGISTER_H__ */ diff --git a/2.3-1/src/c/scilab-arduino/sleep/u16sleeps.c b/2.3-1/src/c/scilab-arduino/sleep/u16sleeps.c index 30459782..88f8a66d 100644 --- a/2.3-1/src/c/scilab-arduino/sleep/u16sleeps.c +++ b/2.3-1/src/c/scilab-arduino/sleep/u16sleeps.c @@ -6,13 +6,11 @@ are also available at http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt Author: Siddhesh Wani - Revised by: Yash Pratap Singh Tomar Organization: FOSSEE, IIT Bombay Email: toolbox@scilab.in */ #include "sleep.h" -#include "Arduino.h" void u16sleeps(uint16 delay_ms) { diff --git a/2.3-1/src/c/signalProcessing/%k/dmodka.c b/2.3-1/src/c/signalProcessing/%k/dmodka.c deleted file mode 100644 index c0630ec0..00000000 --- a/2.3-1/src/c/signalProcessing/%k/dmodka.c +++ /dev/null @@ -1,97 +0,0 @@ -#include<stdio.h> -#include<math.h> -#include "modk.h" -double max_calc(double* ptr,int sz) -{ - int i=0; - double mx; - if(ptr[0]<0) - { - ptr[0]=-1*ptr[0]; - } - mx=(ptr[0]); - //printf("%lf\n",mx); - for(i=1;i<sz;i++) - { - if(ptr[i]<0) - { - ptr[i]=-1*ptr[i]; - } - if(mx<(ptr[i])) - mx=(ptr[i]); - } - return mx; -} -void dmodka(double* inp,int size,double* oup) -{ - double ones[size],PI=M_PI; - double eps=pow(2,-52); - int i; - for(i=0;i<size;i++) - { - ones[i]=1; - } - double a[size],b[size],c[size],an[size],bn[size],cn[size],kans[size]; - - int j,kk,l,m; - for(j=0;j<size;j++) - { - a[j]=1; - } - for(kk=0;kk<size;kk++) - { - b[kk]=sqrt(ones[kk]-inp[kk]); - } - for(l=0;l<size;l++) - { - c[l]=sqrt(inp[l]); - - } - int x=0; - //double maxi; - //maxi=max_calc(c,size); - //printf("%lf",maxi); - - while(max_calc(c,size)>eps) - { - int q,w,r; - for(q=0;q<size;q++) - { - an[q]=0.5*(a[q]+b[q]); - } - for(w=0;w<size;w++) - { - bn[w]=sqrt(a[w]*b[w]); - } - for(r=0;r<size;r++) - { - cn[r]=0.5*(a[r]-b[r]); - } - int x,y,z; - for(x=0;x<size;x++) - { - a[x]=an[x]; - } - for(y=0;y<size;y++) - { - b[y]=bn[y]; - } - for(z=0;z<size;z++) - { - c[z]=cn[z]; - } - } - int q,w; - for(q=0;q<size;q++) - { - oup[q]=PI*(ones[q]/(2*a[q])); - } - -} -/* -int main() -{ - double m[3]={0.1,0.2,0.3}; - dka(m,3); -} -*/ diff --git a/2.3-1/src/c/signalProcessing/%k/int_modk.h b/2.3-1/src/c/signalProcessing/%k/int_modk.h deleted file mode 100644 index ae09c50a..00000000 --- a/2.3-1/src/c/signalProcessing/%k/int_modk.h +++ /dev/null @@ -1,18 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_%K_H__ -#define __INT_%K_H__ - -#define d2modkz2(inp,size,oup) dmodka(inp,size,oup) - -#endif /* !INT_%K_H__! */ diff --git a/2.3-1/src/c/signalProcessing/%k/modk.h b/2.3-1/src/c/signalProcessing/%k/modk.h deleted file mode 100644 index 6b4a7e08..00000000 --- a/2.3-1/src/c/signalProcessing/%k/modk.h +++ /dev/null @@ -1,29 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __%K_H__ -#define __%K_H__ -#include "types.h" -#include "doubleComplex.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void dmodka(double* inp,int size,doubleComplex* oup); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __%K_H__ */ - diff --git a/2.3-1/src/c/signalProcessing/%sn/dmodsna.c b/2.3-1/src/c/signalProcessing/%sn/dmodsna.c deleted file mode 100644 index 7e1e81c3..00000000 --- a/2.3-1/src/c/signalProcessing/%sn/dmodsna.c +++ /dev/null @@ -1,24 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#include<stdio.h> -#include<math.h> -#include "modsn.h" - -void dmodsna(double* uu,int size,double emmc,double* sn) -{ - int i; - for(i=0;i<size;i++) - { - sn[i]=dmodsns(uu[i],emmc); - } -} - diff --git a/2.3-1/src/c/signalProcessing/%sn/dmodsns.c b/2.3-1/src/c/signalProcessing/%sn/dmodsns.c deleted file mode 100644 index 06d0a6f0..00000000 --- a/2.3-1/src/c/signalProcessing/%sn/dmodsns.c +++ /dev/null @@ -1,93 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - Reference:- Abramowitz, Milton and Stegun, Irene A - Handbook of Mathematical Functions, Dover, 1965 - Chapter 16 (Sections 16.4, 16.13 and 16.15) - Link for FORTRAN code:-http://www.aip.de/groups/soe/local/numres/bookfpdf/f6-11.pdf -*/ - -#include<stdio.h> -#include<math.h> -#define CA 0.0003 -#include "modsn.h" -double dmodsns(double uu, double emmc) -{ - double a,b,c,d,emc,u; - double em[14],en[14]; - int i,ii,l,bo; - double sn,cn,dn; - emc=1-emmc; - u=uu; - if(emc) - { - bo=(emc<0.0); - if(bo) - { - d=1.0-emc; - emc/=-1.0/d; - u*=(d=sqrt(d)); - } - a=1.0; - dn=1.0; - for(i=1;i<=13;i++) - { - l=i; - em[i]=a; - en[i]=(emc=sqrt(emc)); - c=0.5*(a+emc); - if(fabs(a-emc)<=CA*a)break; - emc*=a; - a=c; - } - u*=c; - sn=sin(u); - cn=cos(u); - if(sn) - { - a=cn/sn; - c*=a; - for(ii=l;ii>=1;ii--) - { - b=em[ii]; - a*=c; - c*=dn; - dn=(en[ii]+a)/(b+a); - a=c/b; - } - a=1.0/sqrt(c*c+1.0); - sn=(sn>=0.0?a:-a); - cn=c*(sn); - } - if(bo) - { - a=dn; - dn=cn; - cn=a; - sn/=d; - } - } - else - { - cn=1.0/cosh(u); - dn=cn; - sn=tanh(u); - } - return sn; -} -/* -int main() -{ - double u,k; - u=4; - k=0.7; - sn(u,k); -} -*/ diff --git a/2.3-1/src/c/signalProcessing/%sn/int_modsn.h b/2.3-1/src/c/signalProcessing/%sn/int_modsn.h deleted file mode 100644 index 179fb61f..00000000 --- a/2.3-1/src/c/signalProcessing/%sn/int_modsn.h +++ /dev/null @@ -1,18 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_MODSN_H__ -#define __INT_MODSN_H__ - -#define d0d0modsnd0(uu,emmc) dmodsns(uu,emmc) - -#endif /* !INT_MODSN_H__! */ diff --git a/2.3-1/src/c/signalProcessing/%sn/modsn.h b/2.3-1/src/c/signalProcessing/%sn/modsn.h deleted file mode 100644 index c5896562..00000000 --- a/2.3-1/src/c/signalProcessing/%sn/modsn.h +++ /dev/null @@ -1,27 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __MODSN_H__ -#define __MODSN_H__ -#include "types.h" - -#ifdef __cplusplus -extern "c" { -#endif - -double dmodsns(double uu, double emmc); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __MODSN_H__ */ diff --git a/2.3-1/src/c/signalProcessing/%sn/zmodsna.c b/2.3-1/src/c/signalProcessing/%sn/zmodsna.c deleted file mode 100644 index 85bc0c16..00000000 --- a/2.3-1/src/c/signalProcessing/%sn/zmodsna.c +++ /dev/null @@ -1,165 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#include<stdio.h> -#include<math.h> -#include "modsn.h" -#include "doubleComplex.h" -#define CA 0.0003 - - -doubleComplex zmodsnsproto(doubleComplex uu,double emmc,doubleComplex* sni) -{ - doubleComplex ans; - double uur,uui; - uur=zreals(uu); - uui=zimags(uu); - double sr,cr,dr; - //Performing Elliptic Function operation for the real values - double a1,b1,c1,d1,emc1,u1; - double em1[14],en1[14]; - int i1,ii1,l1,bo1; - emc1=1-emmc; - u1=uur; - if(emc1) - { - bo1=(emc1<0.0); - if(bo1) - { - d1=1.0-emc1; - emc1/=-1.0/d1; - u1*=(d1=sqrt(d1)); - } - a1=1.0; - dr=1.0; - for(i1=1;i1<=13;i1++) - { - l1=i1; - em1[i1]=a1; - en1[i1]=(emc1=sqrt(emc1)); - c1=0.5*(a1+emc1); - if(fabs(a1-emc1)<=CA*a1)break; - emc1*=a1; - a1=c1; - } - u1*=c1; - sr=sin(u1); - cr=cos(u1); - if(sr) - { - a1=cr/sr; - c1*=a1; - for(ii1=l1;ii1>=1;ii1--) - { - b1=em1[ii1]; - a1*=c1; - c1*=dr; - dr=(en1[ii1]+a1)/(b1+a1); - a1=c1/b1; - } - a1=1.0/sqrt(c1*c1+1.0); - sr=(sr>=0.0?a1:-a1); - cr=c1*(sr); - } - if(bo1) - { - a1=dr; - dr=cr; - cr=a1; - sr/=d1; - } - } - else - { - cr=1.0/cosh(u1); - dr=cr; - sr=tanh(u1); - } - //////////////////////////////////////////////////////////////// - double si,ci,di; - //Performing Elleptic Function operation for the imaginary values - double a,b,c,d,emc,u; - double em[14],en[14]; - int i,ii,l,bo; - //double s1,c1,d1; - emc=emmc; - u=uui; - if(emc) - { - bo=(emc<0.0); - if(bo) - { - d=1.0-emc; - emc/=-1.0/d; - u*=(d=sqrt(d)); - } - a=1.0; - di=1.0; - for(i=1;i<=13;i++) - { - l=i; - em[i]=a; - en[i]=(emc=sqrt(emc)); - c=0.5*(a+emc); - if(fabs(a-emc)<=CA*a)break; - emc*=a; - a=c; - } - u*=c; - si=sin(u); - ci=cos(u); - if(si) - { - a=ci/si; - c*=a; - for(ii=l;ii>=1;ii--) - { - b=em[ii]; - a*=c; - c*=di; - di=(en[ii]+a)/(b+a); - a=c/b; - } - a=1.0/sqrt(c*c+1.0); - si=(si>=0.0?a:-a); - ci=c*(si); - } - if(bo) - { - a=di; - di=ci; - ci=a; - si/=d; - } - } - else - { - ci=1.0/cosh(u); - di=ci; - si=tanh(u); - } - ///////////////////////////////////////////////////////// - double delta; - delta=ci*ci + emmc*sr*sr*si*si; - double snir,snii; - snir=(sr*di)/delta; - snii=(cr*dr*si*ci)/delta; - *sni=DoubleComplex(snir,snii); -} - -void zmodsna(doubleComplex* uu,int size,double emmc,doubleComplex* sn) -{ - int i; - for(i=0;i<size;i++) - { - zmodsnsproto(uu[i],emmc,&sn[i]); - } -} diff --git a/2.3-1/src/c/signalProcessing/%sn/zmodsns.c b/2.3-1/src/c/signalProcessing/%sn/zmodsns.c deleted file mode 100644 index 5f35059f..00000000 --- a/2.3-1/src/c/signalProcessing/%sn/zmodsns.c +++ /dev/null @@ -1,161 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - Reference:- Abramowitz, Milton and Stegun, Irene A - Handbook of Mathematical Functions, Dover, 1965 - Chapter 16 (Sections 16.4, 16.13 and 16.15) - Link for FORTRAN code:-http://www.aip.de/groups/soe/local/numres/bookfpdf/f6-11.pdf -*/ - -#include<stdio.h> -#include<math.h> -#include "modsn.h" -#include "doubleComplex.h" -#define CA 0.0003 - -doubleComplex zmodsns(doubleComplex uu,double emmc) -{ - doubleComplex ans; - double uur,uui; - uur=zreals(uu); - uui=zimags(uu); - double sr,cr,dr; - //Performing Elliptic Function operation for the real values - double a1,b1,c1,d1,emc1,u1; - double em1[14],en1[14]; - int i1,ii1,l1,bo1; - emc1=1-emmc; - u1=uur; - if(emc1) - { - bo1=(emc1<0.0); - if(bo1) - { - d1=1.0-emc1; - emc1/=-1.0/d1; - u1*=(d1=sqrt(d1)); - } - a1=1.0; - dr=1.0; - for(i1=1;i1<=13;i1++) - { - l1=i1; - em1[i1]=a1; - en1[i1]=(emc1=sqrt(emc1)); - c1=0.5*(a1+emc1); - if(fabs(a1-emc1)<=CA*a1)break; - emc1*=a1; - a1=c1; - } - u1*=c1; - sr=sin(u1); - cr=cos(u1); - if(sr) - { - a1=cr/sr; - c1*=a1; - for(ii1=l1;ii1>=1;ii1--) - { - b1=em1[ii1]; - a1*=c1; - c1*=dr; - dr=(en1[ii1]+a1)/(b1+a1); - a1=c1/b1; - } - a1=1.0/sqrt(c1*c1+1.0); - sr=(sr>=0.0?a1:-a1); - cr=c1*(sr); - } - if(bo1) - { - a1=dr; - dr=cr; - cr=a1; - sr/=d1; - } - } - else - { - cr=1.0/cosh(u1); - dr=cr; - sr=tanh(u1); - } - //////////////////////////////////////////////////////////////// - double si,ci,di; - //Performing Elleptic Function operation for the imaginary values - double a,b,c,d,emc,u; - double em[14],en[14]; - int i,ii,l,bo; - //double s1,c1,d1; - emc=emmc; - u=uui; - if(emc) - { - bo=(emc<0.0); - if(bo) - { - d=1.0-emc; - emc/=-1.0/d; - u*=(d=sqrt(d)); - } - a=1.0; - di=1.0; - for(i=1;i<=13;i++) - { - l=i; - em[i]=a; - en[i]=(emc=sqrt(emc)); - c=0.5*(a+emc); - if(fabs(a-emc)<=CA*a)break; - emc*=a; - a=c; - } - u*=c; - si=sin(u); - ci=cos(u); - if(si) - { - a=ci/si; - c*=a; - for(ii=l;ii>=1;ii--) - { - b=em[ii]; - a*=c; - c*=di; - di=(en[ii]+a)/(b+a); - a=c/b; - } - a=1.0/sqrt(c*c+1.0); - si=(si>=0.0?a:-a); - ci=c*(si); - } - if(bo) - { - a=di; - di=ci; - ci=a; - si/=d; - } - } - else - { - ci=1.0/cosh(u); - di=ci; - si=tanh(u); - } - ///////////////////////////////////////////////////////// - double delta; - delta=ci*ci + emmc*sr*sr*si*si; - double snir,snii; - snir=(sr*di)/delta; - snii=(cr*dr*si*ci)/delta; - ans=DoubleComplex(snir,snii); - return ans; -} diff --git a/2.3-1/src/c/signalProcessing/amell/amell.h b/2.3-1/src/c/signalProcessing/amell/amell.h deleted file mode 100644 index 30bd6c82..00000000 --- a/2.3-1/src/c/signalProcessing/amell/amell.h +++ /dev/null @@ -1,27 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __AMELL_H__ -#define __AMELL_H__ -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -double damells(double u,double x); - -#ifdef __cplusplus -} /* extern "c" */ -#endif - -#endif /*__AMELL_H__*/ diff --git a/2.3-1/src/c/signalProcessing/amell/damella.c b/2.3-1/src/c/signalProcessing/amell/damella.c deleted file mode 100644 index 5c37e2a5..00000000 --- a/2.3-1/src/c/signalProcessing/amell/damella.c +++ /dev/null @@ -1,23 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#include<stdio.h> -#include<math.h> -#include "amell.h" - -void damella(double* u,int size,double x,double* oup) -{ - int i; - for(i=0;i<size;i++) - { - oup[i]=damells(u[i],x); - } -} diff --git a/2.3-1/src/c/signalProcessing/amell/damells.c b/2.3-1/src/c/signalProcessing/amell/damells.c deleted file mode 100644 index 90c20530..00000000 --- a/2.3-1/src/c/signalProcessing/amell/damells.c +++ /dev/null @@ -1,57 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#include<stdio.h> -#include<math.h> -#include "amell.h" -#define N 30 -#define DBL_EPSILON 2.2204460492503131E-16 - - -double damells(double u,double x) -{ - double a[N+1]; - double g[N+1]; - double c[N+1]; - double two_n; - double phi; - double k; - int n; - k=(long double)fabs(x); - if(k==1.0) - return 0; - if(k>1.0) - printf("Wrong type of input argument type #2"); - - a[0]=1.0; - g[0]=sqrt(1.0-k*k); - c[0]=k; - two_n=1.0; - for(n=0;n<N;n++) - { - if(fabs(a[n]-g[n])<(a[n]*DBL_EPSILON)) - { - break; - } - two_n+=two_n; - a[n+1]=0.5*(a[n]+g[n]); - g[n+1]=sqrt(a[n]*g[n]); - c[n+1]=0.5*(a[n]-g[n]); - } - phi=two_n*a[n]*u; - for(;n>0;n--) - { - phi=0.5*(phi+asin(c[n]*sin(phi)/a[n])); - } - return (double)phi; -} - diff --git a/2.3-1/src/c/signalProcessing/amell/int_amell.h b/2.3-1/src/c/signalProcessing/amell/int_amell.h deleted file mode 100644 index 5d0c86f6..00000000 --- a/2.3-1/src/c/signalProcessing/amell/int_amell.h +++ /dev/null @@ -1,18 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_AMELL_H__ -#define __INT_AMELL_H__ - -#define d0d0amelld0(u,x) damells(u,x) - -#endif /* !__INT_AMELL_H__! */ diff --git a/2.3-1/src/c/signalProcessing/buttmag/buttmag.h b/2.3-1/src/c/signalProcessing/buttmag/buttmag.h deleted file mode 100644 index 47e64af8..00000000 --- a/2.3-1/src/c/signalProcessing/buttmag/buttmag.h +++ /dev/null @@ -1,28 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __BUTTMAG_H__ -#define __BUTTMAG_H__ -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void dbuttmags(double order, double omegac, int size, double* sample,double* out); - -#ifdef __cplusplus -} /* extern "C"*/ -#endif - -#endif /* __BUTTMAG_H__ */ - diff --git a/2.3-1/src/c/signalProcessing/buttmag/dbuttmags.c b/2.3-1/src/c/signalProcessing/buttmag/dbuttmags.c deleted file mode 100644 index dc40e814..00000000 --- a/2.3-1/src/c/signalProcessing/buttmag/dbuttmags.c +++ /dev/null @@ -1,33 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include<stdio.h> -#include<math.h> -#include "buttmag.h" -void dbuttmags(double order, double omegac,double* sample,int size,double* out) -{ - double ones[size]; - int j,k; - for(j=0;j<size;j++) - { - ones[j]=1.0; - } - //double h[size]; - for(k=0;k<size;k++) - { - double x=ones[k]/(ones[k]+pow((sample[k]/omegac),(2*order))); - out[k]=x; - //printf("%lf\n",h[k]); - } - -} - diff --git a/2.3-1/src/c/signalProcessing/buttmag/int_buttmag.h b/2.3-1/src/c/signalProcessing/buttmag/int_buttmag.h deleted file mode 100644 index 9867438e..00000000 --- a/2.3-1/src/c/signalProcessing/buttmag/int_buttmag.h +++ /dev/null @@ -1,18 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_BUTTMAG_H__ -#define __INT_BUTTMAG_H__ - -#define d0d0d2buttmagd2(order,omegac,size,sample,out) dbuttmags(order,omegac,size,sample,out) - -#endif /* !INT_BUTTMAG_H__! */ diff --git a/2.3-1/src/c/signalProcessing/buttmag/u8buttmags.c b/2.3-1/src/c/signalProcessing/buttmag/u8buttmags.c deleted file mode 100644 index e7b52c22..00000000 --- a/2.3-1/src/c/signalProcessing/buttmag/u8buttmags.c +++ /dev/null @@ -1,33 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - -#include<stdio.h> -#include<math.h> -#include "buttmag.h" -void dbuttmags(int order, int omegac,double* sample,int size,double* out) -{ - double ones[size]; - int j,k; - for(j=0;j<size;j++) - { - ones[j]=1.0; - } - //double h[size]; - for(k=0;k<size;k++) - { - double x=ones[k]/(ones[k]+pow((sample[k]/omegac),(2*order))); - out[k]=x; - //printf("%lf\n",h[k]); - } - -} - diff --git a/2.3-1/src/c/signalProcessing/cheb1mag/cheb1mag.h b/2.3-1/src/c/signalProcessing/cheb1mag/cheb1mag.h deleted file mode 100644 index 369ee4ce..00000000 --- a/2.3-1/src/c/signalProcessing/cheb1mag/cheb1mag.h +++ /dev/null @@ -1,27 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __CHEB1MAG_H__ -#define __CHEB1MAG_H__ -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void dcheb1mags(double n, double omegac, double epsilon, double* sample,int size,double* out); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __CHEB1MAG_H__ */ diff --git a/2.3-1/src/c/signalProcessing/cheb1mag/dcheb1mags.c b/2.3-1/src/c/signalProcessing/cheb1mag/dcheb1mags.c deleted file mode 100644 index a4a459d4..00000000 --- a/2.3-1/src/c/signalProcessing/cheb1mag/dcheb1mags.c +++ /dev/null @@ -1,35 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#include<stdio.h> -#include<math.h> -#include "cheb1mag.h" -void dcheb1mags(double n, double omegac, double epsilon, double* sample,int size,double* out) -{ - double x; - int j; - double tn; - for(j=0;j<size;j++) - { - x=sample[j]/omegac; - if(x<=1) - { - tn=cos(n*acos(x)); - out[j]=1/(1+(epsilon*epsilon)*(tn*tn)); - } - else - { - tn=cosh(n*acosh(x)); - out[j]=1/(1+(epsilon*epsilon)*(tn*tn)); - } - } -} - diff --git a/2.3-1/src/c/signalProcessing/cheb1mag/int_cheb1mag.h b/2.3-1/src/c/signalProcessing/cheb1mag/int_cheb1mag.h deleted file mode 100644 index fa0ff83e..00000000 --- a/2.3-1/src/c/signalProcessing/cheb1mag/int_cheb1mag.h +++ /dev/null @@ -1,18 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_CHEB1MAG_H__ -#define __INT_CHEB1MAG_H__ - -#define d0d0d2cheb1magd2(n,omegac,epsilon,sample,size,out) dcheb1mags(n,omegac,epsilon,sample,size,out) - -#endif /* !__INT_CHEB1MAG_H__! */ diff --git a/2.3-1/src/c/signalProcessing/cheb2mag/cheb2mag.h b/2.3-1/src/c/signalProcessing/cheb2mag/cheb2mag.h deleted file mode 100644 index 0516ca51..00000000 --- a/2.3-1/src/c/signalProcessing/cheb2mag/cheb2mag.h +++ /dev/null @@ -1,27 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __CHEB2MAG_H__ -#define __CHEB2MAG_H__ -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void dcheb2mags(double n,double omegar, double A, double* sample,int size,double* oup); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __CHEB2MAG_H__ */ diff --git a/2.3-1/src/c/signalProcessing/cheb2mag/dcheb2mags.c b/2.3-1/src/c/signalProcessing/cheb2mag/dcheb2mags.c deleted file mode 100644 index 006c5917..00000000 --- a/2.3-1/src/c/signalProcessing/cheb2mag/dcheb2mags.c +++ /dev/null @@ -1,49 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#include<stdio.h> -#include<math.h> -#include "cheb2mag.h" -void dcheb2mags(double n,double omegar, double A, double* sample,int size,double* oup) -{ - double e; - //e=sqrt(A*A-1); - e=1/(pow(10,A/10)-1); - double x,k,cn,h,tp; - int i; - for(i=0;i<size;i++) - { - x=omegar/sample[i]; - if(x<=1) - { - tp=acos(x); - cn=cos(n*tp); - if(x==1) - { - h=1/(1+A*A-1); - } - else - { - h=1/(1+((A*A-1)/(cn*cn))); - } - - } - else - { - tp=acosh(x); - cn=cosh(n*tp); - h=e*(cn*cn)/(1+e*(cn*cn)); - - } - oup[i]=h; - } -} - diff --git a/2.3-1/src/c/signalProcessing/cheb2mag/int_cheb2mag.h b/2.3-1/src/c/signalProcessing/cheb2mag/int_cheb2mag.h deleted file mode 100644 index 05b77c2d..00000000 --- a/2.3-1/src/c/signalProcessing/cheb2mag/int_cheb2mag.h +++ /dev/null @@ -1,18 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_CHEB2MAG_H__ -#define __INT_CHEB2MAG_H__ - -#define d0d0d0d2cheb2magd2(n,omegar,A,sample,size,oup) dcheb2mag(n,omegar,A,sample,size,oup) - -#endif /* !__INT_CHEB2MAG_H__! */ diff --git a/2.3-1/src/c/signalProcessing/ell1mag/dell1maga.c b/2.3-1/src/c/signalProcessing/ell1mag/dell1maga.c deleted file mode 100644 index 9af0c8e8..00000000 --- a/2.3-1/src/c/signalProcessing/ell1mag/dell1maga.c +++ /dev/null @@ -1,40 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#include<stdio.h> -#include "modsn.h" -#include "ell1mag.h" -#include "doubleComplex.h" - -void dell1maga(double eps,double m1,double* z,int size,double* oup ) -{ - double s[size]; - int i; - for(i=0;i<size;i++) - { - s[i]=zmodsns(z[i],m1); - } - double un[size]; - int j; - for(j=0;j<size;j++) - { - un[j]=1; - } - double v; - int k; - for(k=0;k<size;k++) - { - v=un[k]/(un[k]+(eps*eps*s[k]*s[k])); - oup[k]=v; - } -} - diff --git a/2.3-1/src/c/signalProcessing/ell1mag/ell1mag.h b/2.3-1/src/c/signalProcessing/ell1mag/ell1mag.h deleted file mode 100644 index 8fffc0c6..00000000 --- a/2.3-1/src/c/signalProcessing/ell1mag/ell1mag.h +++ /dev/null @@ -1,28 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __ELL1MAG_H__ -#define __ELL1MAG_H__ -#include "types.h" -#include "doubleComplex.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void dell1mags(double eps,double m1,doubleComplex* z,int size,double* oup); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /*__ELL1MAG_H__*/ diff --git a/2.3-1/src/c/signalProcessing/ell1mag/int_ell1mag.h b/2.3-1/src/c/signalProcessing/ell1mag/int_ell1mag.h deleted file mode 100644 index 590a0abd..00000000 --- a/2.3-1/src/c/signalProcessing/ell1mag/int_ell1mag.h +++ /dev/null @@ -1,18 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_ELL1MAG_H__ -#define __INT_ELL1MAG_H__ - -#define d0d0z2ell1magd2(eps,m1,z,size,oup) dell1mags(eps,m1,z,size,oup) - -#endif /* !__INT_ELL1MAG_H__! */ diff --git a/2.3-1/src/c/signalProcessing/ell1mag/zell1maga.c b/2.3-1/src/c/signalProcessing/ell1mag/zell1maga.c deleted file mode 100644 index 6e7a6f93..00000000 --- a/2.3-1/src/c/signalProcessing/ell1mag/zell1maga.c +++ /dev/null @@ -1,40 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#include<stdio.h> -#include "modsn.h" -#include "ell1mag.h" -#include "doubleComplex.h" - -void zell1maga(double eps,double m1,doubleComplex* z,int size,double* oup ) -{ - doubleComplex s[size]; - int i; - for(i=0;i<size;i++) - { - s[i]=zmodsns(z[i],m1); - } - double un[size]; - int j; - for(j=0;j<size;j++) - { - un[j]=1; - } - doubleComplex v; - int k; - for(k=0;k<size;k++) - { - v=un[k]/(un[k]+(eps*eps*s[k]*s[k])); - oup[k]=zreals(v); - } -} - diff --git a/2.3-1/src/c/signalProcessing/ffilt/ffilt.h b/2.3-1/src/c/signalProcessing/ffilt/ffilt.h deleted file mode 100644 index 9b98f34c..00000000 --- a/2.3-1/src/c/signalProcessing/ffilt/ffilt.h +++ /dev/null @@ -1,27 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __FFILT_H__ -#define __FFILT_H__ -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void gffilts(char* ft,double N,double fc,double fh,double* oup); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __FFILT_H__ */ diff --git a/2.3-1/src/c/signalProcessing/ffilt/gffilts.c b/2.3-1/src/c/signalProcessing/ffilt/gffilts.c deleted file mode 100644 index 538daf3e..00000000 --- a/2.3-1/src/c/signalProcessing/ffilt/gffilts.c +++ /dev/null @@ -1,90 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#include<stdio.h> -#include<math.h> -#include "filt_sinc.h" -#include "ffilt.h" -void gffilts(char* ft,int size,double N,double fc,double fh,double* oup) -{ - int sz=N; - double X[sz]; - double no22=(N-1)/2; - int ino22=(int)no22; - if(ft[0]=='l') - { - dfilt_sincs(N,fc,X); - int k=0; - for(k=0;k<sz;k++) - { - oup[k]=X[k]; - } - } - else if(ft[0]=='h') - { - int k=0; - dfilt_sincs(N,fc,X); - for(k=0;k<sz;k++) - { - oup[k]=-1*X[k]; - } - int id=no22; - oup[id]=1+oup[id]; - } - else if(ft[0]=='b') - { - double wc=M_PI*(fh+fc); - fc=(fh-fc)/2; - dfilt_sincs(N,fc,X); - double Y[sz]; - double k=0; - for(k=-no22;k<=no22;k++) - { - int ind; - ind=k+no22; - Y[ind]=2*cos(wc*k); - } - int j=0; - for(j=0;j<sz;j++) - { - oup[j]=X[j]*Y[j]; - } - } - else if(ft[0]=='s') - { - double wc=M_PI*(fh+fc); - fc=(fh-fc)/2; - dfilt_sincs(N,fc,X); - double Y[sz]; - double k=0; - for(k=-no22;k<=no22;k++) - { - int ind; - ind=k+no22; - Y[ind]=2*cos(wc*k); - } - int j=0; - for(j=0;j<sz;j++) - { - oup[j]=-1*X[j]*Y[j]; - } - int id=no22; - oup[id]=1+oup[id]; - } -} -/* -int main() -{ - string s; - int n; - double fl,fh; -} -*/ diff --git a/2.3-1/src/c/signalProcessing/ffilt/int_ffilt.h b/2.3-1/src/c/signalProcessing/ffilt/int_ffilt.h deleted file mode 100644 index 83f44827..00000000 --- a/2.3-1/src/c/signalProcessing/ffilt/int_ffilt.h +++ /dev/null @@ -1,18 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_FFILT_H__ -#define __INT_FFILT_H__ - -#define g0d0d0d0ffiltd2(ft,N,fc,fh,oup) gffilts(ft,N,fc,fh,oup) - -#endif /* !__INT_FFILT_H__! */ diff --git a/2.3-1/src/c/signalProcessing/filt_sinc/dfilt_sincs.c b/2.3-1/src/c/signalProcessing/filt_sinc/dfilt_sincs.c deleted file mode 100644 index 1b7d1b18..00000000 --- a/2.3-1/src/c/signalProcessing/filt_sinc/dfilt_sincs.c +++ /dev/null @@ -1,49 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#include<stdio.h> -#include<math.h> -#include "filt_sinc.h" -void dfilt_sincs(double N,double fc,double* oup) -{ - double no2=(N-1)/2; - int ino2=(int)no2; - double wl=fc*2*M_PI; - int sz=N; - double xn[sz]; - double i; - int l,m; - for(i=-no2;i<=no2;i++) - { - l=i+no2; - xn[l]=sin(wl*i); - } - double xd[sz]; - double j; - printf("\n"); - for(j=-no2;j<=no2;j++) - { - m=j+no2; - xd[m]=M_PI*j; - } - if(ino2==no2) - { - xn[(int)no2]=2*fc; - xd[(int)no2]=1; - } - double x[sz]; - int k; - for(k=0;k<N;k++) - { - oup[k]=xn[k]/xd[k]; - } -} - diff --git a/2.3-1/src/c/signalProcessing/filt_sinc/filt_sinc.h b/2.3-1/src/c/signalProcessing/filt_sinc/filt_sinc.h deleted file mode 100644 index 43b24151..00000000 --- a/2.3-1/src/c/signalProcessing/filt_sinc/filt_sinc.h +++ /dev/null @@ -1,28 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __FILT_SINC_H__ -#define __FILT_SINC_H__ -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void u8filt_sincs(int N,double fc,double* oup); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __FILT_SINC_H */ - diff --git a/2.3-1/src/c/signalProcessing/filt_sinc/int_filt_sinc.h b/2.3-1/src/c/signalProcessing/filt_sinc/int_filt_sinc.h deleted file mode 100644 index 5b7b07ae..00000000 --- a/2.3-1/src/c/signalProcessing/filt_sinc/int_filt_sinc.h +++ /dev/null @@ -1,18 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_FILT_SINC_H__ -#define __INT_FILT_SINC_H__ - -#define u80d0filt_sincd2(N,fc,oup) u8filt_sincs(N,fc,oup) - -#endif /* !__INT_FILT_SINC_H__! */ diff --git a/2.3-1/src/c/signalProcessing/fsfirlin/dfsfirlina.c b/2.3-1/src/c/signalProcessing/fsfirlin/dfsfirlina.c deleted file mode 100644 index d2079f4d..00000000 --- a/2.3-1/src/c/signalProcessing/fsfirlin/dfsfirlina.c +++ /dev/null @@ -1,144 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#include<stdio.h> - -#include<math.h> -#include "sincd.h" -#include "fsfirlin.h" -//#define PI 3.14159265358979 - -void dfsfirlina(double* hd,int size,double flag,double* hst) -{ - int n1=size,n; - if( n1%2==0) - { - n=2*n1; - } - else - { - n=2*n1+1; - } - double scd[8*n+1]; - //STRAT SINCD - double npt=4*n; - int sz=4*n; - double PI=M_PI; - double pas=PI/npt; - double om[sz+1]; - int i; - for(i=0;i<=sz;i++) - { - om[i]=i*pas; - } - double eps=pow(-1,(n-1)); - double s1[sz+1],s2[sz+1]; - double s[2*(sz)+1]; - double sr[2*(sz)+1]; - if(flag==1) - { - int j,k; - for(j=0;j<=4*n;j++) - { - s1[j]=sin(n*om[j]); - s2[j]=sin(om[j]); - } - s1[0]=n; - s2[0]=1; - s1[sz]=n*eps; - s2[sz]=1; - - for(k=0;k<=4*n;k++) - { - s[k]=s1[k]/s2[k]; - } - - int x; - for(x=0;x<=4*n;x++) - { - scd[sz-x]=s[x]; - } - int l; - for(l=4*n+1;l<=8*n;l++) - { - scd[l]=s[l-(sz)]; - } - int m; - for(m=0;m<=8*n;m++) - { - scd[m]=scd[m]/n; - } - } - else - { - int a; - for(a=0;a<=4*n;a++) - { - om[a]=om[a]-(PI/(2*n)); - } - int j,k; - for(j=0;j<=4*n;j++) - { - s1[j]=sin(n*om[j]); - s2[j]=sin(om[j]); - } - s1[2]=n; - s2[2]=1; - for(k=0;k<=4*n;k++) - { - s[k]=s1[k]/s2[k]; - } - int m; - for(m=0;m<=4*n;m++) - { - scd[m]=(eps*s[m])/n; - } - int l; - for(l=4*n+1;l<=8*n;l++) - { - scd[l]=s[l-(sz)]/n; - } - } - //END SINCD - int ii; - for(ii=4*n;ii<=6*n;ii++) - { - hst[ii-(4*n)]=hd[0]*scd[ii]; - } - - int epsi; - epsi=pow(-1,n-1); - int jj; - for(jj=1;jj<=(n1-1);jj++) - { - double tp1[2*n+1]; - double tp2[2*n+1]; - int k,l; - for(k=(-4*jj+4*n);k<=(-4*jj+6*n);k++) - { - tp1[k-(-4*jj+4*n)]=hd[jj]*scd[k]; - } - - for(l=(4*jj);l<=(4*jj+2*n);l++) - { - tp2[l-(4*jj)]=hd[jj]*(epsi*scd[l]); - } - int m; - for(m=0;m<=2*n;m++) - { - hst[m]=hst[m]+(tp1[m]+tp2[m]); - } - - } - - -} diff --git a/2.3-1/src/c/signalProcessing/fsfirlin/fsfirlin.h b/2.3-1/src/c/signalProcessing/fsfirlin/fsfirlin.h deleted file mode 100644 index 7337cbfe..00000000 --- a/2.3-1/src/c/signalProcessing/fsfirlin/fsfirlin.h +++ /dev/null @@ -1,26 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __FSFIRLIN_H__ -#define __FSFIRLIN_H__ -#include "types.h" -#include "sincd.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void dfsfirlina(double* hd,int size,int flag,double* hst); - -#ifdef __cplusplus -} /* extern "C" */ -#endif diff --git a/2.3-1/src/c/signalProcessing/fsfirlin/int_fsfirlin.h b/2.3-1/src/c/signalProcessing/fsfirlin/int_fsfirlin.h deleted file mode 100644 index 857dae8c..00000000 --- a/2.3-1/src/c/signalProcessing/fsfirlin/int_fsfirlin.h +++ /dev/null @@ -1,18 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_FSFIRLIN_H__ -#define __INT_FSFIRLIN_H__ - -#define d2u80fsfirlind2(hd,size,flag,hst) dfsfirlina(hd,size[1],flag,hst) - -#endif /* !__INT_FSFIRLIN_H__! */ diff --git a/2.3-1/src/c/signalProcessing/includes/amell.h b/2.3-1/src/c/signalProcessing/includes/amell.h deleted file mode 100644 index 2336d3cb..00000000 --- a/2.3-1/src/c/signalProcessing/includes/amell.h +++ /dev/null @@ -1,28 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __AMELL_H__ -#define __AMELL_H__ -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -double damells(double u,double x); -void damella(double* u,int size,double x,double* oup); - -#ifdef __cplusplus -} /* extern "c" */ -#endif - -#endif /*__AMELL_H__*/ diff --git a/2.3-1/src/c/signalProcessing/includes/buttmag.h b/2.3-1/src/c/signalProcessing/includes/buttmag.h deleted file mode 100644 index ef17b7ea..00000000 --- a/2.3-1/src/c/signalProcessing/includes/buttmag.h +++ /dev/null @@ -1,29 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __BUTTMAG_H__ -#define __BUTTMAG_H__ -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void dbuttmags(double order, double omegac, double* sample, int size,double* out); -void u8buttmags(int order, int omegac, double* sample, int size,double* out); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __BUTTMAG_H__ */ - diff --git a/2.3-1/src/c/signalProcessing/includes/cheb1mag.h b/2.3-1/src/c/signalProcessing/includes/cheb1mag.h deleted file mode 100644 index 369ee4ce..00000000 --- a/2.3-1/src/c/signalProcessing/includes/cheb1mag.h +++ /dev/null @@ -1,27 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __CHEB1MAG_H__ -#define __CHEB1MAG_H__ -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void dcheb1mags(double n, double omegac, double epsilon, double* sample,int size,double* out); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __CHEB1MAG_H__ */ diff --git a/2.3-1/src/c/signalProcessing/includes/cheb2mag.h b/2.3-1/src/c/signalProcessing/includes/cheb2mag.h deleted file mode 100644 index 0516ca51..00000000 --- a/2.3-1/src/c/signalProcessing/includes/cheb2mag.h +++ /dev/null @@ -1,27 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __CHEB2MAG_H__ -#define __CHEB2MAG_H__ -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void dcheb2mags(double n,double omegar, double A, double* sample,int size,double* oup); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __CHEB2MAG_H__ */ diff --git a/2.3-1/src/c/signalProcessing/includes/dct.h b/2.3-1/src/c/signalProcessing/includes/dct.h deleted file mode 100644 index db95274b..00000000 --- a/2.3-1/src/c/signalProcessing/includes/dct.h +++ /dev/null @@ -1,38 +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: Ukasha Noor - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - -#ifndef __DCT_H__ -#define __DCT_H__ - -#include <math.h> -#include "types.h" -#include "doubleComplex.h" -#include "addition.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void ddcta(double *in,int row,int col,int sign,double *out); - -void sdcta(float *in,int row,int col,int sign,float *out); - -void zdcta(doubleComplex *in,int row,int col,int sign,doubleComplex *out); - -//void cdcta(floatComplex *in,int row,int col,int sign,floatComplex *out); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif diff --git a/2.3-1/src/c/signalProcessing/includes/ell1mag.h b/2.3-1/src/c/signalProcessing/includes/ell1mag.h deleted file mode 100644 index e881cca9..00000000 --- a/2.3-1/src/c/signalProcessing/includes/ell1mag.h +++ /dev/null @@ -1,29 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __ELL1MAG_H__ -#define __ELL1MAG_H__ -#include "types.h" -#include "doubleComplex.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void zell1maga(double eps,double m1,doubleComplex* z,int size,double* oup); -void dell1maga(double eps,double m1,double* z,int size,double* oup); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /*__ELL1MAG_H__*/ diff --git a/2.3-1/src/c/signalProcessing/includes/ffilt.h b/2.3-1/src/c/signalProcessing/includes/ffilt.h deleted file mode 100644 index f38df6e6..00000000 --- a/2.3-1/src/c/signalProcessing/includes/ffilt.h +++ /dev/null @@ -1,27 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __FFILT_H__ -#define __FFILT_H__ -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void gffilts(char* ft,int size,double N,double fc,double fh,double* oup); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __FFILT_H__ */ diff --git a/2.3-1/src/c/signalProcessing/includes/filt_sinc.h b/2.3-1/src/c/signalProcessing/includes/filt_sinc.h deleted file mode 100644 index 095ca91f..00000000 --- a/2.3-1/src/c/signalProcessing/includes/filt_sinc.h +++ /dev/null @@ -1,28 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __FILT_SINC_H__ -#define __FILT_SINC_H__ -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void dfilt_sincs(double N,double fc,double* oup); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __FILT_SINC_H */ - diff --git a/2.3-1/src/c/signalProcessing/includes/fsfirlin.h b/2.3-1/src/c/signalProcessing/includes/fsfirlin.h deleted file mode 100644 index cf5fbbd0..00000000 --- a/2.3-1/src/c/signalProcessing/includes/fsfirlin.h +++ /dev/null @@ -1,28 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __FSFIRLIN_H__ -#define __FSFIRLIN_H__ -#include "types.h" -#include "sincd.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void dfsfirlina(double* hd,int size,double flag,double* hst); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /*__FSFIRLIN_H__*/ diff --git a/2.3-1/src/c/signalProcessing/includes/idct.h b/2.3-1/src/c/signalProcessing/includes/idct.h deleted file mode 100644 index 1e7b85b3..00000000 --- a/2.3-1/src/c/signalProcessing/includes/idct.h +++ /dev/null @@ -1,38 +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: Ukasha Noor - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - -#ifndef __IDCT_H__ -#define __IDCT_H__ - -#include <math.h> -#include "types.h" -#include "doubleComplex.h" -#include "addition.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void didcta(double *in,int row,int col,double *out); - -void sidcta(float *in,int row,int col,float *out); - -void zidcta(doubleComplex *in,int row,int col,doubleComplex *out); - -void cidcta(floatComplex *in,int row,int col,floatComplex *out); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif diff --git a/2.3-1/src/c/signalProcessing/includes/modk.h b/2.3-1/src/c/signalProcessing/includes/modk.h deleted file mode 100644 index 5040eb7f..00000000 --- a/2.3-1/src/c/signalProcessing/includes/modk.h +++ /dev/null @@ -1,28 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __MODK_H__ -#define __MODK_H__ -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void dmodka(double* inp,int size,double* oup); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __MODK_H__ */ - diff --git a/2.3-1/src/c/signalProcessing/includes/modsn.h b/2.3-1/src/c/signalProcessing/includes/modsn.h deleted file mode 100644 index d91dd9d3..00000000 --- a/2.3-1/src/c/signalProcessing/includes/modsn.h +++ /dev/null @@ -1,31 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __MODSN_H__ -#define __MODSN_H__ -#include "types.h" -#include "doubleComplex.h" - -#ifdef __cplusplus -extern "C" { -#endif - -double dmodsns(double uu, double emmc); -doubleComplex zmodsns(doubleComplex uu,double emmc); -void dmodsna(double* uu,int size,double emmc,double* sn); -void zmodsna(doubleComplex* uu,int size,double emmc,doubleComplex* sn); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __MODSN_H__ */ diff --git a/2.3-1/src/c/signalProcessing/includes/sincd.h b/2.3-1/src/c/signalProcessing/includes/sincd.h deleted file mode 100644 index 9b7a3607..00000000 --- a/2.3-1/src/c/signalProcessing/includes/sincd.h +++ /dev/null @@ -1,29 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __SINCD_H__ -#define __SINCD_H__ -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void dsincds(double n,double flg,double* oup); -void u8sincds(int n,int flg,double* oup); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __SINCD_H__ */ - diff --git a/2.3-1/src/c/signalProcessing/includes/zpch1.h b/2.3-1/src/c/signalProcessing/includes/zpch1.h deleted file mode 100644 index fbe850cc..00000000 --- a/2.3-1/src/c/signalProcessing/includes/zpch1.h +++ /dev/null @@ -1,28 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __ZPCH1_H__ -#define __ZPCH1_H__ -#include "types.h" -#include "doubleComplex.h" - -#ifdef __cplusplus -extern "C" { -#endif - -double dzpch1s(double N,double e,double wc,doubleComplex* out); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __ZPCH1_H__ */ diff --git a/2.3-1/src/c/signalProcessing/includes/zpch2.h b/2.3-1/src/c/signalProcessing/includes/zpch2.h deleted file mode 100644 index d7c1c647..00000000 --- a/2.3-1/src/c/signalProcessing/includes/zpch2.h +++ /dev/null @@ -1,28 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __ZPCH2_H__ -#define __ZPCH2_H__ -#include "types.h" -#include "doubleComplex.h" - -#ifdef __cplusplus -extern "C" { -#endif - -double dzpch2s(double N, double A, double omegar,doubleComplex* zeros,doubleComplex* poles); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __ZPCH2_H__ */ diff --git a/2.3-1/src/c/signalProcessing/interfaces/int_amell.h b/2.3-1/src/c/signalProcessing/interfaces/int_amell.h deleted file mode 100644 index 10719ac5..00000000 --- a/2.3-1/src/c/signalProcessing/interfaces/int_amell.h +++ /dev/null @@ -1,19 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_AMELL_H__ -#define __INT_AMELL_H__ - -#define d0d0amelld0(u,x) damells(u,x) -#define d2d0amelld2(u,size,x,oup) damella(u,size[1],x,oup) - -#endif /* !__INT_AMELL_H__! */ diff --git a/2.3-1/src/c/signalProcessing/interfaces/int_buttmag.h b/2.3-1/src/c/signalProcessing/interfaces/int_buttmag.h deleted file mode 100644 index 4a33fafe..00000000 --- a/2.3-1/src/c/signalProcessing/interfaces/int_buttmag.h +++ /dev/null @@ -1,19 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_BUTTMAG_H__ -#define __INT_BUTTMAG_H__ - -#define d0d0d2buttmagd2(order,omegac,sample,size,out) dbuttmags(order,omegac,sample,size[1],out) -#define u80u80d2buttmagd2(order,omegac,sample,size,out) u8buttmags(order,omegac,sample,size[1],out) - -#endif /* !INT_BUTTMAG_H__! */ diff --git a/2.3-1/src/c/signalProcessing/interfaces/int_cheb1mag.h b/2.3-1/src/c/signalProcessing/interfaces/int_cheb1mag.h deleted file mode 100644 index 764e8c79..00000000 --- a/2.3-1/src/c/signalProcessing/interfaces/int_cheb1mag.h +++ /dev/null @@ -1,18 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_CHEB1MAG_H__ -#define __INT_CHEB1MAG_H__ - -#define d0d0d0d2cheb1magd2(n,omegac,epsilon,sample,size,out) dcheb1mags(n,omegac,epsilon,sample,size[1],out) - -#endif /* !__INT_CHEB1MAG_H__! */ diff --git a/2.3-1/src/c/signalProcessing/interfaces/int_cheb2mag.h b/2.3-1/src/c/signalProcessing/interfaces/int_cheb2mag.h deleted file mode 100644 index b63db04d..00000000 --- a/2.3-1/src/c/signalProcessing/interfaces/int_cheb2mag.h +++ /dev/null @@ -1,18 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_CHEB2MAG_H__ -#define __INT_CHEB2MAG_H__ - -#define d0d0d0d2cheb2magd2(n,omegar,A,sample,size,oup) dcheb2mags(n,omegar,A,sample,size[1],oup) - -#endif /* !__INT_CHEB2MAG_H__! */ diff --git a/2.3-1/src/c/signalProcessing/interfaces/int_dct.h b/2.3-1/src/c/signalProcessing/interfaces/int_dct.h deleted file mode 100644 index ef58b48e..00000000 --- a/2.3-1/src/c/signalProcessing/interfaces/int_dct.h +++ /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: Ukasha Noor - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - - -#ifndef __INT_DCT_H__ -#define __INT_DCT_H__ - - - -#define d2dctd2(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) - -#define s2dcts2(in,size,out) sdcta(in,size[0],size[1],-1,out) - -#define s2s0dcts2(in,size,sign,out) sdcta(in,size[0],size[1],sign,out) - -#define z2dctz2(in,size,out) zdcta(in,size[0],size[1],-1,out) - -#define z2d0dctz2(in,size,sign,out) zdcta(in,size[0],size[1],sign,out) - -//#define c2dctc2(in,size,out) cdcta(in,size[0],size[1],-1,out) - -//#define c2s0dctc2(in,size,sign,out) cdcta(in,size[0],size[1],sign,out) - -#endif diff --git a/2.3-1/src/c/signalProcessing/interfaces/int_ell1mag.h b/2.3-1/src/c/signalProcessing/interfaces/int_ell1mag.h deleted file mode 100644 index c30ffef6..00000000 --- a/2.3-1/src/c/signalProcessing/interfaces/int_ell1mag.h +++ /dev/null @@ -1,19 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_ELL1MAG_H__ -#define __INT_ELL1MAG_H__ - -#define d0d0z2ell1magd2(eps,m1,z,size,oup) zell1maga(eps,m1,z,size[1],oup) -#define d0d0d2ell1magd2(eps,m1,z,size,oup) dell1maga(eps,m1,z,size[1],oup) - -#endif /* !__INT_ELL1MAG_H__! */ diff --git a/2.3-1/src/c/signalProcessing/interfaces/int_ffilt.h b/2.3-1/src/c/signalProcessing/interfaces/int_ffilt.h deleted file mode 100644 index 273b98f7..00000000 --- a/2.3-1/src/c/signalProcessing/interfaces/int_ffilt.h +++ /dev/null @@ -1,18 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_FFILT_H__ -#define __INT_FFILT_H__ - -#define g2d0d0d0ffiltd2(ft,size,N,fc,fh,oup) gffilts(ft,size[1],N,fc,fh,oup) - -#endif /* !__INT_FFILT_H__! */ diff --git a/2.3-1/src/c/signalProcessing/interfaces/int_filt_sinc.h b/2.3-1/src/c/signalProcessing/interfaces/int_filt_sinc.h deleted file mode 100644 index f90d0a62..00000000 --- a/2.3-1/src/c/signalProcessing/interfaces/int_filt_sinc.h +++ /dev/null @@ -1,18 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_FILT_SINC_H__ -#define __INT_FILT_SINC_H__ - -#define d0d0filt_sincd2(N,fc,oup) dfilt_sincs(N,fc,oup) - -#endif /* !__INT_FILT_SINC_H__! */ diff --git a/2.3-1/src/c/signalProcessing/interfaces/int_fsfirlin.h b/2.3-1/src/c/signalProcessing/interfaces/int_fsfirlin.h deleted file mode 100644 index 3f6fb6e0..00000000 --- a/2.3-1/src/c/signalProcessing/interfaces/int_fsfirlin.h +++ /dev/null @@ -1,18 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_FSFIRLIN_H__ -#define __INT_FSFIRLIN_H__ - -#define d2d0fsfirlind2(hd,size,flag,hst) dfsfirlina(hd,size[1],flag,hst) - -#endif /* !__INT_FSFIRLIN_H__! */ diff --git a/2.3-1/src/c/signalProcessing/interfaces/int_idct.h b/2.3-1/src/c/signalProcessing/interfaces/int_idct.h deleted file mode 100644 index f705fe2d..00000000 --- a/2.3-1/src/c/signalProcessing/interfaces/int_idct.h +++ /dev/null @@ -1,28 +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: Ukasha Noor - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - - -#ifndef __INT_IDCT_H__ -#define __INT_IDCT_H__ - - - -#define d2idctd2(in,size,out) didcta(in,size[0],size[1],out) - -#define s2idcts2(in,size,out) sidcta(in,size[0],size[1],out) - -#define z2idctz2(in,size,out) zidcta(in,size[0],size[1],out) - -#define c2idctc2(in,size,out) cidcta(in,size[0],size[1],out) - -#endif diff --git a/2.3-1/src/c/signalProcessing/interfaces/int_modk.h b/2.3-1/src/c/signalProcessing/interfaces/int_modk.h deleted file mode 100644 index 441b9b13..00000000 --- a/2.3-1/src/c/signalProcessing/interfaces/int_modk.h +++ /dev/null @@ -1,18 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_MODK_H__ -#define __INT_MODK_H__ - -#define d2modkd2(inp,size,oup) dmodka(inp,size[1],oup) - -#endif /* !INT_MODK_H__! */ diff --git a/2.3-1/src/c/signalProcessing/interfaces/int_modsn.h b/2.3-1/src/c/signalProcessing/interfaces/int_modsn.h deleted file mode 100644 index 56c8f8cb..00000000 --- a/2.3-1/src/c/signalProcessing/interfaces/int_modsn.h +++ /dev/null @@ -1,21 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_MODSN_H__ -#define __INT_MODSN_H__ - -#define d0d0modsnd0(uu,emmc) dmodsns(uu,emmc) -#define z0d0modsnz0(uu,emmc) zmodsns(uu,emmc) -#define d2d0modsnd2(uu,size,emmc,sn) dmodsna(uu,size[1],emmc,sn) -#define z2d0modsnz2(uu,size,emmc,sn) zmodsna(uu,size[1],emmc,sn) - -#endif /* !__INT_MODSN_H__! */ diff --git a/2.3-1/src/c/signalProcessing/interfaces/int_sincd.h b/2.3-1/src/c/signalProcessing/interfaces/int_sincd.h deleted file mode 100644 index 73136730..00000000 --- a/2.3-1/src/c/signalProcessing/interfaces/int_sincd.h +++ /dev/null @@ -1,19 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_SINCD_H__ -#define __INT_SINCD_H__ - -#define d0d0sincdd2(n,flg,oup) dsincds(n,flg,oup) -#define u80u80sincdd2(n,flg,oup) u8sincds(n,flg,oup) - -#endif /* !__INT_SINCD_H__! */ diff --git a/2.3-1/src/c/signalProcessing/interfaces/int_zpbutt.h b/2.3-1/src/c/signalProcessing/interfaces/int_zpbutt.h deleted file mode 100644 index 775c1026..00000000 --- a/2.3-1/src/c/signalProcessing/interfaces/int_zpbutt.h +++ /dev/null @@ -1,19 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_ZPBUTT_H__ -#define __INT_ZPBUTT_H__ - -#define d0d0zpbuttz2d0(n,fl,out) dzpbutts(n,fl,out) - -#endif /* !INT_ZPBUTT_H__! */ - diff --git a/2.3-1/src/c/signalProcessing/interfaces/int_zpch1.h b/2.3-1/src/c/signalProcessing/interfaces/int_zpch1.h deleted file mode 100644 index 429e7c36..00000000 --- a/2.3-1/src/c/signalProcessing/interfaces/int_zpch1.h +++ /dev/null @@ -1,18 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_ZPCH1_H__ -#define __INT_ZPCH1_H__ - -#define d0d0d0zpch1z2d0(N,e,wc,out) dzpch1s(N,e,wc,out) - -#endif /* !INT_ZPCH1_H__! */ diff --git a/2.3-1/src/c/signalProcessing/interfaces/int_zpch2.h b/2.3-1/src/c/signalProcessing/interfaces/int_zpch2.h deleted file mode 100644 index fcb12a7c..00000000 --- a/2.3-1/src/c/signalProcessing/interfaces/int_zpch2.h +++ /dev/null @@ -1,18 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_ZPCH2_H__ -#define __INT_ZPCH2_H__ - -#define d0d0d0zpch2z2z2d0(N,A,omegar,zeros,poles) dzpch2s(N,A,omegar,zeros,poles) - -#endif /* !INT_ZPCH2_H__! */ diff --git a/2.3-1/src/c/signalProcessing/modk/dmodka.c b/2.3-1/src/c/signalProcessing/modk/dmodka.c deleted file mode 100644 index c0630ec0..00000000 --- a/2.3-1/src/c/signalProcessing/modk/dmodka.c +++ /dev/null @@ -1,97 +0,0 @@ -#include<stdio.h> -#include<math.h> -#include "modk.h" -double max_calc(double* ptr,int sz) -{ - int i=0; - double mx; - if(ptr[0]<0) - { - ptr[0]=-1*ptr[0]; - } - mx=(ptr[0]); - //printf("%lf\n",mx); - for(i=1;i<sz;i++) - { - if(ptr[i]<0) - { - ptr[i]=-1*ptr[i]; - } - if(mx<(ptr[i])) - mx=(ptr[i]); - } - return mx; -} -void dmodka(double* inp,int size,double* oup) -{ - double ones[size],PI=M_PI; - double eps=pow(2,-52); - int i; - for(i=0;i<size;i++) - { - ones[i]=1; - } - double a[size],b[size],c[size],an[size],bn[size],cn[size],kans[size]; - - int j,kk,l,m; - for(j=0;j<size;j++) - { - a[j]=1; - } - for(kk=0;kk<size;kk++) - { - b[kk]=sqrt(ones[kk]-inp[kk]); - } - for(l=0;l<size;l++) - { - c[l]=sqrt(inp[l]); - - } - int x=0; - //double maxi; - //maxi=max_calc(c,size); - //printf("%lf",maxi); - - while(max_calc(c,size)>eps) - { - int q,w,r; - for(q=0;q<size;q++) - { - an[q]=0.5*(a[q]+b[q]); - } - for(w=0;w<size;w++) - { - bn[w]=sqrt(a[w]*b[w]); - } - for(r=0;r<size;r++) - { - cn[r]=0.5*(a[r]-b[r]); - } - int x,y,z; - for(x=0;x<size;x++) - { - a[x]=an[x]; - } - for(y=0;y<size;y++) - { - b[y]=bn[y]; - } - for(z=0;z<size;z++) - { - c[z]=cn[z]; - } - } - int q,w; - for(q=0;q<size;q++) - { - oup[q]=PI*(ones[q]/(2*a[q])); - } - -} -/* -int main() -{ - double m[3]={0.1,0.2,0.3}; - dka(m,3); -} -*/ diff --git a/2.3-1/src/c/signalProcessing/sincd/dsincds.c b/2.3-1/src/c/signalProcessing/sincd/dsincds.c deleted file mode 100644 index 1475d8de..00000000 --- a/2.3-1/src/c/signalProcessing/sincd/dsincds.c +++ /dev/null @@ -1,99 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#include<stdio.h> -#include<math.h> -#include "sincd.h" -//#define PI 3.14159265358979 -void dsincds(double n,double flg,double* oup) -{ - double npt=4*n; - int sz=4*n; - double PI=M_PI; - double pas=PI/npt; - double om[sz+1]; - int i; - for(i=0;i<=sz;i++) - { - om[i]=i*pas; - } - double eps=pow(-1,(n-1)); - double s1[sz+1],s2[sz+1]; - double s[2*(sz)+1]; - double sr[2*(sz)+1]; - if(flg==1) - { - int j,k; - for(j=0;j<=4*n;j++) - { - s1[j]=sin(n*om[j]); - s2[j]=sin(om[j]); - } - s1[0]=n; - s2[0]=1; - s1[sz]=n*eps; - s2[sz]=1; - - for(k=0;k<=4*n;k++) - { - s[k]=s1[k]/s2[k]; - } - - int x; - for(x=0;x<=4*n;x++) - { - oup[sz-x]=s[x]; - } - int l; - for(l=4*n+1;l<=8*n;l++) - { - oup[l]=s[l-(sz)]; - } - int m; - for(m=0;m<=8*n;m++) - { - oup[m]=oup[m]/n; - } - } - else - { - int a; - for(a=0;a<=4*n;a++) - { - om[a]=om[a]-(PI/(2*n)); - } - int j,k; - for(j=0;j<=4*n;j++) - { - s1[j]=sin(n*om[j]); - s2[j]=sin(om[j]); - } - s1[2]=n; - s2[2]=1; - for(k=0;k<=4*n;k++) - { - s[k]=s1[k]/s2[k]; - } - int m; - for(m=0;m<=4*n;m++) - { - oup[m]=(eps*s[m])/n; - } - int l; - for(l=4*n+1;l<=8*n;l++) - { - oup[l]=s[l-(sz)]/n; - } - - } -} - diff --git a/2.3-1/src/c/signalProcessing/sincd/int_sincd.h b/2.3-1/src/c/signalProcessing/sincd/int_sincd.h deleted file mode 100644 index a404978b..00000000 --- a/2.3-1/src/c/signalProcessing/sincd/int_sincd.h +++ /dev/null @@ -1,18 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_SINCD_H__ -#define __INT_SINCD_H__ - -#define u80sincdd2(n,flg,oup) u8sincds(n,flg,oup) - -#endif /* !__INT_SINCD_H__! */ diff --git a/2.3-1/src/c/signalProcessing/sincd/sincd.h b/2.3-1/src/c/signalProcessing/sincd/sincd.h deleted file mode 100644 index 2df85a87..00000000 --- a/2.3-1/src/c/signalProcessing/sincd/sincd.h +++ /dev/null @@ -1,28 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __SINCD_H__ -#define __SINCD_H__ -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void u8sincds(int n,int flg,double* oup); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __SINCD_H__ */ - diff --git a/2.3-1/src/c/signalProcessing/sincd/u8sincds.c b/2.3-1/src/c/signalProcessing/sincd/u8sincds.c deleted file mode 100644 index d03f48ae..00000000 --- a/2.3-1/src/c/signalProcessing/sincd/u8sincds.c +++ /dev/null @@ -1,98 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#include<stdio.h> -#include<math.h> -#include "sincd.h" -#define PI 3.14159265358979 -void u8sincds(int n,int flg,double* oup) -{ - double npt=4*n; - int sz=4*n; - double pas=PI/npt; - double om[sz+1]; - int i; - //om[0]=0; - for(i=0;i<=sz;i++) - { - om[i]=i*pas; - } - double eps=pow(-1,(n-1)); - double s1[sz+1],s2[sz+1]; - double s[2*(sz)+1]; - double sr[2*(sz)+1]; - if(flg==1) - { - int j,k; - for(j=0;j<=4*n;j++) - { - s1[j]=sin(n*om[j]); - s2[j]=sin(om[j]); - } - s1[0]=n; - s2[0]=1; - s1[sz]=n*eps; - s2[sz]=1; - - for(k=0;k<=4*n;k++) - { - s[k]=s1[k]/s2[k]; - } - - int x; - for(x=0;x<=4*n;x++) - { - oup[sz-x]=s[x]; - } - int l; - for(l=4*n+1;l<=8*n;l++) - { - oup[l]=s[l-(sz)]; - } - int m; - for(m=0;m<=8*n;m++) - { - oup[m]=oup[m]/n; - } - } - else - { - int a; - for(a=0;a<=4*n;a++) - { - om[a]=om[a]-(PI/(2*n)); - } - int j,k; - for(j=0;j<=4*n;j++) - { - s1[j]=sin(n*om[j]); - s2[j]=sin(om[j]); - } - s1[2]=n; - s2[2]=1; - for(k=0;k<=4*n;k++) - { - s[k]=s1[k]/s2[k]; - } - int m; - for(m=0;m<=4*n;m++) - { - oup[m]=(eps*s[m])/n; - } - int l; - for(l=4*n+1;l<=8*n;l++) - { - oup[l]=s[l-(sz)]/n; - } - - } -} diff --git a/2.3-1/src/c/signalProcessing/transforms/dct/cdcta.c b/2.3-1/src/c/signalProcessing/transforms/dct/cdcta.c deleted file mode 100644 index 7ff83645..00000000 --- a/2.3-1/src/c/signalProcessing/transforms/dct/cdcta.c +++ /dev/null @@ -1,230 +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: Ukasha Noor - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - -#include "dct.h" -#include "addition.h" -#include "types.h" -#include "floatComplex.h" -#include "multiplication.h" -/*#include "matrixMultiplication"*/ -/*#include <fftw3.h>*/ -#include <math.h> - -void cdcta(floatComplex *in,int row,int col,int sign,floatComplex *out) -{ - int i,j,k,u,v; - int n; - int x,y; - float res,ress,vv,ff; - float re,z,q,m; - floatComplex accu = FloatComplex(0, 0); - floatComplex temp,mm,aa,bb,cc; - if(sign==-1) - { - if(row==1) - { - n=col; - for(u=0;u<row;u++) - { - for(v=0;v<col;v++) - { - x=v*row+u; - out[x]=FloatComplex(0,0); - for(i=0;i<row;i++) - { - for(j=0;j<col;j++) - { - y=row*j+i; - vv = cos(((M_PI)*(y+1-1./2.)*(x))/n); - aa = FloatComplex(vv,0); - temp=cmuls(in[y],aa); - out[x]=cadds(out[x],temp); - } - } - if(x==0) - { - vv = 1./(sqrt(n)); - aa = FloatComplex(vv,0); - out[x]=cmuls(out[x],aa); - } - else - { - float res=2./n; - res = sqrt(res); - aa = FloatComplex(res,0); - out[x]=cmuls(out[x],aa); - } - } - } - } - else - { - n=col*row; - for(u=0;u<row;u++) - { - for(v=0;v<col;v++) - { - x=v*row+u; - out[x]=FloatComplex(0,0); - for(i=0;i<row;i++) - { - temp=FloatComplex(0,0); - mm=FloatComplex(0,0); - for(j=0;j<col;j++) - { - y=j*row+i; - z=(float)(((float)j+1.0/2.0)*(float)v); - q=(float)(M_PI/(float)col); - vv = cos(q*z); - aa = FloatComplex(vv,0); - mm=cmuls(in[y],aa); - temp=cadds(temp,mm); - } - z=(float)(((float)i+1.0/2.0)*(float)u); - q=(float)(M_PI/(float)row); - ff = cos(q*z); - bb = FloatComplex(ff,0); - temp=cmuls(temp,bb); - out[x]=cadds(out[x],temp); - } - if(u==0) - { - vv = 1./sqrt((float)row); - aa = FloatComplex(vv,0); - out[x]=cmuls(out[x],aa); - if(v==0) - { - vv = 1./sqrt((float)col); - aa = FloatComplex(vv,0); - out[x]=cmuls(out[x],aa); - } - else - { - vv = sqrt(2./col); - aa = FloatComplex(vv,0); - out[x]=cmuls(out[x],aa); - } - } - else - { - vv = sqrt(2./row); - aa = FloatComplex(vv,0); - out[x]=cmuls(out[x],aa); - if(v==0) - { - vv = 1./sqrt((float)col); - aa = FloatComplex(vv,0); - out[x]=cmuls(out[x],aa); - } - else - { - vv = sqrt(2./col); - aa = FloatComplex(vv,0); - out[x]=cmuls(out[x],aa); - } - } - } - } - } - } - else if(sign==1) - { - n=col; - if(row==1) - { - res=1./sqrt(n); - ress=sqrt(2./n); - for(u=0;u<row;u++) - { - for(v=0;v<col;v++) - { - x=v*row+u; - out[x]=FloatComplex(0,0); - for(i=0;i<row;i++) - { - for(j=0;j<col;j++) - { - y=row*j+i; - if(y==0) - { - q=res*(cos(((M_PI)*(j)*(v+1./2.))/n)); - aa = FloatComplex(q,0); - out[x]=cadds(out[x],cmuls(in[y],aa)); - } - else - { - q=ress*(cos(((M_PI)*(j)*(v+1./2.))/n)); - aa = FloatComplex(q,0); - out[x]=cadds(out[x],cmuls(in[y],aa)); - } - } - } - } - - } - } - else - { - for(u=0;u<row;u++) - { - for(v=0;v<col;v++) - { - x=v*row+u; - out[x]=FloatComplex(0,0); - for(i=0;i<row;i++) - { - re=0; - mm=FloatComplex(0,0); - temp=FloatComplex(0,0); - for(j=0;j<col;j++) - { - y=row*j+i; - mm=in[j*row+i]; - z=(float)(((float)v+1.0/2.0)*(float)j); - q=(float)(M_PI/(float)col); - vv = cos(q*z); - aa = FloatComplex(vv,0); - mm=cmuls(mm,aa); - if(j==0) - { - vv = 1./sqrt((float)col); - aa = FloatComplex(vv,0); - temp=cadds(temp,cmuls(mm,aa)); - } - else - { - vv = sqrt(2./col); - aa = FloatComplex(vv,0); - temp=cadds(temp,cmuls(mm,aa)); - } - } - z=(float)(((float)u+1.0/2.0)*(float)i); - q=(float)(M_PI/(float)row); - if(i==0) - { - vv = (cos(z*q))*(1./sqrt(row)); - aa = FloatComplex(vv,0); - out[x]=cadds(out[x],cmuls(temp,aa)); - } - else - { - vv = (cos(z*q))*sqrt(2./row); - aa = FloatComplex(vv,0); - out[x]=cadds(out[x],cmuls(temp,aa)); - } - } - } - } - } - } -} diff --git a/2.3-1/src/c/signalProcessing/transforms/dct/ddcta.c b/2.3-1/src/c/signalProcessing/transforms/dct/ddcta.c deleted file mode 100644 index 3802c816..00000000 --- a/2.3-1/src/c/signalProcessing/transforms/dct/ddcta.c +++ /dev/null @@ -1,160 +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: Ukasha Noor - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - -#include "dct.h" -/*#include <fftw3.h>*/ -#include <math.h> - -void ddcta(double *in,int row,int col,int sign,double *out) -{ - int i,j,k,u,v; - int n; - int x,y; - double res,ress; - double re,z,q,m; - if(sign==-1) - { - if(row==1) - { - n=col; - for(u=0;u<row;u++) - { - for(v=0;v<col;v++) - { - x=v*row+u; - out[x]=0; - for(i=0;i<row;i++) - { - for(j=0;j<col;j++) - { - y=row*j+i; - out[x]+=in[y]*(cos(((M_PI)*(y+1-1./2.)*(x))/n)); - } - } - if(x==0) - out[x]*=1./(sqrt(n)); - else - { - double res=2./n; - out[x]*=sqrt(res); - } - } - } - } - else - { - n=col*row; - for(u=0;u<row;u++) - { - for(v=0;v<col;v++) - { - x=v*row+u; - out[x]=0; - for(i=0;i<row;i++) - { - re=0; - for(j=0;j<col;j++) - { - m=(double)in[j*row+i]; - z=(double)(((double)j+1.0/2.0)*(double)v); - q=(double)(M_PI/(double)col); - re+=m*(cos(q*z)); - } - z=(double)(((double)i+1.0/2.0)*(double)u); - q=(double)(M_PI/(double)row); - out[x]+=re*(cos(q*z)); - } - if(u==0) - { - out[x]/=sqrt((double)row); - if(v==0) - out[x]/=sqrt((double)col); - else - out[x]*=sqrt(2./col); - } - else - { - out[x]*=sqrt(2./row); - if(v==0) - out[x]/=sqrt((double)col); - else - out[x]*=sqrt(2./col); - } - } - } - - } - } - else if(sign==1) - { - n=col; - if(row==1) - { - res=1./sqrt(n); - ress=sqrt(2./n); - for(u=0;u<row;u++) - { - for(v=0;v<col;v++) - { - x=v*row+u; - out[x]=0; - for(i=0;i<row;i++) - { - for(j=0;j<col;j++) - { - y=row*j+i; - if(y==0) - out[x]+=res*in[y]*(cos(((M_PI)*(j)*(v+1./2.))/n)); - else - out[x]+=ress*in[y]*(cos(((M_PI)*(j)*(v+1./2.))/n)); - } - } - } - - } - } - else - { - for(u=0;u<row;u++) - { - for(v=0;v<col;v++) - { - x=v*row+u; - out[x]=0; - for(i=0;i<row;i++) - { - re=0; - for(j=0;j<col;j++) - { - y=row*j+i; - m=(double)in[j*row+i]; - z=(double)(((double)v+1.0/2.0)*(double)j); - q=(double)(M_PI/(double)col); - m=m*(cos(q*z)); - if(j==0) - re+=m/sqrt((double)col); - else - re+=m*sqrt(2./col); - } - z=(double)(((double)u+1.0/2.0)*(double)i); - q=(double)(M_PI/(double)row); - if(i==0) - out[x]+=(re*(cos(z*q)))/sqrt((double)row); - else - out[x]+=(re*(cos(z*q))*sqrt(2./row)); - } - } - } - } - } -} diff --git a/2.3-1/src/c/signalProcessing/transforms/dct/sdcta.c b/2.3-1/src/c/signalProcessing/transforms/dct/sdcta.c deleted file mode 100644 index 9f380e8b..00000000 --- a/2.3-1/src/c/signalProcessing/transforms/dct/sdcta.c +++ /dev/null @@ -1,160 +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: Ukasha Noor - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - -#include "dct.h" -/*#include <fftw3.h>*/ -#include <math.h> - -void sdcta(float *in,int row,int col,int sign,float *out) -{ - int i,j,k,u,v; - int n; - int x,y; - float res,ress; - float re,z,q,m; - if(sign==-1) - { - if(row==1) - { - n=col; - for(u=0;u<row;u++) - { - for(v=0;v<col;v++) - { - x=v*row+u; - out[x]=0; - for(i=0;i<row;i++) - { - for(j=0;j<col;j++) - { - y=row*j+i; - out[x]+=in[y]*(cos(((M_PI)*(y+1-1./2.)*(x))/n)); - } - } - if(x==0) - out[x]*=1./(sqrt(n)); - else - { - float res=2./n; - out[x]*=sqrt(res); - } - } - } - } - else - { - n=col*row; - for(u=0;u<row;u++) - { - for(v=0;v<col;v++) - { - x=v*row+u; - out[x]=0; - for(i=0;i<row;i++) - { - re=0; - for(j=0;j<col;j++) - { - m=(float)in[j*row+i]; - z=(float)(((float)j+1.0/2.0)*(float)v); - q=(float)(M_PI/(float)col); - re+=m*(cos(q*z)); - } - z=(float)(((float)i+1.0/2.0)*(float)u); - q=(float)(M_PI/(float)row); - out[x]+=re*(cos(q*z)); - } - if(u==0) - { - out[x]/=sqrt((float)row); - if(v==0) - out[x]/=sqrt((float)col); - else - out[x]*=sqrt(2./col); - } - else - { - out[x]*=sqrt(2./row); - if(v==0) - out[x]/=sqrt((float)col); - else - out[x]*=sqrt(2./col); - } - } - } - - } - } - else if(sign==1) - { - n=col; - if(row==1) - { - res=1./sqrt(n); - ress=sqrt(2./n); - for(u=0;u<row;u++) - { - for(v=0;v<col;v++) - { - x=v*row+u; - out[x]=0; - for(i=0;i<row;i++) - { - for(j=0;j<col;j++) - { - y=row*j+i; - if(y==0) - out[x]+=res*in[y]*(cos(((M_PI)*(j)*(v+1./2.))/n)); - else - out[x]+=ress*in[y]*(cos(((M_PI)*(j)*(v+1./2.))/n)); - } - } - } - - } - } - else - { - for(u=0;u<row;u++) - { - for(v=0;v<col;v++) - { - x=v*row+u; - out[x]=0; - for(i=0;i<row;i++) - { - re=0; - for(j=0;j<col;j++) - { - y=row*j+i; - m=(float)in[j*row+i]; - z=(float)(((float)v+1.0/2.0)*(float)j); - q=(float)(M_PI/(float)col); - m=m*(cos(q*z)); - if(j==0) - re+=m/sqrt((float)col); - else - re+=m*sqrt(2./col); - } - z=(float)(((float)u+1.0/2.0)*(float)i); - q=(float)(M_PI/(float)row); - if(i==0) - out[x]+=(re*(cos(z*q)))/sqrt((float)row); - else - out[x]+=(re*(cos(z*q))*sqrt(2./row)); - } - } - } - } - } -} diff --git a/2.3-1/src/c/signalProcessing/transforms/dct/zdcta.c b/2.3-1/src/c/signalProcessing/transforms/dct/zdcta.c deleted file mode 100644 index 3ae2e333..00000000 --- a/2.3-1/src/c/signalProcessing/transforms/dct/zdcta.c +++ /dev/null @@ -1,230 +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: Ukasha Noor - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - -#include "dct.h" -#include "addition.h" -#include "types.h" -#include "doubleComplex.h" -#include "multiplication.h" -/*#include "matrixMultiplication"*/ -/*#include <fftw3.h>*/ -#include <math.h> - -void zdcta(doubleComplex *in,int row,int col,int sign,doubleComplex *out) -{ - int i,j,k,u,v; - int n; - int x,y; - double res,ress,vv,ff; - double re,z,q,m; - doubleComplex accu = DoubleComplex(0, 0); - doubleComplex temp,mm,aa,bb,cc; - if(sign==-1) - { - if(row==1) - { - n=col; - for(u=0;u<row;u++) - { - for(v=0;v<col;v++) - { - x=v*row+u; - out[x]=DoubleComplex(0,0); - for(i=0;i<row;i++) - { - for(j=0;j<col;j++) - { - y=row*j+i; - vv = cos(((M_PI)*(y+1-1./2.)*(x))/n); - aa = DoubleComplex(vv,0); - temp=zmuls(in[y],aa); - out[x]=zadds(out[x],temp); - } - } - if(x==0) - { - vv = 1./(sqrt(n)); - aa = DoubleComplex(vv,0); - out[x]=zmuls(out[x],aa); - } - else - { - double res=2./n; - res = sqrt(res); - aa = DoubleComplex(res,0); - out[x]=zmuls(out[x],aa); - } - } - } - } - else - { - n=col*row; - for(u=0;u<row;u++) - { - for(v=0;v<col;v++) - { - x=v*row+u; - out[x]=DoubleComplex(0,0); - for(i=0;i<row;i++) - { - temp=DoubleComplex(0,0); - mm=DoubleComplex(0,0); - for(j=0;j<col;j++) - { - y=j*row+i; - z=(double )(((double )j+1.0/2.0)*(double )v); - q=(double )(M_PI/(double )col); - vv = cos(q*z); - aa = DoubleComplex(vv,0); - mm=zmuls(in[y],aa); - temp=zadds(temp,mm); - } - z=(double )(((double )i+1.0/2.0)*(double )u); - q=(double )(M_PI/(double )row); - ff = cos(q*z); - bb = DoubleComplex(ff,0); - temp=zmuls(temp,bb); - out[x]=zadds(out[x],temp); - } - if(u==0) - { - vv = 1./sqrt((double )row); - aa = DoubleComplex(vv,0); - out[x]=zmuls(out[x],aa); - if(v==0) - { - vv = 1./sqrt((double )col); - aa = DoubleComplex(vv,0); - out[x]=zmuls(out[x],aa); - } - else - { - vv = sqrt(2./col); - aa = DoubleComplex(vv,0); - out[x]=zmuls(out[x],aa); - } - } - else - { - vv = sqrt(2./row); - aa = DoubleComplex(vv,0); - out[x]=zmuls(out[x],aa); - if(v==0) - { - vv = 1./sqrt((double )col); - aa = DoubleComplex(vv,0); - out[x]=zmuls(out[x],aa); - } - else - { - vv = sqrt(2./col); - aa = DoubleComplex(vv,0); - out[x]=zmuls(out[x],aa); - } - } - } - } - } - } - else if(sign==1) - { - n=col; - if(row==1) - { - res=1./sqrt(n); - ress=sqrt(2./n); - for(u=0;u<row;u++) - { - for(v=0;v<col;v++) - { - x=v*row+u; - out[x]=DoubleComplex(0,0); - for(i=0;i<row;i++) - { - for(j=0;j<col;j++) - { - y=row*j+i; - if(y==0) - { - q=res*(cos(((M_PI)*(j)*(v+1./2.))/n)); - aa = DoubleComplex(q,0); - out[x]=zadds(out[x],zmuls(in[y],aa)); - } - else - { - q=ress*(cos(((M_PI)*(j)*(v+1./2.))/n)); - aa = DoubleComplex(q,0); - out[x]=zadds(out[x],zmuls(in[y],aa)); - } - } - } - } - - } - } - else - { - for(u=0;u<row;u++) - { - for(v=0;v<col;v++) - { - x=v*row+u; - out[x]=DoubleComplex(0,0); - for(i=0;i<row;i++) - { - re=0; - mm=DoubleComplex(0,0); - temp=DoubleComplex(0,0); - for(j=0;j<col;j++) - { - y=row*j+i; - mm=in[j*row+i]; - z=(double )(((double )v+1.0/2.0)*(double )j); - q=(double )(M_PI/(double )col); - vv = cos(q*z); - aa = DoubleComplex(vv,0); - mm=zmuls(mm,aa); - if(j==0) - { - vv = 1./sqrt((double )col); - aa = DoubleComplex(vv,0); - temp=zadds(temp,zmuls(mm,aa)); - } - else - { - vv = sqrt(2./col); - aa = DoubleComplex(vv,0); - temp=zadds(temp,zmuls(mm,aa)); - } - } - z=(double )(((double )u+1.0/2.0)*(double )i); - q=(double )(M_PI/(double )row); - if(i==0) - { - vv = (cos(z*q))*(1./sqrt(row)); - aa = DoubleComplex(vv,0); - out[x]=zadds(out[x],zmuls(temp,aa)); - } - else - { - vv = (cos(z*q))*sqrt(2./row); - aa = DoubleComplex(vv,0); - out[x]=zadds(out[x],zmuls(temp,aa)); - } - } - } - } - } - } -} diff --git a/2.3-1/src/c/signalProcessing/transforms/idct/cidcta.c b/2.3-1/src/c/signalProcessing/transforms/idct/cidcta.c deleted file mode 100644 index ae98ba19..00000000 --- a/2.3-1/src/c/signalProcessing/transforms/idct/cidcta.c +++ /dev/null @@ -1,118 +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: Ukasha Noor - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - -#include "idct.h" -#include "addition.h" -#include "types.h" -#include "floatComplex.h" -#include "multiplication.h" -/*#include "matrixMultiplication"*/ -/*#include <fftw3.h>*/ -#include <math.h> - -void cidcta(floatComplex *in,int row,int col,floatComplex *out) -{ - int i,j,k,u,v; - int n=col; - int x,y; - float res,ress,vv,ff; - float re,z,q,m; - floatComplex accu = FloatComplex(0, 0); - floatComplex temp,mm,aa,bb; - if(row==1) - { - res=1./sqrt(n); - ress=sqrt(2./n); - for(u=0;u<row;u++) - { - for(v=0;v<col;v++) - { - x=v*row+u; - out[x]=FloatComplex(0,0); - for(i=0;i<row;i++) - { - for(j=0;j<col;j++) - { - y=row*j+i; - if(y==0) - { - q=res*(cos(((M_PI)*(j)*(v+1./2.))/n)); - aa=FloatComplex(q,0); - out[x]=cadds(out[x],cmuls(in[y],aa)); - } - else - { - q=ress*(cos(((M_PI)*(j)*(v+1./2.))/n)); - aa=FloatComplex(q,0); - out[x]=cadds(out[x],cmuls(in[y],aa)); - } - } - } - } - - } - } - else - { - for(u=0;u<row;u++) - { - for(v=0;v<col;v++) - { - x=v*row+u; - out[x]=FloatComplex(0,0); - for(i=0;i<row;i++) - { - re=0; - mm=FloatComplex(0,0); - temp=FloatComplex(0,0); - for(j=0;j<col;j++) - { - y=row*j+i; - mm=in[j*row+i]; - z=(float)(((float)v+1.0/2.0)*(float)j); - q=(float)(M_PI/(float)col); - vv=cos(q*z); - aa=FloatComplex(vv,0); - mm=cmuls(mm,aa); - if(j==0) - { - vv=1./sqrt((float)col); - aa=FloatComplex(vv,0); - temp=cadds(temp,cmuls(mm,aa)); - } - else - { - vv=sqrt(2./col); - aa=FloatComplex(vv,0); - temp=cadds(temp,cmuls(mm,aa)); - } - } - z=(float)(((float)u+1.0/2.0)*(float)i); - q=(float)(M_PI/(float)row); - if(i==0) - { - vv=(cos(z*q))*(1./sqrt(row)); - aa=FloatComplex(vv,0); - out[x]=cadds(out[x],cmuls(temp,aa)); - } - else - { - vv=(cos(z*q))*sqrt(2./row); - aa=FloatComplex(vv,0); - out[x]=cadds(out[x],cmuls(temp,aa)); - } - } - } - } - } -} diff --git a/2.3-1/src/c/signalProcessing/transforms/idct/didcta.c b/2.3-1/src/c/signalProcessing/transforms/idct/didcta.c deleted file mode 100644 index 5f475160..00000000 --- a/2.3-1/src/c/signalProcessing/transforms/idct/didcta.c +++ /dev/null @@ -1,83 +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: Ukasha Noor - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - -#include "idct.h" -/*#include <fftw3.h>*/ -#include <math.h> - -void didcta(double *in,int row,int col,double *out) -{ - int i,j,k,u,v; - int n=col; - int x,y; - double res,ress; - double re,z,q,m; - if(row==1) - { - res=1./sqrt(n); - ress=sqrt(2./n); - for(u=0;u<row;u++) - { - for(v=0;v<col;v++) - { - x=v*row+u; - out[x]=0; - for(i=0;i<row;i++) - { - for(j=0;j<col;j++) - { - y=row*j+i; - if(y==0) - out[x]+=res*in[y]*(cos(((M_PI)*(j)*(v+1./2.))/n)); - else - out[x]+=ress*in[y]*(cos(((M_PI)*(j)*(v+1./2.))/n)); - } - } - } - - } - } - else - { - for(u=0;u<row;u++) - { - for(v=0;v<col;v++) - { - x=v*row+u; - out[x]=0; - for(i=0;i<row;i++) - { - re=0; - for(j=0;j<col;j++) - { - y=row*j+i; - m=(double)in[j*row+i]; - z=(double)(((double)v+1.0/2.0)*(double)j); - q=(double)(M_PI/(double)col); - m=m*(cos(q*z)); - if(j==0) - re+=m/sqrt((double)col); - else - re+=m*sqrt(2./col); - } - z=(double)(((double)u+1.0/2.0)*(double)i); - q=(double)(M_PI/(double)row); - if(i==0) - out[x]+=(re*(cos(z*q)))/sqrt((double)row); - else - out[x]+=(re*(cos(z*q))*sqrt(2./row)); - } - } - } - } -} diff --git a/2.3-1/src/c/signalProcessing/transforms/idct/sidcta.c b/2.3-1/src/c/signalProcessing/transforms/idct/sidcta.c deleted file mode 100644 index 62f85da0..00000000 --- a/2.3-1/src/c/signalProcessing/transforms/idct/sidcta.c +++ /dev/null @@ -1,83 +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: Ukasha Noor - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - -#include "idct.h" -/*#include <fftw3.h>*/ -#include <math.h> - -void sidcta(float *in,int row,int col,float *out) -{ - int i,j,k,u,v; - int n=col; - int x,y; - float res,ress; - float re,z,q,m; - if(row==1) - { - res=1./sqrt(n); - ress=sqrt(2./n); - for(u=0;u<row;u++) - { - for(v=0;v<col;v++) - { - x=v*row+u; - out[x]=0; - for(i=0;i<row;i++) - { - for(j=0;j<col;j++) - { - y=row*j+i; - if(y==0) - out[x]+=res*in[y]*(cos(((M_PI)*(j)*(v+1./2.))/n)); - else - out[x]+=ress*in[y]*(cos(((M_PI)*(j)*(v+1./2.))/n)); - } - } - } - - } - } - else - { - for(u=0;u<row;u++) - { - for(v=0;v<col;v++) - { - x=v*row+u; - out[x]=0; - for(i=0;i<row;i++) - { - re=0; - for(j=0;j<col;j++) - { - y=row*j+i; - m=(float)in[j*row+i]; - z=(float)(((float)v+1.0/2.0)*(float)j); - q=(float)(M_PI/(float)col); - m=m*(cos(q*z)); - if(j==0) - re+=m/sqrt((float)col); - else - re+=m*sqrt(2./col); - } - z=(float)(((float)u+1.0/2.0)*(float)i); - q=(float)(M_PI/(float)row); - if(i==0) - out[x]+=(re*(cos(z*q)))/sqrt((float)row); - else - out[x]+=(re*(cos(z*q))*sqrt(2./row)); - } - } - } - } -} diff --git a/2.3-1/src/c/signalProcessing/transforms/idct/zidcta.c b/2.3-1/src/c/signalProcessing/transforms/idct/zidcta.c deleted file mode 100644 index cc01c966..00000000 --- a/2.3-1/src/c/signalProcessing/transforms/idct/zidcta.c +++ /dev/null @@ -1,118 +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: Ukasha Noor - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ - - -#include "idct.h" -#include "addition.h" -#include "types.h" -#include "doubleComplex.h" -#include "multiplication.h" -/*#include "matrixMultiplication"*/ -/*#include <fftw3.h>*/ -#include <math.h> - -void zidcta(doubleComplex *in,int row,int col,doubleComplex *out) -{ - int i,j,k,u,v; - int n=col; - int x,y; - double res,ress,vv,ff; - double re,z,q,m; - doubleComplex accu = DoubleComplex(0, 0); - doubleComplex temp,mm,aa,bb; - if(row==1) - { - res=1./sqrt(n); - ress=sqrt(2./n); - for(u=0;u<row;u++) - { - for(v=0;v<col;v++) - { - x=v*row+u; - out[x]=DoubleComplex(0,0); - for(i=0;i<row;i++) - { - for(j=0;j<col;j++) - { - y=row*j+i; - if(y==0) - { - q=res*(cos(((M_PI)*(j)*(v+1./2.))/n)); - aa=DoubleComplex(q,0); - out[x]=zadds(out[x],zmuls(in[y],aa)); - } - else - { - q=ress*(cos(((M_PI)*(j)*(v+1./2.))/n)); - aa=DoubleComplex(q,0); - out[x]=zadds(out[x],zmuls(in[y],aa)); - } - } - } - } - - } - } - else - { - for(u=0;u<row;u++) - { - for(v=0;v<col;v++) - { - x=v*row+u; - out[x]=DoubleComplex(0,0); - for(i=0;i<row;i++) - { - re=0; - mm=DoubleComplex(0,0); - temp=DoubleComplex(0,0); - for(j=0;j<col;j++) - { - y=row*j+i; - mm=in[j*row+i]; - z=(double)(((double)v+1.0/2.0)*(double)j); - q=(double)(M_PI/(double)col); - vv=cos(q*z); - aa=DoubleComplex(vv,0); - mm=zmuls(mm,aa); - if(j==0) - { - vv=1./sqrt((double)col); - aa=DoubleComplex(vv,0); - temp=zadds(temp,zmuls(mm,aa)); - } - else - { - vv=sqrt(2./col); - aa=DoubleComplex(vv,0); - temp=zadds(temp,zmuls(mm,aa)); - } - } - z=(double)(((double)u+1.0/2.0)*(double)i); - q=(double)(M_PI/(double)row); - if(i==0) - { - vv=(cos(z*q))*(1./sqrt(row)); - aa=DoubleComplex(vv,0); - out[x]=zadds(out[x],zmuls(temp,aa)); - } - else - { - vv=(cos(z*q))*sqrt(2./row); - aa=DoubleComplex(vv,0); - out[x]=zadds(out[x],zmuls(temp,aa)); - } - } - } - } - } -} diff --git a/2.3-1/src/c/signalProcessing/zpbutt/dzpbutts.c b/2.3-1/src/c/signalProcessing/zpbutt/dzpbutts.c deleted file mode 100644 index 33f22af9..00000000 --- a/2.3-1/src/c/signalProcessing/zpbutt/dzpbutts.c +++ /dev/null @@ -1,33 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ -#include<stdio.h> -#include<math.h> -#include "zpbutt.h" -#define PI 3.14159265 -double dzpbutts(double n,double fl,doubleComplex* out) -{ - double e= PI/(2.0*(n)); - int k; - double rl,cpx,gain; - for(k=1;k<=n;k++) - { - double v=2.0*(double)k+(n)-1.0; - rl=(fl)*cos(e*v); - cpx=(fl)*sin(e*v); - out[k-1]=DoubleComplex(rl,cpx); - } - gain=pow(fl,n); - -return gain; - -} - diff --git a/2.3-1/src/c/signalProcessing/zpbutt/int_zpbutt.h b/2.3-1/src/c/signalProcessing/zpbutt/int_zpbutt.h deleted file mode 100644 index 72eae8a2..00000000 --- a/2.3-1/src/c/signalProcessing/zpbutt/int_zpbutt.h +++ /dev/null @@ -1,19 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_ZPBUTT_H__ -#define __INT_ZPBUTT_H__ - -#define d0d0zpbuttzada(n,fl,out,gain) dzpbutts(n,fl,out,gain) - -#endif /* !INT_ZPBUTT_H__ */ - diff --git a/2.3-1/src/c/signalProcessing/zpch1/dzpch1s.c b/2.3-1/src/c/signalProcessing/zpch1/dzpch1s.c deleted file mode 100644 index ab7b6332..00000000 --- a/2.3-1/src/c/signalProcessing/zpch1/dzpch1s.c +++ /dev/null @@ -1,53 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#include<stdio.h> -#include<math.h> -#include "zpch1.h" -#include "multiplication.h" -#include "conj.h" -#include "abs.h" -#define PI 3.14159265 -double dzpch1s(double N,double e,double wc,doubleComplex* out) -{ - doubleComplex accumulate,tp; - double B,r,R,gain,realVal; - double temp=sqrt(1+e*e); - - B=pow((temp+1)/e,1/N); - - r=wc*((B*B-1)/(2*B)); - R=wc*((B*B+1)/(2*B)); - - int k; - double t1=1; - double t2=0; - accumulate=DoubleComplex(t1,t2); - for(k=0;k<N;k++) - { - double theta; - theta=(PI/2)+((2*k+1)*PI)/(2*N); - double xk,yk; - xk=r*cos(theta); - yk=R*sin(theta); - out[k]=DoubleComplex(xk,yk); - tp=DoubleComplex(xk,yk); - accumulate=zmuls(accumulate,tp); - } - - realVal=zreals(accumulate); - gain=dabss(realVal); - if (N==2*(int)(N/2)) - gain=gain/sqrt(1+e*e); -return gain; - -} - diff --git a/2.3-1/src/c/signalProcessing/zpch1/int_zpch1.h b/2.3-1/src/c/signalProcessing/zpch1/int_zpch1.h deleted file mode 100644 index 8933d1a2..00000000 --- a/2.3-1/src/c/signalProcessing/zpch1/int_zpch1.h +++ /dev/null @@ -1,18 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_ZPCH1_H__ -#define __INT_ZPCH1_H__ - -#define d0d0d0zpch1z2d0(N,e,wc) dzpch1s(N,e,wc) - -#endif /* !INT_ZPCH1_H__! */ diff --git a/2.3-1/src/c/signalProcessing/zpch1/zpch1.h b/2.3-1/src/c/signalProcessing/zpch1/zpch1.h deleted file mode 100644 index fbe850cc..00000000 --- a/2.3-1/src/c/signalProcessing/zpch1/zpch1.h +++ /dev/null @@ -1,28 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __ZPCH1_H__ -#define __ZPCH1_H__ -#include "types.h" -#include "doubleComplex.h" - -#ifdef __cplusplus -extern "C" { -#endif - -double dzpch1s(double N,double e,double wc,doubleComplex* out); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __ZPCH1_H__ */ diff --git a/2.3-1/src/c/signalProcessing/zpch2/dzpch2s.c b/2.3-1/src/c/signalProcessing/zpch2/dzpch2s.c deleted file mode 100644 index 22a46a64..00000000 --- a/2.3-1/src/c/signalProcessing/zpch2/dzpch2s.c +++ /dev/null @@ -1,63 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#include<stdio.h> -#include<math.h> -#include "zpch2.h" -#include "multiplication.h" -#include "abs.h" -#include "division.h" -#define PI 3.14159265 -double dzpch2s(double N, double A, double omegar,doubleComplex* zeros,doubleComplex* poles) -{ - int k,j; - double e,xk,realVal,gain; - doubleComplex accumulate1,accumulate2,tp1,tp2; - accumulate1=DoubleComplex(1,0); - accumulate2=DoubleComplex(1,0); - int ct=0; - for(k=1;k<=N;k++) - { - if(k!=((N+1)/2)) - { - ct++; - double num=PI*(2*k-1); - double den=2*N; - xk=cos(num/den); - double sk=omegar/xk; - zeros[k-1]=DoubleComplex(0,sk); - tp1=DoubleComplex(0,sk); - accumulate1=zmuls(accumulate1,tp1); - } - } - for(j=1;j<=N;j++) - { - double num=PI*(2*j-1); - double den=2*N; - double xk1=num/den; - double Gamma=pow((A+sqrt(A*A-1)),(1/N)); - double alpha=-((Gamma-1/Gamma)/2)*sin(xk1); - double Beta=((Gamma+1/Gamma)/2)*cos(xk1); - double normal=alpha*alpha+Beta*Beta; - poles[j-1]=DoubleComplex((omegar*alpha)/normal,(omegar*Beta)/normal); - tp2=DoubleComplex((omegar*alpha)/normal,(omegar*Beta)/normal); - accumulate2=zmuls(accumulate2,tp2); - } - double qt; - double ra2=zreals(accumulate2); - double ra1=zreals(accumulate1); - qt=dldivs(ra1,ra2); - gain=dabss(qt); - - return gain; - -} - diff --git a/2.3-1/src/c/signalProcessing/zpch2/int_zpch2.h b/2.3-1/src/c/signalProcessing/zpch2/int_zpch2.h deleted file mode 100644 index 683a7614..00000000 --- a/2.3-1/src/c/signalProcessing/zpch2/int_zpch2.h +++ /dev/null @@ -1,18 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __INT_ZPCH2_H__ -#define __INT_ZPCH2_H__ - -#define d0d0d0zpch2z2z2(N,A,omegar,zeros,poles) dzpch2s(N,A,omegar,zeros,poles) - -#endif /* !INT_ZPCH2_H__! */ diff --git a/2.3-1/src/c/signalProcessing/zpch2/zpch2.h b/2.3-1/src/c/signalProcessing/zpch2/zpch2.h deleted file mode 100644 index 0d191d5c..00000000 --- a/2.3-1/src/c/signalProcessing/zpch2/zpch2.h +++ /dev/null @@ -1,28 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ - -#ifndef __ZPCH2_H__ -#define __ZPCH2_H__ -#include "types.h" -#include "doubleComplex.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void dzpch2s(double N, double A, double omegar,doubleComplex* zeros,doubleComplex* poles); - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __ZPCH2_H__ */ diff --git a/2.3-1/src/c/string/ascii/dasciia.c b/2.3-1/src/c/string/ascii/dasciia.c deleted file mode 100644 index d2452880..00000000 --- a/2.3-1/src/c/string/ascii/dasciia.c +++ /dev/null @@ -1,21 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ -#include<stdio.h> -#include "ascii.h" -void dasciia(double* inp,int size,char* oup) -{ - int i; - for(i=0;i<size;i++) - { - oup[i]=(char)inp[i]; - } -} diff --git a/2.3-1/src/c/string/ascii/gasciia.c b/2.3-1/src/c/string/ascii/gasciia.c deleted file mode 100644 index ec11d6e2..00000000 --- a/2.3-1/src/c/string/ascii/gasciia.c +++ /dev/null @@ -1,26 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in -*/ -#include<stdio.h> -/* This is the "asciiconv" function which converts the given string - into its ascii equivalent. -*/ -#include "ascii.h" -void gasciia(char *str,int size,int* oup) -{ - int i; - for(i=0;i<size;i++) - { - *(oup+i)=(int)str[i]; - } - -} - diff --git a/2.3-1/src/c/string/disp/ddisph.c b/2.3-1/src/c/string/disp/ddisph.c index 71cda9f4..b36ecb80 100644 --- a/2.3-1/src/c/string/disp/ddisph.c +++ b/2.3-1/src/c/string/disp/ddisph.c @@ -22,7 +22,7 @@ double ddisph (double* in, int rows, int columns, int levels){ { for (j=0;j<columns;j++) { - printf (" %1.20f ", in[i+j*rows+k*columns*rows]); + printf (" %e ", in[i+j*rows+k*columns*rows]); } printf("\n"); } diff --git a/2.3-1/src/c/string/disp/ddisps.c b/2.3-1/src/c/string/disp/ddisps.c index d1b4ef80..513f8ee1 100644 --- a/2.3-1/src/c/string/disp/ddisps.c +++ b/2.3-1/src/c/string/disp/ddisps.c @@ -13,6 +13,6 @@ #include "disp.h" double ddisps (double in) { - printf (" %1.20f \n", in); + printf (" %e \n", in); return 0; } diff --git a/2.3-1/src/c/string/disp/zdispa.c b/2.3-1/src/c/string/disp/zdispa.c index bc71de4b..94b24e98 100644 --- a/2.3-1/src/c/string/disp/zdispa.c +++ b/2.3-1/src/c/string/disp/zdispa.c @@ -16,7 +16,7 @@ double zdispa (doubleComplex* in, int rows, int columns){ int i = 0,j = 0; for (i = 0; i < rows; ++i) { - for (j=0;j<columns;j++) printf(" %1.20lf + %1.20lfi " ,zreals(in[i+j*rows]) ,zimags(in[i+j*rows])); + for (j=0;j<columns;j++) printf(" %e + %ei " ,zreals(in[i+j*rows]) ,zimags(in[i+j*rows])); printf("\n"); } return 0; diff --git a/2.3-1/src/c/string/disp/zdisps.c b/2.3-1/src/c/string/disp/zdisps.c index c4ec137f..4a040cd7 100644 --- a/2.3-1/src/c/string/disp/zdisps.c +++ b/2.3-1/src/c/string/disp/zdisps.c @@ -14,6 +14,6 @@ double zdisps (doubleComplex in) { - printf(" %1.20f + %1.20fi \n" ,zreals(in) ,zimags(in)); + printf(" %e + %ei \n" ,zreals(in) ,zimags(in)); return 0; } diff --git a/2.3-1/src/c/string/includes/ascii.h b/2.3-1/src/c/string/includes/ascii.h deleted file mode 100644 index fcf969da..00000000 --- a/2.3-1/src/c/string/includes/ascii.h +++ /dev/null @@ -1,27 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#ifndef __ASCII_H__ -#define __ASCII_H__ -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -void gasciia(char* str,int size,int* oup); -void dasciia(double* inp,int size,char* oup); - -#ifdef __cplusplus -}/* extern "C" */ -#endif - -#endif /*___ASCII_H__*/ diff --git a/2.3-1/src/c/string/includes/strchr.h b/2.3-1/src/c/string/includes/strchr.h deleted file mode 100644 index 7e306413..00000000 --- a/2.3-1/src/c/string/includes/strchr.h +++ /dev/null @@ -1,25 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#ifndef __STRCHR_H__ -#define __STRCHR_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -void gstrchra(char* str,int size, char* key,int size2, char* out); - -#ifdef __cplusplus -}/* extern "C" */ -#endif - -#endif /*__STRCHR_H__*/ diff --git a/2.3-1/src/c/string/includes/strcspn.h b/2.3-1/src/c/string/includes/strcspn.h deleted file mode 100644 index aa91fb47..00000000 --- a/2.3-1/src/c/string/includes/strcspn.h +++ /dev/null @@ -1,26 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#ifndef __STRCSPN_H__ -#define __STRCSPN_H__ -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -uint8 gstrcspna(char* str1,int size1,char* str2,int size2); - -#ifdef __cplusplus -}/* extern "C" */ -#endif - -#endif /* __STRCSPN_H */ diff --git a/2.3-1/src/c/string/includes/strncpy.h b/2.3-1/src/c/string/includes/strncpy.h deleted file mode 100644 index f2aa705b..00000000 --- a/2.3-1/src/c/string/includes/strncpy.h +++ /dev/null @@ -1,25 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#ifndef __STRNCPY_H__ -#define __STRNCPY_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -void gstrncpya(char* str,int size,double key,char* oup); - -#ifdef __cplusplus -}/* extern "C" */ -#endif - -#endif /*__STRNCPY_H__*/ diff --git a/2.3-1/src/c/string/includes/strspn.h b/2.3-1/src/c/string/includes/strspn.h deleted file mode 100644 index 427caa4c..00000000 --- a/2.3-1/src/c/string/includes/strspn.h +++ /dev/null @@ -1,26 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#ifndef __STRSPN_H__ -#define __STRSPN_H__ -#include "types.h" - -#ifdef __cplusplus -extern "C" { -#endif - -uint8 gstrspna(char* str1,int size1,char* str2,int size2); - -#ifdef __cplusplus -}/* extern "C" */ -#endif - -#endif /* __STRSPN_H */ diff --git a/2.3-1/src/c/string/interfaces/int_ascii.h b/2.3-1/src/c/string/interfaces/int_ascii.h deleted file mode 100644 index 87b1b125..00000000 --- a/2.3-1/src/c/string/interfaces/int_ascii.h +++ /dev/null @@ -1,26 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#ifndef __INT_ASCII_H__ -#define __INT_ASCII_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -#define g2asciiu82(str,size,oup) gasciia(str,size[1],oup) -#define d2asciig2(inp,size,oup) dasciia(inp,size[1],oup) - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /*__INT_ASCII_H__*/ diff --git a/2.3-1/src/c/string/interfaces/int_strchr.h b/2.3-1/src/c/string/interfaces/int_strchr.h deleted file mode 100644 index 8747545b..00000000 --- a/2.3-1/src/c/string/interfaces/int_strchr.h +++ /dev/null @@ -1,25 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#ifndef __INT_STRCHR_H__ -#define __INT_STRCHR_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -#define g2g2strchrg2(str,size,key,size2,out) gstrchra(str,size[1],key,size2[1],out) - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /*__INT_STRCHR_H__*/ diff --git a/2.3-1/src/c/string/interfaces/int_strcspn.h b/2.3-1/src/c/string/interfaces/int_strcspn.h deleted file mode 100644 index 74c6379f..00000000 --- a/2.3-1/src/c/string/interfaces/int_strcspn.h +++ /dev/null @@ -1,25 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#ifndef __INT_STRCSPN_H__ -#define __INT_STRCSPN_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -#define g2g2strcspnu80(str1,size1,str2,size2) gstrcspna(str1,size1[1],str2,size2[1]) - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __INT_STRCSPN_H__*/ diff --git a/2.3-1/src/c/string/interfaces/int_strncpy.h b/2.3-1/src/c/string/interfaces/int_strncpy.h deleted file mode 100644 index e7ffdb42..00000000 --- a/2.3-1/src/c/string/interfaces/int_strncpy.h +++ /dev/null @@ -1,26 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#ifndef __INT_STRNCPY_H__ -#define __INT_STRNCPY_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -#define g2d0strncpyg2(str,size,key,oup) gstrncpya(str,size[1],key,oup) - -#ifdef __cplusplus -} /* extern "C"*/ -#endif - -#endif /*__INT_STRNCPY_H__*/ - diff --git a/2.3-1/src/c/string/interfaces/int_strspn.h b/2.3-1/src/c/string/interfaces/int_strspn.h deleted file mode 100644 index e4b06f72..00000000 --- a/2.3-1/src/c/string/interfaces/int_strspn.h +++ /dev/null @@ -1,25 +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: Ankit Raj - Organization: FOSSEE, IIT Bombay - Email: toolbox@scilab.in - */ -#ifndef __INT_STRSPN_H__ -#define __INT_STRSPN_H__ - -#ifdef __cplusplus -extern "C" { -#endif - -#define g2g2strspnu80(str1,size1,str2,size2) gstrspna(str1,size1[1],str2,size2[1]) - -#ifdef __cplusplus -} /* extern "C" */ -#endif - -#endif /* __INT_STRSPN_H__*/ diff --git a/2.3-1/src/c/string/strcspn/gstrcspna.c b/2.3-1/src/c/string/strcspn/gstrcspna.c deleted file mode 100644 index b611fff8..00000000 --- a/2.3-1/src/c/string/strcspn/gstrcspna.c +++ /dev/null @@ -1,32 +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 - Organization: FOSSEE, IIT Bombay - Author: Ankit Raj - Email: toolbox@scilab.in -*/ -#include<stdio.h> -#include<string.h> -#include "strcspn.h" -uint8 gstrcspna(char *str1,int size1,char *str2,int size2) -{ - int ind,i,j; - - for(i=0;i<=size1;i++) - { - for(j=0;j<=size2;j++) - { - if(str2[j]==str1[i]) - { - ind=j; - break; - } - } - } - return (ind+1); -} - diff --git a/2.3-1/src/c/string/strncpy/gstrncpya.c b/2.3-1/src/c/string/strncpy/gstrncpya.c deleted file mode 100644 index 92801985..00000000 --- a/2.3-1/src/c/string/strncpy/gstrncpya.c +++ /dev/null @@ -1,25 +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 - Organization: FOSSEE, IIT Bombay - Author: Ankit Raj - Email: toolbox@scilab.in -*/ -#include<stdio.h> -#include "strncpy.h" -void gstrncpya(char *str,int size,double key,char *oup) -{ - int j; - char c; - for(j=0;j<key;j++) - { - c=str[j]; - oup[j]=c; - } -} - - diff --git a/2.3-1/src/c/string/strspn/gstrspna.c b/2.3-1/src/c/string/strspn/gstrspna.c deleted file mode 100644 index af1acbb8..00000000 --- a/2.3-1/src/c/string/strspn/gstrspna.c +++ /dev/null @@ -1,44 +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 - Organization: FOSSEE, IIT Bombay - Author: Ankit Raj - Email: toolbox@scilab.in -*/ -#include<stdio.h> -#include "strspn.h" - -int maxg(int a,int b){ - if(a>b) return a; - return b; -} -uint8 gstrspna(char *str1,int size1,char *str2,int size2) -{ - int i,j,ct=0,k=0,m=0; - for(i=0;i<size2;i++) - { - if(str1[0]==str2[i]) - { - k=i; - ct=0; - j=0; - while(str1[j]==str2[k]) - { - ct++; - j++; - k++; - if(j >= size1) break; - } - if(j==size1) - { - ct=ct-1; - } - m = maxg(m,ct); - } - } -return m; -} |