octave_fun

@@ -94,11 +94,11 @@

Report an issue

- << scilab_octave + << scilab_octave

- scilab_octave + scilab_octave

diff --git a/help/en_US/scilab_en_US_help/section_03d75e04f21a47a401a1c20a6b501bc4.html b/help/en_US/scilab_en_US_help/section_03d75e04f21a47a401a1c20a6b501bc4.html new file mode 100644 index 0000000..a828712 --- /dev/null +++ b/help/en_US/scilab_en_US_help/section_03d75e04f21a47a401a1c20a6b501bc4.html @@ -0,0 +1,55 @@ + + + + + + +

+ + + + +

+ +

+ scilab_octave + +

+ +

+ + + + scilab_octave >> scilab_octave + +

+

scilab_octave

octave_fun — Calls an octave function with given inputs and returns the expected output

+
+ +

+ + + + + + +

Report an issue
+ +	+ scilab_octave + +	+ +

+ + diff --git a/help/en_US/scilab_en_US_help/section_cf80d198f9b614eed1313b0fb421a3f1.html b/help/en_US/scilab_en_US_help/section_cf80d198f9b614eed1313b0fb421a3f1.html deleted file mode 100644 index a828712..0000000 --- a/help/en_US/scilab_en_US_help/section_cf80d198f9b614eed1313b0fb421a3f1.html +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - -

- - - - -

- -

- scilab_octave - -

- -

- - - - scilab_octave >> scilab_octave - -

-

scilab_octave

octave_fun — Calls an octave function with given inputs and returns the expected output

-
- -

- - - - - - -

Report an issue
- -	- scilab_octave - -	- -

- - diff --git a/jar/scilab_en_US_help.jar b/jar/scilab_en_US_help.jar index 2170167..8dd28e5 100644 Binary files a/jar/scilab_en_US_help.jar and b/jar/scilab_en_US_help.jar differ diff --git a/macros/octave_fun.bin b/macros/octave_fun.bin index 3c35c06..ea3dc49 100644 Binary files a/macros/octave_fun.bin and b/macros/octave_fun.bin differ diff --git a/sci_gateway/cpp/libscilab_octave.so b/sci_gateway/cpp/libscilab_octave.so index f4317ae..5802301 100755 Binary files a/sci_gateway/cpp/libscilab_octave.so and b/sci_gateway/cpp/libscilab_octave.so differ diff --git a/sci_gateway/cpp/sci_octave.cpp b/sci_gateway/cpp/sci_octave.cpp index d76993f..2e22b97 100644 --- a/sci_gateway/cpp/sci_octave.cpp +++ b/sci_gateway/cpp/sci_octave.cpp @@ -180,7 +180,7 @@ int sci_octave_fun(scilabEnv env, int nin, scilabVar* in, int nopt, scilabOpt* o //printf("in scilab ouput args are: %d\n", funcall.n_out_arguments); if(status_fun==1) { - Scierror(999, "Scilab unable to process!\n"); + Scierror(999, ""); return 1; } else if(funcall.n_out_user <= funcall.n_out_arguments) diff --git a/src/fun.cpp b/src/fun.cpp index 7e30688..4eeb24c 100644 --- a/src/fun.cpp +++ b/src/fun.cpp @@ -183,7 +183,7 @@ extern "C" } catch (const octave::execution_exception&) { - std::cerr << "error encountered in Octave evaluator!" << std::endl; + //std::cerr << "error encountered in Octave evaluator!" << std::endl; return 1; } return 0; diff --git a/src/fun.o b/src/fun.o index a7d57d3..03270cf 100644 Binary files a/src/fun.o and b/src/fun.o differ diff --git a/src/libfun.so b/src/libfun.so index 777cb3f..6c97c22 100755 Binary files a/src/libfun.so and b/src/libfun.so differ diff --git a/src/testfun b/src/testfun index 5e607f7..500b639 100755 Binary files a/src/testfun and b/src/testfun differ diff --git a/thirdparty/linux/lib/x64/libfun.so b/thirdparty/linux/lib/x64/libfun.so index 777cb3f..6c97c22 100755 Binary files a/thirdparty/linux/lib/x64/libfun.so and b/thirdparty/linux/lib/x64/libfun.so differ -- cgit