final tweaks

Author: DavePearce

pkg/air/gadgets/lexicographic_sort.go

@@ -40,7 +40,6 @@ import (
 // ensure it is positive.  The delta column is constrained to a given bitwidth,
 // with constraints added as necessary to ensure this.
 func ApplyLexicographicSortingGadget(prefix string, columns []uint, signs []bool, bitwidth uint, schema *air.Schema) {
-	fmt.Printf("Columns: source (%d) vs signs (%d), bitwidth: %d\n", len(columns), len(signs), bitwidth)
 	// Check preconditions
 	if len(columns) < len(signs) {
 		panic("Inconsistent number of columns and signs for lexicographic sort.")

pkg/mir/lower.go

@@ -214,9 +214,9 @@ func lowerSortedConstraintToAir(c SortedConstraint, mirSchema *Schema, airSchema
 		sources[i] = air_gadgets.Expand(c.Context, sourceBitwidth, source, airSchema)
 	}
 	// Determine number of ordered columns
-	ncols := len(c.Signs)
+	numSignedCols := len(c.Signs)
 	// finally add the constraint
-	if ncols == 1 {
+	if numSignedCols == 1 {
 		// For a single column sort, its actually a bit easier because we don't
 		// need to implement a multiplexor (i.e. to determine which column is
 		// differs, etc).  Instead, we just need a delta column which ensures
@@ -231,7 +231,7 @@ func lowerSortedConstraintToAir(c SortedConstraint, mirSchema *Schema, airSchema
 	// Sanity check bitwidth
 	bitwidth := uint(0)
 
-	for i := 0; i < ncols; i++ {
+	for i := 0; i < numSignedCols; i++ {
 		// Extract bitwidth of ith column
 		ith := mirSchema.Columns().Nth(sources[i]).DataType.AsUint().BitWidth()
 		if ith > bitwidth {