* Bug #13364 fixed - Scilab did not start on CentOS 6.5, RedHat 5.4, RedHat 5.5 (GLIBC issue).
-* Bug #13365 fixed - Data bounds werenot correctly updated in 3-D.
+* Bug #13365 fixed - Data bounds were not correctly updated in 3-D.
+
+* Bug #13367 fixed - ATOMS default repository was 5.4 one instead of 5.5.
* Bug #13378 fixed - The "Console" handle display was not homogeneous with others.
* Bug #13509 fixed - It was not possible to have an empty prefix with xmlNs.
+* Bug #13510 fixed - Datatip callback cleared 'd'.
+
Xcos Bug Fixes
==============
* Bug #13396 fixed - MBLOCK did not work with an external file containing the modelica class.
+* Bug #13513 fixed - EXPRESSION block with "u1" as expression failed with a
+ singularity error.
+
+* Bug #13514 fixed - External modules' loader_pal.sce file contained absolute path.
+
Known issues
=============
$(top_srcdir)/modules/helptools/etc/SciDocConf.xml.in \
$(top_srcdir)/modules/core/includes/version.h.in \
$(top_srcdir)/modules/core/includes/stack.h.in \
+ $(top_srcdir)/modules/atoms/etc/repositories.in \
+ $(top_srcdir)/modules/atoms/tests/unit_tests/repositories.orig.in \
$(top_srcdir)/config/depcomp COPYING config/ar-lib \
config/compile config/config.guess config/config.rpath \
config/config.sub config/depcomp config/install-sh \
etc/Info.plist etc/logging.properties scilab.properties \
scilab-lib.properties scilab-lib-doc.properties \
modules/helptools/etc/SciDocConf.xml \
- modules/core/includes/version.h modules/core/includes/stack.h
+ modules/core/includes/version.h modules/core/includes/stack.h \
+ modules/atoms/etc/repositories \
+ modules/atoms/tests/unit_tests/repositories.orig
CONFIG_CLEAN_VPATH_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" \
"$(DESTDIR)$(infofilesdir)" "$(DESTDIR)$(pkgconfigdir)" \
cd $(top_builddir) && $(SHELL) ./config.status $@
modules/core/includes/stack.h: $(top_builddir)/config.status $(top_srcdir)/modules/core/includes/stack.h.in
cd $(top_builddir) && $(SHELL) ./config.status $@
+modules/atoms/etc/repositories: $(top_builddir)/config.status $(top_srcdir)/modules/atoms/etc/repositories.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
+modules/atoms/tests/unit_tests/repositories.orig: $(top_builddir)/config.status $(top_srcdir)/modules/atoms/tests/unit_tests/repositories.orig.in
+ cd $(top_builddir) && $(SHELL) ./config.status $@
install-binPROGRAMS: $(bin_PROGRAMS)
@$(NORMAL_INSTALL)
@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-ac_config_files="$ac_config_files contrib/Makefile desktop/images/icons/Makefile desktop/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/graphic_objects/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/mpi/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/prebuildjava/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/preferences/Makefile modules/xml/Makefile modules/external_objects/Makefile modules/external_objects_java/Makefile modules/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h modules/core/includes/stack.h"
+ac_config_files="$ac_config_files contrib/Makefile desktop/images/icons/Makefile desktop/Makefile modules/helptools/Makefile modules/data_structures/Makefile modules/differential_equations/Makefile modules/optimization/Makefile modules/elementary_functions/Makefile modules/special_functions/Makefile modules/io/Makefile modules/completion/Makefile modules/history_manager/Makefile modules/jvm/Makefile modules/commons/Makefile modules/sound/Makefile modules/statistics/Makefile modules/mexlib/Makefile modules/sparse/Makefile modules/linear_algebra/Makefile modules/polynomials/Makefile modules/symbolic/Makefile modules/signal_processing/Makefile modules/arnoldi/Makefile modules/interpolation/Makefile modules/intersci/Makefile modules/localization/Makefile modules/cacsd/Makefile modules/boolean/Makefile modules/integer/Makefile modules/double/Makefile modules/fileio/Makefile modules/spreadsheet/Makefile modules/string/Makefile modules/time/Makefile modules/graphics/Makefile modules/graphic_export/Makefile modules/graphic_objects/Makefile modules/renderer/Makefile modules/action_binding/Makefile modules/gui/Makefile modules/mpi/Makefile modules/randlib/Makefile modules/tclsci/Makefile modules/windows_tools/Makefile modules/core/Makefile modules/prebuildjava/Makefile modules/api_scilab/Makefile modules/call_scilab/Makefile modules/types/Makefile modules/hdf5/Makefile modules/fftw/Makefile modules/umfpack/Makefile modules/scicos/Makefile modules/scicos_blocks/Makefile modules/functions/Makefile modules/dynamic_link/Makefile modules/overloading/Makefile modules/javasci/Makefile modules/m2sci/Makefile modules/compatibility_functions/Makefile modules/development_tools/Makefile modules/output_stream/Makefile modules/console/Makefile modules/demo_tools/Makefile modules/genetic_algorithms/Makefile modules/simulated_annealing/Makefile modules/parameters/Makefile modules/matio/Makefile modules/atoms/Makefile modules/xcos/Makefile modules/scinotes/Makefile modules/ui_data/Makefile modules/graph/Makefile modules/parallel/Makefile modules/modules_manager/Makefile modules/history_browser/Makefile modules/preferences/Makefile modules/xml/Makefile modules/external_objects/Makefile modules/external_objects_java/Makefile modules/Makefile Makefile scilab.pc etc/modules.xml etc/classpath.xml etc/Info.plist etc/logging.properties scilab.properties scilab-lib.properties scilab-lib-doc.properties modules/helptools/etc/SciDocConf.xml modules/core/includes/version.h modules/core/includes/stack.h modules/atoms/etc/repositories modules/atoms/tests/unit_tests/repositories.orig"
# Detection of the module for the future version of Scilab 6
"modules/helptools/etc/SciDocConf.xml") CONFIG_FILES="$CONFIG_FILES modules/helptools/etc/SciDocConf.xml" ;;
"modules/core/includes/version.h") CONFIG_FILES="$CONFIG_FILES modules/core/includes/version.h" ;;
"modules/core/includes/stack.h") CONFIG_FILES="$CONFIG_FILES modules/core/includes/stack.h" ;;
+ "modules/atoms/etc/repositories") CONFIG_FILES="$CONFIG_FILES modules/atoms/etc/repositories" ;;
+ "modules/atoms/tests/unit_tests/repositories.orig") CONFIG_FILES="$CONFIG_FILES modules/atoms/tests/unit_tests/repositories.orig" ;;
"modules/development_tools/src/fake/Makefile") CONFIG_FILES="$CONFIG_FILES modules/development_tools/src/fake/Makefile" ;;
*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
# by the above --with options
AC_JAVA_WITH_JDK
if test "$with_jdk" != no; then
-
+
AC_JAVA_DETECT_JVM
case "$ac_java_jvm_version" in
1.6 | 1.7 | 1.8)
modules/helptools/etc/SciDocConf.xml
modules/core/includes/version.h
modules/core/includes/stack.h
+modules/atoms/etc/repositories
+modules/atoms/tests/unit_tests/repositories.orig
])
# Detection of the module for the future version of Scilab 6
end
// =============================================================================
// force to load some libraries (dependancies)
- loadScicos();
+ loadXcosLibs(); loadScicos();
// =============================================================================
etc_tlbx = get_absolute_file_path("xcos_toolbox_skeleton.start");
etc_tlbx = getshortpathname(etc_tlbx);
-http://atoms.scilab.org/5.4
+http://atoms.scilab.org/5.6
--- /dev/null
+http://atoms.scilab.org/@SCILAB_VERSION_MAJOR@.@SCILAB_VERSION_MINOR@
--- /dev/null
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2014 - Scilab Enterprises - Bruno JOFRET
+//
+// This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- TEST WITH ATOMS -->
+//
+// <-- Non-regression test for bug 13367 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=13367
+//
+// <-- Short Description -->
+// Wrong atoms default repository
+defaultRepo = atomsRepositoryList();
+v = getversion("scilab");
+goodRepo = sprintf("http://atoms.scilab.org/%d.%d", v(1), v(2));
+assert_checkequal(defaultRepo(1), goodRepo);
--- /dev/null
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2014 - Scilab Enterprises - Bruno JOFRET
+//
+// This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- TEST WITH ATOMS -->
+//
+// <-- Non-regression test for bug 13367 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=13367
+//
+// <-- Short Description -->
+// Wrong atoms default repository
+
+defaultRepo = atomsRepositoryList();
+v = getversion("scilab");
+
+goodRepo = sprintf("http://atoms.scilab.org/%d.%d", v(1), v(2));
+
+assert_checkequal(defaultRepo(1), goodRepo);
\ No newline at end of file
-http://atoms.scilab.org/5.4
+http://atoms.scilab.org/5.6
--- /dev/null
+http://atoms.scilab.org/@SCILAB_VERSION_MAJOR@.@SCILAB_VERSION_MINOR@
--- /dev/null
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2014-2014 - Scilab Enterprises - Bruno JOFRET
+//
+// This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- CLI SHELL MODE -->
+// test de creation des listes avec des elements null()
+l = list(,);
+m = l(1);
+n = l(2);
+assert_checkfalse(isdef("m"));
+assert_checkfalse(isdef("n"));
+l = list(1,);
+n = l(2);
+assert_checkfalse(isdef("n"));
+assert_checkequal(l(1), 1);
+l = list(,1);
+m = l(1);
+assert_checkfalse(isdef("m"));
+assert_checkequal(l(2), 1);
+l = list(,,);
+m = l(1);
+n = l(2);
+p = l(3);
+assert_checkfalse(isdef("m"));
+assert_checkfalse(isdef("n"));
+assert_checkfalse(isdef("p"));
+l = list(1,,);
+n = l(2);
+p = l(3);
+assert_checkequal(l(1), 1);
+assert_checkfalse(isdef("n"));
+assert_checkfalse(isdef("p"));
+l = list(,1,);
+m = l(1);
+p = l(3);
+assert_checkfalse(isdef("m"));
+assert_checkequal(l(2), 1);
+assert_checkfalse(isdef("p"));
+l = list(,,1);
+m = l(1);
+n = l(2);
+assert_checkfalse(isdef("m"));
+assert_checkfalse(isdef("n"));
+assert_checkequal(l(3), 1);
+l = list(1,1,);
+p = l(3);
+assert_checkequal(l(1), 1);
+assert_checkequal(l(2), 1);
+assert_checkfalse(isdef("p"));
+l = list(1,,1);
+n = l(2);
+assert_checkequal(l(1), 1);
+assert_checkfalse(isdef("n"));
+assert_checkequal(l(3), 1);
+l = list(,1,1);
+m = l(1);
+assert_checkfalse(isdef("m"));
+assert_checkequal(l(2), 1);
+assert_checkequal(l(3), 1);
--- /dev/null
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2014-2014 - Scilab Enterprises - Bruno JOFRET
+//
+// This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- CLI SHELL MODE -->
+
+// test de creation des listes avec des elements null()
+
+l = list(,);
+m = l(1);
+n = l(2);
+assert_checkfalse(isdef("m"));
+assert_checkfalse(isdef("n"));
+
+l = list(1,);
+n = l(2);
+assert_checkfalse(isdef("n"));
+assert_checkequal(l(1), 1);
+
+l = list(,1);
+m = l(1);
+assert_checkfalse(isdef("m"));
+assert_checkequal(l(2), 1);
+
+l = list(,,);
+m = l(1);
+n = l(2);
+p = l(3);
+assert_checkfalse(isdef("m"));
+assert_checkfalse(isdef("n"));
+assert_checkfalse(isdef("p"));
+
+l = list(1,,);
+n = l(2);
+p = l(3);
+assert_checkequal(l(1), 1);
+assert_checkfalse(isdef("n"));
+assert_checkfalse(isdef("p"));
+
+l = list(,1,);
+m = l(1);
+p = l(3);
+assert_checkfalse(isdef("m"));
+assert_checkequal(l(2), 1);
+assert_checkfalse(isdef("p"));
+
+l = list(,,1);
+m = l(1);
+n = l(2);
+assert_checkfalse(isdef("m"));
+assert_checkfalse(isdef("n"));
+assert_checkequal(l(3), 1);
+
+l = list(1,1,);
+p = l(3);
+assert_checkequal(l(1), 1);
+assert_checkequal(l(2), 1);
+assert_checkfalse(isdef("p"));
+
+l = list(1,,1);
+n = l(2);
+assert_checkequal(l(1), 1);
+assert_checkfalse(isdef("n"));
+assert_checkequal(l(3), 1);
+
+l = list(,1,1);
+m = l(1);
+assert_checkfalse(isdef("m"));
+assert_checkequal(l(2), 1);
+assert_checkequal(l(3), 1);
\ No newline at end of file
// Initialize CURL environment
// =============================================================================
-if getos()=="Linux" then
+function startModule()
+ if getos()=="Linux" then
- // List of hard-coded paths comes from curl sources (configure.ac)
+ // List of hard-coded paths comes from curl sources (configure.ac)
- userBundle = getenv("CURL_CA_BUNDLE", "");
- if isempty(userBundle) then // Not defined by the user
+ userBundle = getenv("CURL_CA_BUNDLE", "");
+ if isempty(userBundle) then // Not defined by the user
- standardFiles = ["/etc/ssl/certs/ca-certificates.crt";
- "/etc/pki/tls/certs/ca-bundle.crt";
- "/usr/share/ssl/certs/ca-bundle.crt";
- "/usr/local/share/certs/ca-root.crt";
- "/etc/ssl/cert.pem"];
+ standardFiles = ["/etc/ssl/certs/ca-certificates.crt";
+ "/etc/pki/tls/certs/ca-bundle.crt";
+ "/usr/share/ssl/certs/ca-bundle.crt";
+ "/usr/local/share/certs/ca-root.crt";
+ "/etc/ssl/cert.pem"];
- for iFile = 1:size(standardFiles, "*")
- if isfile(standardFiles(iFile)) then
- setenv("CURL_CA_BUNDLE", standardFiles(iFile));
- break
+ for iFile = 1:size(standardFiles, "*")
+ if isfile(standardFiles(iFile)) then
+ setenv("CURL_CA_BUNDLE", standardFiles(iFile));
+ break
+ end
end
end
- end
- caBundle = getenv("CURL_CA_BUNDLE", "");
- caPath = getenv("CURL_CA_PATH", "");
- if isempty(caBundle) & isempty(caPath) then
- setenv("CURL_CA_PATH", "/etc/ssl/certs/");
+ caBundle = getenv("CURL_CA_BUNDLE", "");
+ caPath = getenv("CURL_CA_PATH", "");
+ if isempty(caBundle) & isempty(caPath) then
+ setenv("CURL_CA_PATH", "/etc/ssl/certs/");
+ end
end
-end
+endfunction
+startModule();
+clear startModule
\ No newline at end of file
String errMsg = Messages.gettext("Wrong value for ''%s'' property: A valid function name expected.\n");
String updateCommand = "try;" +
- " d = getcallbackobject(" + getIdentifier() + ");" +
- " d.text = " + fnc + "(d);" +
- " clear(\"d\");" +
+ "GDZa786XBSq7899SHKp=getcallbackobject(" + getIdentifier() + ");" +
+ "set(GDZa786XBSq7899SHKp,\"text\"," + fnc + "(GDZa786XBSq7899SHKp));" +
+ "clear(\"GDZa786XBSq7899SHKp\");" +
"catch;" +
- " d.display_function = \"\";" +
- " d.parent.display_function = \"\";" +
- " clear(\"d\");" +
- " error(msprintf(\"" + errMsg + "\", \"display_function\"));" +
+ "set(GDZa786XBSq7899SHKp,\"display_function\",\"\");" +
+ "set(GDZa786XBSq7899SHKp.parent,\"display_function\",\"\");" +
+ "clear(\"GDZa786XBSq7899SHKp\");" +
+ "error(msprintf(\"" + errMsg + "\", \"display_function\"));" +
"end;";
InterpreterManagement.requestScilabExec(updateCommand);
}
--- /dev/null
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2014 - Scilab Enterprises - Calixte DENIZET
+//
+// This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- TEST WITH GRAPHIC -->
+// <-- Non-regression test for bug 13510 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/13510
+//
+// <-- Short Description -->
+// Datatip callback cleared 'd'
+clear("pl", "ax", "h", "s", "d", "d1");
+s = poly(0,"s");
+h = syslin("c", 1 / (s + 1));
+nyquist(h);
+d = 123;
+ax = gca();
+pl = ax.children(1).children(2);
+d1 = datatipCreate(pl, 200);
+assert_checkequal(d, 123);
--- /dev/null
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2014 - Scilab Enterprises - Calixte DENIZET
+//
+// This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- TEST WITH GRAPHIC -->
+
+// <-- Non-regression test for bug 13510 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/13510
+//
+// <-- Short Description -->
+// Datatip callback cleared 'd'
+
+clear("pl", "ax", "h", "s", "d", "d1");
+s = poly(0,"s");
+h = syslin("c", 1 / (s + 1));
+nyquist(h);
+
+d = 123;
+ax = gca();
+pl = ax.children(1).children(2);
+d1 = datatipCreate(pl, 200);
+
+assert_checkequal(d, 123);
\ No newline at end of file
//
SC=3.2;
square(-SC,-SC,SC,SC)
-drawaxis(x=[SC,-SC,8],y=-SC,dir='d',tics='r',format_n="%1.1f");
+drawaxis(x=[SC,-SC,8],y=-SC,dir="d",tics="r",format_n="%1.1f");
axis = gce();
if (axis.tics_labels <> ["3.2" "2.4" "1.6" "0.8" "0.0" "-0.8" "-1.6" "-2.4" "-3.2"]) then bugmes();quit;end
// <-- Short Description -->
// set or get 'format_n' property from an axes crash scilab.
plot2d(1:10,1:10,1,strf="020")
-drawaxis(x=2:7,y=4,dir='u',tics='v');
+drawaxis(x=2:7,y=4,dir="u",tics="v");
e=gce();
assert_checkequal(e.format_n, "");
// Check that the display does not crash
@echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild."
-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
-@JAVASCI_FALSE@install-data-local:
@JAVASCI_FALSE@install-html-local:
@JAVASCI_FALSE@clean-local:
@JAVASCI_FALSE@distclean-local:
+@JAVASCI_FALSE@install-data-local:
clean: clean-am
clean-am: clean-generic clean-libtool clean-local \
// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
// Copyright (C) 2013 - INRIA - Serge STEER
+// Copyright (C) 2014 - Scilab Enterprises - Clément DAVID
//
// This file must be used under the terms of the CeCILL.
// This source file is licensed as described in the file COPYING, which
end
- t=["function loaderpal()"
+ t=["// This file is released under the 3-clause BSD license. See COPYING-BSD."
+ "// Generated by tbx_build_pal_loader: Please, do not edit this file"
+ ""
+ "function loaderpal()"
" xpal = xcosPal("""+palettename+""");"
- " images_path = "+sci2exp(module_path+"/images/");
+ " images_path = get_absolute_file_path(""loader_pal.sce"")+""/../images/"";"
" interfacefunctions ="+sci2exp(interfacefunctions);
" for i=1:size(interfacefunctions,""*"")"
" h5_instances = ls(images_path + ""h5/"" + interfacefunctions(i) + "".sod"");"
" if graph_icons==[] then"
" error(msprintf(_(""%s: block %s has no editor icon.\n""),""loader_pal.sce"",interfacefunctions(i)))"
" end"
- " xpal = xcosPalAddBlock(xpal, h5_instances(1), pal_icons , graph_icons(1));"
+ " xpal = xcosPalAddBlock(xpal, interfacefunctions(i), pal_icons(1) , graph_icons(1));"
" end"
" xcosPalAdd(xpal);"
"endfunction"
end
x=u*diag(diag(s).^p)*inv(u);
end
- if real(p)==p&r then x=real(x),end
+ if int(p)==p & real(p)==p & r then
+ x=real(x);
+ end
else
error(43)
end
case 5:
count = count + 1;
/* invalid script : call a function without lhs */
- if (bottom <= 0)
+ if (bottom < 0)
{
set_block_error(-2);
return;
stack[bottom] = (double) block->mode[nzcr];
}
break;
- /* if (stack[bottom]>0) {
- stack[bottom]=floor(stack[bottom]+.5);
- }else{
- stack[bottom]=ceil(stack[bottom]-.5);
- }*/
+ /* if (stack[bottom]>0) {
+ stack[bottom]=floor(stack[bottom]+.5);
+ }else{
+ stack[bottom]=ceil(stack[bottom]-.5);
+ }*/
case 111:
if (block->ng > 0)
{
stack[bottom] = (double) block->mode[nzcr];
}
break;
- /* if (stack[bottom]>0) {
- stack[bottom]=1.0;
- }else if(stack[bottom]<0){
- stack[bottom]=-1.0;
- }else{
- stack[bottom]=0.0;
- }*/
+ /* if (stack[bottom]>0) {
+ stack[bottom]=1.0;
+ }else if(stack[bottom]<0){
+ stack[bottom]=-1.0;
+ }else{
+ stack[bottom]=0.0;
+ }*/
case 114: /* abs */
if (block->ng > 0)
{
stack[bottom] = stack[bottom] * (block->mode[nzcr]);
}
break;
- /* if (stack[bottom]>0) {
- stack[bottom]=stack[bottom];
- }else {
- stack[bottom]=-stack[bottom];
- }*/
+ /* if (stack[bottom]>0) {
+ stack[bottom]=stack[bottom];
+ }else {
+ stack[bottom]=-stack[bottom];
+ }*/
case 115:
if (block->ng > 0)
{
--- /dev/null
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2014 - Scilab Enterprises - Clément DAVID
+//
+// This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- XCOS TEST -->
+//
+// <-- Non-regression test for bug 13513 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=13513
+//
+// <-- Short Description -->
+// EXPRESSION block with parameter "u1" report a singularity error.
+assert_checktrue(importXcosDiagram(SCI + "/modules/xcos/tests/nonreg_tests/bug_13513.zcos"));
+// compile and simulate
+xcos_simulate(scs_m, 4);
--- /dev/null
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2014 - Scilab Enterprises - Clément DAVID
+//
+// This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- XCOS TEST -->
+//
+// <-- Non-regression test for bug 13513 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=13513
+//
+// <-- Short Description -->
+// EXPRESSION block with parameter "u1" report a singularity error.
+
+assert_checktrue(importXcosDiagram(SCI + "/modules/xcos/tests/nonreg_tests/bug_13513.zcos"));
+
+// compile and simulate
+xcos_simulate(scs_m, 4);
+
projects / scilab.git / commitdiff