lib/operations: Range is int, not int64

cmd/client/survey.go

@@ -80,17 +80,17 @@ func surveySetOperation(c *cli.Context) error {
 			return errors.New("range should be ','-separated")
 		}
 
-		min, err := strconv.ParseInt(splitted[0], 10, 64)
+		min, err := strconv.ParseInt(splitted[0], 10, 0)
 		if err != nil {
 			return err
 		}
 
-		max, err := strconv.ParseInt(splitted[1], 10, 64)
+		max, err := strconv.ParseInt(splitted[1], 10, 0)
 		if err != nil {
 			return err
 		}
 
-		parsedRange = &cmd.Range{Min: min, Max: max}
+		parsedRange = &cmd.Range{Min: int(min), Max: int(max)}
 	}
 
 	conf, err := readConfigFrom(os.Stdin)

cmd/index.go

@@ -1,7 +1,7 @@
 package cmd
 
 // Range is a text serialisable width.
-type Range struct{ Min, Max int64 }
+type Range struct{ Min, Max int }
 
 // Operation is a text serialisable lib.Operation.
 type Operation struct {

lib/operations/frequency_count.go

@@ -19,7 +19,7 @@ func (FrequencyCount) MarshalID() [8]byte {
 }
 
 // NewFrequencyCount creates a new FrequencyCount bound to the given range.
-func NewFrequencyCount(min, max int64) (FrequencyCount, error) {
+func NewFrequencyCount(min, max int) (FrequencyCount, error) {
 	if min > max {
 		return FrequencyCount{}, errors.New("given minimum is greater than maximum")
 	}
@@ -33,7 +33,7 @@ func (fc FrequencyCount) ExecuteOnProvider(loaded [][]float64) ([]float64, error
 	}
 
 	converted := floatsToInts(loaded[0])
-	freqCount := libdrynxencoding.ExecuteFreqCountOnProvider(converted, fc.min, fc.max)
+	freqCount := libdrynxencoding.ExecuteFreqCountOnProvider(converted, int64(fc.min), int64(fc.max))
 	ret := make([]float64, len(freqCount))
 	for i, v := range freqCount {
 		ret[i] = float64(v)

lib/operations/index.go

@@ -21,10 +21,8 @@ func intsToFloats(arr []int64) []float64 {
 	return ret
 }
 
-// Range represents a width between two int64
-type Range struct {
-	min, max int64
-}
+// Range represents a width between two int
+type Range struct{ min, max int }
 
 // MarshalBinary encodes to binary
 func (r Range) MarshalBinary() ([]byte, error) {