summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--jar/scilab_en_US_help.jarbin11210 -> 11210 bytes
-rw-r--r--macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci4
-rw-r--r--macros/findDeps/getAllSources.sci1
-rw-r--r--src/c/matrixOperations/includes/matrix.h4
-rw-r--r--src/c/matrixOperations/interfaces/int_matrix.h7
-rw-r--r--src/c/matrixOperations/matrix/zmatrixa.c33
6 files changed, 46 insertions, 3 deletions
diff --git a/jar/scilab_en_US_help.jar b/jar/scilab_en_US_help.jar
index f1548e3..c39272b 100644
--- a/jar/scilab_en_US_help.jar
+++ b/jar/scilab_en_US_help.jar
Binary files differ
diff --git a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci b/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
index a9a2635..c203ba7 100644
--- a/macros/ToolInitialization/INIT_FillSCI2LibCDirs.sci
+++ b/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/macros/findDeps/getAllSources.sci b/macros/findDeps/getAllSources.sci
index 7e9dcfd..2124da9 100644
--- a/macros/findDeps/getAllSources.sci
+++ b/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/src/c/matrixOperations/includes/matrix.h b/src/c/matrixOperations/includes/matrix.h
index af9e09e..dbb0e22 100644
--- a/src/c/matrixOperations/includes/matrix.h
+++ b/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/src/c/matrixOperations/interfaces/int_matrix.h b/src/c/matrixOperations/interfaces/int_matrix.h
index e4a39da..f69ba11 100644
--- a/src/c/matrixOperations/interfaces/int_matrix.h
+++ b/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/src/c/matrixOperations/matrix/zmatrixa.c b/src/c/matrixOperations/matrix/zmatrixa.c
new file mode 100644
index 0000000..5e5651b
--- /dev/null
+++ b/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");
+ }
+}