Xcos tests: fix for DAE 92/12392/2
Paul BIGNIER [Fri, 30 Aug 2013 14:29:16 +0000 (16:29 +0200)]
Change-Id: I93a5289b8b5ebc829c876f7c6976f663e219d857

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_Platform.win.dia.ref
scilab/modules/scicos/tests/unit_tests/Solvers/ODE/LSodar.dia.ref
scilab/modules/scicos/tests/unit_tests/Solvers/ODE/LSodar.tst
scilab/modules/xcos/tests/unit_tests/Solvers/DAE/Bouncing.zcos
scilab/modules/xcos/tests/unit_tests/Solvers/DAE/Hydraulics.zcos
scilab/modules/xcos/tests/unit_tests/Solvers/DAE/Platform.zcos
scilab/modules/xcos/tests/unit_tests/Solvers/DAE/RLC.zcos

index 57f9058..1b0a230 100644 (file)
@@ -23,50 +23,50 @@ endfunction
 funcprot(prot);
 
 IDA_val_ref = [ 11.
-                11.
-                11.
-                7.1057377
-                4.2276434
-                3.7837192
-                2.9538128
-                5.8771057
-                6.3928885
-                7.7794415
-                8.7234525
-                8.1656745
-                5.4692996
-                4.119467
-                3.98566
-                4.5880334
-                6.2619705
-                7.460788
-                8.0411235
-                7.0316339
-                5.9103864
-                5.0870516
-                4.8350387
-                5.2736793
-                6.0991627
-                6.8411039
-                7.22751
-                6.791484
-                6.0262625
-                5.4580017
-                5.3754978
-                5.5876889
-                6.078075
-                6.5118764
-                6.6403792
-                6.4498018
-                6.0902532
-                5.7053277
-                5.6308887
-                5.8353956 ];
+11.
+11.
+7.1057377
+4.2276434
+3.7837192
+2.9538128
+5.8771057
+6.3928885
+7.7794415
+8.7234525
+8.1656745
+5.4692996
+4.119467
+3.98566
+4.5880334
+6.2619705
+7.460788
+8.0411235
+7.0316339
+5.9103864
+5.0870516
+4.8350387
+5.2736793
+6.0991627
+6.8411039
+7.22751
+6.791484
+6.0262625
+5.4580017
+5.3754978
+5.5876889
+6.078075
+6.5118764
+6.6403792
+6.4498018
+6.0902532
+5.7053277
+5.6308887
+5.8353956 ];
 IDA_time_ref = (0:.5:19.5)';
 
 scs_m.props.tol(6) = 100; // Solver
 scs_m.props.context = "per = 0.5"; // Period, to get more varied results
 scicos_simulate(scs_m);   // IDA
 
-assert_checkalmostequal(res.values, IDA_val_ref, [], 1d-7);
+assert_checkalmostequal(res.values, IDA_val_ref, [], 1d-6);
 assert_checkalmostequal(res.time, IDA_time_ref);
index 749d5c5..c3ef03e 100644 (file)
@@ -67,5 +67,5 @@ scicos_simulate(scs_m);   // IDA
 
  Flat Modelica : TMPDIR/Platform_imf.mo
  Simulation C code :TMPDIR/Platform_im.c
-assert_checkalmostequal(res.values, IDA_val_ref, [], 1d-7);
+assert_checkalmostequal(res.values, IDA_val_ref, [], 1d-6);
 assert_checkalmostequal(res.time, IDA_time_ref);
index b9ae529..77dbf17 100644 (file)
@@ -67,5 +67,5 @@ scicos_simulate(scs_m);   // IDA
 
  Flat Modelica : TMPDIR\Platform_imf.mo
  Simulation C code :TMPDIR\Platform_im.c
-assert_checkalmostequal(res.values, IDA_val_ref, [], 1d-7);
+assert_checkalmostequal(res.values, IDA_val_ref, [], 1d-6);
 assert_checkalmostequal(res.time, IDA_time_ref);
index 1729f9f..66b523f 100644 (file)
@@ -30,7 +30,7 @@ assert_checktrue(maxi <= 1d-8);
 assert_checktrue(mea <= 1d-8);
 assert_checktrue(stdeviation <= 1d-8);
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/Controller.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/ODE/Controller.zcos"));
 // Set solver to LSodar + run LSodar + save results
 scs_m.props.tol(6) = 0;                                    // Set solver to LSodar
 try scicos_simulate(scs_m); catch disp(lasterror()); end; // Run LSodar
index e0306cd..1c67b3a 100644 (file)
@@ -38,7 +38,7 @@ assert_checktrue(stdeviation <= 1d-8);
 
 
 // Import diagram
-assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/Controller.zcos"));
+assert_checktrue(importXcosDiagram("SCI/modules/xcos/tests/unit_tests/Solvers/ODE/Controller.zcos"));
 
 // Set solver to LSodar + run LSodar + save results
 scs_m.props.tol(6) = 0;                                    // Set solver to LSodar
index dfbef79..354a3c9 100644 (file)
Binary files a/scilab/modules/xcos/tests/unit_tests/Solvers/DAE/Bouncing.zcos and b/scilab/modules/xcos/tests/unit_tests/Solvers/DAE/Bouncing.zcos differ
index b4b832d..d4cbd6f 100644 (file)
Binary files a/scilab/modules/xcos/tests/unit_tests/Solvers/DAE/Hydraulics.zcos and b/scilab/modules/xcos/tests/unit_tests/Solvers/DAE/Hydraulics.zcos differ
index d711446..99fc79f 100644 (file)
Binary files a/scilab/modules/xcos/tests/unit_tests/Solvers/DAE/Platform.zcos and b/scilab/modules/xcos/tests/unit_tests/Solvers/DAE/Platform.zcos differ
index d9b3b9c..dc3a86e 100644 (file)
Binary files a/scilab/modules/xcos/tests/unit_tests/Solvers/DAE/RLC.zcos and b/scilab/modules/xcos/tests/unit_tests/Solvers/DAE/RLC.zcos differ