Scicos tests: remove messageboxredefinitions 73/18473/3
Paul Bignier [Wed, 17 Aug 2016 08:43:28 +0000 (10:43 +0200)]
 * https://codereview.scilab.org/#/c/18356 redefines it in test_run

Change-Id: I265b702537ea09bef7d35b7010e477b734de7ceb

26 files changed:
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Bouncing.tst
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Bouncing.unix.dia.ref
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Hydraulics.tst
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Hydraulics.unix.dia.ref
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Platform.tst
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_Platform.unix.dia.ref
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_RLC.tst
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrK_RLC.unix.dia.ref
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Bouncing.tst
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Bouncing.unix.dia.ref
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Hydraulics.tst
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Hydraulics.unix.dia.ref
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Platform.tst
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_Platform.unix.dia.ref
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_RLC.tst
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/DDaskrN_RLC.unix.dia.ref
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Bouncing.tst
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Bouncing.unix.dia.ref
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Hydraulics.tst
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Hydraulics.unix.dia.ref
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Platform.tst
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_Platform.unix.dia.ref
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_RLC.tst
scilab/modules/scicos/tests/unit_tests/Solvers/DAE/IDA_RLC.unix.dia.ref
scilab/modules/scicos/tests/unit_tests/Solvers/ODE/DAE_ODE.dia.ref
scilab/modules/scicos/tests/unit_tests/Solvers/ODE/DAE_ODE.tst

index 37bad2c..9c185dc 100644 (file)
@@ -15,12 +15,6 @@ ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Bouncing.zcos"));
 
-// Redefining messagebox() to avoid popup
-prot = funcprot();
-funcprot(0);
-function messagebox(msg, msg_title)
-endfunction
-funcprot(prot);
 Info = scicos_simulate(scs_m, list());
 
 // Modify solver + run DDaskr + save results
index 7ea50f6..b979ed0 100644 (file)
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Bouncing.zcos"));
-// Redefining messagebox() to avoid popup
-prot = funcprot();
-funcprot(0);
-function messagebox(msg, msg_title)
-endfunction
-funcprot(prot);
 Info = scicos_simulate(scs_m, list());
 --------------------------------------------\
  Main Modelica : TMPDIR/Bouncing_im.mo
  Flat Modelica : TMPDIR/Bouncing_imf.mo
  Simulation C code :TMPDIR/Bouncing_im.c
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 2                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 0                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 0                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 1                      !
+!                                                                     !
+!messagebox: Number of modes  : 0                                     !
+!                                                                     !
+!messagebox: Number of inputs : 0                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[T]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/         !
+!                                                                     !
+!messagebox:                                                          !
 // Modify solver + run DDaskr + save results
 scs_m.props.tol(6) = 102;       // Solver
 scicos_simulate(scs_m, Info);   // DDaskr
index 87d5829..196061b 100644 (file)
@@ -15,13 +15,6 @@ ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Hydraulics.zcos"));
 
-// Redefining messagebox() to avoid popup
-prot = funcprot();
-funcprot(0);
-function messagebox(msg, msg_title)
-endfunction
-funcprot(prot);
-
 // Modify solver + run DDaskr + save results
 scs_m.props.tol(6) = 102;       // Solver
 scicos_simulate(scs_m);   // DDaskr
index 5755907..ddad834 100644 (file)
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Hydraulics.zcos"));
-// Redefining messagebox() to avoid popup
-prot = funcprot();
-funcprot(0);
-function messagebox(msg, msg_title)
-endfunction
-funcprot(prot);
 // Modify solver + run DDaskr + save results
 scs_m.props.tol(6) = 102;       // Solver
 scicos_simulate(scs_m);   // DDaskr
@@ -25,6 +19,33 @@ scicos_simulate(scs_m);   // DDaskr
  Main Modelica : TMPDIR/Hydraulics_im.mo
  Flat Modelica : TMPDIR/Hydraulics_imf.mo
  Simulation C code :TMPDIR/Hydraulics_im.c
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 2                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 5                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 0                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 19                     !
+!                                                                     !
+!messagebox: Number of modes  : 19                                    !
+!                                                                     !
+!messagebox: Number of inputs : 1                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[F]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/         !
+!                                                                     !
+!messagebox:                                                          !
 ddaskrval = res.values;         // Results
 // Modify solver + run IDA + save results
 scs_m.props.tol(6) = 100;      // Solver
@@ -33,6 +54,33 @@ scicos_simulate(scs_m);  // IDA
  Main Modelica : TMPDIR/Hydraulics_im.mo
  Flat Modelica : TMPDIR/Hydraulics_imf.mo
  Simulation C code :TMPDIR/Hydraulics_im.c
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 2                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 5                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 0                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 19                     !
+!                                                                     !
+!messagebox: Number of modes  : 19                                    !
+!                                                                     !
+!messagebox: Number of inputs : 1                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[F]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/         !
+!                                                                     !
+!messagebox:                                                          !
 idaval = res.values;           // Results
 // Compare results
 compa = abs(ddaskrval-idaval);
index f336172..eb9fbb3 100644 (file)
@@ -15,12 +15,6 @@ ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Platform.zcos"));
 
-// Redefining messagebox() to avoid popup
-prot = funcprot();
-funcprot(0);
-function messagebox(msg, msg_title)
-endfunction
-
 for i=1:2  // 'max step size' = 10^-i, precision
 
     // Start by updating the clock block period (sampling)
@@ -50,4 +44,3 @@ for i=1:2  // 'max step size' = 10^-i, precision
     assert_checktrue(stdeviation <= 5*10^-(i+2));
 
 end
-funcprot(prot);
index cd05c0d..0ada280 100644 (file)
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Platform.zcos"));
-// Redefining messagebox() to avoid popup
-prot = funcprot();
-funcprot(0);
-function messagebox(msg, msg_title)
-endfunction
 for i=1:2  // 'max step size' = 10^-i, precision
     // Start by updating the clock block period (sampling)
     Context.per = 5*10^-i;
@@ -43,16 +38,123 @@ end
  Main Modelica : TMPDIR/Platform_im.mo
  Flat Modelica : TMPDIR/Platform_imf.mo
  Simulation C code :TMPDIR/Platform_im.c
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 4                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 0                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 2                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 1                      !
+!                                                                     !
+!messagebox: Number of modes  : 0                                     !
+!                                                                     !
+!messagebox: Number of inputs : 0                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[T]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/         !
+!                                                                     !
+!messagebox:                                                          !
 --------------------------------------------\
  Main Modelica : TMPDIR/Platform_im.mo
  Flat Modelica : TMPDIR/Platform_imf.mo
  Simulation C code :TMPDIR/Platform_im.c
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 4                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 0                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 2                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 1                      !
+!                                                                     !
+!messagebox: Number of modes  : 0                                     !
+!                                                                     !
+!messagebox: Number of inputs : 0                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[T]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/         !
+!                                                                     !
+!messagebox:                                                          !
 --------------------------------------------\
  Main Modelica : TMPDIR/Platform_im.mo
  Flat Modelica : TMPDIR/Platform_imf.mo
  Simulation C code :TMPDIR/Platform_im.c
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 4                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 0                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 2                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 1                      !
+!                                                                     !
+!messagebox: Number of modes  : 0                                     !
+!                                                                     !
+!messagebox: Number of inputs : 0                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[T]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/         !
+!                                                                     !
+!messagebox:                                                          !
 --------------------------------------------\
  Main Modelica : TMPDIR/Platform_im.mo
  Flat Modelica : TMPDIR/Platform_imf.mo
  Simulation C code :TMPDIR/Platform_im.c
-funcprot(prot);
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 4                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 0                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 2                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 1                      !
+!                                                                     !
+!messagebox: Number of modes  : 0                                     !
+!                                                                     !
+!messagebox: Number of inputs : 0                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[T]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/         !
+!                                                                     !
+!messagebox:                                                          !
index b025865..1173205 100644 (file)
@@ -14,13 +14,6 @@ ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/RLC.zcos"));
 
-// Redefining messagebox() to avoid popup
-prot = funcprot();
-funcprot(0);
-function messagebox(msg, msg_title)
-endfunction
-funcprot(prot);
-
 for i=2:3
 
     // Start by updating the clock block period (sampling)
index 4c34ba1..afc7717 100644 (file)
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/RLC.zcos"));
-// Redefining messagebox() to avoid popup
-prot = funcprot();
-funcprot(0);
-function messagebox(msg, msg_title)
-endfunction
-funcprot(prot);
 for i=2:3
     // Start by updating the clock block period (sampling)
     scs_m.props.context = "per = 5*10^-"+string(i);
@@ -43,15 +37,123 @@ end
  Main Modelica : TMPDIR/RLC_im.mo
  Flat Modelica : TMPDIR/RLC_imf.mo
  Simulation C code :TMPDIR/RLC_im.c
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 2                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 1                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 0                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 0                      !
+!                                                                     !
+!messagebox: Number of modes  : 0                                     !
+!                                                                     !
+!messagebox: Number of inputs : 0                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[T]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/          !
+!                                                                     !
+!messagebox:                                                          !
 --------------------------------------------\
  Main Modelica : TMPDIR/RLC_im.mo
  Flat Modelica : TMPDIR/RLC_imf.mo
  Simulation C code :TMPDIR/RLC_im.c
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 2                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 1                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 0                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 0                      !
+!                                                                     !
+!messagebox: Number of modes  : 0                                     !
+!                                                                     !
+!messagebox: Number of inputs : 0                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[T]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/          !
+!                                                                     !
+!messagebox:                                                          !
 --------------------------------------------\
  Main Modelica : TMPDIR/RLC_im.mo
  Flat Modelica : TMPDIR/RLC_imf.mo
  Simulation C code :TMPDIR/RLC_im.c
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 2                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 1                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 0                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 0                      !
+!                                                                     !
+!messagebox: Number of modes  : 0                                     !
+!                                                                     !
+!messagebox: Number of inputs : 0                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[T]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/          !
+!                                                                     !
+!messagebox:                                                          !
 --------------------------------------------\
  Main Modelica : TMPDIR/RLC_im.mo
  Flat Modelica : TMPDIR/RLC_imf.mo
  Simulation C code :TMPDIR/RLC_im.c
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 2                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 1                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 0                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 0                      !
+!                                                                     !
+!messagebox: Number of modes  : 0                                     !
+!                                                                     !
+!messagebox: Number of inputs : 0                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[T]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/          !
+!                                                                     !
+!messagebox:                                                          !
index 575d6fa..36dd859 100644 (file)
@@ -15,12 +15,6 @@ ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Bouncing.zcos"));
 
-// Redefining messagebox() to avoid popup
-prot = funcprot();
-funcprot(0);
-function messagebox(msg, msg_title)
-endfunction
-funcprot(prot);
 Info = scicos_simulate(scs_m, list());
 
 // Modify solver + run DDaskr + save results
index e547aa8..35cf8c6 100644 (file)
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Bouncing.zcos"));
-// Redefining messagebox() to avoid popup
-prot = funcprot();
-funcprot(0);
-function messagebox(msg, msg_title)
-endfunction
-funcprot(prot);
 Info = scicos_simulate(scs_m, list());
 --------------------------------------------\
  Main Modelica : TMPDIR/Bouncing_im.mo
  Flat Modelica : TMPDIR/Bouncing_imf.mo
  Simulation C code :TMPDIR/Bouncing_im.c
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 2                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 0                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 0                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 1                      !
+!                                                                     !
+!messagebox: Number of modes  : 0                                     !
+!                                                                     !
+!messagebox: Number of inputs : 0                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[T]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/         !
+!                                                                     !
+!messagebox:                                                          !
 // Modify solver + run DDaskr + save results
 scs_m.props.tol(6) = 101;      // Solver
 scicos_simulate(scs_m, Info);  // DDaskr
index 8edf01d..281ff72 100644 (file)
@@ -15,13 +15,6 @@ ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Hydraulics.zcos"));
 
-// Redefining messagebox() to avoid popup
-prot = funcprot();
-funcprot(0);
-function messagebox(msg, msg_title)
-endfunction
-funcprot(prot);
-
 // Modify solver + run DDaskr + save results
 scs_m.props.tol(6) = 101;       // Solver
 scicos_simulate(scs_m);   // DDaskr
index f7576b1..9c5e0cb 100644 (file)
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Hydraulics.zcos"));
-// Redefining messagebox() to avoid popup
-prot = funcprot();
-funcprot(0);
-function messagebox(msg, msg_title)
-endfunction
-funcprot(prot);
 // Modify solver + run DDaskr + save results
 scs_m.props.tol(6) = 101;       // Solver
 scicos_simulate(scs_m);   // DDaskr
@@ -25,6 +19,33 @@ scicos_simulate(scs_m);   // DDaskr
  Main Modelica : TMPDIR/Hydraulics_im.mo
  Flat Modelica : TMPDIR/Hydraulics_imf.mo
  Simulation C code :TMPDIR/Hydraulics_im.c
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 2                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 5                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 0                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 19                     !
+!                                                                     !
+!messagebox: Number of modes  : 19                                    !
+!                                                                     !
+!messagebox: Number of inputs : 1                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[F]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/         !
+!                                                                     !
+!messagebox:                                                          !
 ddaskrval = res.values;         // Results
 // Modify solver + run IDA + save results
 scs_m.props.tol(6) = 100;       // Solver
@@ -33,6 +54,33 @@ scicos_simulate(scs_m);   // IDA
  Main Modelica : TMPDIR/Hydraulics_im.mo
  Flat Modelica : TMPDIR/Hydraulics_imf.mo
  Simulation C code :TMPDIR/Hydraulics_im.c
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 2                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 5                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 0                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 19                     !
+!                                                                     !
+!messagebox: Number of modes  : 19                                    !
+!                                                                     !
+!messagebox: Number of inputs : 1                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[F]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/         !
+!                                                                     !
+!messagebox:                                                          !
 idaval = res.values;            // Results
 // Compare results
 compa = abs(ddaskrval-idaval);
index ef82e64..9c3172c 100644 (file)
@@ -15,12 +15,6 @@ ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Platform.zcos"));
 
-// Redefining messagebox() to avoid popup
-prot = funcprot();
-funcprot(0);
-function messagebox(msg, msg_title)
-endfunction
-
 for i=1:3  // 'max step size' = 10^-i, precision
 
     // Start by updating the clock block period (sampling)
@@ -50,4 +44,3 @@ for i=1:3  // 'max step size' = 10^-i, precision
     assert_checktrue(stdeviation <= 5*10^-(i+3));
 
 end
-funcprot(prot);
index 26f1fef..cf3eaa8 100644 (file)
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Platform.zcos"));
-// Redefining messagebox() to avoid popup
-prot = funcprot();
-funcprot(0);
-function messagebox(msg, msg_title)
-endfunction
 for i=1:3  // 'max step size' = 10^-i, precision
     // Start by updating the clock block period (sampling)
     Context.per = 5*10^-i;
@@ -43,24 +38,185 @@ end
  Main Modelica : TMPDIR/Platform_im.mo
  Flat Modelica : TMPDIR/Platform_imf.mo
  Simulation C code :TMPDIR/Platform_im.c
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 4                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 0                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 2                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 1                      !
+!                                                                     !
+!messagebox: Number of modes  : 0                                     !
+!                                                                     !
+!messagebox: Number of inputs : 0                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[T]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/         !
+!                                                                     !
+!messagebox:                                                          !
 --------------------------------------------\
  Main Modelica : TMPDIR/Platform_im.mo
  Flat Modelica : TMPDIR/Platform_imf.mo
  Simulation C code :TMPDIR/Platform_im.c
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 4                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 0                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 2                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 1                      !
+!                                                                     !
+!messagebox: Number of modes  : 0                                     !
+!                                                                     !
+!messagebox: Number of inputs : 0                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[T]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/         !
+!                                                                     !
+!messagebox:                                                          !
 --------------------------------------------\
  Main Modelica : TMPDIR/Platform_im.mo
  Flat Modelica : TMPDIR/Platform_imf.mo
  Simulation C code :TMPDIR/Platform_im.c
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 4                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 0                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 2                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 1                      !
+!                                                                     !
+!messagebox: Number of modes  : 0                                     !
+!                                                                     !
+!messagebox: Number of inputs : 0                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[T]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/         !
+!                                                                     !
+!messagebox:                                                          !
 --------------------------------------------\
  Main Modelica : TMPDIR/Platform_im.mo
  Flat Modelica : TMPDIR/Platform_imf.mo
  Simulation C code :TMPDIR/Platform_im.c
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 4                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 0                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 2                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 1                      !
+!                                                                     !
+!messagebox: Number of modes  : 0                                     !
+!                                                                     !
+!messagebox: Number of inputs : 0                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[T]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/         !
+!                                                                     !
+!messagebox:                                                          !
 --------------------------------------------\
  Main Modelica : TMPDIR/Platform_im.mo
  Flat Modelica : TMPDIR/Platform_imf.mo
  Simulation C code :TMPDIR/Platform_im.c
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 4                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 0                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 2                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 1                      !
+!                                                                     !
+!messagebox: Number of modes  : 0                                     !
+!                                                                     !
+!messagebox: Number of inputs : 0                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[T]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/         !
+!                                                                     !
+!messagebox:                                                          !
 --------------------------------------------\
  Main Modelica : TMPDIR/Platform_im.mo
  Flat Modelica : TMPDIR/Platform_imf.mo
  Simulation C code :TMPDIR/Platform_im.c
-funcprot(prot);
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 4                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 0                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 2                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 1                      !
+!                                                                     !
+!messagebox: Number of modes  : 0                                     !
+!                                                                     !
+!messagebox: Number of inputs : 0                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[T]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/         !
+!                                                                     !
+!messagebox:                                                          !
index 33b44db..b665dd1 100644 (file)
@@ -14,13 +14,6 @@ ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/RLC.zcos"));
 
-// Redefining messagebox() to avoid popup
-prot = funcprot();
-funcprot(0);
-function messagebox(msg, msg_title)
-endfunction
-funcprot(prot);
-
 for i=2:3
 
     // Start by updating the clock block period (sampling)
index 8e4c579..31b51c0 100644 (file)
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/RLC.zcos"));
-// Redefining messagebox() to avoid popup
-prot = funcprot();
-funcprot(0);
-function messagebox(msg, msg_title)
-endfunction
-funcprot(prot);
 for i=2:3
     // Start by updating the clock block period (sampling)
     scs_m.props.context = "per = 5*10^-"+string(i);
@@ -43,15 +37,123 @@ end
  Main Modelica : TMPDIR/RLC_im.mo
  Flat Modelica : TMPDIR/RLC_imf.mo
  Simulation C code :TMPDIR/RLC_im.c
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 2                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 1                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 0                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 0                      !
+!                                                                     !
+!messagebox: Number of modes  : 0                                     !
+!                                                                     !
+!messagebox: Number of inputs : 0                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[T]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/          !
+!                                                                     !
+!messagebox:                                                          !
 --------------------------------------------\
  Main Modelica : TMPDIR/RLC_im.mo
  Flat Modelica : TMPDIR/RLC_imf.mo
  Simulation C code :TMPDIR/RLC_im.c
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 2                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 1                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 0                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 0                      !
+!                                                                     !
+!messagebox: Number of modes  : 0                                     !
+!                                                                     !
+!messagebox: Number of inputs : 0                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[T]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/          !
+!                                                                     !
+!messagebox:                                                          !
 --------------------------------------------\
  Main Modelica : TMPDIR/RLC_im.mo
  Flat Modelica : TMPDIR/RLC_imf.mo
  Simulation C code :TMPDIR/RLC_im.c
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 2                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 1                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 0                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 0                      !
+!                                                                     !
+!messagebox: Number of modes  : 0                                     !
+!                                                                     !
+!messagebox: Number of inputs : 0                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[T]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/          !
+!                                                                     !
+!messagebox:                                                          !
 --------------------------------------------\
  Main Modelica : TMPDIR/RLC_im.mo
  Flat Modelica : TMPDIR/RLC_imf.mo
  Simulation C code :TMPDIR/RLC_im.c
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 2                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 1                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 0                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 0                      !
+!                                                                     !
+!messagebox: Number of modes  : 0                                     !
+!                                                                     !
+!messagebox: Number of inputs : 0                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[T]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/          !
+!                                                                     !
+!messagebox:                                                          !
index d34d985..61a2655 100644 (file)
@@ -15,39 +15,32 @@ ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Bouncing.zcos"));
 
-// Redefining messagebox() to avoid popup
-prot = funcprot();
-funcprot(0);
-function messagebox(msg, msg_title)
-endfunction
-funcprot(prot);
-
 IDA_val_ref = [ 10.
-                11.3875
-                12.55
-                13.4875
-                14.2
-                14.6875
-                14.95
-                14.9875
-                14.8
-                14.3875
-                13.75
-                12.8875
-                11.8
-                10.4875
-                8.95
-                7.1875
-                5.2
-                2.9875
-                0.55
-                1.5647919
-                3.3538291
-                4.9178663
-                6.2569034
-                7.3709406
-                8.2599778
-                8.924015 ];
+11.3875
+12.55
+13.4875
+14.2
+14.6875
+14.95
+14.9875
+14.8
+14.3875
+13.75
+12.8875
+11.8
+10.4875
+8.95
+7.1875
+5.2
+2.9875
+0.55
+1.5647919
+3.3538291
+4.9178663
+6.2569034
+7.3709406
+8.2599778
+8.924015 ];
 IDA_time_ref = (0:.5:49.5)';
 
 scs_m.props.tol(6) = 100; // Solver
index f880d87..ad3ad01 100644 (file)
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Bouncing.zcos"));
-// Redefining messagebox() to avoid popup
-prot = funcprot();
-funcprot(0);
-function messagebox(msg, msg_title)
-endfunction
-funcprot(prot);
 IDA_val_ref = [ 10.
                 11.3875
                 12.55
@@ -52,5 +46,32 @@ scicos_simulate(scs_m);   // IDA
  Main Modelica : TMPDIR/Bouncing_im.mo
  Flat Modelica : TMPDIR/Bouncing_imf.mo
  Simulation C code :TMPDIR/Bouncing_im.c
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 2                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 0                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 0                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 1                      !
+!                                                                     !
+!messagebox: Number of modes  : 0                                     !
+!                                                                     !
+!messagebox: Number of inputs : 0                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[T]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/         !
+!                                                                     !
+!messagebox:                                                          !
 assert_checkalmostequal(res.values(1:26), IDA_val_ref, [], 1d-7);
 assert_checkalmostequal(res.time, IDA_time_ref);
index 4b7ae90..49b7be5 100644 (file)
@@ -15,81 +15,74 @@ ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Hydraulics.zcos"));
 
-// Redefining messagebox() to avoid popup
-prot = funcprot();
-funcprot(0);
-function messagebox(msg, msg_title)
-endfunction
-funcprot(prot);
-
 IDA_val_ref = [ 0.2014730
-                0.2014678
-                0.2014630
-                0.2014586
-                0.2014545
-                0.2014507
-                0.2014472
-                0.2014440
-                0.201441
-                0.2014383
-                0.2014358
-                0.2014336
-                0.2014315
-                0.2014297
-                0.201428
-                0.2014265
-                0.2014252
-                0.2014240
-                0.2014229
-                0.2014220
-                0.2014211
-                0.2014204
-                0.2014198
-                0.2014192
-                0.2014188
-                0.2014184
-                0.2014181
-                0.2014178
-                0.2014176
-                0.2014174
-                0.2014173
-                0.2014172
-                0.2014172
-                0.2014172
-                0.2014172
-                0.2014172
-                0.2014173
-                0.2014174
-                0.2014174
-                0.2014175
-                0.2014176
-                0.2014178
-                0.2014179
-                0.201418
-                0.2014181
-                0.2014183
-                0.2014184
-                0.2014185
-                0.2014186
-                0.2014188
-                0.2014189
-                0.2014190
-                0.2014191
-                0.2014193
-                0.2014194
-                0.2014195
-                0.2014196
-                0.2014197
-                0.2014198
-                0.2014199
-                0.2014200
-                0.2014200
-                0.2014201
-                0.2014202
-                0.2014203
-                0.2014203
-                0.2014204
-                0.2014204 ];
+0.2014678
+0.2014630
+0.2014586
+0.2014545
+0.2014507
+0.2014472
+0.2014440
+0.201441
+0.2014383
+0.2014358
+0.2014336
+0.2014315
+0.2014297
+0.201428
+0.2014265
+0.2014252
+0.2014240
+0.2014229
+0.2014220
+0.2014211
+0.2014204
+0.2014198
+0.2014192
+0.2014188
+0.2014184
+0.2014181
+0.2014178
+0.2014176
+0.2014174
+0.2014173
+0.2014172
+0.2014172
+0.2014172
+0.2014172
+0.2014172
+0.2014173
+0.2014174
+0.2014174
+0.2014175
+0.2014176
+0.2014178
+0.2014179
+0.201418
+0.2014181
+0.2014183
+0.2014184
+0.2014185
+0.2014186
+0.2014188
+0.2014189
+0.2014190
+0.2014191
+0.2014193
+0.2014194
+0.2014195
+0.2014196
+0.2014197
+0.2014198
+0.2014199
+0.2014200
+0.2014200
+0.2014201
+0.2014202
+0.2014203
+0.2014203
+0.2014204
+0.2014204 ];
 IDA_time_ref = (25.05:.05:50)';
 
 scs_m.props.tol(6) = 100; // Solver
index 60be117..7f172a0 100644 (file)
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Hydraulics.zcos"));
-// Redefining messagebox() to avoid popup
-prot = funcprot();
-funcprot(0);
-function messagebox(msg, msg_title)
-endfunction
-funcprot(prot);
 IDA_val_ref = [ 0.2014730
                 0.2014678
                 0.2014630
@@ -94,5 +88,32 @@ scicos_simulate(scs_m);   // IDA
  Main Modelica : TMPDIR/Hydraulics_im.mo
  Flat Modelica : TMPDIR/Hydraulics_imf.mo
  Simulation C code :TMPDIR/Hydraulics_im.c
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 2                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 5                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 0                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 19                     !
+!                                                                     !
+!messagebox: Number of modes  : 19                                    !
+!                                                                     !
+!messagebox: Number of inputs : 1                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[F]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/         !
+!                                                                     !
+!messagebox:                                                          !
 assert_checkalmostequal(res.values($-67:$, :), IDA_val_ref, [], 1d-7);
 assert_checkalmostequal(res.time, IDA_time_ref);
index 1b0a230..34eba34 100644 (file)
@@ -15,13 +15,6 @@ ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Platform.zcos"));
 
-// Redefining messagebox() to avoid popup
-prot = funcprot();
-funcprot(0);
-function messagebox(msg, msg_title)
-endfunction
-funcprot(prot);
-
 IDA_val_ref = [ 11.
 11.
 11.
index a318191..d47a3d2 100644 (file)
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/Platform.zcos"));
-// Redefining messagebox() to avoid popup
-prot = funcprot();
-funcprot(0);
-function messagebox(msg, msg_title)
-endfunction
-funcprot(prot);
 IDA_val_ref = [ 11.
 11.
 11.
@@ -66,5 +60,32 @@ scicos_simulate(scs_m);   // IDA
  Main Modelica : TMPDIR/Platform_im.mo
  Flat Modelica : TMPDIR/Platform_imf.mo
  Simulation C code :TMPDIR/Platform_im.c
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 4                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 0                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 2                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 1                      !
+!                                                                     !
+!messagebox: Number of modes  : 0                                     !
+!                                                                     !
+!messagebox: Number of inputs : 0                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[T]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/         !
+!                                                                     !
+!messagebox:                                                          !
 assert_checkalmostequal(res.values, IDA_val_ref, [], 1d-6);
 assert_checkalmostequal(res.time, IDA_time_ref);
index 25a59b7..079b206 100644 (file)
@@ -15,13 +15,6 @@ ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/RLC.zcos"));
 
-// Redefining messagebox() to avoid popup
-prot = funcprot();
-funcprot(0);
-function messagebox(msg, msg_title)
-endfunction
-funcprot(prot);
-
 IDA_val_ref = [
 -0.0019611
 -0.0015823
index 539c193..6a75870 100644 (file)
 ilib_verbose(0); //to remove ilib_* traces
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/DAE/RLC.zcos"));
-// Redefining messagebox() to avoid popup
-prot = funcprot();
-funcprot(0);
-function messagebox(msg, msg_title)
-endfunction
-funcprot(prot);
 IDA_val_ref = [
 -0.0019611
 -0.0015823
@@ -57,5 +51,32 @@ scicos_simulate(scs_m);   // IDA
  Main Modelica : TMPDIR/RLC_im.mo
  Flat Modelica : TMPDIR/RLC_imf.mo
  Simulation C code :TMPDIR/RLC_im.c
+!messagebox: Modelica blocks are reduced to a block with:             !
+!                                                                     !
+!messagebox: Number of differential states: 2                         !
+!                                                                     !
+!messagebox: Number of algebraic states: 1                            !
+!                                                                     !
+!messagebox: Number of discrete time states  : 0                      !
+!                                                                     !
+!messagebox: Number of zero-crossing surfaces: 0                      !
+!                                                                     !
+!messagebox: Number of modes  : 0                                     !
+!                                                                     !
+!messagebox: Number of inputs : 0                                     !
+!                                                                     !
+!messagebox: Number of outputs: 1                                     !
+!                                                                     !
+!messagebox: Input/output dependency:[T]                              !
+!                                                                     !
+!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)             !
+!                                                                     !
+!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)  !
+!                                                                     !
+!messagebox:                                                          !
+!                                                                     !
+!messagebox: Generated files path: TMPDIR/         !
+!                                                                     !
+!messagebox:                                                          !
 assert_checkalmostequal(res.values, IDA_val_ref, [], 1d-7);
 assert_checkalmostequal(res.time, IDA_time_ref);
index ad23cc5..13a4090 100644 (file)
 //
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/ODE/Kalman.zcos"));
-// Redefining messagebox() to avoid popup
-prot = funcprot();
-funcprot(0);
-function message(msg)
-endfunction
-funcprot(prot);
 // Modify solver + run IDA
 scs_m.props.tol(6) = 100;       // Solver
 ier = execstr('xcos_simulate(scs_m, 4);', 'errcatch'); // Run simulation (LSodar will actually take over)
+!messagebox: Diagram has been compiled for explicit solver  !
+!                                                           !
+!messagebox: switching to explicit Solver                   !
 assert_checkequal(ier, 0);
 ier = execstr('scicos_simulate(scs_m);', 'errcatch');
 assert_checkequal(ier, 0);
 // Modify solver + run DDaskr Newton
 scs_m.props.tol(6) = 101;       // Solver
 ier = execstr('xcos_simulate(scs_m, 4);', 'errcatch'); // Run simulation (LSodar will actually take over)
+!messagebox: Diagram has been compiled for explicit solver  !
+!                                                           !
+!messagebox: switching to explicit Solver                   !
 assert_checkequal(ier, 0);
 ier = execstr('scicos_simulate(scs_m);', 'errcatch');
 assert_checkequal(ier, 0);
 // Modify solver + run DDaskr GMRes
 scs_m.props.tol(6) = 102;       // Solver
 ier = execstr('xcos_simulate(scs_m, 4);', 'errcatch'); // Run simulation (LSodar will actually take over)
+!messagebox: Diagram has been compiled for explicit solver  !
+!                                                           !
+!messagebox: switching to explicit Solver                   !
 assert_checkequal(ier, 0);
 ier = execstr('scicos_simulate(scs_m);', 'errcatch');
 assert_checkequal(ier, 0);
index caf59cd..7b1fb36 100644 (file)
 // Import diagram
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/ODE/Kalman.zcos"));
 
-// Redefining messagebox() to avoid popup
-prot = funcprot();
-funcprot(0);
-function message(msg)
-endfunction
-funcprot(prot);
-
 // Modify solver + run IDA
 scs_m.props.tol(6) = 100;       // Solver
-ier = execstr('xcos_simulate(scs_m, 4);', 'errcatch'); // Run simulation (LSodar will actually take over)
+ier = execstr("xcos_simulate(scs_m, 4);", "errcatch"); // Run simulation (LSodar will actually take over)
 assert_checkequal(ier, 0);
-ier = execstr('scicos_simulate(scs_m);', 'errcatch');
+ier = execstr("scicos_simulate(scs_m);", "errcatch");
 assert_checkequal(ier, 0);
 
 // Modify solver + run DDaskr Newton
 scs_m.props.tol(6) = 101;       // Solver
-ier = execstr('xcos_simulate(scs_m, 4);', 'errcatch'); // Run simulation (LSodar will actually take over)
+ier = execstr("xcos_simulate(scs_m, 4);", "errcatch"); // Run simulation (LSodar will actually take over)
 assert_checkequal(ier, 0);
-ier = execstr('scicos_simulate(scs_m);', 'errcatch');
+ier = execstr("scicos_simulate(scs_m);", "errcatch");
 assert_checkequal(ier, 0);
 
 // Modify solver + run DDaskr GMRes
 scs_m.props.tol(6) = 102;       // Solver
-ier = execstr('xcos_simulate(scs_m, 4);', 'errcatch'); // Run simulation (LSodar will actually take over)
+ier = execstr("xcos_simulate(scs_m, 4);", "errcatch"); // Run simulation (LSodar will actually take over)
 assert_checkequal(ier, 0);
-ier = execstr('scicos_simulate(scs_m);', 'errcatch');
+ier = execstr("scicos_simulate(scs_m);", "errcatch");
 assert_checkequal(ier, 0);