# HG changeset patch # User Sascha L. Teichmann # Date 1572017280 -7200 # Node ID 199c49f967d27e722e06b01348992c120d249c9d # Parent fe838fc3ca692933d9c49249d2ae2935beed2421 Some Go clean-ups. diff -r fe838fc3ca69 -r 199c49f967d2 pkg/controllers/stretches.go --- a/pkg/controllers/stretches.go Fri Oct 25 17:11:37 2019 +0200 +++ b/pkg/controllers/stretches.go Fri Oct 25 17:28:00 2019 +0200 @@ -93,9 +93,6 @@ func sumClassesTo(breaks []time.Duration, to int) time.Duration { var result time.Duration - if to < 0 { - result = 0 - } for i := 0; i <= to; i++ { result += breaks[i] } @@ -108,18 +105,18 @@ ) []time.Duration { newAgg := make([]time.Duration, len(agg)) - fmt.Printf("Old agg: %v\n", agg) - fmt.Printf("compwit: %v\n", new) + log.Printf("info: Old agg: %v\n", agg) + log.Printf("info: compwit: %v\n", new) for i := 0; i < len(new)-1; i++ { - old_sum := sumClassesTo(agg, i) - new_sum := sumClassesTo(new, i) - newAgg[i] = maxDuration(new_sum, old_sum) - sumClassesTo(newAgg, i-1) + oldSum := sumClassesTo(agg, i) + newSum := sumClassesTo(new, i) + newAgg[i] = maxDuration(newSum, oldSum) - sumClassesTo(newAgg, i-1) } // adjust highest class so the sum of all classes in agg // matches the original sum of all classes in new. newAgg[len(new)-1] = sumClassesTo(new, len(new)-1) - sumClassesTo(newAgg, len(new)-2) - fmt.Printf("New agg: %v\n", newAgg) + log.Printf("info: New agg: %v\n", newAgg) return newAgg }