Merge remote-tracking branch 'origin/master'

Author: UnknownJoe796

src/main/java/com/lightningkite/kotlin/bytes/Int.ext.kt

@@ -0,0 +1,40 @@
+package com.lightningkite.kotlin.bytes
+
+/**
+ *
+ * Created by shanethompson on 6/29/17.
+ *
+ */
+
+class IntBitArray(var value: Int = 0) : Iterable<Boolean> {
+    operator fun get(index: Int): Boolean {
+        return value.ushr(index).and(0x1) == 1
+    }
+
+    operator fun set(index: Int, isTrue: Boolean) {
+        if(isTrue) {
+            value = value or 0x1.shl(index)
+        } else {
+            value = value.and(1.shl(index).inv())
+        }
+    }
+
+    override fun iterator(): Iterator<Boolean> {
+        return object : Iterator<Boolean> {
+            var currentIndex = 0
+            override fun hasNext(): Boolean {
+                return currentIndex < 32
+            }
+
+            override fun next(): Boolean {
+                val result = this@IntBitArray[currentIndex]
+                currentIndex++
+                return result
+            }
+        }
+    }
+}
+
+fun Int.toBitArray(): IntBitArray {
+    return IntBitArray(this)
+}

src/main/java/com/lightningkite/kotlin/bytes/Long.ext.kt

@@ -0,0 +1,41 @@
+package com.lightningkite.kotlin.bytes
+
+/**
+ *
+ * Created by shanethompson on 6/29/17.
+ *
+ */
+
+
+class LongBitArray(var value: Long = 0) : Iterable<Boolean> {
+    operator fun get(index: Int): Boolean {
+        return value.ushr(index).and(0x1) == 1L
+    }
+
+    operator fun set(index: Int, isTrue: Boolean) {
+        if(isTrue) {
+            value = value or 0x1.shl(index).toLong()
+        } else {
+            value = value.and(1.shl(index).inv().toLong())
+        }
+    }
+
+    override fun iterator(): Iterator<Boolean> {
+        return object : Iterator<Boolean> {
+            var currentIndex = 0
+            override fun hasNext(): Boolean {
+                return currentIndex < 64
+            }
+
+            override fun next(): Boolean {
+                val result = this@LongBitArray[currentIndex]
+                currentIndex++
+                return result
+            }
+        }
+    }
+}
+
+fun Long.toBitArray(): LongBitArray {
+    return LongBitArray(this)
+}

src/test/java/com/lightningkite/kotlin/BitArrayTest.kt

@@ -0,0 +1,58 @@
+package com.lightningkite.kotlin
+
+import com.lightningkite.kotlin.bytes.toBitArray
+import org.junit.Test
+import org.junit.Assert.*
+
+class BitArrayTest {
+
+    @Test
+    fun testIntBitArray() {
+        var intArray = 0.toBitArray()
+        intArray.forEach {
+            assertFalse(it)
+        }
+        assertEquals(0, intArray.value)
+        intArray[0] = true
+        assertEquals(1, intArray.value)
+        intArray[4] = true
+        intArray.forEachIndexed { index, b ->
+            when(index) {
+                0 -> assertTrue(b)
+                4 -> assertTrue(b)
+                else -> assertFalse(b)
+            }
+        }
+        intArray[31] = true
+        assertTrue(intArray[31])
+        for(i in 0..31) {
+            intArray[i] = true
+        }
+        intArray.forEach { assertTrue(it) }
+    }
+
+    @Test
+    fun testLongArray() {
+        var longArray = 0L.toBitArray()
+        longArray.forEach {
+            assertFalse(it)
+        }
+        assertEquals(0, longArray.value)
+        longArray[0] = true
+        assertEquals(1, longArray.value)
+        longArray[4] = true
+        longArray.forEachIndexed { index, b ->
+            when(index) {
+                0 -> assertTrue(b)
+                4 -> assertTrue(b)
+                else -> assertFalse(b)
+            }
+        }
+        longArray[31] = true
+        assertTrue(longArray[31])
+        for(i in 0..63) {
+            longArray[i] = true
+        }
+        longArray.forEach { assertTrue(it) }
+    }
+}