Changeset 457 for trunk/Include/Classes/System/Math.ab

Timestamp:

Mar 6, 2008, 9:49:43 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

(SPrintF.ab) FormatIntegerExにStringBuilderを引数に取る版を追加。

File:

• trunk/Include/Classes/System/Math.ab (modified) (6 diffs)

trunk/Include/Classes/System/Math.ab

@@ -127 +127 @@
 
     Static Function Ceiling(x As Double) As Long
-        If Floor(x) = x then
-            Return x As Long
-        Else
-            Return Floor(x) + 1
+        Ceiling = Floor(x)
+        If Ceiling <> x Then
+            Ceiling++
         End If
     End Function
@@ -145 +144 @@
 
     Static Function Cosh(value As Double) As Double
-        Dim t As Double
-        t = Math.Exp(value)
+        Dim t = Math.Exp(value)
         return (t + 1 / t) * 0.5
     End Function
@@ -156 +154 @@
 
     Static Function DivRem(x As Int64, y As Int64, ByRef ret As Int64) As Int64
-        ret = x - (x \ y) * y
-        return x \ y
+        DivRem = x \ y
+        ret = x - (DivRem) * y
     End Function
 
@@ -196 +194 @@
         Return Int(value)
     End Function
-
-    'GetHashCode
-
-    'GetType
 
     Static Function IEEERemainder(x As Double, y As Double) As Double
@@ -513 +507 @@
 
     Static Function Sqrt(x As Double) As Double
-        Dim s As Double, last As Double
-        Dim i As *Word, j As Long, jj As Long, k As Long
         If x > 0 Then
             If ActiveBasic.Math.IsInf(x) Then
@@ -520 +512 @@
             Else
                 Sqrt = x
-                i = (VarPtr(Sqrt) + 6) As *Word
-                jj = GetWord(i)
-                j = jj >> 5
-                k = jj And &h0000001f
-                j = (j+  511) << 4 + k
+                Dim i = (VarPtr(Sqrt) + 6) As *Word
+                Dim jj = GetWord(i) As Long
+                Dim j = jj >> 5 As Long
+                Dim k = (jj And &h0000001f) As Long
+                j = (j + 511) << 4 + k
                 SetWord(i, j)
+                Dim last As Double
                 Do
                     last = Sqrt
-                    Sqrt = (x /Sqrt + Sqrt) * 0.5
+                    Sqrt = (x / Sqrt + Sqrt) * 0.5
                 Loop While Sqrt <> last
             End If