Changed circuits.Stats type.

markkurossi · Sep 1, 2021 · 3d17c61 · 3d17c61
1 parent 38961d8
commit 3d17c61
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 15 deletions.
diff --git a/circuit/circuit.go b/circuit/circuit.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019 Markku Rossi
+// Copyright (c) 2019-2021 Markku Rossi
 //
 // All rights reserved.
 //
@@ -23,6 +23,8 @@ const (
 	INV
 )
 
+type Stats [INV + 1]int
+
 func (op Operation) String() string {
 	switch op {
 	case XOR:
@@ -149,7 +151,7 @@ type Circuit struct {
 	Inputs   IO
 	Outputs  IO
 	Gates    []Gate
-	Stats    map[Operation]int
+	Stats    Stats
 }
 
 func (c *Circuit) String() string {

diff --git a/circuit/parser.go b/circuit/parser.go
@@ -1,5 +1,5 @@
 //
-// Copyright (c) 2019 Markku Rossi
+// Copyright (c) 2019-2021 Markku Rossi
 //
 // All rights reserved.
 //
@@ -101,7 +101,7 @@ func ParseMPCLC(in io.Reader) (*Circuit, error) {
 	}
 
 	gates := make([]Gate, header.NumGates)
-	stats := make(map[Operation]int)
+	var stats Stats
 	var gate int
 	for gate = 0; ; gate++ {
 		op, err := r.ReadByte()
@@ -175,9 +175,7 @@ func ParseMPCLC(in io.Reader) (*Circuit, error) {
 		default:
 			return nil, fmt.Errorf("unsupported gate type %s", Operation(op))
 		}
-		count := stats[Operation(op)]
-		count++
-		stats[Operation(op)] = count
+		stats[Operation(op)]++
 	}
 
 	if uint32(gate) != header.NumGates {
@@ -348,7 +346,7 @@ func ParseBristol(in io.Reader) (*Circuit, error) {
 	}
 
 	gates := make([]Gate, numGates)
-	stats := make(map[Operation]int)
+	var stats Stats
 	var gate int
 	for gate = 0; ; gate++ {
 		line, err = readLine(r)
@@ -452,9 +450,7 @@ func ParseBristol(in io.Reader) (*Circuit, error) {
 			Output: outputs[0],
 			Op:     op,
 		}
-		count := stats[op]
-		count++
-		stats[op] = count
+		stats[op]++
 	}
 	if gate != numGates {
 		return nil, fmt.Errorf("not enough gates: got %d, expected %d",

diff --git a/compiler/circuits/compiler.go b/compiler/circuits/compiler.go
@@ -211,11 +211,9 @@ func (c *Compiler) Compile() *circuit.Circuit {
 		gate.Compile(c)
 	}
 
-	stats := make(map[circuit.Operation]int)
+	var stats circuit.Stats
 	for _, g := range c.compiled {
-		count := stats[g.Op]
-		count++
-		stats[g.Op] = count
+		stats[g.Op]++
 	}
 
 	result := &circuit.Circuit{