changeset 4796:199c49f967d2

Some Go clean-ups.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Fri, 25 Oct 2019 17:28:00 +0200
parents fe838fc3ca69
children 9a4f5f319419
files pkg/controllers/stretches.go
diffstat 1 files changed, 6 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- 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
 }