Changeset 1684Tweet

Timestamp:

Jan 17, 2007, 3:35:12 PM (16 years ago)

Author:

Sam Hocevar

Message:

• Allow -r 0.0 again. Fixed the testsuite accordingly.

Location:

zzuf/trunk

Files:

• src/fd.c (modified) (2 diffs)
• test/testsuite.sh (modified) (3 diffs)

zzuf/trunk/src/fd.c

@@ -79 +79 @@
 void _zz_setratio(double r0, double r1)
 {
+    if(r0 == 0.0 && r1 == 0.0)
+    {
+        maxratio = minratio = 0.0;
+        return;
+    }
+
     minratio = r0 < MIN_RATIO ? MIN_RATIO : r0 > MAX_RATIO ? MAX_RATIO : r0;
     maxratio = r1 < MIN_RATIO ? MIN_RATIO : r1 > MAX_RATIO ? MAX_RATIO : r1;
@@ -94 +100 @@
     uint16_t rate;
     double min, max, cur;
+
+    if(minratio == maxratio)
+        return minratio; /* this also takes care of 0.0 */
 
     rate = shuffle[seed & 0xf] << 12;

zzuf/trunk/test/testsuite.sh

@@ -19 +19 @@
     CMD="$2"
     ALIAS="$3"
+    CHECK="$4"
     echo -n " $(echo "$ALIAS .............." | cut -b1-18) "
     MD5="$(eval "$ZZUF -m $ZZOPTS $CMD" 2>/dev/null | cut -f2 -d' ')"
+    if [ -n "$CHECK" ]; then
+        REFMD5="$CHECK"
+    fi
     if [ -z "$REFMD5" ]; then
         REFMD5="$MD5"
@@ -74 +78 @@
 
 for r in 0.0 0.00001 0.001 0.1 10.0; do
-    for file in /tmp/zzuf-zero-$$ /tmp/zzuf-text-$$ /tmp/zzuf-random-$$; do
+    for type in zero text random; do
+        file=/tmp/zzuf-$type-$$
         ZZOPTS="-s $seed -r $r"
         case $file in
@@ -81 +86 @@
         echo "*** file $file, ratio $r ***"
         REFMD5=""
-        check "$ZZOPTS" "< $file" "zzuf"
+        if [ $r = 0.0 -a $type = zero ]; then
+            check="bb7df04e1b0a2570657527a7e108ae23"
+            echo "*** should be $check ***"
+            check "$ZZOPTS" "< $file" "zzuf" "$check"
+        else
+            check "$ZZOPTS" "< $file" "zzuf"
+        fi
         check "$ZZOPTS" "$FDCAT $file" "fdcat"
         check "$ZZOPTS" "$STREAMCAT $file" "streamcat"