* Bug #14863 fixed - Scicos: reduce default final time 90/18690/7
Paul Bignier [Mon, 14 Nov 2016 16:20:07 +0000 (17:20 +0100)]
Change-Id: I72ef6102ce994956d384f6ab45dec869b01ce261

scilab/CHANGES.md
scilab/modules/scicos/macros/scicos_scicos/scicos_params.sci
scilab/modules/scicos/src/cpp/model/Diagram.hxx
scilab/modules/scicos/tests/unit_tests/model/Adapter_list_extract.dia.ref
scilab/modules/scicos/tests/unit_tests/model/Adapter_list_extract.tst
scilab/modules/scicos/tests/unit_tests/model/Deep_cloning.dia.ref
scilab/modules/scicos/tests/unit_tests/model/Diagram.dia.ref
scilab/modules/scicos/tests/unit_tests/model/SuperBlock_in_SuperBlock.dia.ref
scilab/modules/scicos/tests/unit_tests/model/from_mlist.dia.ref
scilab/modules/scicos/tests/unit_tests/scicos_new.dia.ref

index bc13780..e9a1a59 100644 (file)
@@ -87,16 +87,19 @@ Feature changes and additions
   - For decimal numbers `x > 2^52`, querried bits below `%eps` (indices < log2(x)-52) now return `Nan` instead of 0.
   - Several bits can now be retrieved from each component of an input array.
 
-  
+
 Help pages:
 -----------
-* overhauled/rewritten: `bitget`
+
+* overhauled / rewritten: `bitget`
 * fixed / improved:  `bench_run` `M_SWITCH`
 
 
 Xcos
 ----
 
+* Default ending time reduced from 100000 to 30, to fit default scope block
+
 
 API modification
 ----------------
@@ -127,6 +130,7 @@ Bug Fixes
 * [#14604](http://bugzilla.scilab.org/show_bug.cgi?id=14604): `emptystr()` is 40x slower with 6.0.0 wrt 5.5.2
 * [#14605](http://bugzilla.scilab.org/show_bug.cgi?id=14605): fixed - `bench_run` was too strict about the specification of tests names.
 * [#14812](http://bugzilla.scilab.org/show_bug.cgi?id=14812): Minor typos in messages.
+* [#14863](http://bugzilla.scilab.org/show_bug.cgi?id=14863): In Xcos, the default ending time was unhandily high (100000), reduced it to 30.
 * [#14982](http://bugzilla.scilab.org/show_bug.cgi?id=14982): `msprintf` segmentation fault was caught due to wrong size
 * [#15269](http://bugzilla.scilab.org/show_bug.cgi?id=15269): `xgetech` was poor and stiff compared to any combination of `gca()` properties `.axes_bounds`, `.data_bounds`, `.log_flags`, and `.margins`. It is removed.
 * [#15271](http://bugzilla.scilab.org/show_bug.cgi?id=15271): `bitget` needed to be upgraded.
index 7075b4b..706a09f 100644 (file)
@@ -30,8 +30,8 @@ function params=scicos_params(v1,v2,v3,v4,v5,v6,v7,v8,v9,v10)
             titlex=Title
         end
     end
-    if exists("tf","local")==0 then tf=100000,end
-    if exists("tol","local")==0 then tol=[1.d-6,1.d-6,1.d-10,tf+1,0,1,0],end
+    if exists("tf","local")==0 then tf=30,end
+    if exists("tol","local")==0 then tol=[1.d-6,1.d-6,1.d-10,100001,0,1,0],end
     if exists("context","local")==0 then context=[],end
     void1=[]
     if exists("options","local")==0 then options=default_options(),end
index b95804f..4ea2ee7 100644 (file)
@@ -39,8 +39,8 @@ struct SimulationConfig
     double solver;              //!< Current numerical solver.
     double delta_h;             //!< Maximum step interval.
 
-    SimulationConfig() : final_time(100000), absolute_tolerance(1e-6), relative_tolerance(1e-6),
-        time_tolerance(1e-10), delta_t(final_time + 1), realtime_scale(0), solver(1), delta_h(0) {};
+    SimulationConfig() : final_time(30), absolute_tolerance(1e-6), relative_tolerance(1e-6),
+        time_tolerance(1e-10), delta_t(100001), realtime_scale(0), solver(1), delta_h(0) {};
 
     SimulationConfig(const SimulationConfig& p) :  final_time(p.final_time), absolute_tolerance(p.absolute_tolerance),
         relative_tolerance(p.relative_tolerance), time_tolerance(p.time_tolerance), delta_t(p.delta_t),
index 65f874a..21844fb 100644 (file)
@@ -10,7 +10,7 @@ loadXcosLibs();
 // With a diagram
 scs_m = scicos_diagram();
 lTf = list("props", "tf");
-assert_checkequal(scs_m(lTf), 100000);
+assert_checkequal(scs_m(lTf), 30);
 lObjs  = list("objs");
 assert_checkequal(scs_m(lObjs),  list());
 // With a link
index 154c32e..b903d72 100644 (file)
@@ -15,7 +15,7 @@ loadXcosLibs();
 scs_m = scicos_diagram();
 
 lTf = list("props", "tf");
-assert_checkequal(scs_m(lTf), 100000);
+assert_checkequal(scs_m(lTf), 30);
 
 lObjs  = list("objs");
 assert_checkequal(scs_m(lObjs),  list());
index 875a024..97c3dc2 100644 (file)
@@ -241,7 +241,7 @@ Xcos trace:   objectUnreferenced( 15 , BLOCK ) : 1
 wpar = [600,450,0,0,600,450]
 title = ["";""]
 tol = [0.000001,0.000001,1.000D-10,100001,0,1,0]
-tf = 100000
+tf = 30
 context = []
 void1 = []
 options = tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8])
@@ -336,7 +336,7 @@ Xcos trace:   objectUnreferenced( 15 , BLOCK ) : 1
 wpar = [600,450,0,0,600,450]
 title = ["";""]
 tol = [0.000001,0.000001,1.000D-10,100001,0,1,0]
-tf = 100000
+tf = 30
 context = []
 void1 = []
 options = tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8])
@@ -966,7 +966,7 @@ Xcos trace:   objectUnreferenced( 62 , BLOCK ) : 1
 wpar = [600,450,0,0,600,450]
 title = ["";""]
 tol = [0.000001,0.000001,1.000D-10,100001,0,1,0]
-tf = 100000
+tf = 30
 context = []
 void1 = []
 options = tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8])
@@ -1113,7 +1113,7 @@ Xcos trace:   objectUnreferenced( 62 , BLOCK ) : 1
 wpar = [600,450,0,0,600,450]
 title = ["";""]
 tol = [0.000001,0.000001,1.000D-10,100001,0,1,0]
-tf = 100000
+tf = 30
 context = []
 void1 = []
 options = tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8])
@@ -1343,7 +1343,7 @@ Xcos trace:   objectUnreferenced( 62 , BLOCK ) : 1
 wpar = [600,450,0,0,600,450]
 title = ["";""]
 tol = [0.000001,0.000001,1.000D-10,100001,0,1,0]
-tf = 100000
+tf = 30
 context = []
 void1 = []
 options = tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8])
@@ -2068,7 +2068,7 @@ Xcos trace:   objectUnreferenced( 91 , BLOCK ) : 1
 wpar = [600,450,0,0,600,450]
 title = ["";""]
 tol = [0.000001,0.000001,1.000D-10,100001,0,1,0]
-tf = 100000
+tf = 30
 context = []
 void1 = []
 options = tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8])
index 97091c8..1405ab4 100644 (file)
@@ -25,7 +25,7 @@ Xcos trace:   objectUnreferenced( 1 , DIAGRAM ) : 0
 wpar = [600,450,0,0,600,450]
 title = ["Untitled";""]
 tol = [0.000001,0.000001,1.000D-10,100001,0,1,0]
-tf = 100000
+tf = 30
 context = []
 void1 = []
 options = tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8])
@@ -39,7 +39,7 @@ Xcos trace:   objectUnreferenced( 1 , DIAGRAM ) : 0
 wpar = [600,450,0,0,600,450]
 title = ["Untitled";""]
 tol = [0.000001,0.000001,1.000D-10,100001,0,1,0]
-tf = 100000
+tf = 30
 context = []
 void1 = []
 options = tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8])
@@ -339,7 +339,7 @@ Xcos trace:   objectUnreferenced( 16 , DIAGRAM ) : 0
 wpar = [600,450,0,0,600,450]
 title = ["Untitled";""]
 tol = [0.000001,0.000001,1.000D-10,100001,0,1,0]
-tf = 100000
+tf = 30
 context = []
 void1 = []
 options = tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8])
index ce27263..15bda3d 100644 (file)
@@ -185,7 +185,7 @@ evtout = []
 state = []
 dstate = []
 odstate = list()
-rpar = mlist(["diagram","props","objs","version","contrib"],tlist(["params","wpar","title","tol","tf","context","void1","options","void2","void3","doc"],[600,450,0,0,600,450],["Quat_Conj";""],[0.000001,0.000001,1.000D-10,100001,0,1,0],100000,[],[],tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8]),[],[],list()),list(mlist(["Link","xx","yy","id","thick","ct","from","to"],[],[],"",[0,0],[1,1],[2,1,0],[3,1,1])),"",list())
+rpar = mlist(["diagram","props","objs","version","contrib"],tlist(["params","wpar","title","tol","tf","context","void1","options","void2","void3","doc"],[600,450,0,0,600,450],["Quat_Conj";""],[0.000001,0.000001,1.000D-10,100001,0,1,0],30,[],[],tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8]),[],[],list()),list(mlist(["Link","xx","yy","id","thick","ct","from","to"],[],[],"",[0,0],[1,1],[2,1,0],[3,1,1])),"",list())
 ipar = []
 opar = list()
 blocktype = "h"
index 3e46599..aa634f8 100644 (file)
@@ -16,7 +16,7 @@ Xcos trace:   objectReferenced( 1 , DIAGRAM ) : 1
 Xcos debug:   propertyUpdated( 1 , DIAGRAM , TITLE ) : SUCCESS
 Xcos debug:   propertyUpdated( 1 , DIAGRAM , PATH ) : SUCCESS
 Xcos debug:   propertyUpdated( 1 , DIAGRAM , PROPERTIES ) : SUCCESS
-Xcos trace:   propertyUpdated( 1 , DIAGRAM , PROPERTIES ) : NO_CHANGES
+Xcos debug:   propertyUpdated( 1 , DIAGRAM , PROPERTIES ) : SUCCESS
 Xcos trace:   propertyUpdated( 1 , DIAGRAM , CONTEXT ) : NO_CHANGES
 Xcos trace:   objectUnreferenced( 1 , DIAGRAM ) : 0
 Xcos trace:   propertyUpdated( 1 , DIAGRAM , CHILDREN ) : NO_CHANGES
index 32afe47..2139c56 100644 (file)
@@ -118,7 +118,7 @@ scs_m = scicos_diagram()
 wpar = [600,450,0,0,600,450]
 title = ["Untitled";""]
 tol = [0.000001,0.000001,1.000D-10,100001,0,1,0]
-tf = 100000
+tf = 30
 context = []
 void1 = []
 options = tlist(["scsopt","3D","Background","Link","ID","Cmap"],list(%t,33),[8,1],[1,5],list([4,1,10,1],[4,1,2,1]),[0.8,0.8,0.8])