gemma: pkg/controllers/fwa.go comparison

If looking at sections/stretches the bottleneck with the lowest class determines the class of the whole construct.

author	Sascha L. Teichmann <sascha.teichmann@intevation.de>
date	Wed, 13 May 2020 09:29:55 +0200
parents	1fce0fd81f46
children	878d52d95e37

comparison

equal deleted inserted replaced

-:1fce0fd81f46
+:aebe1a12e8b9
 		next = current.AddDate(0, 0, 1)
 		// Assume that a bottleneck is over LDC.
 		overLDC := true
-		highest := -1
+		lowest := len(counters) - 1
 		var hasValid bool
 		// check all bottlenecks
 		for i, validity := range validities {
 			if min := minClass(bns[i].measurements.classify(
 				current, next,
 				chooseBreaks[vs.limiting],
 				limitingAccess[vs.limiting]),
 				12*time.Hour,
-			); min > highest {
+			); min < lowest {
-				highest = min
+				lowest = min
 			}
 		}
 		if hasValid {
 			if overLDC {
 				overLDCDays++
 			}
-			if highest > -1 {
+			counters[lowest]++
-				counters[highest]++
-			}
 		} else { // assume that all is in best conditions
 			overLDCDays++
 			counters[len(counters)-1]++
 		}
 	for i, v := range classes {
 		if sum += v; sum >= threshold {
 			return i
 		}
 	}
-	return -1
+	return len(classes) - 1
 }
 func dusk(t time.Time) time.Time {
 	return time.Date(
 		t.Year(),

Mercurial > gemma