move bitmap to bitarray package

Author: Theodus

.gitignore

@@ -1,2 +1,3 @@
 *.out
-*.test
+*.test
+.idea

bitmap/bitmap.go renamed to bitarray/bitmap.go

@@ -1,6 +1,4 @@
-// Package bitmap contains bitmaps of length 32 and 64 for tracking bool
-// values without the need for arrays or hashing.
-package bitmap
+package bitarray
 
 // Bitmap32 tracks 32 bool values within a uint32
 type Bitmap32 uint32
@@ -20,7 +18,7 @@ func (b Bitmap32) HasBit(pos uint) bool {
 	return (b & (1 << pos)) != 0
 }
 
-// PopCount returns the ammount of bits set to 1 in the Bitmap32
+// PopCount returns the amount of bits set to 1 in the Bitmap32
 func (b Bitmap32) PopCount() int {
 	// http://graphics.stanford.edu/~seander/bithacks.html#CountBitsSetParallel
 	b -= (b >> 1) & 0x55555555
@@ -49,7 +47,7 @@ func (b Bitmap64) HasBit(pos uint) bool {
 	return (b & (1 << pos)) != 0
 }
 
-// PopCount returns the ammount of bits set to 1 in the Bitmap64
+// PopCount returns the amount of bits set to 1 in the Bitmap64
 func (b Bitmap64) PopCount() int {
 	// http://graphics.stanford.edu/~seander/bithacks.html#CountBitsSetParallel
 	b -= (b >> 1) & 0x5555555555555555

bitmap/bitmap_test.go renamed to bitarray/bitmap_test.go

@@ -1,12 +1,12 @@
-package bitmap
+package bitarray
 
 import (
 	"testing"
 
 	"github.com/stretchr/testify/assert"
 )
 
-func TestPopCount32(t *testing.T) {
+func TestBitmap32_PopCount(t *testing.T) {
 	b := []uint32{
 		uint32(0x55555555), // 0x55555555 = 01010101 01010101 01010101 01010101
 		uint32(0x33333333), // 0x33333333 = 00110011 00110011 00110011 00110011
@@ -19,7 +19,7 @@ func TestPopCount32(t *testing.T) {
 	}
 }
 
-func TestPopCount64(t *testing.T) {
+func TestBitmap64_PopCount(t *testing.T) {
 	b := []uint64{
 		uint64(0x5555555555555555),
 		uint64(0x3333333333333333),
@@ -32,30 +32,45 @@ func TestPopCount64(t *testing.T) {
 	}
 }
 
-func TestSetBit(t *testing.T) {
+func TestBitmap32_SetBit(t *testing.T) {
 	m := Bitmap32(0)
 	assert.Equal(t, Bitmap32(0x4), m.SetBit(2))
 }
 
-func TestClearBit(t *testing.T) {
+func TestBitmap32_ClearBit(t *testing.T) {
 	m := Bitmap32(0x4)
 	assert.Equal(t, Bitmap32(0), m.ClearBit(2))
 }
 
-func TestHasBit(t *testing.T) {
+func TestBitmap32_HasBit(t *testing.T) {
 	m := Bitmap32(0x55555555)
 	assert.Equal(t, true, m.HasBit(2))
 }
 
-func BenchmarkPopCount32(b *testing.B) {
+func TestBitmap64_SetBit(t *testing.T) {
+	m := Bitmap64(0)
+	assert.Equal(t, Bitmap64(0x4), m.SetBit(2))
+}
+
+func TestBitmap64_ClearBit(t *testing.T) {
+	m := Bitmap64(0x4)
+	assert.Equal(t, Bitmap64(0), m.ClearBit(2))
+}
+
+func TestBitmap64_HasBit(t *testing.T) {
+	m := Bitmap64(0x55555555)
+	assert.Equal(t, true, m.HasBit(2))
+}
+
+func BenchmarkBitmap32_PopCount(b *testing.B) {
 	m := Bitmap32(0x33333333)
 	b.ResetTimer()
 	for i := b.N; i > 0; i-- {
 		m.PopCount()
 	}
 }
 
-func BenchmarkPopCount64(b *testing.B) {
+func BenchmarkBitmap64_PopCount(b *testing.B) {
 	m := Bitmap64(0x3333333333333333)
 	b.ResetTimer()
 	for i := b.N; i > 0; i-- {