Changeset 285 for Include/Classes/ActiveBasic/Math

Timestamp:

Jul 26, 2007, 5:43:54 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

wtypes.abを追加

File:

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

Include/Classes/ActiveBasic/Math/Math.ab

@@ -13 +13 @@
 Function CopySign(x As Single, y As Single) As Single
     SetDWord(VarPtr(CopySign), (GetDWord(VarPtr(x)) And &h7fffffff) Or (GetDWord(VarPtr(y)) And &h80000000))
+End Function
+
+Function Hypot(x As Double, y As Double) As Double
+    If x = 0 Then
+        Hypot = Abs(y)
+    Else If y = 0 Then
+        Hypot = Abs(x)
+    Else
+        Dim ax = Abs(x)
+        Dim ay = Abs(y)
+        If ay > ax Then
+            Dim t = x / y
+            Hypot = ay * Sqr(1 + t * t)
+        Else
+            Dim t = y / x
+            Hypot = ax * Sqr(1 + t * t)
+        End If
+    End If
 End Function
 
@@ -39 +57 @@
 
 Function IsInf(x As Double) As Boolean
-    Dim p As *DWord, nan As Double
-    p = VarPtr(x) As *DWord
+    Dim p = VarPtr(x) As *DWord
     p[1] And= &h7fffffff
-    nan = ActiveBasic.Math.Detail.GetInf(False)
-    IsInf = (memcmp(p As *Byte, VarPtr(nan), SizeOf (Double)) = 0)
+    Dim inf = ActiveBasic.Math.Detail.GetInf(False)
+    IsInf = (memcmp(p As *Byte, VarPtr(inf), SizeOf (Double)) = 0)
 End Function
 
 Function IsFinite(x As Double) As Boolean
-    Dim p As *DWord, nan As Double
-    p = VarPtr(x) As *DWord
-'   p[1] And= &h7ffe0000
+    Dim p = VarPtr(x) As *DWord
     p[1] And= &H7FF00000
-    p[0] = 0
-    nan = ActiveBasic.Math.Detail.GetInf(/*x,*/ False)
-    IsFinite = (memcmp(p As BytePtr, VarPtr(nan), SizeOf (Double)) = 0)
+    IsFinite = p[1] And &H7FF00000 = &H7FF00000
 End Function
 
@@ -82 +95 @@
 
 Function GetNaN() As Double
-    Dim p As *DWord
-    p = VarPtr(GetNaN) As *DWord
+    Dim p = VarPtr(GetNaN) As *DWord
     p[0] = 0
     p[1] = &H7FF80000
@@ -104 +116 @@
     While i >= 1
         Dim t = (i * x) As Double
-        s = t / (2 + t / (2 * i + 1 + s))
+        s = t * (2 * i + 1 + s) / (2 + t)
         i--
     Wend
@@ -111 +123 @@
 
 Function _Support_tan(x As Double, ByRef k As Long) As Double
-    Dim i As Long
-    Dim t As Double, x2 As Double
-
     If x>=0 Then
         k=Fix(x/(_System_PI/2)+0.5)
@@ -122 +131 @@
     x=(x-(CDbl(3217)/CDbl(2048))*k)+4.4544551033807686783083602485579e-6*k
 
-    x2=x*x
-    t=0
+    Dim x2 = x * x
+    Dim t = 0 As Double
 
+    Dim i As Long
     For i=19 To 3 Step -2
         t=x2/(i-t)