gemma: pkg/controllers/gauges.go comparison

Nash Sutcliffe: Optimization: When append predicted values only accept predictions where the issue date is 24/48/72h in the past of the measure date.

author	Sascha L. Teichmann <sascha.teichmann@intevation.de>
date	Thu, 25 Apr 2019 11:39:17 +0200
parents	f516ac26f4db
children	54a3e40cfbed

comparison

equal deleted inserted replaced

-:d79e6045452e
+:41ed69dbf9bb
 	); err != nil {
 		return nil, err
 	}
 	defer rows.Close()
+	acceptedDeltas := []time.Duration{
+		-time.Hour * 24,
+		-time.Hour * 48,
+		-time.Hour * 72,
+	}
+	isAccepted := func(observed, predicted time.Time) bool {
+		for _, delta := range acceptedDeltas {
+			t := observed.Add(delta)
+			d := predicted.Sub(t)
+			if -10*time.Millisecond < d && d < 10*time.Millisecond {
+				return true
+			}
+		}
+		return false
+	}
 	var (
 		hasCurrent bool
 		current    observedPredictedValues
 		values     []observedPredictedValues
 	)
 				when:     measureDate,
 			}
 		}
 		if predicted {
-			current.predicted = append(
+			if isAccepted(measureDate, issueDate) {
-				current.predicted,
+				current.predicted = append(
-				common.TimedValue{When: issueDate, Value: value},
+					current.predicted,
-			)
+					common.TimedValue{When: issueDate, Value: value},
-			/*
+				)
-				// current prediction same as last two?
+			}
-				if l := len(current.predicted); l > 1 && current.predicted[l-1].Value == value && current.predicted[l-2].Value == value {
-					// only update last time.
-					current.predicted[l-1].When = issueDate
-				} else {
-					current.predicted = append(
-						current.predicted,
-						common.TimedValue{When: issueDate, Value: value},
-					)
-				}
-			*/
 		} else {
 			current.observed = value
 		}
 	}

Mercurial > gemma