Pulled from upstream master

3 files changed, 38 insertions, 57 deletions

diff --git a/2.3-1/src/c/matrixOperations/includes/norm.h b/2.3-1/src/c/matrixOperations/includes/norm.h
index dc9d351f..4fe3872c 100644
--- a/2.3-1/src/c/matrixOperations/includes/norm.h
+++ b/2.3-1/src/c/matrixOperations/includes/norm.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
+ Author: Sandeep Gupta
  Organization: FOSSEE, IIT Bombay
  Email: toolbox@scilab.in
  */
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/includes/toeplitz.h b/2.3-1/src/c/matrixOperations/includes/toeplitz.h
new file mode 100644
index 00000000..7384b43c
--- /dev/null
+++ b/2.3-1/src/c/matrixOperations/includes/toeplitz.h
@@ -0,0 +1,37 @@
+ /* 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: Brijesh Gupta C R
+ Organization: FOSSEE, IIT Bombay
+ Email: toolbox@scilab.in
+ */
+
+#ifndef __TOEPLITZ_H__
+#define __TOEPLITZ_H__
+#include "types.h"
+#include "doubleComplex.h"
+#include "floatComplex.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+void dtoeplitza(double* inp1,int size1,double* inp2,int size2,double* oup);
+void u8toeplitza(uint8* inp1,int size1,uint8* inp2,int size2,uint8* oup);
+void u16toeplitza(uint16* inp1,int size1,uint16* inp2,int size2,uint16* oup);
+void ztoeplitza(doubleComplex* inp1,int size1,doubleComplex* inp2,int size2,doubleComplex* oup);
+void gtoeplitza(char* inp1,int size1,char* inp2,int size2,char* oup);
+void stoeplitza(float* inp1,int size1,float* inp2,int size2,float* oup);
+void ctoeplitza(floatComplex* inp1,int size1,floatComplex* inp2,int size2,floatComplex* oup);
+void i8toeplitza(int8* inp1,int size1,int8* inp2,int size2,int8* oup);
+void i16toeplitza(int16* inp1,int size1,int16* inp2,int size2,int16* oup);
+
+#ifdef  __cplusplus 
+} /* extern "C" */
+#endif
+
+#endif /*__TOEPLITZ_H__*/