Small changes to benchmarks

election/election_test.go

@@ -323,6 +323,9 @@ func BenchmarkCombineThreshold(b *testing.B) {
 func BenchmarkCombineOptimal(b *testing.B) {
 	log.SetOutput(ioutil.Discard)
 	config := benchConfig()
+	b.Run("2  of 3  servers", func(b *testing.B) { benchmarkCombine(config, 10, 3, 2, b) })
+	b.Run("3  of 5  servers", func(b *testing.B) { benchmarkCombine(config, 10, 5, 3, b) })
+	b.Run("4  of 7  servers", func(b *testing.B) { benchmarkCombine(config, 10, 7, 4, b) })
 	b.Run("5  of 9  servers", func(b *testing.B) { benchmarkCombine(config, 10, 9, 5, b) })
 	b.Run("6  of 11 servers", func(b *testing.B) { benchmarkCombine(config, 10, 11, 6, b) })
 	b.Run("7  of 13 servers", func(b *testing.B) { benchmarkCombine(config, 10, 13, 7, b) })
@@ -330,7 +333,6 @@ func BenchmarkCombineOptimal(b *testing.B) {
 	b.Run("9  of 17 servers", func(b *testing.B) { benchmarkCombine(config, 10, 17, 9, b) })
 	b.Run("10 of 19 servers", func(b *testing.B) { benchmarkCombine(config, 10, 19, 10, b) })
 	b.Run("11 of 21 servers", func(b *testing.B) { benchmarkCombine(config, 10, 21, 11, b) })
-
 }
 
 ///////////////////////
@@ -342,17 +344,17 @@ func BenchmarkCombineOptimal(b *testing.B) {
 func BenchmarkClientConfig(b *testing.B) {
 	log.SetOutput(ioutil.Discard)
 	config := createConfig(primes("16"))
-	b.Run(" 16-bit", func(b *testing.B) { benchmarkBallots(config, 10, 17, 9, b) })
+	b.Run(" 16-bit", func(b *testing.B) { benchmarkBallots(config, 1, 17, 9, b) })
 	config = createConfig(primes("32"))
-	b.Run(" 32-bit", func(b *testing.B) { benchmarkBallots(config, 10, 17, 9, b) })
+	b.Run(" 32-bit", func(b *testing.B) { benchmarkBallots(config, 1, 17, 9, b) })
 	config = createConfig(primes("64"))
-	b.Run(" 64-bit", func(b *testing.B) { benchmarkBallots(config, 10, 17, 9, b) })
+	b.Run(" 64-bit", func(b *testing.B) { benchmarkBallots(config, 1, 17, 9, b) })
 	config = createConfig(primes("128"))
-	b.Run("128-bit", func(b *testing.B) { benchmarkBallots(config, 10, 17, 9, b) })
+	b.Run("128-bit", func(b *testing.B) { benchmarkBallots(config, 1, 17, 9, b) })
 	config = createConfig(primes("256"))
-	b.Run("256-bit", func(b *testing.B) { benchmarkBallots(config, 10, 17, 9, b) })
+	b.Run("256-bit", func(b *testing.B) { benchmarkBallots(config, 1, 17, 9, b) })
 	config = createConfig(primes("512"))
-	b.Run("512-bit", func(b *testing.B) { benchmarkBallots(config, 10, 17, 9, b) })
+	b.Run("512-bit", func(b *testing.B) { benchmarkBallots(config, 1, 17, 9, b) })
 }
 
 func BenchmarkTallyConfig(b *testing.B) {