xcos: regen dia.ref tests

Change-Id: Iec5b865a03108f19ef0444eb1e5cc5b6ea28fdf7

diff --git a/scilab/modules/xcos/tests/nonreg_tests/bug_10697.dia.ref b/scilab/modules/xcos/tests/nonreg_tests/bug_10697.dia.ref
index 8faa1ad..affb609 100644 (file)
--- a/scilab/modules/xcos/tests/nonreg_tests/bug_10697.dia.ref
+++ b/scilab/modules/xcos/tests/nonreg_tests/bug_10697.dia.ref
@@ -21,4 +21,4 @@ function post_xcos_simulate(%cpr, scs_m, needcompile)
 endfunction
 // simulate
 xcos_simulate(scs_m, 4);
- post_xcos_simulate
+  "post_xcos_simulate"

diff --git a/scilab/modules/xcos/tests/nonreg_tests/bug_11975.unix.dia.ref b/scilab/modules/xcos/tests/nonreg_tests/bug_11975.unix.dia.ref
index 8456341..30c2ae1 100644 (file)
--- a/scilab/modules/xcos/tests/nonreg_tests/bug_11975.unix.dia.ref
+++ b/scilab/modules/xcos/tests/nonreg_tests/bug_11975.unix.dia.ref
@@ -38,32 +38,19 @@ assert_checktrue(importXcosDiagram("SCI/modules/xcos/demos/ModelicaBlocks/Hydrau
  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: 2                                     !
-!                                                                     !
-!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:                                                          !
+  "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: 2"                                   
+  "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: "                                                       
 WARNING: Diagram contains implicit blocks, compiling for implicit Solver.
 assert_checktrue(ok);

diff --git a/scilab/modules/xcos/tests/nonreg_tests/bug_11975.win.dia.ref b/scilab/modules/xcos/tests/nonreg_tests/bug_11975.win.dia.ref
index 7f65194..39e91ce 100644 (file)
--- a/scilab/modules/xcos/tests/nonreg_tests/bug_11975.win.dia.ref
+++ b/scilab/modules/xcos/tests/nonreg_tests/bug_11975.win.dia.ref
@@ -38,33 +38,19 @@ assert_checktrue(importXcosDiagram("SCI/modules/xcos/demos/ModelicaBlocks/Hydrau
  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: 2                                      !
-!                                                                      !
-!messagebox: Input/output dependency:[F]                               !
-!                                                                      !
-!messagebox: Analytical Jacobian: enabled  (%Jacobian=%t)              !
-!                                                                      !
-!messagebox: Parameter embedding mode: enabled (%Modelica_ParEmb=%t)   !
-!                                                                      !
-!messagebox:                                                           !
-!                                                                      !
-!messagebox: Generated files path: C:\Users\cdd\AppData\Local\Temp\SCI_!
-!TMP_24944_2926\                                                       !
-!                                                                      !
-!messagebox:                                                           !
+  "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: 2"                                   
+  "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: "                                                       
 WARNING: Diagram contains implicit blocks, compiling for implicit Solver.
 assert_checktrue(ok);

diff --git a/scilab/modules/xcos/tests/nonreg_tests/bug_12384.unix.dia.ref b/scilab/modules/xcos/tests/nonreg_tests/bug_12384.unix.dia.ref
index 079b16d..47b58d1 100644 (file)
--- a/scilab/modules/xcos/tests/nonreg_tests/bug_12384.unix.dia.ref
+++ b/scilab/modules/xcos/tests/nonreg_tests/bug_12384.unix.dia.ref
@@ -21,30 +21,17 @@ Info = scicos_simulate(scs_m,list());
  Main Modelica : TMPDIR/Loop_im.mo
  Flat Modelica : TMPDIR/Loop_imf.mo
  Simulation C code :TMPDIR/Loop_im.c
-!messagebox: Modelica blocks are reduced to a block with:             !
-!                                                                     !
-!messagebox: Number of differential states: 0                         !
-!                                                                     !
-!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:                                                          !
+  "messagebox: Modelica blocks are reduced to a block with:"           
+  "messagebox: Number of differential states: 0"                       
+  "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: "                                                       

diff --git a/scilab/modules/xcos/tests/nonreg_tests/bug_12384.win.dia.ref b/scilab/modules/xcos/tests/nonreg_tests/bug_12384.win.dia.ref
index dd50f6a..65ee36d 100644 (file)
--- a/scilab/modules/xcos/tests/nonreg_tests/bug_12384.win.dia.ref
+++ b/scilab/modules/xcos/tests/nonreg_tests/bug_12384.win.dia.ref
@@ -21,31 +21,17 @@ Info = scicos_simulate(scs_m,list());
  Main Modelica : TMPDIR\Loop_im.mo
  Flat Modelica : TMPDIR\Loop_imf.mo
  Simulation C code :TMPDIR\Loop_im.c
-!messagebox: Modelica blocks are reduced to a block with:              !
-!                                                                      !
-!messagebox: Number of differential states: 0                          !
-!                                                                      !
-!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: C:\Users\cdd\AppData\Local\Temp\SCI_!
-!TMP_28512_3135\                                                       !
-!                                                                      !
-!messagebox:                                                           !
+  "messagebox: Modelica blocks are reduced to a block with:"           
+  "messagebox: Number of differential states: 0"                       
+  "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: "                                                       

diff --git a/scilab/modules/xcos/tests/nonreg_tests/bug_13011.dia.ref b/scilab/modules/xcos/tests/nonreg_tests/bug_13011.dia.ref
index 8b3bace..e2fb05b 100644 (file)
--- a/scilab/modules/xcos/tests/nonreg_tests/bug_13011.dia.ref
+++ b/scilab/modules/xcos/tests/nonreg_tests/bug_13011.dia.ref
@@ -20,31 +20,18 @@ xcos_simulate(scs_m, 4);
  Main Modelica : TMPDIR/Loop_im.mo
  Flat Modelica : TMPDIR/Loop_imf.mo
  Simulation C code :TMPDIR/Loop_im.c
-!messagebox: Modelica blocks are reduced to a block with:             !
-!                                                                     !
-!messagebox: Number of differential states: 0                         !
-!                                                                     !
-!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:                                                          !
+  "messagebox: Modelica blocks are reduced to a block with:"           
+  "messagebox: Number of differential states: 0"                       
+  "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: "                                                       
 WARNING: Diagram contains implicit blocks, compiling for implicit Solver.

diff --git a/scilab/modules/xcos/tests/nonreg_tests/bug_13396.unix.dia.ref b/scilab/modules/xcos/tests/nonreg_tests/bug_13396.unix.dia.ref
index 49cd88e..fbc5cfa 100644 (file)
--- a/scilab/modules/xcos/tests/nonreg_tests/bug_13396.unix.dia.ref
+++ b/scilab/modules/xcos/tests/nonreg_tests/bug_13396.unix.dia.ref
@@ -63,33 +63,20 @@ end
  Main Modelica : TMPDIR/bug_13396_im.mo
  Flat Modelica : TMPDIR/bug_13396_imf.mo
  Simulation C code :TMPDIR/bug_13396_im.c
-!messagebox: Modelica blocks are reduced to a block with:             !
-!                                                                     !
-!messagebox: Number of differential states: 0                         !
-!                                                                     !
-!messagebox: Number of algebraic states: 1                            !
-!                                                                     !
-!messagebox: Number of discrete time states  : 0                      !
-!                                                                     !
-!messagebox: Number of zero-crossing surfaces: 1                      !
-!                                                                     !
-!messagebox: Number of modes  : 1                                     !
-!                                                                     !
-!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:                                                          !
+  "messagebox: Modelica blocks are reduced to a block with:"           
+  "messagebox: Number of differential states: 0"                       
+  "messagebox: Number of algebraic states: 1"                          
+  "messagebox: Number of discrete time states  : 0"                    
+  "messagebox: Number of zero-crossing surfaces: 1"                    
+  "messagebox: Number of modes  : 1"                                   
+  "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: "                                                       
 WARNING: Diagram contains implicit blocks, compiling for implicit Solver.
 assert_checktrue(ok);
 // simulate the diagram
@@ -98,33 +85,20 @@ xcos_simulate(scs_m, 4);
  Main Modelica : TMPDIR/bug_13396_im.mo
  Flat Modelica : TMPDIR/bug_13396_imf.mo
  Simulation C code :TMPDIR/bug_13396_im.c
-!messagebox: Modelica blocks are reduced to a block with:             !
-!                                                                     !
-!messagebox: Number of differential states: 0                         !
-!                                                                     !
-!messagebox: Number of algebraic states: 1                            !
-!                                                                     !
-!messagebox: Number of discrete time states  : 0                      !
-!                                                                     !
-!messagebox: Number of zero-crossing surfaces: 1                      !
-!                                                                     !
-!messagebox: Number of modes  : 1                                     !
-!                                                                     !
-!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:                                                          !
+  "messagebox: Modelica blocks are reduced to a block with:"           
+  "messagebox: Number of differential states: 0"                       
+  "messagebox: Number of algebraic states: 1"                          
+  "messagebox: Number of discrete time states  : 0"                    
+  "messagebox: Number of zero-crossing surfaces: 1"                    
+  "messagebox: Number of modes  : 1"                                   
+  "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: "                                                       
 WARNING: Diagram contains implicit blocks, compiling for implicit Solver.
 WARNING: Diagram has been compiled for implicit solver
 WARNING: switching to implicit Solver

diff --git a/scilab/modules/xcos/tests/nonreg_tests/bug_13396.win.dia.ref b/scilab/modules/xcos/tests/nonreg_tests/bug_13396.win.dia.ref
index dc2f759..dd45cd4 100644 (file)
--- a/scilab/modules/xcos/tests/nonreg_tests/bug_13396.win.dia.ref
+++ b/scilab/modules/xcos/tests/nonreg_tests/bug_13396.win.dia.ref
@@ -63,34 +63,20 @@ end
  Main Modelica : TMPDIR\bug_13396_im.mo
  Flat Modelica : TMPDIR\bug_13396_imf.mo
  Simulation C code :TMPDIR\bug_13396_im.c
-!messagebox: Modelica blocks are reduced to a block with:              !
-!                                                                      !
-!messagebox: Number of differential states: 0                          !
-!                                                                      !
-!messagebox: Number of algebraic states: 1                             !
-!                                                                      !
-!messagebox: Number of discrete time states  : 0                       !
-!                                                                      !
-!messagebox: Number of zero-crossing surfaces: 1                       !
-!                                                                      !
-!messagebox: Number of modes  : 1                                      !
-!                                                                      !
-!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: C:\Users\cdd\AppData\Local\Temp\SCI_!
-!TMP_25080_3547\                                                       !
-!                                                                      !
-!messagebox:                                                           !
+  "messagebox: Modelica blocks are reduced to a block with:"           
+  "messagebox: Number of differential states: 0"                       
+  "messagebox: Number of algebraic states: 1"                          
+  "messagebox: Number of discrete time states  : 0"                    
+  "messagebox: Number of zero-crossing surfaces: 1"                    
+  "messagebox: Number of modes  : 1"                                   
+  "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: "                                                       
 WARNING: Diagram contains implicit blocks, compiling for implicit Solver.
 assert_checktrue(ok);
 // simulate the diagram
@@ -99,34 +85,20 @@ xcos_simulate(scs_m, 4);
  Main Modelica : TMPDIR\bug_13396_im.mo
  Flat Modelica : TMPDIR\bug_13396_imf.mo
  Simulation C code :TMPDIR\bug_13396_im.c
-!messagebox: Modelica blocks are reduced to a block with:              !
-!                                                                      !
-!messagebox: Number of differential states: 0                          !
-!                                                                      !
-!messagebox: Number of algebraic states: 1                             !
-!                                                                      !
-!messagebox: Number of discrete time states  : 0                       !
-!                                                                      !
-!messagebox: Number of zero-crossing surfaces: 1                       !
-!                                                                      !
-!messagebox: Number of modes  : 1                                      !
-!                                                                      !
-!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: C:\Users\cdd\AppData\Local\Temp\SCI_!
-!TMP_25080_3547\                                                       !
-!                                                                      !
-!messagebox:                                                           !
+  "messagebox: Modelica blocks are reduced to a block with:"           
+  "messagebox: Number of differential states: 0"                       
+  "messagebox: Number of algebraic states: 1"                          
+  "messagebox: Number of discrete time states  : 0"                    
+  "messagebox: Number of zero-crossing surfaces: 1"                    
+  "messagebox: Number of modes  : 1"                                   
+  "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: "                                                       
 WARNING: Diagram contains implicit blocks, compiling for implicit Solver.
 WARNING: Diagram has been compiled for implicit solver
 WARNING: switching to implicit Solver

diff --git a/scilab/modules/xcos/tests/nonreg_tests/bug_8397.dia.ref b/scilab/modules/xcos/tests/nonreg_tests/bug_8397.dia.ref
index c9f9803..4507ab9 100644 (file)
--- a/scilab/modules/xcos/tests/nonreg_tests/bug_8397.dia.ref
+++ b/scilab/modules/xcos/tests/nonreg_tests/bug_8397.dia.ref
@@ -36,6 +36,5 @@ mputl(mo_content, fd);
 mclose(fd);
 // modelicac call
 ok = modelicac(src_file, function_file, xml_file, %t, c_file, %f);
- messagebox: Fatal error: exception Failure("The number of equations do 
- esn't match the number of variables: 2 equations and 3 variables.")   
+  "messagebox: Fatal error: exception Failure("The number of equations doesn't match the number of variables: 2 equations and 3 variables.")"
 assert_checkequal(ok, %f);

diff --git a/scilab/modules/xcos/tests/nonreg_tests/bug_8674.dia.ref b/scilab/modules/xcos/tests/nonreg_tests/bug_8674.dia.ref
index 11a7773..5ce7f3a 100644 (file)
--- a/scilab/modules/xcos/tests/nonreg_tests/bug_8674.dia.ref
+++ b/scilab/modules/xcos/tests/nonreg_tests/bug_8674.dia.ref
@@ -25,15 +25,9 @@ function result = dialog(labels,valueini)
 endfunction
 funcprot(prot);
 %cpr = xcos_simulate(scs_m, 4);
-!messagebox: Not enough information to find port sizes.  !
-!                                                        !
-!messagebox: I try to find the problem.                  !
- <html><body><em>Please update the diagram to avoid this warning.</em>< 
- br />Block output port has a non-determined size:<ul><li>Output port 1 
-  size is: 1</li><li>Input port 1 size is: 1</li></ul></body></html>   
- <html><body><em>Please update the diagram to avoid this warning.</em>< 
- br />Block input port has a non-determined size:<ul><li>Output port 1  
- size is: 1</li><li>Input port 1 size is: 1</li></ul></body></html>    
- The 'V' variable does not exist.
- <html><body>Initialisation problem: <br/>The 'V' variable does not exi 
- st.</body></html>                                                     
+  "messagebox: Not enough information to find port sizes."
+  "messagebox: I try to find the problem."                
+  "<html><body><em>Please update the diagram to avoid this warning.</em><br />Block output port has a non-determined size:<ul><li>Output port 1 size is: 1</li><li>Input port 1 size is: 1</li></ul></body></html>"
+  "<html><body><em>Please update the diagram to avoid this warning.</em><br />Block input port has a non-determined size:<ul><li>Output port 1 size is: 1</li><li>Input port 1 size is: 1</li></ul></body></html>"
+  "The 'V' variable does not exist."
+  "<html><body>Initialisation problem: <br/>The 'V' variable does not exist.</body></html>"

diff --git a/scilab/modules/xcos/tests/nonreg_tests/bug_9810.dia.ref b/scilab/modules/xcos/tests/nonreg_tests/bug_9810.dia.ref
index ec5baf2..fabedb6 100644 (file)
--- a/scilab/modules/xcos/tests/nonreg_tests/bug_9810.dia.ref
+++ b/scilab/modules/xcos/tests/nonreg_tests/bug_9810.dia.ref
@@ -20,6 +20,4 @@ status = importXcosDiagram(SCI + "/modules/xcos/tests/nonreg_tests/bug_9810.zcos
 if ~status then bugmes();quit;end
 // compile and simulate
 xcos_simulate(scs_m, 4);
- <html><body>Simulation problem: <br/>The LU factorization has been com 
- pleted, but the factor <br/>U is exactly singular : U(1,1) is exactly  
- zero.</body></html>                                                   
+  "<html><body>Simulation problem: <br/>The LU factorization has been completed, but the factor <br/>U is exactly singular : U(1,1) is exactly zero.</body></html>"

diff --git a/scilab/modules/xcos/tests/unit_tests/Integer/dflipflop.dia.ref b/scilab/modules/xcos/tests/unit_tests/Integer/dflipflop.dia.ref
index 33a3c8f..f20b682 100644 (file)
--- a/scilab/modules/xcos/tests/unit_tests/Integer/dflipflop.dia.ref
+++ b/scilab/modules/xcos/tests/unit_tests/Integer/dflipflop.dia.ref
@@ -10,17 +10,10 @@
 assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Integer/dflipflop.zcos"));
 A_ref = int8(zeros(128,1));
 try scicos_simulate(scs_m, "nw"); catch disp(lasterror()); end
-!messagebox: No continuous-time state. Thresholds are ignored; this    !
-!                                                                      !
-!messagebox: may be OK if you don't generate external events with them.!
-!                                                                      !
-!messagebox: If you want to reactivate the thresholds, then you need   !
-!                                                                      !
-!messagebox:                                                           !
-!                                                                      !
-!messagebox: to include a block with continuous-time state in your diag!
-!ram.                                                                  !
-!                                                                      !
-!messagebox:    You can for example include DUMMY CLSS block (linear pa!
-!lette).                                                               !
+  "messagebox: No continuous-time state. Thresholds are ignored; this "        
+  "messagebox: may be OK if you don't generate external events with them."     
+  "messagebox: If you want to reactivate the thresholds, then you need"        
+  "messagebox: "                                                               
+  "messagebox: to include a block with continuous-time state in your diagram." 
+  "messagebox:    You can for example include DUMMY CLSS block (linear palette)."
 assert_checkequal(A.values, A_ref);

diff --git a/scilab/modules/xcos/tests/unit_tests/Integer/dlatch.dia.ref b/scilab/modules/xcos/tests/unit_tests/Integer/dlatch.dia.ref
index 83a1cfa..c9708b2 100644 (file)
--- a/scilab/modules/xcos/tests/unit_tests/Integer/dlatch.dia.ref
+++ b/scilab/modules/xcos/tests/unit_tests/Integer/dlatch.dia.ref
@@ -13,19 +13,12 @@ A_ref2 = int8(zeros(24,1));
 A_ref3 = int8(ones(15,1));
 A_ref4 = int8(zeros(26,1));
 try scicos_simulate(scs_m, "nw"); catch disp(lasterror()); end
-!messagebox: No continuous-time state. Thresholds are ignored; this    !
-!                                                                      !
-!messagebox: may be OK if you don't generate external events with them.!
-!                                                                      !
-!messagebox: If you want to reactivate the thresholds, then you need   !
-!                                                                      !
-!messagebox:                                                           !
-!                                                                      !
-!messagebox: to include a block with continuous-time state in your diag!
-!ram.                                                                  !
-!                                                                      !
-!messagebox:    You can for example include DUMMY CLSS block (linear pa!
-!lette).                                                               !
+  "messagebox: No continuous-time state. Thresholds are ignored; this "        
+  "messagebox: may be OK if you don't generate external events with them."     
+  "messagebox: If you want to reactivate the thresholds, then you need"        
+  "messagebox: "                                                               
+  "messagebox: to include a block with continuous-time state in your diagram." 
+  "messagebox:    You can for example include DUMMY CLSS block (linear palette)."
 assert_checkequal(A.values(1:7),   A_ref1);
 assert_checkequal(A.values(8:31),  A_ref2);
 assert_checkequal(A.values(32:46), A_ref3);

diff --git a/scilab/modules/xcos/tests/unit_tests/error_reporting_nw.dia.ref b/scilab/modules/xcos/tests/unit_tests/error_reporting_nw.dia.ref
index 846907a..d8c189d 100644 (file)
--- a/scilab/modules/xcos/tests/unit_tests/error_reporting_nw.dia.ref
+++ b/scilab/modules/xcos/tests/unit_tests/error_reporting_nw.dia.ref
@@ -19,9 +19,9 @@ try
     scicos_simulate(scs_m, "nw");
 catch
 end
- Input ports are not numbered properly.
- scicos_flat: Input ports are not numbered properly.
- c_pass1: flat failed
+  "Input ports are not numbered properly."
+  "scicos_flat: Input ports are not numbered properly."
+  "c_pass1: flat failed"
 //-----------------------------------------------------------------------------
 // on do_eval (context evaluation)
 //-----------------------------------------------------------------------------

diff --git a/scilab/modules/xcos/tests/unit_tests/post_xcos_simulate.dia.ref b/scilab/modules/xcos/tests/unit_tests/post_xcos_simulate.dia.ref
index 625ab3c..0d26cca 100644 (file)
--- a/scilab/modules/xcos/tests/unit_tests/post_xcos_simulate.dia.ref
+++ b/scilab/modules/xcos/tests/unit_tests/post_xcos_simulate.dia.ref
@@ -14,14 +14,14 @@ endfunction
 // Register function
 post_xcos_simulate = list("disp_post_simulate");
 xcos_simulate(scs_m, 4);
- Calling disp_post_simulate
+  "Calling disp_post_simulate"
 assert_checktrue(isdef('cumsum_r'));
 clear('cumsum_r');
 // Register function
 clear post_xcos_simulate
 post_xcos_simulate = disp_post_simulate;
 xcos_simulate(scs_m, 4);
- Calling disp_post_simulate
+  "Calling disp_post_simulate"
 assert_checktrue(isdef('cumsum_r'));
 function analyze_post_simulate(%cpr, scs_m, needcompile)
 // Retrieve all objects
@@ -52,18 +52,18 @@ clear('cumsum_r');
 clear post_xcos_simulate
 post_xcos_simulate = list("analyze_post_simulate");
 xcos_simulate(scs_m, 4);
- Diagram Analysis:
- Found 24 Blocks.
- Found 22 Links.
- Found 0 Other component.
+  "Diagram Analysis:"
+  "Found 24 Blocks."
+  "Found 22 Links."
+  "Found 0 Other component."
 assert_checktrue(isdef('cumsum_r'));
 clear('cumsum_r');
 // Register function
 clear post_xcos_simulate
 post_xcos_simulate = analyze_post_simulate;
 xcos_simulate(scs_m, 4);
- Diagram Analysis:
- Found 24 Blocks.
- Found 22 Links.
- Found 0 Other component.
+  "Diagram Analysis:"
+  "Found 24 Blocks."
+  "Found 22 Links."
+  "Found 0 Other component."
 assert_checktrue(isdef('cumsum_r'));

diff --git a/scilab/modules/xcos/tests/unit_tests/pre_xcos_simulate.dia.ref b/scilab/modules/xcos/tests/unit_tests/pre_xcos_simulate.dia.ref
index 71dccfe..453cf7c 100644 (file)
--- a/scilab/modules/xcos/tests/unit_tests/pre_xcos_simulate.dia.ref
+++ b/scilab/modules/xcos/tests/unit_tests/pre_xcos_simulate.dia.ref
@@ -15,13 +15,13 @@ endfunction
 // Register function
 pre_xcos_simulate = list("fail_pre_simulate");
 xcos_simulate(scs_m, 4);
- Calling fail_pre_simulate
+  "Calling fail_pre_simulate"
 assert_checkfalse(isdef('cumsum_r'));
 // Register function
 clear pre_xcos_simulate
 pre_xcos_simulate = fail_pre_simulate;
 xcos_simulate(scs_m, 4);
- Calling fail_pre_simulate
+  "Calling fail_pre_simulate"
 assert_checkfalse(isdef('cumsum_r'));
 function continueSimulation = analyze_pre_simulate(scs_m, needcompile)
 // Retrieve all objects
@@ -53,18 +53,18 @@ endfunction
 clear pre_xcos_simulate
 pre_xcos_simulate = list("analyze_pre_simulate");
 xcos_simulate(scs_m, 4);
- Diagram Analysis:
- Found 24 Blocks.
- Found 22 Links.
- Found 0 Other component.
+  "Diagram Analysis:"
+  "Found 24 Blocks."
+  "Found 22 Links."
+  "Found 0 Other component."
 assert_checktrue(isdef('cumsum_r'));
 clear('cumsum_r');
 // Register function
 clear pre_xcos_simulate
 pre_xcos_simulate = analyze_pre_simulate;
 xcos_simulate(scs_m, 4);
- Diagram Analysis:
- Found 24 Blocks.
- Found 22 Links.
- Found 0 Other component.
+  "Diagram Analysis:"
+  "Found 24 Blocks."
+  "Found 22 Links."
+  "Found 0 Other component."
 assert_checktrue(isdef('cumsum_r'));

diff --git a/scilab/modules/xcos/tests/unit_tests/scicos_diagram.dia.ref b/scilab/modules/xcos/tests/unit_tests/scicos_diagram.dia.ref
index 29fd5ff..40fabec 100644 (file)
--- a/scilab/modules/xcos/tests/unit_tests/scicos_diagram.dia.ref
+++ b/scilab/modules/xcos/tests/unit_tests/scicos_diagram.dia.ref
@@ -36,7 +36,7 @@ function assert_check_props(props)
     // check tol
     assert_checkequal(props.tol(:)', [0.000001,0.000001,1.000D-10,100001,0,1,0]);
     // check tf
-    assert_checkequal(props.tf, 100000);
+    assert_checkequal(props.tf, 30);
     // check context
     assert_checkequal(props.context, []);
     // check void1

diff --git a/scilab/modules/xcos/tests/unit_tests/scicos_diagram.tst b/scilab/modules/xcos/tests/unit_tests/scicos_diagram.tst
index b3b0444..a9a1ef7 100644 (file)
--- a/scilab/modules/xcos/tests/unit_tests/scicos_diagram.tst
+++ b/scilab/modules/xcos/tests/unit_tests/scicos_diagram.tst
@@ -49,7 +49,7 @@ function assert_check_props(props)
     assert_checkequal(props.tol(:)', [0.000001,0.000001,1.000D-10,100001,0,1,0]);
 
     // check tf
-    assert_checkequal(props.tf, 100000);
+    assert_checkequal(props.tf, 30);
 
     // check context
     assert_checkequal(props.context, []);

diff --git a/scilab/modules/xcos/tests/unit_tests/xcosPal.dia.ref b/scilab/modules/xcos/tests/unit_tests/xcosPal.dia.ref
index 1eac06d..a0bf24c 100644 (file)
--- a/scilab/modules/xcos/tests/unit_tests/xcosPal.dia.ref
+++ b/scilab/modules/xcos/tests/unit_tests/xcosPal.dia.ref
@@ -8,13 +8,10 @@
 // White-box test for the xcosPal macro.
 fields=["name";"blockNames";"icons";"style"]
  fields  = 
-!name        !
-!            !
-!blockNames  !
-!            !
-!icons       !
-!            !
-!style       !
+  "name"      
+  "blockNames"
+  "icons"     
+  "style"     
 name = "My palette";
 exec(SCI + "/modules/scicos/palettes/Lookup_Tables.cosf", -1); // getting an scs_m
 pal = xcosPal();