Changeset 9857 for temp/trunk

Timestamp:

2006/11/30 15:38:54 (20 years ago)

Author:

kakinaka

Message:

blank

Location:

temp/trunk

Files:

• data/lib/slib.php (modified) (3 diffs)
• html/test/kakinaka/tax.php (modified) (1 diff)

temp/trunk/data/lib/slib.php

@@ -1111 +1111 @@
 function sfRound($value, $pow = 0){
     $adjust = pow(10 ,$pow);
-    
+
     // À°¿ô³î¤Ä0½Ð¤Ê¤±¤ì¤Ð·å¿ô»ØÄê¤ò¹Ô¤¦
     if(sfIsInt($adjust) and $pow > 0){
@@ -1127 +1127 @@
 // ·å¿ô¤ò»ØÄꤷ¤ÆÀÚ¤ê¼Î¤Æ
 function sfFloor($value, $digit = 1){
-    
-    $digit = $digit-1;
+    $adjust = pow(10 ,$pow);
     
     // À°¿ô³î¤Ä0½Ð¤Ê¤±¤ì¤Ð·å¿ô»ØÄê¤ò¹Ô¤¦
-    if(sfIsInt($digit) and $digit != 0) $value = $value * 10 * $digit;
-    $ret = floor($value);
-    $ret = floor($ret/$adjust);
+    if(sfIsInt($adjust) and $pow > 0){
+        $ret = (floor($value * $adjust)/$adjust);
+        $ret = sfFloor($ret, $pow - 1);
+        return $ret;
+    }else{
+        $ret = floor($value);
+        $ret = floor($ret/$adjust);
+    }
+    
     return $ret;
 }
@@ -1139 +1144 @@
 // ·å¿ô¤ò»ØÄꤷ¤ÆÀÚ¤ê¾å¤²
 function sfCeil($value, $digit = 1){
-    
-    $digit = $digit-1;
-
+    $adjust = pow(10 ,$pow);
+    
     // À°¿ô³î¤Ä0½Ð¤Ê¤±¤ì¤Ð·å¿ô»ØÄê¤ò¹Ô¤¦
-    if(sfIsInt($digit) and $digit != 0) $value = $value * 10 * $digit;
-    $ret = ceil($value);
-    $ret = floor($ret/$adjust);
+    if(sfIsInt($adjust) and $pow > 0){
+        $ret = (floor($value * $adjust)/$adjust);
+        $ret = sfCeil($ret, $pow - 1);
+        return $ret;
+    }else{
+        $ret = ceil($value);
+        $ret = floor($ret/$adjust);
+    }
+
     return $ret / 10 * $digit;
 }

temp/trunk/html/test/kakinaka/tax.php

@@ -4 +4 @@
 
 
-$tax = sfRound(5.4445,3);
+echo "»Í¼Î¸ÞÆþ¡§" . sfRound(5.4445,3);
+echo "ÀÚ¤ê¼Î¤Æ¡§" . sfFloor(5.4445,3);
+echo "ÀÚ¤ê¾å¤²¡§" . sfCeil(5.4445,3);
 
-sfprintr($tax);
 
 ?>