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

scilab: fix scilab_li_matrix wrong checks

Browse source
This commit is contained in:
Simon Marchetto 2014-03-12 11:36:45 +01:00
commit d4168ef47c
2 changed files with 35 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

56
Examples/test-suite/scilab/scilab_li_matrix_runme.sci
View file

@ -4,46 +4,58 @@ exec("swigtest.start", -1);
// test matrix passed as output argument from fonction
function test_out_matrix(value_type, expected_out_matrix)
cmd = msprintf("out_matrix = out_%s_matrix_func();", value_type);
func_name = msprintf("out_%s_matrix_func", value_type);
cmd = msprintf("out_matrix = %s();", func_name);
ierr = execstr(cmd, "errcatch");
if ierr <> 0 then swigtesterror(); end
if ~isdef('expected_out_matrix') | out_matrix <> expected_out_matrix then swigtesterror(); end
if ierr <> 0 then
swigtesterror(msprintf("Error %d in %s", ierr, func_name));
end
if ~isdef('out_matrix') | ~isequal(out_matrix, expected_out_matrix) then
swigtesterror(msprintf("Wrong value returned from %s()", func_name));
end
endfunction
// test matrix passed as input argument of fonction
function test_in_matrix(value_type, in_matrix, expected_ret_value)
cmd = msprintf("ret_value = in_%s_matrix_func(in_matrix);", value_type);
function test_in_matrix(value_type, in_matrix, expected_in_value)
func_name = msprintf("in_%s_matrix_func", value_type);
cmd = msprintf("in_value = %s(in_matrix);", func_name);
ierr = execstr(cmd, "errcatch");
if ierr <> 0 then swigtesterror(); end
if ~isdef('ret_value') | ret_value <> expected_ret_value then swigtesterror(); end
if ierr <> 0 then
swigtesterror(msprintf("Error %d in %s", ierr, func_name));
end
if ~isdef('in_value') | ~isequal(in_value, expected_in_value) then
swigtesterror(msprintf("Wrong value returned from %s()", func_name));
end
endfunction
// test matrixes passed as input and output arguments of fonction
function test_inout_matrix(value_type, in_matrix, expected_out_matrix)
cmd = msprintf("out_matrix = inout_%s_matrix_func(in_matrix);", value_type);
function test_inout_matrix(value_type, inout_matrix, expected_inout_matrix)
func_name = msprintf("inout_%s_matrix_func", value_type);
cmd = msprintf("inout_matrix = %s(inout_matrix);", func_name);
ierr = execstr(cmd, "errcatch");
if ierr <> 0 then swigtesterror(); end
if ~isdef('out_matrix') | out_matrix <> expected_out_matrix then swigtesterror(); end
if ierr <> 0 then
swigtesterror(msprintf("Error %d in %s", ierr, func_name));
end
if ~isdef('inout_matrix') | ~isequal(inout_matrix, expected_inout_matrix) then
swigtesterror(msprintf("Wrong value returned from %s()", func_name));
end
endfunction
function test_matrix_typemaps(value_type, expected_out_matrix, expected_ret_value, expected_out_matrix2)
function test_matrix_typemaps(value_type, matrix, expected_out_matrix, expected_in_value, expected_inout_matrix)
test_out_matrix(value_type, expected_out_matrix);
test_in_matrix(value_type, expected_out_matrix, expected_ret_value);
test_inout_matrix(value_type, expected_out_matrix, expected_out_matrix2);
test_in_matrix(value_type, matrix, expected_in_value);
test_inout_matrix(value_type, matrix, expected_inout_matrix);
endfunction
m = [0 3; 1 4; 2 5];
test_matrix_typemaps("int", m, sum(m), m .* m);
test_matrix_typemaps("int", int32(m), sum(m), m .* m);
m = [0. 3.; 1. 4.; 2. 5.];
test_matrix_typemaps("int", m, m, sum(m), m .* m);
test_matrix_typemaps("int", int32(m), m, sum(m), m .* m);
test_matrix_typemaps("double", m, sum(m), m .* m);
//m = ["0" "3"; "1" "4"; "2" "5"]
//test_matrix_typemaps("charptr", m, strcat(m), m + m);
test_matrix_typemaps("double", m, m, sum(m), m .* m);
m = [%T, %F; %F, %T; %T, %F];
test_matrix_typemaps("bool", m, %T, ~m);
test_matrix_typemaps("bool", m, m, %T, ~m);
exec("swigtest.quit", -1);

2
Examples/test-suite/scilab_li_matrix.i
View file

@ -117,7 +117,7 @@ template<> void inout_matrix_func(bool *inputMatrix, int nbRow, int nbCol, bool
*nbColRes = nbCol;
*resultMatrix = (bool*) malloc(size * sizeof(bool));
for (i=0; i<size; i++) {
(*resultMatrix)[i] = ~inputMatrix[i];
(*resultMatrix)[i] = inputMatrix[i]==1?0:1;
}
}
%}