* Bug #11193 fixed - Lincos did not honor context values.

Change-Id: I2c56cd4bb76c34dd684f4bb22f9dde7917ee7efc

diff --git a/scilab/CHANGES_5.4.X b/scilab/CHANGES_5.4.X
index bd9ee4d..dd7cf33 100644 (file)
--- a/scilab/CHANGES_5.4.X
+++ b/scilab/CHANGES_5.4.X
@@ -104,6 +104,8 @@ Xcos
 
 * Bug #10660 fixed - model2blk and callblk crashed Scilab on 64-bit platforms.
 
+* Bug #11193 fixed - Lincos did not honor context values.
+
 * Bug #11775 fixed - xcos.tst crashed on Linux and MacOS X.
 
 * Bug #11821 fixed - Running XcosPalAdd example from help led to deadlock

diff --git a/scilab/modules/scicos/macros/scicos_auto/lincos.sci b/scilab/modules/scicos/macros/scicos_auto/lincos.sci
index 3d1380b..48bb727 100644 (file)
--- a/scilab/modules/scicos/macros/scicos_auto/lincos.sci
+++ b/scilab/modules/scicos/macros/scicos_auto/lincos.sci
@@ -90,6 +90,20 @@ if typeof(scs_m)<>"diagram" then
   error(msprintf(gettext("%s: Wrong type for input argument #%d: A diagram expected.\n"), "lincos", 1));
 end
 
+// Propagate context through all blocks
+%state0     = list();
+needcompile = 4;
+%cpr        = struct();
+%cpr.state  = %state0;
+%scicos_context = struct();
+context = scs_m.props.context;
+
+[%scicos_context, ierr] = script2var(context, %scicos_context);
+[scs_m,%cpr,needcompile,ok] = do_eval(scs_m, %cpr, %scicos_context);
+if ~ok then
+    error(msprintf(gettext("%s: Error during block parameters evaluation.\n"), "lincos"));
+end
+
 IN  = [];
 OUT = [];
 

diff --git a/scilab/modules/xcos/tests/nonreg_tests/bug_11193.dia.ref b/scilab/modules/xcos/tests/nonreg_tests/bug_11193.dia.ref
new file mode 100644 (file)
index 0000000..cdea0cc
--- /dev/null
+++ b/scilab/modules/xcos/tests/nonreg_tests/bug_11193.dia.ref
@@ -0,0 +1,46 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2012 - Scilab Enterprises - Alexandre HERISSE
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+// <-- XCOS TEST -->
+//
+// <-- Non-regression test for bug 11193 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=11193
+//
+// <-- Short Description -->
+// Lincos did not honor context values.
+loadXcosLibs();
+// First test with B = 3.0;
+B = 3.0;
+assert_checktrue(importXcosDiagram(SCI + "/modules/xcos/tests/nonreg_tests/bug_11193.zcos"));
+// looking for the Superblock to linearize
+for i=1:length(scs_m.objs)
+    if typeof(scs_m.objs(i))=="Block" & scs_m.objs(i).gui=="SUPER_f" then
+        scs_m = scs_m.objs(i).model.rpar;
+        break;
+    end
+end
+sys = lincos(scs_m);
+assert_checkequal(sys.A, []);
+assert_checkequal(sys.B, []);
+assert_checkequal(sys.C, []);
+assert_checkequal(sys.D, 3.0);
+// Second test with B = 7.0
+B = 7.0;
+assert_checktrue(importXcosDiagram(SCI + "/modules/xcos/tests/nonreg_tests/bug_11193.zcos"));
+// looking for the Superblock to linearize
+for i=1:length(scs_m.objs)
+    if typeof(scs_m.objs(i))=="Block" & scs_m.objs(i).gui=="SUPER_f" then
+        scs_m = scs_m.objs(i).model.rpar;
+        break;
+    end
+end
+sys = lincos(scs_m);
+assert_checkequal(sys.A, []);
+assert_checkequal(sys.B, []);
+assert_checkequal(sys.C, []);
+assert_checkequal(sys.D, 7.0);

diff --git a/scilab/modules/xcos/tests/nonreg_tests/bug_11193.tst b/scilab/modules/xcos/tests/nonreg_tests/bug_11193.tst
new file mode 100644 (file)
index 0000000..fd0294b
--- /dev/null
+++ b/scilab/modules/xcos/tests/nonreg_tests/bug_11193.tst
@@ -0,0 +1,56 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2012 - Scilab Enterprises - Alexandre HERISSE
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+
+// <-- XCOS TEST -->
+//
+// <-- Non-regression test for bug 11193 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=11193
+//
+// <-- Short Description -->
+// Lincos did not honor context values.
+
+loadXcosLibs();
+
+// First test with B = 3.0;
+B = 3.0;
+assert_checktrue(importXcosDiagram(SCI + "/modules/xcos/tests/nonreg_tests/bug_11193.zcos"));
+
+// looking for the Superblock to linearize
+for i=1:length(scs_m.objs)
+    if typeof(scs_m.objs(i))=="Block" & scs_m.objs(i).gui=="SUPER_f" then
+        scs_m = scs_m.objs(i).model.rpar;
+        break;
+    end
+end
+
+sys = lincos(scs_m);
+assert_checkequal(sys.A, []);
+assert_checkequal(sys.B, []);
+assert_checkequal(sys.C, []);
+assert_checkequal(sys.D, 3.0);
+
+// Second test with B = 7.0
+B = 7.0;
+assert_checktrue(importXcosDiagram(SCI + "/modules/xcos/tests/nonreg_tests/bug_11193.zcos"));
+
+// looking for the Superblock to linearize
+for i=1:length(scs_m.objs)
+    if typeof(scs_m.objs(i))=="Block" & scs_m.objs(i).gui=="SUPER_f" then
+        scs_m = scs_m.objs(i).model.rpar;
+        break;
+    end
+end
+
+sys = lincos(scs_m);
+assert_checkequal(sys.A, []);
+assert_checkequal(sys.B, []);
+assert_checkequal(sys.C, []);
+assert_checkequal(sys.D, 7.0);
+
+

diff --git a/scilab/modules/xcos/tests/nonreg_tests/bug_11193.zcos b/scilab/modules/xcos/tests/nonreg_tests/bug_11193.zcos
new file mode 100644 (file)
index 0000000..b4e0fd1
Binary files /dev/null and b/scilab/modules/xcos/tests/nonreg_tests/bug_11193.zcos differ