scilab: test *matrix, size) array typemaps

This commit is contained in:
Simon Marchetto 2014-03-26 14:39:34 +01:00
commit a4979d8d7e
3 changed files with 149 additions and 96 deletions

View file

@ -3,8 +3,10 @@
%include matrix.i
%define %use_matrix_apply(TYPE...)
%apply (TYPE *matrixIn, int matrixInRowCount, int matrixInColCount) { (TYPE *inputMatrix, int nbRow, int nbCol) }
%apply (TYPE **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) { (TYPE **resultMatrix, int *nbRowRes, int *nbColRes) }
%apply (TYPE *matrixIn, int matrixInRowCount, int matrixInColCount) { (TYPE *matrix, int nbRow, int nbCol) }
%apply (TYPE **matrixOut, int *matrixOutRowCount, int *matrixOutColCount) { (TYPE **matrixRes, int *nbRowRes, int *nbColRes) }
%apply (TYPE *matrixIn, int matrixInSize) { (TYPE *matrix, int size) }
%apply (TYPE **matrixOut, int *matrixOutSize) { (TYPE **matrixRes, int *sizeRes) }
%enddef
%use_matrix_apply(int);
@ -14,113 +16,138 @@
%inline %{
// int and double matrix functions
template<typename T> T in_matrix_func(T *inputMatrix, int nbRow, int nbCol) {
/*
* (T *matrixIn, int matrixInSize) pattern functions
*/
template<typename T> T in_matrix_size(T *matrix, int size) {
T sum = 0;
int i;
for (i=0; i<nbRow*nbCol; i++)
sum += inputMatrix[i];
for (i = 0; i < size; i++)
sum += matrix[i];
return sum;
}
template<typename T> void out_matrix_func(T **resultMatrix, int *nbRowRes, int *nbColRes) {
template<typename T> void out_matrix_size(T **matrixRes, int *sizeRes) {
int size;
int i;
*nbRowRes = 3;
*nbColRes = 2;
size = (*nbRowRes) * (*nbColRes);
*resultMatrix = (T*) malloc(size * sizeof(T));
for (i=0; i<size; i++)
(*resultMatrix)[i] = i;
*sizeRes = 6;
*matrixRes = (T*) malloc(*sizeRes * sizeof(T));
for (i = 0; i < *sizeRes; i++)
(*matrixRes)[i] = i;
}
template<typename T> void inout_matrix_func(T *inputMatrix, int nbRow, int nbCol, T **resultMatrix, int *nbRowRes, int *nbColRes) {
template<typename T> void inout_matrix_size(T *matrix, int size, T **matrixRes, int *sizeRes) {
int i;
int size = nbRow * nbCol;
*nbRowRes = nbRow;
*nbColRes = nbCol;
*resultMatrix = (T*) malloc(size * sizeof(T));
for (i=0; i<size; i++) {
(*resultMatrix)[i] = inputMatrix[i] * inputMatrix[i];
*sizeRes = size;
*matrixRes = (T*) malloc(size * sizeof(T));
for (i = 0; i < size; i++) {
(*matrixRes)[i] = matrix[i] * matrix[i];
}
}
// char* matrix functions
template<> char* in_matrix_func(char **inputMatrix, int nbRow, int nbCol) {
char *s = (char *) malloc(nbRow * nbCol * sizeof(char) + 1);
/*
* (char **matrixIn, int matrixInSize) pattern functions
*/
template<> char* in_matrix_size(char **matrix, int size) {
char *s = (char *) calloc(size + 1, sizeof(char));
int i;
for (i=0; i<nbRow*nbCol; i++)
strcat(s, inputMatrix[i]);
for (i = 0; i < size; i++)
strcat(s, matrix[i]);
return s;
}
template<> void out_matrix_func(char ***resultMatrix, int *nbRowRes, int *nbColRes) {
int size;
template<> void out_matrix_size(char ***matrixRes, int *sizeRes) {
char *s;
int i;
*nbRowRes = 3;
*nbColRes = 2;
size = (*nbRowRes) * (*nbColRes);
*resultMatrix = (char **) malloc(size * sizeof(char *));
for (i=0; i<size; i++) {
*sizeRes = 6;
*matrixRes = (char **) malloc(*sizeRes * sizeof(char *));
for (i = 0; i < *sizeRes; i++) {
s = (char *) malloc(sizeof(char)+1);
sprintf(s, "%c", char(65 + i));
(*resultMatrix)[i] = s;
(*matrixRes)[i] = s;
}
}
template<> void inout_matrix_func(char **inputMatrix, int nbRow, int nbCol, char ***resultMatrix, int *nbRowRes, int *nbColRes) {
template<> void inout_matrix_size(char **matrix, int size,
char ***matrixRes, int *sizeRes) {
int i;
char *s;
int size = nbRow * nbCol;
*nbRowRes = nbRow;
*nbColRes = nbCol;
*resultMatrix = (char **) malloc(size * sizeof(char* ));
for (i=0; i<size; i++) {
s = (char *) malloc((2 * strlen(inputMatrix[i]) + 1) * sizeof(char));
sprintf(s, "%s%s", inputMatrix[i], inputMatrix[i]);
(*resultMatrix)[i] = s;
*sizeRes = size;
*matrixRes = (char **) malloc(*sizeRes * sizeof(char* ));
for (i = 0; i < *sizeRes; i++) {
s = (char *) malloc((2 * strlen(matrix[i]) + 1) * sizeof(char));
sprintf(s, "%s%s", matrix[i], matrix[i]);
(*matrixRes)[i] = s;
}
}
// bool matrix functions
template<> bool in_matrix_func(bool *inputMatrix, int nbRow, int nbCol) {
/*
* (bool **matrixIn, int matrixInSize) pattern functions
*/
template<> bool in_matrix_size(bool *matrix, int size) {
bool b = true;
int i;
b = inputMatrix[0];
for (i=1; i<nbRow*nbCol; i++)
b = b ^ inputMatrix[i];
b = matrix[0];
for (i = 1; i < size; i++)
b = b ^ matrix[i];
return b;
}
template<> void out_matrix_func(bool **resultMatrix, int *nbRowRes, int *nbColRes) {
int size;
template<> void out_matrix_size(bool **matrixRes, int *sizeRes) {
int i;
*nbRowRes = 3;
*nbColRes = 2;
size = (*nbRowRes) * (*nbColRes);
*resultMatrix = (bool*) malloc(size * sizeof(bool));
for (i=0; i<size; i++) {
(*resultMatrix)[i] = i % 2 == 0;
*sizeRes = 6;
*matrixRes = (bool*) malloc(*sizeRes * sizeof(bool));
for (i = 0; i < *sizeRes; i++) {
(*matrixRes)[i] = i % 2 == 0;
}
}
template<> void inout_matrix_func(bool *inputMatrix, int nbRow, int nbCol, bool **resultMatrix, int *nbRowRes, int *nbColRes) {
template<> void inout_matrix_size(bool *matrix, int size,
bool **matrixRes, int *sizeRes) {
int i;
int size = nbRow * nbCol;
*nbRowRes = nbRow;
*nbColRes = nbCol;
*resultMatrix = (bool*) malloc(size * sizeof(bool));
for (i=0; i<size; i++) {
(*resultMatrix)[i] = inputMatrix[i]==1?0:1;
*sizeRes = size;
*matrixRes = (bool*) malloc(*sizeRes * sizeof(bool));
for (i = 0; i < *sizeRes; i++) {
(*matrixRes)[i] = matrix[i] == 1 ? 0 : 1;
}
}
/*
* (T *matrixIn, int matrixInRowCount, int matrixInColCount) pattern functions
*/
template<typename T> T in_matrix_dims(T *matrix, int nbRow, int nbCol) {
return in_matrix_size(matrix, nbRow * nbCol);
}
template<typename T> void out_matrix_dims(T **matrixRes, int *nbRowRes, int *nbColRes) {
int size = 0;
out_matrix_size(matrixRes, &size);
*nbRowRes = 3;
*nbColRes = 2;
}
template<typename T> void inout_matrix_dims(T *matrix, int nbRow, int nbCol,
T **matrixRes, int *nbRowRes, int *nbColRes) {
*nbRowRes = nbRow;
*nbColRes = nbCol;
int sizeRes = 0;
inout_matrix_size(matrix, nbRow * nbCol, matrixRes, &sizeRes);
}
%}
%define %instantiate_matrix_template_functions(NAME, TYPE...)
%template(in_ ## NAME ## _matrix_func) in_matrix_func<TYPE>;
%template(out_ ## NAME ## _matrix_func) out_matrix_func<TYPE>;
%template(inout_ ## NAME ## _matrix_func) inout_matrix_func<TYPE>;
%template(in_ ## NAME ## _matrix_dims) in_matrix_dims<TYPE>;
%template(out_ ## NAME ## _matrix_dims) out_matrix_dims<TYPE>;
%template(inout_ ## NAME ## _matrix_dims) inout_matrix_dims<TYPE>;
%template(in_ ## NAME ## _matrix_size) in_matrix_size<TYPE>;
%template(out_ ## NAME ## _matrix_size) out_matrix_size<TYPE>;
%template(inout_ ## NAME ## _matrix_size) inout_matrix_size<TYPE>;
%enddef
%instantiate_matrix_template_functions(int, int);