[scicos] dia.ref updated 87/21387/2
Cedric Delamarre [Fri, 21 Feb 2020 17:03:42 +0000 (18:03 +0100)]
Change-Id: Ifef9ca5610d3750a4a5d58fbd6315d019c8f086f

scilab/modules/scicos/tests/unit_tests/do_eval.dia.ref
scilab/modules/scicos/tests/unit_tests/model/Annotation.dia.ref
scilab/modules/scicos/tests/unit_tests/model/Block.dia.ref
scilab/modules/scicos/tests/unit_tests/model/Diagram.dia.ref
scilab/modules/scicos/tests/unit_tests/model/SuperBlock.dia.ref
scilab/modules/scicos/tests/unit_tests/sciblk2.dia.ref
scilab/modules/scicos/tests/unit_tests/scicos.dia.ref

index f7fb2ee..6aead6f 100644 (file)
@@ -8,7 +8,7 @@
 // <-- CLI SHELL MODE -->
 scicos_log("INFO")
  ans  =
- WARNING
+  "WARNING"
 loadXcosLibs();
 // check contained blocks interfaces
 o = CONST_m("define");
index 5d470f2..b2cdac0 100644 (file)
@@ -51,7 +51,7 @@ o.void
     []
 o.gui
  ans  =
- TEXT_f
+  "TEXT_f"
 // Redefine gca() to prevent graphic display
 p = funcprot();
 funcprot(0);
@@ -102,7 +102,7 @@ o.void
     []
 o.gui
  ans  =
- TEXT_f
+  "TEXT_f"
 // Check that all the model items are freed
 clear
 Xcos info:    objectDeleted( 2 , ANNOTATION )
index 90627db..f8c042f 100644 (file)
@@ -157,7 +157,7 @@ equations = list()
 uid = ""
 o.gui
  ans  =
- BIGSOM_f
+  "BIGSOM_f"
 o.doc
  ans  =
      ()
@@ -1392,7 +1392,7 @@ equations = list()
 uid = ""
 o.gui
  ans  =
- CSCOPE
+  "CSCOPE"
 o.doc
  ans  =
      ()
@@ -2283,18 +2283,17 @@ Xcos trace:   objectReferenced( 34 , BLOCK ) : 1
 Xcos trace:   objectUnreferenced( 34 , BLOCK ) : 0
  ans  =
        ans(1)
-!modelica  model  inputs  outputs  parameters  !
+  "modelica"  "model"  "inputs"  "outputs"  "parameters"
        ans(2)
- VsourceAC
+  "VsourceAC"
        ans(3)
- p
+  "p"
        ans(4)
- n
+  "n"
        ans(5)
               ans(5)(1)
-!VA  !
-!    !
-!f   !
+  "VA"
+  "f" 
               ans(5)(2)
                      ans(5)(2)(1)
    220.
@@ -2511,26 +2510,29 @@ Xcos trace:   objectReferenced( 37 , BLOCK ) : 1
 Xcos trace:   objectUnreferenced( 37 , BLOCK ) : 0
  ans  =
        ans(1)
-!MBLOCK  in  intype  out  outtype  param  paramv  pprop  nameF  funtxt  !
+         column 1 to 8
+  "MBLOCK"  "in"  "intype"  "out"  "outtype"  "param"  "paramv"  "pprop"
+         column 9 to 10
+  "nameF"  "funtxt"
        ans(2)
- "u1"
+  ""u1""
        ans(3)
- "I"
+  ""I""
        ans(4)
- ["y1";"y2"]
+  "["y1";"y2"]"
        ans(5)
- ["I";"E"]
+  "["I";"E"]"
        ans(6)
- ["R";"L"]
+  "["R";"L"]"
        ans(7)
               ans(7)(1)
- 0.1
+  "0.1"
               ans(7)(2)
- 0.0001
+  "0.0001"
        ans(8)
- [0;0]
+  "[0;0]"
        ans(9)
- generic
+  "generic"
        ans(10)
     []
 o.model.equations
@@ -2538,20 +2540,18 @@ Xcos trace:   objectReferenced( 37 , BLOCK ) : 1
 Xcos trace:   objectUnreferenced( 37 , BLOCK ) : 0
  ans  =
        ans(1)
-!modelica  model  inputs  outputs  parameters  !
+  "modelica"  "model"  "inputs"  "outputs"  "parameters"
        ans(2)
- generic
+  "generic"
        ans(3)
- u1
+  "u1"
        ans(4)
-!y1  !
-!    !
-!y2  !
+  "y1"
+  "y2"
        ans(5)
               ans(5)(1)
-!R  !
-!   !
-!L  !
+  "R"
+  "L"
               ans(5)(2)
                      ans(5)(2)(1)
    0.1
@@ -2944,183 +2944,140 @@ Xcos trace:   objectUnreferenced( 52 , BLOCK ) : 0
  ans  =
        ans(1)
               ans(1)(1)
-!paramspde        !
-!                 !
-!a                !
-!                 !
-!b                !
-!                 !
-!txt_exp          !
-!                 !
-!check_op1        !
-!                 !
-!a1               !
-!                 !
-!b1               !
-!                 !
-!check_op2        !
-!                 !
-!a2               !
-!                 !
-!b2               !
-!                 !
-!check_op3        !
-!                 !
-!a3               !
-!                 !
-!b3               !
-!                 !
-!check_op4        !
-!                 !
-!a4               !
-!                 !
-!b4               !
-!                 !
-!check_op5        !
-!                 !
-!a5               !
-!                 !
-!b5               !
-!                 !
-!check_op6        !
-!                 !
-!a6               !
-!                 !
-!b6               !
-!                 !
-!check_op7        !
-!                 !
-!a7               !
-!                 !
-!b7               !
-!                 !
-!discr_cst        !
-!                 !
-!discr_non_cst    !
-!                 !
-!signe            !
-!                 !
-!rad_automatique  !
-!                 !
-!rad_manuel       !
-!                 !
-!methode          !
-!                 !
-!ord1             !
-!                 !
-!ord2             !
-!                 !
-!ord3             !
-!                 !
-!degre            !
-!                 !
-!nnode            !
-!                 !
-!txt_pas          !
-!                 !
-!CI               !
-!                 !
-!dCI              !
-!                 !
-!CLa              !
-!                 !
-!CLa_exp          !
-!                 !
-!CLb              !
-!                 !
-!CLb_exp          !
-!                 !
-!points           !
+  "paramspde"      
+  "a"              
+  "b"              
+  "txt_exp"        
+  "check_op1"      
+  "a1"             
+  "b1"             
+  "check_op2"      
+  "a2"             
+  "b2"             
+  "check_op3"      
+  "a3"             
+  "b3"             
+  "check_op4"      
+  "a4"             
+  "b4"             
+  "check_op5"      
+  "a5"             
+  "b5"             
+  "check_op6"      
+  "a6"             
+  "b6"             
+  "check_op7"      
+  "a7"             
+  "b7"             
+  "discr_cst"      
+  "discr_non_cst"  
+  "signe"          
+  "rad_automatique"
+  "rad_manuel"     
+  "methode"        
+  "ord1"           
+  "ord2"           
+  "ord3"           
+  "degre"          
+  "nnode"          
+  "txt_pas"        
+  "CI"             
+  "dCI"            
+  "CLa"            
+  "CLa_exp"        
+  "CLb"            
+  "CLb_exp"        
+  "points"         
               ans(1)(2)
+  ""
               ans(1)(3)
+  ""
               ans(1)(4)
+  ""
               ans(1)(5)
- 0
+  "0"
               ans(1)(6)
+  ""
               ans(1)(7)
- IN_EDP1(t)
+  "IN_EDP1(t)"
               ans(1)(8)
- 0
+  "0"
               ans(1)(9)
+  ""
               ans(1)(10)
- IN_EDP2(t)
+  "IN_EDP2(t)"
               ans(1)(11)
- 0
+  "0"
               ans(1)(12)
+  ""
               ans(1)(13)
- IN_EDP3(t)
+  "IN_EDP3(t)"
               ans(1)(14)
- 0
+  "0"
               ans(1)(15)
+  ""
               ans(1)(16)
- IN_EDP4(t)
+  "IN_EDP4(t)"
               ans(1)(17)
- 0
+  "0"
               ans(1)(18)
+  ""
               ans(1)(19)
- IN_EDP5(t)
+  "IN_EDP5(t)"
               ans(1)(20)
- 0
+  "0"
               ans(1)(21)
+  ""
               ans(1)(22)
- IN_EDP6(t)
+  "IN_EDP6(t)"
               ans(1)(23)
- 0
+  "0"
               ans(1)(24)
+  ""
               ans(1)(25)
- IN_EDP7(t)
+  "IN_EDP7(t)"
               ans(1)(26)
- 0
+  "0"
               ans(1)(27)
- 0
+  "0"
               ans(1)(28)
- 0
+  "0"
               ans(1)(29)
- 0
+  "0"
               ans(1)(30)
- 0
+  "0"
               ans(1)(31)
- 0
+  "0"
               ans(1)(32)
+  ""
               ans(1)(33)
+  ""
               ans(1)(34)
+  ""
               ans(1)(35)
+  ""
               ans(1)(36)
+  ""
               ans(1)(37)
+  ""
               ans(1)(38)
+  ""
               ans(1)(39)
+  ""
               ans(1)(40)
- 0
+  "0"
               ans(1)(41)
- IN_CL1(t)
+  "IN_CL1(t)"
               ans(1)(42)
- 0
+  "0"
               ans(1)(43)
- IN_CL2(t)
+  "IN_CL2(t)"
               ans(1)(44)
+  ""
        ans(2)
     []
        ans(3)
+  ""
 // Test 'ipar', 'nzcross' and 'nmode' fields
 o = scicos_block();
 Xcos info:    objectCreated( 60 , BLOCK )
index c604af6..136bfd0 100644 (file)
@@ -551,7 +551,7 @@ uid = ""
 sb.gui
 Xcos trace:   objectUnreferenced( 10 , BLOCK ) : 0
  ans  =
- SUPER_f
+  "SUPER_f"
 sb.doc
  ans  =
      ()
@@ -834,7 +834,7 @@ Xcos trace:   objectReferenced( 10 , BLOCK ) : 2
 Xcos trace:   objectUnreferenced( 10 , BLOCK ) : 1
 Xcos trace:   objectUnreferenced( 10 , BLOCK ) : 0
  ans  =
+  ""
 sb.model.rpar.contrib
 Xcos trace:   objectReferenced( 10 , BLOCK ) : 1
 Xcos trace:   objectReferenced( 10 , BLOCK ) : 2
index d761bbf..813a01d 100644 (file)
@@ -175,10 +175,9 @@ function [xd, tvec, z, x, outptr] = anim_pen(flag, nevprt, t, x, z, rpar, ipar,
 endfunction
 warning(wMode);
 cpr = scicos_simulate(scs_m);
- INTEGRAL('set'): Wrong type for block parameter 'Initial Condition': v 
- ec(-1) expected, getting z0                                           
- INTEGRAL('set'): Wrong type for block parameter 'Initial Condition': v 
- ec(-1) expected, getting th0                                             Generate a loader file
+  "INTEGRAL('set'): Wrong type for block parameter 'Initial Condition': vec(-1) expected, getting z0"
+  "INTEGRAL('set'): Wrong type for block parameter 'Initial Condition': vec(-1) expected, getting th0"
+   Generate a loader file
    Generate a Makefile
    ilib_gen_Make: Copy compilation files (Makefile*, libtool...) to TMPDIR
    ilib_gen_Make: Copy inv_pend.c to TMPDIR
@@ -188,10 +187,8 @@ cpr = scicos_simulate(scs_m);
    Generate a cleaner file
 Shared archive loaded.
 Link done.
- INTEGRAL('set'): Wrong type for block parameter 'Initial Condition': v 
- ec(-1) expected, getting z0                                           
- INTEGRAL('set'): Wrong type for block parameter 'Initial Condition': v 
- ec(-1) expected, getting th0                                          
+  "INTEGRAL('set'): Wrong type for block parameter 'Initial Condition': vec(-1) expected, getting z0"
+  "INTEGRAL('set'): Wrong type for block parameter 'Initial Condition': vec(-1) expected, getting th0"
 cpr229 = [ ...
 -0.00000010072892435; ...
 -0.0000000093251865; ...
index 61be9f3..e9acf6f 100644 (file)
@@ -14,22 +14,24 @@ end
 if or(~isdef(["modelica_libs" "scicos_pal_libs"])) then
     [modelica_libs, scicos_pal_libs, %scicos_with_grid, %scs_wgrid] = initial_scicos_tables()
 end
+ modelica_libs  = 
+         column 1
+  "SCI/modules/scicos_blocks/macros/Electrical"
+         column 2
+  "SCI/modules/scicos_blocks/macros/Hydraulics"
+ scicos_pal_libs  = 
+         column 1 to 6
+  "Branching"  "Events"  "Misc"  "Sinks"  "Threshold"  "Linear"
+         column 7 to 12
+  "MatrixOp"  "NonLinear"  "Sources"  "Electrical"  "Hydraulics"  "PDE"
+         column 13
+  "IntegerOp"
+ %scicos_with_grid  = 
+  F
  %scs_wgrid  = 
    10.
    10.
    12.
- %scicos_with_grid  = 
-  F
- scicos_pal_libs  = 
-         column 1 to 8
-!Branching  Events  Misc  Sinks  Threshold  Linear  MatrixOp  NonLinear  !
-         column 9 to 13
-!Sources  Electrical  Hydraulics  PDE  IntegerOp  !
- modelica_libs  = 
-         column 1
-!SCI/modules/scicos_blocks/macros/Electrical  !
-         column 2
-!SCI/modules/scicos_blocks/macros/Hydraulics  !
 exec(loadpallibs,-1)
 exec("SCI/modules/scicos/tests/unit_tests/scicos_tests.sci");
 options = default_options();