* Bug #8597 fixed - Uncontrolled message of grand/clcg4 should be displayed as warning.

This reverts commit 53b9d53c0d2f02507be3c96c35a3eecc5468415b

Change-Id: I765695a9be2a8f323647702e28c7af6eefc9d7db

diff --git a/scilab/CHANGES_5.5.X b/scilab/CHANGES_5.5.X
index 6eb3d9f..72c54cb 100644 (file)
--- a/scilab/CHANGES_5.5.X
+++ b/scilab/CHANGES_5.5.X
@@ -85,11 +85,13 @@ Bug fixes
 
 * Bug #7927 fixed - Output "flag" in qmr function was not well documented.
 
+* Bug #8162 fixed - Area of stability of plzr was wrong for continuous systems (+unit test added).
+
 * Bug #8319 fixed - dbphi(hypermat) and phasemag(hypermat) returned a matrix instead of a hypermatrix.
 
-* Bug #8607 fixed - Some error messages in modules/overloading/macros were not standard and not localized.
+* Bug #8597 fixed - Uncontrolled message of grand/clcg4 should be displayed as warning.
 
-* Bug #8162 fixed - Area of stability of plzr was wrong for continuous systems (+unit test added).
+* Bug #8607 fixed - Some error messages in modules/overloading/macros were not standard and not localized.
 
 * Bug #8667 fixed - Handling of %nan in functions min,max,median is not correctly documented.
 

diff --git a/scilab/modules/randlib/src/c/clcg4.c b/scilab/modules/randlib/src/c/clcg4.c
index edd3222..f576078 100644 (file)
--- a/scilab/modules/randlib/src/c/clcg4.c
+++ b/scilab/modules/randlib/src/c/clcg4.c
@@ -61,6 +61,7 @@
 #include "sciprint.h"
 #include "others_generators.h"
 #include "localization.h"
+#include "warningmode.h"
 
 /***********************************************************************/
 /* Private part.                                                       */
@@ -182,7 +183,10 @@ int set_seed_clcg4(int g, double s0, double s1, double s2, double s3)
         Ig [0][g] = (int) s0; Ig [1][g] = (int) s1;
         Ig [2][g] = (int) s2; Ig [3][g] = (int) s3;
         init_generator_clcg4(g, InitialSeed);
-        sciprint(_("\n=> be aware that you have may lost synchronization\n    between the virtual gen %d and the others !\n    use grand(\"setall\", s1, s2, s3, s4) if you want recover it."), g);
+        if (getWarningMode())
+        {
+        sciprint(_("WARNING: %s\n"), _("be aware that you have may lost synchronization\n    between the virtual gen %d and the others !\n    use grand(\"setall\", s1, s2, s3, s4) if you want recover it."), g);
+        }
         return ( 1 );
     }
     else

diff --git a/scilab/modules/randlib/src/c/randlib.vcxproj b/scilab/modules/randlib/src/c/randlib.vcxproj
index 1d40a3e..91c0612 100644 (file)
--- a/scilab/modules/randlib/src/c/randlib.vcxproj
+++ b/scilab/modules/randlib/src/c/randlib.vcxproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
@@ -239,6 +239,9 @@ lib /DEF:"$(ProjectDir)elementary_functions_f_Import.def" /SUBSYSTEM:WINDOWS /MA
     <ProjectReference Include="..\..\..\api_scilab\api_scilab.vcxproj">
       <Project>{43c5bab1-1dca-4743-a183-77e0d42fe7d0}</Project>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\core\src\c\core.vcxproj">
+      <Project>{c6e2bc17-34d8-46e4-85f3-6293cb21adcd}</Project>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\localization\src\localization.vcxproj">
       <Project>{ecffeb0c-1eda-45ee-9a10-b18143852e17}</Project>
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>

diff --git a/scilab/modules/randlib/tests/nonreg_tests/bug_8597.dia.ref b/scilab/modules/randlib/tests/nonreg_tests/bug_8597.dia.ref
new file mode 100644 (file)
index 0000000..b49d273
--- /dev/null
+++ b/scilab/modules/randlib/tests/nonreg_tests/bug_8597.dia.ref
@@ -0,0 +1,27 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- CLI SHELL MODE -->
+//
+// <-- ENGLISH IMPOSED -->
+//
+// <-- Non-regression test for bug 8597 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=8597
+//
+// <-- Short Description -->
+// Uncontrolled message of grand/clcg4 should be displayed as warning
+warning("off");
+grand('setgen',"clcg4");
+grand('setsd',123456,123456,123456,123456);
+warning("on");
+grand('setgen',"clcg4");
+grand('setsd',123456,123456,123456,123456);
+WARNING: be aware that you have may lost synchronization
+    between the virtual gen %d and the others !
+    use grand("setall", s1, s2, s3, s4) if you want recover it.

diff --git a/scilab/modules/randlib/tests/nonreg_tests/bug_8597.tst b/scilab/modules/randlib/tests/nonreg_tests/bug_8597.tst
new file mode 100644 (file)
index 0000000..e861fc0
--- /dev/null
+++ b/scilab/modules/randlib/tests/nonreg_tests/bug_8597.tst
@@ -0,0 +1,26 @@
+// =============================================================================
+// Scilab ( http://www.scilab.org/ ) - This file is part of Scilab
+// Copyright (C) 2013 - Scilab Enterprises - Charlotte HECQUET
+//
+//  This file is distributed under the same license as the Scilab package.
+// =============================================================================
+//
+// <-- CLI SHELL MODE -->
+//
+// <-- ENGLISH IMPOSED -->
+//
+// <-- Non-regression test for bug 8597 -->
+//
+// <-- Bugzilla URL -->
+// http://bugzilla.scilab.org/show_bug.cgi?id=8597
+//
+// <-- Short Description -->
+// Uncontrolled message of grand/clcg4 should be displayed as warning
+
+warning("off");
+grand('setgen',"clcg4");
+grand('setsd',123456,123456,123456,123456);
+
+warning("on");
+grand('setgen',"clcg4");
+grand('setsd',123456,123456,123456,123456);