Improve types for bitset

bitset.go

@@ -7,14 +7,14 @@ package schulze
 
 type bitSet []uint64
 
-func newBitset(size uint) bitSet {
+func newBitset(size uint64) bitSet {
 	return bitSet(make([]uint64, size/64+1))
 }
 
-func (s bitSet) set(i uint) {
+func (s bitSet) set(i uint64) {
 	s[i/64] |= 1 << (i % 64)
 }
 
-func (s bitSet) isSet(i uint) bool {
+func (s bitSet) isSet(i uint64) bool {
 	return s[i/64]&(1<<(i%64)) != 0
 }

bitset_test.go

@@ -12,7 +12,7 @@ import (
 )
 
 func TestBitSet(t *testing.T) {
-	contains := func(i uint, values []uint) bool {
+	contains := func(i uint64, values []uint64) bool {
 		for _, v := range values {
 			if i == v {
 				return true
@@ -23,16 +23,16 @@ func TestBitSet(t *testing.T) {
 
 	seed := time.Now().UnixNano()
 	r := rand.New(rand.NewSource(seed))
-	size := uint(r.Intn(12345))
+	size := uint64(r.Intn(12345))
 	s := newBitset(size)
-	values := make([]uint, 0)
-	for i, count := uint(0), uint(r.Intn(100)); i < count; i++ {
-		values = append(values, uint(r.Intn(int(size))))
+	values := make([]uint64, 0)
+	for i, count := uint64(0), uint64(r.Intn(100)); i < count; i++ {
+		values = append(values, uint64(r.Intn(int(size))))
 	}
 	for _, v := range values {
 		s.set(v)
 	}
-	for i := uint(0); i < size; i++ {
+	for i := uint64(0); i < size; i++ {
 		if contains(i, values) {
 			if !s.isSet(i) {
 				t.Errorf("expected value %v is not set (seed %v)", i, seed)

schulze.go

@@ -150,7 +150,7 @@ func ballotRanks[C comparable](choices []C, b Ballot[C]) (ranks [][]choiceIndex,
 	ballotRanks := make(map[int][]choiceIndex, ballotLen)
 	var rankedChoices bitSet
 	if hasUnrankedChoices {
-		rankedChoices = newBitset(uint(choicesLen))
+		rankedChoices = newBitset(uint64(choicesLen))
 	}
 
 	choicesLen = len(choices)
@@ -163,7 +163,7 @@ func ballotRanks[C comparable](choices []C, b Ballot[C]) (ranks [][]choiceIndex,
 		ballotRanks[rank] = append(ballotRanks[rank], index)
 
 		if hasUnrankedChoices {
-			rankedChoices.set(uint(index))
+			rankedChoices.set(uint64(index))
 		}
 	}
 
@@ -183,7 +183,10 @@ func ballotRanks[C comparable](choices []C, b Ballot[C]) (ranks [][]choiceIndex,
 
 	if hasUnrankedChoices {
 		unranked := make([]choiceIndex, 0, choicesLen-ballotLen)
-		for i := uint(0); int(i) < choicesLen; i++ {
+		// rankedChoices.iterateUnset(func(i uint64) {
+		// 	unranked = append(unranked, choiceIndex(i))
+		// })
+		for i := uint64(0); int(i) < choicesLen; i++ {
 			if !rankedChoices.isSet(i) {
 				unranked = append(unranked, choiceIndex(i))
 			}