summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStéphane MOTTELET <stephane.mottelet@utc.fr>2019-06-19 13:22:42 +0200
committerClément DAVID <clement.david@esi-group.com>2019-07-24 14:27:17 +0200
commitf6d82aa7bb0a39745077410352c22a167a45f1c0 (patch)
treed9508f9016e5ad9eb3944142426da7995004be68
parent081354179eecddda5ae70bf9291f4db22cb7deee (diff)
downloadscilab-f6d82aa7bb0a39745077410352c22a167a45f1c0.zip
scilab-f6d82aa7bb0a39745077410352c22a167a45f1c0.tar.gz
* Bug 14557 fixed: now csim work when system has no state
http://bugzilla.scilab.org/show_bug.cgi?id=14557 Change-Id: I872d72f8435bfe5fc0ee6d4dacea61ed0bd75210
-rw-r--r--scilab/CHANGES.md1
-rw-r--r--scilab/modules/cacsd/macros/csim.sci6
2 files changed, 6 insertions, 1 deletions
diff --git a/scilab/CHANGES.md b/scilab/CHANGES.md
index 79f2f24..3274c43 100644
--- a/scilab/CHANGES.md
+++ b/scilab/CHANGES.md
@@ -144,6 +144,7 @@ Bug Fixes
144* [#8784](http://bugzilla.scilab.org/show_bug.cgi?id=8784): Automatic self-adjusting blocks `SCALE_CSCOPE` & `SCALE_CMSCOPE` in Xcos. 144* [#8784](http://bugzilla.scilab.org/show_bug.cgi?id=8784): Automatic self-adjusting blocks `SCALE_CSCOPE` & `SCALE_CMSCOPE` in Xcos.
145* [#9673](http://bugzilla.scilab.org/show_bug.cgi?id=9673): Priority of colon `:` operator was too low 145* [#9673](http://bugzilla.scilab.org/show_bug.cgi?id=9673): Priority of colon `:` operator was too low
146* [#14498](http://bugzilla.scilab.org/show_bug.cgi?id=14498): `size([],3)` returned 1 instead of 0. 146* [#14498](http://bugzilla.scilab.org/show_bug.cgi?id=14498): `size([],3)` returned 1 instead of 0.
147* [#14557](http://bugzilla.scilab.org/show_bug.cgi?id=14557): `csim` failed when the system has no state.
147* [#14604](http://bugzilla.scilab.org/show_bug.cgi?id=14604): `emptystr()` is 40x slower with 6.0.0 wrt 5.5.2 148* [#14604](http://bugzilla.scilab.org/show_bug.cgi?id=14604): `emptystr()` is 40x slower with 6.0.0 wrt 5.5.2
148* [#14605](http://bugzilla.scilab.org/show_bug.cgi?id=14605): fixed - `bench_run` was too strict about the specification of tests names. 149* [#14605](http://bugzilla.scilab.org/show_bug.cgi?id=14605): fixed - `bench_run` was too strict about the specification of tests names.
149* [#14606](http://bugzilla.scilab.org/show_bug.cgi?id=14606): Memory used by variables returned by `[names,mem]=who()` was always zero. 150* [#14606](http://bugzilla.scilab.org/show_bug.cgi?id=14606): Memory used by variables returned by `[names,mem]=who()` was always zero.
diff --git a/scilab/modules/cacsd/macros/csim.sci b/scilab/modules/cacsd/macros/csim.sci
index 55426b6..df1d975 100644
--- a/scilab/modules/cacsd/macros/csim.sci
+++ b/scilab/modules/cacsd/macros/csim.sci
@@ -176,6 +176,10 @@ function [y,x]=csim(u,dt,sl,x0,tol)
176 end; 176 end;
177 k=k+n 177 k=k+n
178 end; 178 end;
179 y = c*x + d*ut 179 if isempty(c)
180 y = d*ut;
181 else
182 y = c*x + d*ut
183 end
180 if lhs==2 then x=v1*v2*x,end 184 if lhs==2 then x=v1*v2*x,end
181endfunction 185endfunction