* Bug #12508 fixed - Wrong error message in the rand function fixed.

Change-Id: Ibd5b97d187bcb505366f583bd650aad509c6f19a

diff --git a/scilab/CHANGES_5.5.X b/scilab/CHANGES_5.5.X
index 1e0bcc2..bf3b476 100644 (file)
--- a/scilab/CHANGES_5.5.X
+++ b/scilab/CHANGES_5.5.X
@@ -119,6 +119,8 @@ Bug fixes
 
 * Bug #12506 fixed - In SciNotes, miscolorization when returned values list was broken.
 
+* Bug #12508 fixed - Wrong error message in the rand function fixed.
+
 * Bug #12518 fixed - Polynoms were not displayed by default in browsevar.
 
 * Bug #12520 fixed - Improve the description of the size in browsevar.

diff --git a/scilab/modules/randlib/locales/randlib.pot b/scilab/modules/randlib/locales/randlib.pot
index f777113..08fddbc 100644 (file)
--- a/scilab/modules/randlib/locales/randlib.pot
+++ b/scilab/modules/randlib/locales/randlib.pot
@@ -14,12 +14,12 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Revision-Date: 2013-03-27 13:20+0100\n"
+"Revision-Date: 2013-04-16 17:24+0100\n"
 
 # File: sci_gateway/c/sci_grand.c, line: 146
-# File: sci_gateway/c/sci_grand.c, line: 502
-# File: sci_gateway/c/sci_grand.c, line: 562
-# File: sci_gateway/c/sci_grand.c, line: 913
+# File: sci_gateway/c/sci_grand.c, line: 501
+# File: sci_gateway/c/sci_grand.c, line: 561
+# File: sci_gateway/c/sci_grand.c, line: 912
 #, c-format
 msgid "%s: Wrong number of input argument: %d expected with option '%s'.\n"
 msgstr ""
@@ -39,10 +39,10 @@ msgstr ""
 #
 # File: sci_gateway/c/sci_grand.c, line: 194
 # File: sci_gateway/c/sci_grand.c, line: 410
-# File: sci_gateway/c/sci_grand.c, line: 437
-# File: sci_gateway/c/sci_grand.c, line: 460
-# File: sci_gateway/c/sci_grand.c, line: 483
-# File: sci_gateway/c/sci_grand.c, line: 520
+# File: sci_gateway/c/sci_grand.c, line: 436
+# File: sci_gateway/c/sci_grand.c, line: 459
+# File: sci_gateway/c/sci_grand.c, line: 482
+# File: sci_gateway/c/sci_grand.c, line: 519
 #, c-format
 msgid "%s: Wrong number of input arguments: %d expected with option '%s'.\n"
 msgstr ""
@@ -61,8 +61,8 @@ msgstr ""
 # File: sci_gateway/c/sci_grand.c, line: 367
 # File: sci_gateway/c/sci_grand.c, line: 373
 # File: sci_gateway/c/sci_grand.c, line: 392
-# File: sci_gateway/c/sci_grand.c, line: 584
-# File: sci_gateway/c/sci_grand.c, line: 591
+# File: sci_gateway/c/sci_grand.c, line: 583
+# File: sci_gateway/c/sci_grand.c, line: 590
 #, c-format
 msgid "%s: Wrong type for input argument #%d: Scalar expected.\n"
 msgstr ""
@@ -121,43 +121,43 @@ msgid "%s: Wrong number of output argument: %d expected with option '%s'.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 433
+# File: sci_gateway/c/sci_grand.c, line: 432
 #, c-format
 msgid "%s: The %s option affects only the %s generator\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 443
+# File: sci_gateway/c/sci_grand.c, line: 442
 #, c-format
 msgid "%s: Wrong value for input argument #%d: %d, %d or %d expected.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 456
-# File: sci_gateway/c/sci_grand.c, line: 479
+# File: sci_gateway/c/sci_grand.c, line: 455
+# File: sci_gateway/c/sci_grand.c, line: 478
 #, c-format
 msgid "The %s option affects only the %s generator\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 466
+# File: sci_gateway/c/sci_grand.c, line: 465
 #, c-format
 msgid "%s: Wrong value for input argument #%d: Must be between %d and %d.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 490
+# File: sci_gateway/c/sci_grand.c, line: 489
 #, c-format
 msgid "%s: Wrong value for input argument #%d: Must be > %d.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 507
+# File: sci_gateway/c/sci_grand.c, line: 506
 msgid "This information concerns only the clcg4 generator\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 550
+# File: sci_gateway/c/sci_grand.c, line: 549
 #, c-format
 msgid ""
 "%s: Wrong value for input argument #%d: '%s', '%s', '%s', '%s', '%s' or '%s' "
@@ -165,55 +165,55 @@ msgid ""
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 572
+# File: sci_gateway/c/sci_grand.c, line: 571
 #, c-format
-msgid "%s Wrong value for input argument #%d: %s.\n"
+msgid "%s Wrong value for input argument #%d: '%s' is unknown.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 599
-# File: sci_gateway/c/sci_grand.c, line: 605
+# File: sci_gateway/c/sci_grand.c, line: 598
+# File: sci_gateway/c/sci_grand.c, line: 604
 #, c-format
 msgid "%s: Wrong value for input argument #%d: Positive scalar expected.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 620
+# File: sci_gateway/c/sci_grand.c, line: 619
 msgid "Missing A and B for beta law\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 626
-# File: sci_gateway/c/sci_grand.c, line: 632
-# File: sci_gateway/c/sci_grand.c, line: 659
-# File: sci_gateway/c/sci_grand.c, line: 665
-# File: sci_gateway/c/sci_grand.c, line: 700
-# File: sci_gateway/c/sci_grand.c, line: 763
-# File: sci_gateway/c/sci_grand.c, line: 769
-# File: sci_gateway/c/sci_grand.c, line: 800
-# File: sci_gateway/c/sci_grand.c, line: 806
+# File: sci_gateway/c/sci_grand.c, line: 625
+# File: sci_gateway/c/sci_grand.c, line: 631
+# File: sci_gateway/c/sci_grand.c, line: 658
+# File: sci_gateway/c/sci_grand.c, line: 664
+# File: sci_gateway/c/sci_grand.c, line: 699
+# File: sci_gateway/c/sci_grand.c, line: 762
+# File: sci_gateway/c/sci_grand.c, line: 768
+# File: sci_gateway/c/sci_grand.c, line: 799
+# File: sci_gateway/c/sci_grand.c, line: 805
 #, c-format
 msgid "%s: Wrong size for input argument: Scalar expected for %s.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 638
+# File: sci_gateway/c/sci_grand.c, line: 637
 #, c-format
 msgid "Rand(...,'bet',..): A or B < %f\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 653
+# File: sci_gateway/c/sci_grand.c, line: 652
 msgid "Missing Dfn and Dfd for F law\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 671
+# File: sci_gateway/c/sci_grand.c, line: 670
 msgid "Degrees of freedom nonpositive\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 688
+# File: sci_gateway/c/sci_grand.c, line: 687
 #, c-format
 msgid ""
 "%s: Wrong value for input argument #%d: Must be the number of random "
@@ -221,147 +221,147 @@ msgid ""
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 694
+# File: sci_gateway/c/sci_grand.c, line: 693
 msgid "Missing N and P for MULtinomial law\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 706
+# File: sci_gateway/c/sci_grand.c, line: 705
 #, c-format
 msgid "%s: Wrong size for input argument: Column vector expected.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 713
-# File: sci_gateway/c/sci_grand.c, line: 986
-# File: sci_gateway/c/sci_grand.c, line: 1024
+# File: sci_gateway/c/sci_grand.c, line: 712
+# File: sci_gateway/c/sci_grand.c, line: 985
+# File: sci_gateway/c/sci_grand.c, line: 1023
 msgid "N < 0\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 718
+# File: sci_gateway/c/sci_grand.c, line: 717
 msgid "Ncat <= 1\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 726
+# File: sci_gateway/c/sci_grand.c, line: 725
 #, c-format
 msgid "P(%d) < 0\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 731
+# File: sci_gateway/c/sci_grand.c, line: 730
 #, c-format
 msgid "P(%d) > 1\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 738
+# File: sci_gateway/c/sci_grand.c, line: 737
 msgid "Sum of P(i) > 1\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 757
-msgid "Missing shape and scale for Gamma law\n"
+# File: sci_gateway/c/sci_grand.c, line: 756
+msgid "Missing shape and rate for Gamma law\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 775
+# File: sci_gateway/c/sci_grand.c, line: 774
 msgid "grand(..'gam',A,R) : A <= 0.0 or R <= 0.0\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 794
+# File: sci_gateway/c/sci_grand.c, line: 793
 msgid "Missing Av and Sd for Normal law\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 812
+# File: sci_gateway/c/sci_grand.c, line: 811
 msgid "SD < 0.0\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 828
+# File: sci_gateway/c/sci_grand.c, line: 827
 msgid "Missing Low and High for Uniform Real law\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 835
-# File: sci_gateway/c/sci_grand.c, line: 842
-# File: sci_gateway/c/sci_grand.c, line: 875
-# File: sci_gateway/c/sci_grand.c, line: 882
-# File: sci_gateway/c/sci_grand.c, line: 969
-# File: sci_gateway/c/sci_grand.c, line: 975
-# File: sci_gateway/c/sci_grand.c, line: 1007
-# File: sci_gateway/c/sci_grand.c, line: 1013
-# File: sci_gateway/c/sci_grand.c, line: 1216
-# File: sci_gateway/c/sci_grand.c, line: 1222
-# File: sci_gateway/c/sci_grand.c, line: 1249
-# File: sci_gateway/c/sci_grand.c, line: 1255
-# File: sci_gateway/c/sci_grand.c, line: 1261
-# File: sci_gateway/c/sci_grand.c, line: 1289
-# File: sci_gateway/c/sci_grand.c, line: 1316
-# File: sci_gateway/c/sci_grand.c, line: 1344
-# File: sci_gateway/c/sci_grand.c, line: 1374
+# File: sci_gateway/c/sci_grand.c, line: 834
+# File: sci_gateway/c/sci_grand.c, line: 841
+# File: sci_gateway/c/sci_grand.c, line: 874
+# File: sci_gateway/c/sci_grand.c, line: 881
+# File: sci_gateway/c/sci_grand.c, line: 968
+# File: sci_gateway/c/sci_grand.c, line: 974
+# File: sci_gateway/c/sci_grand.c, line: 1006
+# File: sci_gateway/c/sci_grand.c, line: 1012
+# File: sci_gateway/c/sci_grand.c, line: 1215
+# File: sci_gateway/c/sci_grand.c, line: 1221
+# File: sci_gateway/c/sci_grand.c, line: 1248
+# File: sci_gateway/c/sci_grand.c, line: 1254
+# File: sci_gateway/c/sci_grand.c, line: 1260
+# File: sci_gateway/c/sci_grand.c, line: 1288
+# File: sci_gateway/c/sci_grand.c, line: 1315
+# File: sci_gateway/c/sci_grand.c, line: 1343
+# File: sci_gateway/c/sci_grand.c, line: 1373
 #, c-format
 msgid "%s: Wrong type for input argument: Scalar expected.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 851
-# File: sci_gateway/c/sci_grand.c, line: 890
+# File: sci_gateway/c/sci_grand.c, line: 850
+# File: sci_gateway/c/sci_grand.c, line: 889
 #, c-format
 msgid "%s: Wrong type for input argument. Low < High expected.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 867
+# File: sci_gateway/c/sci_grand.c, line: 866
 msgid "Missing Low and High for Uniform int law\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 896
+# File: sci_gateway/c/sci_grand.c, line: 895
 msgid "a and b must integers with (b-a+1) <= 2147483561"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 930
+# File: sci_gateway/c/sci_grand.c, line: 929
 #, c-format
 msgid ""
 "%s: Wrong value for input argument: Number of random simulation expected.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 936
+# File: sci_gateway/c/sci_grand.c, line: 935
 msgid "Missing vect for random permutation\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 942
-# File: sci_gateway/c/sci_grand.c, line: 1053
+# File: sci_gateway/c/sci_grand.c, line: 941
+# File: sci_gateway/c/sci_grand.c, line: 1052
 #, c-format
 msgid "%s: Wrong type for input argument: Column vector expected.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 963
+# File: sci_gateway/c/sci_grand.c, line: 962
 msgid "Missing N and P for Negative Binomial law\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 981
-# File: sci_gateway/c/sci_grand.c, line: 1019
+# File: sci_gateway/c/sci_grand.c, line: 980
+# File: sci_gateway/c/sci_grand.c, line: 1018
 msgid "P is not in [0,1]\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1001
+# File: sci_gateway/c/sci_grand.c, line: 1000
 msgid "Missing N and P for Binomial law\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1041
-# File: sci_gateway/c/sci_grand.c, line: 1096
+# File: sci_gateway/c/sci_grand.c, line: 1040
+# File: sci_gateway/c/sci_grand.c, line: 1095
 #, c-format
 msgid ""
 "%s: Wrong value for input argument #%d: Must be the number of random "
@@ -369,18 +369,18 @@ msgid ""
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1047
+# File: sci_gateway/c/sci_grand.c, line: 1046
 msgid "Missing Mean and Cov for Multivariate Normal law\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1059
+# File: sci_gateway/c/sci_grand.c, line: 1058
 #, c-format
 msgid "%s: Wrong type for input argument: Square matrix expected.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1064
+# File: sci_gateway/c/sci_grand.c, line: 1063
 #, c-format
 msgid ""
 "%s: Wrong type for input arguments: Mean and Cov have incompatible "
@@ -388,19 +388,19 @@ msgid ""
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1074
+# File: sci_gateway/c/sci_grand.c, line: 1073
 #, c-format
 msgid "%s: Wrong size for input arguments: Mean and Cov are of null size.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1102
+# File: sci_gateway/c/sci_grand.c, line: 1101
 #, c-format
 msgid "%s: Missing P matrix and X0 for Markov chain\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1109
+# File: sci_gateway/c/sci_grand.c, line: 1108
 #, c-format
 msgid ""
 "%s: Wrong type for input argument #%d: Square matrix or row vector "
@@ -408,103 +408,103 @@ msgid ""
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1115
+# File: sci_gateway/c/sci_grand.c, line: 1114
 msgid "X0 is empty\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1122
+# File: sci_gateway/c/sci_grand.c, line: 1121
 #, c-format
 msgid "%s: X0(%d) must be in the range [1,%d[\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1137
+# File: sci_gateway/c/sci_grand.c, line: 1136
 #, c-format
 msgid "P(%d,%d) < 0\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1142
+# File: sci_gateway/c/sci_grand.c, line: 1141
 #, c-format
 msgid "P(%d,%d) > 1\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1149
+# File: sci_gateway/c/sci_grand.c, line: 1148
 #, c-format
 msgid "Sum of P(%d,1:%d)=%f ~= 1\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1193
+# File: sci_gateway/c/sci_grand.c, line: 1192
 #, c-format
 msgid "%s: Wrong number of input argument.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1210
+# File: sci_gateway/c/sci_grand.c, line: 1209
 msgid "Missing Df and Xnonc for non-central chi-square law\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1228
+# File: sci_gateway/c/sci_grand.c, line: 1227
 msgid "DF < 1 or XNONC < 0\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1243
+# File: sci_gateway/c/sci_grand.c, line: 1242
 msgid "Missing Dfn, Dfd and Xnonc for non-central F law\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1267
+# File: sci_gateway/c/sci_grand.c, line: 1266
 msgid "DF < 1.0 or DF <= 0.0 or Xnonc < 0.0\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1283
+# File: sci_gateway/c/sci_grand.c, line: 1282
 msgid "Missing Df for chi-square law\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1295
+# File: sci_gateway/c/sci_grand.c, line: 1294
 msgid "Rand: DF <= 0\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1310
+# File: sci_gateway/c/sci_grand.c, line: 1309
 msgid "Missing Av for Poisson law\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1322
+# File: sci_gateway/c/sci_grand.c, line: 1321
 msgid "Av < 0\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1338
+# File: sci_gateway/c/sci_grand.c, line: 1337
 msgid "Missing p for Geometric law\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1350
+# File: sci_gateway/c/sci_grand.c, line: 1349
 #, c-format
 msgid "%s: Wrong value for input argument: Must be between '%s' and %d.\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1368
+# File: sci_gateway/c/sci_grand.c, line: 1367
 msgid "Missing Av for exponential law\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1380
+# File: sci_gateway/c/sci_grand.c, line: 1379
 msgid "Av < 0.0\n"
 msgstr ""
 
 #
-# File: sci_gateway/c/sci_grand.c, line: 1394
+# File: sci_gateway/c/sci_grand.c, line: 1393
 #, c-format
 msgid "%s: Wrong value for input argument %s.\n"
 msgstr ""

diff --git a/scilab/modules/randlib/sci_gateway/c/sci_grand.c b/scilab/modules/randlib/sci_gateway/c/sci_grand.c
index fb6ac96..6a88a6a 100644 (file)
--- a/scilab/modules/randlib/sci_gateway/c/sci_grand.c
+++ b/scilab/modules/randlib/sci_gateway/c/sci_grand.c
@@ -135,7 +135,7 @@ int sci_Rand(char *fname, unsigned long fname_len)
     Nbvars = 0;
     CheckRhs(minrhs, maxrhs);
     CheckLhs(minlhs, maxlhs);
-    if ( GetType(1) != sci_matrix)
+    if (GetType(1) != sci_matrix)
     {
         int un = 1, deux = 2, dim_state_mt = 625, dim_state_fsultra = 40, dim_state_4 = 4;
         GetRhsVar(1, STRING_DATATYPE, &ms, &ns, &ls);
@@ -424,7 +424,6 @@ int sci_Rand(char *fname, unsigned long fname_len)
             PutLhsVar();
             return 0;
         }
-
         else if (strcmp("initgn", cstk(ls)) == 0)
         {
             SeedType Where;
@@ -569,7 +568,7 @@ int sci_Rand(char *fname, unsigned long fname_len)
         }
         else
         {
-            Scierror(999, _("%s Wrong value for input argument #%d: %s.\n"), fname, 1, cstk(ls));
+            Scierror(999, _("%s Wrong value for input argument #%d: '%s' is unknown.\n"), fname, 1, cstk(ls));
 
             return 0;
         }