Changeset 558 for trunk

Timestamp:

Jul 20, 2008, 10:31:12 PM (16 years ago)

Author:

NoWest

Message:

Queueジェネリッククラスを追加
Listジェネリッククラスの内部でメモリの再確保が頻繁に行われないように改良

Location:

trunk/ab5.0/ablib/src/Classes

Files:

• System/Collections/Generic/List.ab (modified) (10 diffs)
• System/Collections/Generic/Queue.ab (added)
• System/Collections/Generic/Stack.ab (modified) (3 diffs)
• index.ab (modified) (1 diff)

trunk/ab5.0/ablib/src/Classes/System/Collections/Generic/List.ab

@@ -9 +9 @@
     items As *T
     size As Long
+    count As Long
 
     currentIndexForEnumerator As Long
@@ -32 +33 @@
     Sub List( capacity As Long )
         This.List()
-        This.Realloc( capacity )
+        If capacity > 0 Then
+            This.size = capacity
+            Realloc(capacity)
+        End If
     End Sub
 
@@ -41 +45 @@
     @param  インデックス
     */
-    Sub List( array As *T, count As Long )
-        This.List( count )
-        memmove( This.items, array, count * SizeOf(T) )
-        This.size = count
-    End Sub
+    Sub List( array As *T, length As Long )
+        This.List( length )
+        memmove( This.items, array, length * SizeOf(T) )
+        This.count = length
+    End Sub
+
     Sub ~List()
     End Sub
@@ -83 +88 @@
     */
     Override Function Count() As Long
-        Return size
+        Return This.count
     End Function
 
@@ -106 +111 @@
     */
     Override Sub Add( item As T )
-        Realloc( size + 1 )
-
-        items[size] = item
-        size++
+        If This.size < (This.count + 1) Then
+            This.size++
+            Realloc( This.size )
+        End If
+        This.items[ This.count ] = item
+        This.count++
     End Sub
 
@@ -120 +127 @@
     */
     Override Sub Clear()
-        size = 0
+        This.count = 0
     End Sub
 
@@ -135 +142 @@
     Override Function IndexOf( item As T ) As Long
         Dim i As Long
-        For i = 0 To ELM(size)
+        For i = 0 To ELM( This.count )
             If items[i].Equals(item) Then
                 Return i
@@ -149 +156 @@
     */
     Override Sub Insert( index As Long, item As T )
-        Realloc( size + 1 )
-        memmove( items + (index+1)*SizeOf(T), items + index*SizeOf(T), (size-index)*SizeOf(T) )
+        If This.size < (This.count + 1) Then
+            This.size++
+            Realloc( This.size )
+        End If
+        memmove( items + (index+1)*SizeOf(T), items + index*SizeOf(T), (This.count - index)*SizeOf(T) )
         items[index] = item
-        size++
+        This.count++
     End Sub
 
@@ -175 +185 @@
     @author Daisuke Yamamoto
     @date   2007/10/03
-    @return 値が削除されたときはTrue、されなかったときはFlaseが返る
     */
     Override Sub RemoveAt( index As Long )
-        memmove( items + index*SizeOf(T), items + (index+1)*SizeOf(T), (size-(index+1))*SizeOf(T) )
-        Realloc( size - 1 )
-        size--
+        memmove( items + index*SizeOf(T), items + (index+1)*SizeOf(T), (This.count - (index+1))*SizeOf(T) )
+        This.count--
     End Sub
 
@@ -192 +200 @@
         Dim string As String
         Dim i As Long
-        For i = 0 To This.Count-2
+        For i = 0 To ELM( This.count )
             string += This[i].ToString() + Ex"\r\n"
         Next
         Return string + This[i].ToString()
     End Function
+
+    /*!
+    @brief  実際の要素数が現在の容量の 90% 未満の場合は、容量をその数に設定します
+    @author NoWest
+    @date   2008/07/20
+    */
+    Sub TrimExcess ()
+        Dim pmemobj = _System_pGC->GetMemoryObjectPtr( items )
+        If ( This.size ) * 0.9 > This.count Then
+            This.size = This.count
+            Realloc( This.size )
+        End If
+    End Sub
 
     /*!

trunk/ab5.0/ablib/src/Classes/System/Collections/Generic/Stack.ab

@@ -72 +72 @@
     */
     Function Peek () As T
-        Peek = This.items[ This.count -1 ]
+        Peek = This.items[ 0 ]
     End Function
 
@@ -81 +81 @@
     */
     Function Pop () As T
-        Pop = This.items[ This.count -1 ]
+        Pop = This.items[ 0 ]
+        memmove( items, items + SizeOf(T), (This.count - 1)*SizeOf(T) )
         This.count--
     End Function
@@ -91 +92 @@
     */
     Sub Push ( item As T )
-        This.count++
-        If This.size < This.count Then
+        If This.size < (This.count + 1) Then
             This.size++
             Realloc( This.size )
         End If
-        This.items[ This.count -1 ] = item
+        memmove( items + SizeOf(T), items, This.count * SizeOf(T) )
+        items[ 0 ] = item
+        This.count++
     End Sub
 

trunk/ab5.0/ablib/src/Classes/index.ab

@@ -30 +30 @@
 #require "./System/Collections/Generic/Dictionary.ab"
 #require "./System/Collections/Generic/List.ab"
+#require "./System/Collections/Generic/Queue.ab"
 #require "./System/Collections/Generic/Stack.ab"
 #require "./System/Collections/Generic/KeyNotFoundException.ab"