Float complex for matrix reshape

6 files changed, 46 insertions, 3 deletions

diff --git a/2.3-1/jar/scilab_en_US_help.jar b/2.3-1/jar/scilab_en_US_help.jar
index f1548e3f..c39272b8 100644
--- a/2.3-1/jar/scilab_en_US_help.jar
+++ b/2.3-1/jar/scilab_en_US_help.jar
diff --git a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index a9a26353..c203ba70 100644
--- a/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/2.3-1/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
@@ -6911,8 +6911,8 @@ PrintStringInfo('d2d0d0'+ArgSeparator+'d2',ClassFileName,'file','y');
 PrintStringInfo('d2s0s0'+ArgSeparator+'d2',ClassFileName,'file','y');

 PrintStringInfo('d2u160u160'+ArgSeparator+'d2',ClassFileName,'file','y');

 PrintStringInfo('d2u80u80'+ArgSeparator+'d2',ClassFileName,'file','y');

-PrintStringInfo('u160'+ArgSeparator+'u160',ClassFileName,'file','y');

-PrintStringInfo('i160'+ArgSeparator+'i160',ClassFileName,'file','y');

+PrintStringInfo('z2d0d0'+ArgSeparator+'z2',ClassFileName,'file','y');

+PrintStringInfo('z2s0s0'+ArgSeparator+'z2',ClassFileName,'file','y');

 

 PrintStringInfo('s2d0d0'+ArgSeparator+'s2',ClassFileName,'file','y');

 PrintStringInfo('s2s0s0'+ArgSeparator+'s2',ClassFileName,'file','y');

diff --git a/2.3-1/macros/findDeps/getAllSources.sci b/2.3-1/macros/findDeps/getAllSources.sci
index 7e9dcfdc..2124da9e 100644
--- a/2.3-1/macros/findDeps/getAllSources.sci
+++ b/2.3-1/macros/findDeps/getAllSources.sci
@@ -315,6 +315,7 @@ function allSources = getAllSources(SharedInfo)
       "src/c/matrixOperations/matrix/dmatrixa.c"
       "src/c/matrixOperations/matrix/smatrixa.c"
       "src/c/matrixOperations/matrix/u16matrixa.c"
+      "src/c/matrixOperations/matrix/zmatrixa.c"
       "src/c/matrixOperations/triu/dtriua.c"
       "src/c/matrixOperations/triu/striua.c"
       "src/c/matrixOperations/triu/u8triua.c"
diff --git a/2.3-1/src/c/matrixOperations/includes/matrix.h b/2.3-1/src/c/matrixOperations/includes/matrix.h
index af9e09e5..dbb0e223 100644
--- a/2.3-1/src/c/matrixOperations/includes/matrix.h
+++ b/2.3-1/src/c/matrixOperations/includes/matrix.h
@@ -15,7 +15,7 @@
 #define __MATRIX_H__
 
 #include "types.h"
-#include "uint16.h"
+#include "doubleComplex.h"
 
 #ifdef  __cplusplus
 extern "C" {
@@ -24,6 +24,8 @@ extern "C" {
 void dmatrixa(double* , int , int , int , int , double*);
 void smatrixa( float* , int , int , int , int , float*);
 void u16matrixa(uint16 *, int , int , int , int ,uint16 *out);
+void zmatrixa(doubleComplex *, int , int , int , int  ,doubleComplex *);
+
 
 #ifdef  __cplusplus
 } /* extern "C" */
diff --git a/2.3-1/src/c/matrixOperations/interfaces/int_matrix.h b/2.3-1/src/c/matrixOperations/interfaces/int_matrix.h
index e4a39dae..f69ba116 100644
--- a/2.3-1/src/c/matrixOperations/interfaces/int_matrix.h
+++ b/2.3-1/src/c/matrixOperations/interfaces/int_matrix.h
@@ -33,6 +33,13 @@ extern "C" {
 //#define s2u160u160matrixs2(in1, size, in2, in3, out )     smatrixa(in1, size[0], size[1], in2, in3, out)
 //#define s2u80u80matrixs2(in1, size, in2, in3, out )       smatrixa(in1, size[0], size[1], in2, in3, out)
 
+#define z2d0d0matrixz2(in1, size, in2, in3, out )         zmatrixa(in1, size[0], size[1], in2, in3, out)
+#define z2s0s0matrixz2(in1, size, in2, in3, out )         zmatrixa(in1, size[0], size[1], in2, in3, out)
+//#define s2u160u160matrixs2(in1, size, in2, in3, out )     smatrixa(in1, size[0], size[1], in2, in3, out)
+//#define s2u80u80matrixs2(in1, size, in2, in3, out )       smatrixa(in1, size[0], size[1], in2, in3, out)
+
+
+
 
 
 #ifdef  __cplusplus
diff --git a/2.3-1/src/c/matrixOperations/matrix/zmatrixa.c b/2.3-1/src/c/matrixOperations/matrix/zmatrixa.c
new file mode 100644
index 00000000..5e5651b1
--- /dev/null
+++ b/2.3-1/src/c/matrixOperations/matrix/zmatrixa.c
@@ -0,0 +1,33 @@
+/* Copyright (C) 2016 - IIT Bombay - FOSSEE
+
+ This file must be used under the terms of the CeCILL.
+ This source file is licensed as described in the file COPYING, which
+ you should have received as part of this distribution.  The terms
+ are also available at
+ http://www.cecill.info/licences/Licence_CeCILL_V2-en.txt
+ Author: Abhinav Dronamraju
+ Organization: FOSSEE, IIT Bombay
+ Email: toolbox@scilab.in
+*/
+ 
+/*Function returns cumulative sum of members of array/matrix*/
+
+#include "matrix.h"
+#include "types.h"
+#include "doubleComplex.h"
+
+void zmatrixa(doubleComplex *in, int irow, int icolumn, int orow, int ocolumn ,doubleComplex *out)
+{
+	int i;
+		if(irow*icolumn==orow*ocolumn)
+			{
+                            for(i=0;i<irow*icolumn ; i++)
+				{
+					out[i]=in[i];
+				}
+			}
+		else
+			{
+				printf("The given dimensions are not valid for matrix reshaping");
+			}
+}