Changeset 2809Tweet

Timestamp:

Jul 23, 2013, 8:14:41 AM (9 years ago)

Author:

sam

Message:

base: Array::Remove(int) now accepts a negative index to remove elements
from the end. Also added Array::RemoveSwap() for faster removes at the
expense of element ordering.

Location:

trunk

Files:

• src/lol/base/array.h (modified) (1 diff)
• test/unit/array.cpp (modified) (1 diff)

trunk/src/lol/base/array.h

@@ -188 +188 @@
     void Remove(int pos, int todelete = 1)
     {
-        ASSERT(pos >= 0);
         ASSERT(todelete >= 0);
+        ASSERT(pos - todelete >= -m_count - 1);
         ASSERT(pos + todelete <= m_count);
+        if (pos < 0)
+            pos = m_count + pos;
+
         for (int i = pos; i + todelete < m_count; i++)
             m_data[i] = m_data[i + todelete];
         for (int i = m_count - todelete; i < m_count; i++)
             m_data[i].~Element();
+        m_count -= todelete;
+    }
+
+    void RemoveSwap(int pos, int todelete = 1)
+    {
+        ASSERT(todelete >= 0);
+        ASSERT(pos - todelete >= -m_count - 1);
+        ASSERT(pos + todelete <= m_count);
+        if (pos < 0)
+            pos = m_count + pos;
+
+        for (int i = 0; i < todelete; i++)
+        {
+            if (pos + i < m_count - 1 - i)
+                m_data[pos + i] = m_data[m_count - 1 - i];
+            m_data[m_count - 1 - i].~Element();
+        }
         m_count -= todelete;
     }

trunk/test/unit/array.cpp

@@ -84 +84 @@
         a.Remove(1);
 
+        LOLUNIT_ASSERT_EQUAL(a.Count(), 3);
         LOLUNIT_ASSERT_EQUAL(a[0], 0);
         LOLUNIT_ASSERT_EQUAL(a[1], 2);
         LOLUNIT_ASSERT_EQUAL(a[2], 3);
+
+        Array<int> b;
+        b << 0 << 1 << 2 << 3;
+        b.Remove(-2);
+
+        LOLUNIT_ASSERT_EQUAL(b.Count(), 3);
+        LOLUNIT_ASSERT_EQUAL(b[0], 0);
+        LOLUNIT_ASSERT_EQUAL(b[1], 1);
+        LOLUNIT_ASSERT_EQUAL(b[2], 3);
+    }
+
+    LOLUNIT_TEST(ArrayRemoveSwap)
+    {
+        Array<int> a;
+        a << 0 << 1 << 2 << 3;
+        a.RemoveSwap(1);
+
+        LOLUNIT_ASSERT_EQUAL(a.Count(), 3);
+        LOLUNIT_ASSERT_EQUAL(a[0], 0);
+        LOLUNIT_ASSERT_EQUAL(a[1], 3);
+        LOLUNIT_ASSERT_EQUAL(a[2], 2);
+
+        Array<int> b;
+        b << 0 << 1 << 2 << 3;
+        b.Remove(1, 2);
+
+        LOLUNIT_ASSERT_EQUAL(b.Count(), 2);
+        LOLUNIT_ASSERT_EQUAL(b[0], 0);
+        LOLUNIT_ASSERT_EQUAL(b[1], 3);
     }
 #endif