[PHP-CVS] cvs: php4 /ext/standard/tests/strings 004.phpt

2002-10-30 Thread Derick Rethans
derick  Thu Oct 31 01:37:18 2002 EDT

  Modified files:  
/php4/ext/standard/tests/strings004.phpt 
  Log:
  - Fix test, in some cases the first significant number in the time
was a 3
  
  
Index: php4/ext/standard/tests/strings/004.phpt
diff -u php4/ext/standard/tests/strings/004.phpt:1.1 
php4/ext/standard/tests/strings/004.phpt:1.2
--- php4/ext/standard/tests/strings/004.phpt:1.1Wed Oct 23 15:33:12 2002
+++ php4/ext/standard/tests/strings/004.phptThu Oct 31 01:37:18 2002
 -31,54 +31,54 
 
 stats('str_shuffle', $a);
 ?
---EXPECTF--
+--EXPECTREGEX--
 shuffle
-1234: 3%d: 0.04%d
-1243: 3%d: 0.04%d
-1324: 3%d: 0.04%d
-1342: 3%d: 0.04%d
-1423: 3%d: 0.04%d
-1432: 3%d: 0.04%d
-2134: 3%d: 0.04%d
-2143: 3%d: 0.04%d
-2314: 3%d: 0.04%d
-2341: 3%d: 0.04%d
-2413: 3%d: 0.04%d
-2431: 3%d: 0.04%d
-3124: 3%d: 0.04%d
-3142: 3%d: 0.04%d
-3214: 3%d: 0.04%d
-3241: 3%d: 0.04%d
-3412: 3%d: 0.04%d
-3421: 3%d: 0.04%d
-4123: 3%d: 0.04%d
-4132: 3%d: 0.04%d
-4213: 3%d: 0.04%d
-4231: 3%d: 0.04%d
-4312: 3%d: 0.04%d
-4321: 3%d: 0.04%d
+1234: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+1243: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+1324: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+1342: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+1423: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+1432: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+2134: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+2143: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+2314: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+2341: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+2413: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+2431: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+3124: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+3142: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+3214: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+3241: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+3412: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+3421: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+4123: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+4132: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+4213: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+4231: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+4312: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+4321: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
 str_shuffle
-1234: 3%d: 0.04%d
-1243: 3%d: 0.04%d
-1324: 3%d: 0.04%d
-1342: 3%d: 0.04%d
-1423: 3%d: 0.04%d
-1432: 3%d: 0.04%d
-2134: 3%d: 0.04%d
-2143: 3%d: 0.04%d
-2314: 3%d: 0.04%d
-2341: 3%d: 0.04%d
-2413: 3%d: 0.04%d
-2431: 3%d: 0.04%d
-3124: 3%d: 0.04%d
-3142: 3%d: 0.04%d
-3214: 3%d: 0.04%d
-3241: 3%d: 0.04%d
-3412: 3%d: 0.04%d
-3421: 3%d: 0.04%d
-4123: 3%d: 0.04%d
-4132: 3%d: 0.04%d
-4213: 3%d: 0.04%d
-4231: 3%d: 0.04%d
-4312: 3%d: 0.04%d
-4321: 3%d: 0.04%d
+1234: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+1243: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+1324: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+1342: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+1423: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+1432: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+2134: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+2143: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+2314: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+2341: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+2413: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+2431: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+3124: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+3142: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+3214: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+3241: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+3412: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+3421: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+4123: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+4132: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+4213: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+4231: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+4312: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]
+4321: 3[0-9][0-9][0-9]: 0.0[3-4][0-9]



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php




[PHP-CVS] cvs: php4 /ext/standard/tests/strings 004.phpt

2002-10-23 Thread Andrey Hristov
andrey  Wed Oct 23 15:33:13 2002 EDT

  Added files: 
/php4/ext/standard/tests/strings004.phpt 
  Log:
  Test case regarding randomization of shuffle() and str_shuffle().
  The code was provided by Adam Trachtenberg : adam trachtenberg com
  
  

Index: php4/ext/standard/tests/strings/004.phpt
+++ php4/ext/standard/tests/strings/004.phpt
--TEST--
Testing randomization of shuffle() and str_shuffle().
--FILE--
?php
function stats($f, $a) {
$times = 9;
print $f\n;
ksort($a);
foreach($a as $k = $v)
print $k: $v:  . sprintf('%0.3f', $v / $times) . \n;
}
$a = array();
$times = 9;
for ($i = 0; $i  $times; $i++) {
$p = range(1,4);
shuffle($p);
$s = join('', $p);
if (empty($a[$s])) $a[$s] = 0; 
$a[$s]++;
}

stats('shuffle', $a);
$a = array();
$times = 9;
for ($i = 0; $i  $times; $i++) {
$p = '1234';
$s = str_shuffle($p);
if (empty($a[$s])) $a[$s] = 0;
$a[$s]++;
}

stats('str_shuffle', $a);
?
--EXPECTF--
shuffle
1234: 3%d: 0.04%d
1243: 3%d: 0.04%d
1324: 3%d: 0.04%d
1342: 3%d: 0.04%d
1423: 3%d: 0.04%d
1432: 3%d: 0.04%d
2134: 3%d: 0.04%d
2143: 3%d: 0.04%d
2314: 3%d: 0.04%d
2341: 3%d: 0.04%d
2413: 3%d: 0.04%d
2431: 3%d: 0.04%d
3124: 3%d: 0.04%d
3142: 3%d: 0.04%d
3214: 3%d: 0.04%d
3241: 3%d: 0.04%d
3412: 3%d: 0.04%d
3421: 3%d: 0.04%d
4123: 3%d: 0.04%d
4132: 3%d: 0.04%d
4213: 3%d: 0.04%d
4231: 3%d: 0.04%d
4312: 3%d: 0.04%d
4321: 3%d: 0.04%d
str_shuffle
1234: 3%d: 0.04%d
1243: 3%d: 0.04%d
1324: 3%d: 0.04%d
1342: 3%d: 0.04%d
1423: 3%d: 0.04%d
1432: 3%d: 0.04%d
2134: 3%d: 0.04%d
2143: 3%d: 0.04%d
2314: 3%d: 0.04%d
2341: 3%d: 0.04%d
2413: 3%d: 0.04%d
2431: 3%d: 0.04%d
3124: 3%d: 0.04%d
3142: 3%d: 0.04%d
3214: 3%d: 0.04%d
3241: 3%d: 0.04%d
3412: 3%d: 0.04%d
3421: 3%d: 0.04%d
4123: 3%d: 0.04%d
4132: 3%d: 0.04%d
4213: 3%d: 0.04%d
4231: 3%d: 0.04%d
4312: 3%d: 0.04%d
4321: 3%d: 0.04%d



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php