jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update testing code in examples/scilab/matrix2

Browse source
This commit is contained in:
Yung Lee 2013-04-29 20:23:04 +08:00
commit ff10bf04b8
3 changed files with 41 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Examples/scilab/matrix2/matrixlib.c
View file

@ -1,3 +1,4 @@
#include <stdlib.h>
double sumitems(double *first, int nbRow, int nbCol) { double sumitems(double *first, int nbRow, int nbCol) {
int i; int i;
double total; double total;
@ -14,14 +15,16 @@ void sumitems_argoutput(double *first, int nbRow, int nbCol,double** result,int*
*result=malloc(nbRow*nbCol*sizeof(double)); *result=malloc(nbRow*nbCol*sizeof(double));
for (i=0; i<(nbRow*nbCol); i++) { for (i=0; i<(nbRow*nbCol); i++) {
(*result)[i]=first[i]+first[i]; (*result)[i]=first[i]+first[i];
} }
return; return;
} }
double* getValues(int *numberOfRow, int *numberOfCol) { double* getValues(int *numberOfRow, int *numberOfCol) {
*numberOfRow=23; *numberOfCol=3; double *tempMatrix ;
double *tempMatrix = (double*)malloc(sizeof(double) * *numberOfRow * *numberOfCol);
int i; int i;
*numberOfRow=23; *numberOfCol=3;
tempMatrix= (double*)malloc(sizeof(double )* *numberOfRow * *numberOfCol);
for (i=0; i<((*numberOfRow)*(*numberOfCol)); i++) { for (i=0; i<((*numberOfRow)*(*numberOfCol)); i++) {
tempMatrix[i]=i*2; tempMatrix[i]=i*2;
} }

39
Examples/scilab/matrix2/matrixlib.i
View file

@ -2,12 +2,41 @@
%include matrix.i %include matrix.i
%apply (double* matrixAsInput,int rows,int cols){(double *first, int nbRow, int nbCol)} %apply (double* matrixAsInput,int rows,int cols){(double *first, int nbRow, int nbCol)}
%apply (double** matrixAsArgOutput,int* rows,int* cols){(double **result,int* nbRowOut,int* nbColOut)} %apply (double** matrixAsArgOutput,int* rows,int* cols){(double **result,int* nbRowOut,int* nbColOut)}
%inline {
extern void sumitems_argoutput(double *first, int nbRow, int nbCol,double **result,int* nbRowOut,int* nbColOut); %typemap(out) (double*)(int *nRow, int *nCol)
extern double* getValues(int *numberOfRow, int *numberOfCol); {
SciErr sciErr;
sciErr = createMatrixOfDouble(pvApiCtx, Rhs+$result, *nRow, *nCol, (double *)$1);
if (sciErr.iErr) {
printError(&sciErr, 0);
return 0;
}
AssignOutputVariable(pvApiCtx, outputPosition) = Rhs+$result;
free($1);
}
%typemap (in,numinputs=0) (int *numberOfRow, int *numberOfCol)
{
}
%typemap(arginit) (int *numberOfRow, int *numberOfCol)
{
$1 =(int*)malloc(sizeof(int));
$2 =(int*)malloc(sizeof(int));
nRow =$1;
nCol =$2;
}
%typemap(freearg) (int *numberOfRow, int *numberOfCol)
{
free($1);
free($2);
}
%inline {
extern void sumitems_argoutput(double *first, int nbRow, int nbCol,double **result,int* nbRowOut,int* nbColOut);
extern double* getValues(int *numberOfRow, int *numberOfCol);
} }

3
Examples/scilab/matrix2/runme.sci
View file

@ -2,8 +2,7 @@
exec loader.sce exec loader.sce
myMatrix=[ 103 3 1 12;0 0 2043 1]; myMatrix=[ 103 3 1 12;0 0 2043 1];
sumitems(myMatrix) m=sumitems_argoutput(myMatrix)
myOtherMatrix=getValues(); myOtherMatrix=getValues();
size(myOtherMatrix) size(myOtherMatrix)
disp(myOtherMatrix); disp(myOtherMatrix);