diff options
20 files changed, 14 insertions, 15 deletions
diff --git a/help/en_US/master_help.xml b/help/en_US/master_help.xml index 4fd980d..3ec9204 100644 --- a/help/en_US/master_help.xml +++ b/help/en_US/master_help.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE book [ <!--Begin Entities--> -<!ENTITY ae2c4e799fa7bd155915cca166300af7e SYSTEM "/home/shagun/Documents/fossee-scilab-octave-toolbox/help/en_US/octave_fun.xml"> +<!ENTITY aa15f19e90e8889fc1cf1bbfeeb08ce0d SYSTEM "/home/ananmay/Documents/fossee-scilab-octave-toolbox/help/en_US/octave_fun.xml"> <!--End Entities--> ]> <book version="5.0-subset Scilab" xml:lang="en_US" @@ -16,8 +16,8 @@ <title>scilab_octave</title> </info> -<part xml:id='section_cf80d198f9b614eed1313b0fb421a3f1'> +<part xml:id='section_03d75e04f21a47a401a1c20a6b501bc4'> <title>scilab_octave</title> -&ae2c4e799fa7bd155915cca166300af7e; +&aa15f19e90e8889fc1cf1bbfeeb08ce0d; </part> </book> diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS Binary files differindex 2b0c40c..e7476c0 100644 --- a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS +++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB Binary files differindex d8be745..d8995ba 100644 --- a/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB +++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/DOCS.TAB diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS b/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS index 1ea4172..ec3f923 100644 --- a/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS +++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/OFFSETS @@ -1,2 +1 @@ -ö@ -€F z`
\ No newline at end of file +‡™€ƒÀadn`
\ No newline at end of file diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS b/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS Binary files differindex d472163..14c2668 100644 --- a/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS +++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/POSITIONS diff --git a/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP b/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP Binary files differindex 4191943..33d0cbc 100644 --- a/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP +++ b/help/en_US/scilab_en_US_help/JavaHelpSearch/TMAP diff --git a/help/en_US/scilab_en_US_help/index.html b/help/en_US/scilab_en_US_help/index.html index ed8d5de..5851fba 100644 --- a/help/en_US/scilab_en_US_help/index.html +++ b/help/en_US/scilab_en_US_help/index.html @@ -31,7 +31,7 @@ <h3 class="book-title">scilab_octave</h3> <ul class="list-part"><a name="scilab_octave_manual"></a><div class="info"></div> -<li><a href="section_cf80d198f9b614eed1313b0fb421a3f1.html" class="part">scilab_octave</a> +<li><a href="section_03d75e04f21a47a401a1c20a6b501bc4.html" class="part">scilab_octave</a> <ul class="list-chapter"><li><a href="octave_fun.html" class="refentry">octave_fun</a> — <span class="refentry-description">Calls an octave function with given inputs and returns the expected output</span></li></ul></li></ul> <br /> diff --git a/help/en_US/scilab_en_US_help/jhelpmap.jhm b/help/en_US/scilab_en_US_help/jhelpmap.jhm index 9f3b27f..bd4e16f 100644 --- a/help/en_US/scilab_en_US_help/jhelpmap.jhm +++ b/help/en_US/scilab_en_US_help/jhelpmap.jhm @@ -2,6 +2,6 @@ <!DOCTYPE map PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp Map Version 1.0//EN" "http://java.sun.com/products/javahelp/map_1_0.dtd"> <map version="1.0"> <mapID target="index" url="index.html"/> -<mapID target="section_cf80d198f9b614eed1313b0fb421a3f1" url="section_cf80d198f9b614eed1313b0fb421a3f1.html"/> +<mapID target="section_03d75e04f21a47a401a1c20a6b501bc4" url="section_03d75e04f21a47a401a1c20a6b501bc4.html"/> <mapID target="octave_fun" url="octave_fun.html"/> </map>
\ No newline at end of file diff --git a/help/en_US/scilab_en_US_help/jhelptoc.xml b/help/en_US/scilab_en_US_help/jhelptoc.xml index 9774bdf..5b72dc8 100644 --- a/help/en_US/scilab_en_US_help/jhelptoc.xml +++ b/help/en_US/scilab_en_US_help/jhelptoc.xml @@ -2,7 +2,7 @@ <!DOCTYPE toc PUBLIC "-//Sun Microsystems Inc.//DTD JavaHelp TOC Version 1.0//EN" "http://java.sun.com/products/javahelp/toc_1_0.dtd"> <toc version="1.0"> <tocitem target="index" text="scilab_octave"> -<tocitem target="section_cf80d198f9b614eed1313b0fb421a3f1" text="scilab_octave"> +<tocitem target="section_03d75e04f21a47a401a1c20a6b501bc4" text="scilab_octave"> <tocitem target="octave_fun" text="octave_fun"/> </tocitem> </tocitem> diff --git a/help/en_US/scilab_en_US_help/octave_fun.html b/help/en_US/scilab_en_US_help/octave_fun.html index bff31a0..16b6d23 100644 --- a/help/en_US/scilab_en_US_help/octave_fun.html +++ b/help/en_US/scilab_en_US_help/octave_fun.html @@ -12,11 +12,11 @@ <div class="manualnavbar"> <table width="100%"><tr> <td width="30%"> - <span class="previous"><a href="section_cf80d198f9b614eed1313b0fb421a3f1.html"><< scilab_octave</a></span> + <span class="previous"><a href="section_03d75e04f21a47a401a1c20a6b501bc4.html"><< scilab_octave</a></span> </td> <td width="40%" class="center"> - <span class="top"><a href="section_cf80d198f9b614eed1313b0fb421a3f1.html">scilab_octave</a></span> + <span class="top"><a href="section_03d75e04f21a47a401a1c20a6b501bc4.html">scilab_octave</a></span> </td> <td width="30%" class="next"> @@ -28,7 +28,7 @@ - <span class="path"><a href="index.html">scilab_octave</a> >> <a href="section_cf80d198f9b614eed1313b0fb421a3f1.html">scilab_octave</a> > octave_fun</span> + <span class="path"><a href="index.html">scilab_octave</a> >> <a href="section_03d75e04f21a47a401a1c20a6b501bc4.html">scilab_octave</a> > octave_fun</span> <br /><br /> <div class="refnamediv"><h1 class="refname">octave_fun</h1> @@ -94,11 +94,11 @@ <tr><td colspan="3" class="next"><a href="http://bugzilla.scilab.org/enter_bug.cgi?product=Scilab%20software&component=Documentation%20pages" class="ulink">Report an issue</a></td></tr> <tr> <td width="30%"> - <span class="previous"><a href="section_cf80d198f9b614eed1313b0fb421a3f1.html"><< scilab_octave</a></span> + <span class="previous"><a href="section_03d75e04f21a47a401a1c20a6b501bc4.html"><< scilab_octave</a></span> </td> <td width="40%" class="center"> - <span class="top"><a href="section_cf80d198f9b614eed1313b0fb421a3f1.html">scilab_octave</a></span> + <span class="top"><a href="section_03d75e04f21a47a401a1c20a6b501bc4.html">scilab_octave</a></span> </td> <td width="30%" class="next"> diff --git a/help/en_US/scilab_en_US_help/section_cf80d198f9b614eed1313b0fb421a3f1.html b/help/en_US/scilab_en_US_help/section_03d75e04f21a47a401a1c20a6b501bc4.html index a828712..a828712 100644 --- a/help/en_US/scilab_en_US_help/section_cf80d198f9b614eed1313b0fb421a3f1.html +++ b/help/en_US/scilab_en_US_help/section_03d75e04f21a47a401a1c20a6b501bc4.html diff --git a/jar/scilab_en_US_help.jar b/jar/scilab_en_US_help.jar Binary files differindex 2170167..8dd28e5 100644 --- a/jar/scilab_en_US_help.jar +++ b/jar/scilab_en_US_help.jar diff --git a/macros/octave_fun.bin b/macros/octave_fun.bin Binary files differindex 3c35c06..ea3dc49 100644 --- a/macros/octave_fun.bin +++ b/macros/octave_fun.bin diff --git a/sci_gateway/cpp/libscilab_octave.so b/sci_gateway/cpp/libscilab_octave.so Binary files differindex f4317ae..5802301 100755 --- a/sci_gateway/cpp/libscilab_octave.so +++ b/sci_gateway/cpp/libscilab_octave.so 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;
Binary files differdiff --git a/src/libfun.so b/src/libfun.so Binary files differindex 777cb3f..6c97c22 100755 --- a/src/libfun.so +++ b/src/libfun.so diff --git a/src/testfun b/src/testfun Binary files differindex 5e607f7..500b639 100755 --- a/src/testfun +++ b/src/testfun diff --git a/thirdparty/linux/lib/x64/libfun.so b/thirdparty/linux/lib/x64/libfun.so Binary files differindex 777cb3f..6c97c22 100755 --- a/thirdparty/linux/lib/x64/libfun.so +++ b/thirdparty/linux/lib/x64/libfun.so |