Changeset 257

Timestamp:

May 19, 2007, 3:29:33 PM (17 years ago)

Author:

イグトランス (egtra)

Message:

VersionTest追加、Log1p追加

Files:

• Include/Classes/System/Math.ab (modified) (2 diffs)
• Include/Classes/System/OperatingSystem.ab (modified) (5 diffs)
• Include/Classes/System/Runtime/InteropServices/GCHandle.ab (modified) (1 diff)
• Include/Classes/System/Version.ab (modified) (2 diffs)
• Include/basic/function.sbp (modified) (10 diffs)
• TestCase/SimpleTestCase/SimpleTestCase.idx (modified) (1 diff)
• TestCase/SimpleTestCase/SimpleTestCase.pj (modified) (1 diff)
• TestCase/SimpleTestCase/VersionTest.ab (added)

Include/Classes/System/Math.ab

@@ -232 +232 @@
             Dim tmp = x * _System_InverseSqrt2
             Dim p = VarPtr(tmp) As *QWord
-            Dim m = p[0] And &h7FF0000000000000
+            Dim m = GetQWord(p) And &h7FF0000000000000
             Dim k = ((m >> 52) As DWord) As Long - 1022
-            p[0] = m + &h0010000000000000
+            SetQWord(p, m + &h0010000000000000)
             x /= tmp
-
-            x--
-            Dim s = 0 As Double
-            Dim i = _System_Log_N As Long
-            While i >= 1
-                Dim t = (i * x) As Double
-                s = t / (2 + t / (2 * i + 1 + s))
-                i--
-            Wend
-            Log = _System_LOG2 * k + x / (1 + s)
+            Log = _System_LOG2 * k + _System_Log1p(x - 1)
         End If
     End Function
@@ -602 +593 @@
     End Function
 Private
-    Static Const _System_Log_N = 7 As Long
     Static Const _System_Atan_N = 20 As Long
     Static Const _System_UrTan_N = 17 As Long

Include/Classes/System/OperatingSystem.ab

@@ -10 +10 @@
 Public
     ' Constractor
-    Sub OperatingSystem(platform As PlatformID, version As Version)
+    Sub OperatingSystem(platform As PlatformID, version As System.Version)
         pf = platform
         ver = version
@@ -18 +18 @@
     Sub OperatingSystem(vi As OSVERSIONINFOA)
         pf = vi.dwPlatformId As PlatformID
-        ver = New Version(vi.dwMajorVersion, vi.dwMinorVersion, vi.dwBuildNumber)
+        ver = New System.Version(vi.dwMajorVersion, vi.dwMinorVersion, vi.dwBuildNumber)
         sp = New String(vi.szCSDVersion As PCSTR)
     End Sub
@@ -24 +24 @@
     Sub OperatingSystem(vi As OSVERSIONINFOW)
         pf = vi.dwPlatformId As PlatformID
-        ver = New Version(vi.dwMajorVersion, vi.dwMinorVersion, vi.dwBuildNumber)
+        ver = New System.Version(vi.dwMajorVersion, vi.dwMinorVersion, vi.dwBuildNumber)
         sp = New String(vi.szCSDVersion As PCSTR)
     End Sub
@@ -33 +33 @@
     End Function
 
-    Const Function Version() As Version
+    Const Function Version() As System.Version
         Return ver
     End Function
@@ -71 +71 @@
 Private
     pf As PlatformID
-    ver As Version
+    ver As System.Version
     sp As String
 End Class

Include/Classes/System/Runtime/InteropServices/GCHandle.ab

@@ -12 +12 @@
     Sub Target(obj As Object)
         allocated.Add(obj)
-        handle = VarPtr(obj) 'ObjPtr
+        handle = ObjPtr(obj)
     End Sub
 

Include/Classes/System/Version.ab

@@ -5 +5 @@
 
 #require <api_winsock2.sbp>
+
+Namespace System
 
 Class Version
@@ -149 +151 @@
 End Class
 
+End Namespace 'System
+
 #endif '__SYSTEM_VERSION_AB__

Include/basic/function.sbp

@@ -9 +9 @@
 Const _System_LOG2 = 0.6931471805599453094172321214581765680755
 Const _System_SQRT2 = 1.41421356237309504880168872421
+Const _System_Log_N = 7 As Long
 
 
@@ -21 +22 @@
         Exit Function
     End If
-    Dim pSrc As *QWord, pDest As *QWord
-    pSrc = VarPtr(x) As *QWord
-    pDest = VarPtr(ldexp) As *QWord
-
+    Dim pSrc = VarPtr(x) As *QWord
+    Dim pDest = VarPtr(ldexp) As *QWord
     n += (pSrc[0] >> 52) As DWord And &h7FF
-
     pDest[0] = n << 52 Or (pSrc[0] And &h800FFFFFFFFFFFFF)
 End Function
@@ -37 +35 @@
     End If
 
-    Dim pSrc As *QWord, pDest As *QWord
-    pSrc = VarPtr(x) As *QWord
-    pDest = VarPtr(frexp) As *QWord
+    Dim pSrc = VarPtr(x) As *QWord
+    Dim pDest = VarPtr(frexp) As *QWord
     n = ((pSrc[0] >> 52) As DWord And &h7FF) - 1022
     pDest[0] = (pSrc[0] And &h800FFFFFFFFFFFFF) Or &h3FE0000000000000
@@ -100 +97 @@
 End Function
 
-Function _System_GetInf(sign As BOOL) As Double
+Function _System_GetInf(sign As Boolean) As Double
     Dim s = 0 As QWord
     If sign Then s = 1 << 63
@@ -115 +112 @@
 End Function
 
-Function _System_GetInf(sign As BOOL) As Double
+Function _System_GetInf(sign As Boolean) As Double
     Dim s = 0 As DWord
     If sign Then s = (1 As DWord) << 31
@@ -240 +237 @@
 End Function
 
+Function Log1p(x As Double) As Double
+    If x < -1 Or IsNaN(x) Then
+        Log1p = _System_GetNaN()
+    ElseIf x = 0 Then
+        x = 0
+    ElseIf IsInf(x) Then
+        Log1p = x
+    Else
+        Log1p = _System_Log1p(x)
+    End If
+End Function
+
+Function _System_Log1p(x As Double) As Double
+    Dim s = 0 As Double
+    Dim i = 7 As Long
+    While i >= 1
+        Dim t = (i * x) As Double
+        s = t / (2 + t / (2 * i + 1 + s))
+        i--
+    Wend
+    Return x / (1 + s)
+End Function
+
 Function Sgn(number As Double) As Long
     Sgn = Math.Sign(number)
@@ -293 +313 @@
     Dim p As *DWord
     p = VarPtr(x) As *DWord
-    IsNaN = FALSE
+    IsNaN = False
     If (p[1] And &H7FF00000) = &H7FF00000 Then
         If (p[0] <> 0) Or ((p[1] And &HFFFFF) <> 0) Then
@@ -299 +319 @@
         End If
     End If
-
-'   IsNaN=FALSE
 End Function
 
@@ -307 +325 @@
     p = VarPtr(x) As *DWord
     p[1] And= &h7fffffff
-    nan = _System_GetInf(FALSE)
+    nan = _System_GetInf(False)
     IsInf = (memcmp(p As *Byte, VarPtr(nan), SizeOf (Double)) = 0)
 End Function
@@ -321 +339 @@
     p[1] And= &H7FF00000
     p[0] = 0
-    nan = _System_GetInf(/*x,*/ FALSE)
+    nan = _System_GetInf(/*x,*/ False)
     IsFinite = (memcmp(p As BytePtr, VarPtr(nan), SizeOf (Double)) = 0)
 End Function

TestCase/SimpleTestCase/SimpleTestCase.idx

@@ -10 +10 @@
 #include "GCHandleTest.ab"
 _ClearNamespaceImported
+#include "VersionTest.ab"
+_ClearNamespaceImported
 #include "PathTest.ab"
 _ClearNamespaceImported

TestCase/SimpleTestCase/SimpleTestCase.pj

@@ -30 +30 @@
 StringTest.ab
 GCHandleTest.ab
+VersionTest.ab
 PathTest.ab