xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Issue #1194 make time matching more lenient for latest live data." into development

Browse source 
Former-commit-id: 005082dfef [formerly 0341a27900] [formerly 005082dfef [formerly 0341a27900] [formerly 6332549702 [formerly e0f013bb51f9d974f1554237b22739cf20ef0c56]]]
Former-commit-id: 6332549702
Former-commit-id: 0f6ea23c5c [formerly c0ff0c5801]
Former-commit-id: 398c9e2345
This commit is contained in:
Nate Jensen 2012-09-20 11:46:22 -05:00 • committed by Gerrit Code Review
commit ac1ac8eee2
1 changed files with 22 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
View file

@ -553,7 +553,7 @@ public class TimeMatcher {
int f, f0;
int p, pp, m, n, q;
int best;
long dtf, dt, fd;
long dtf, dt, dtd, fd;
double fo;
long vf, v1, v2, vd;
@ -648,6 +648,7 @@ public class TimeMatcher {
IntrinsicReturnVal rv = intrinsicPeriod(depictTimes, majorIndex,
dataFcsts);
dt = rv.intrinsicPeriod;
dtd = (rv.intrinsicPeriod * 3) / 2;
dataFcsts = rv.haveForecasts;
if (fspatial) {
@ -682,6 +683,15 @@ public class TimeMatcher {
dt++;
}
if (dt > dtd || frameTimes[ef].getMatchValid() - latest.getTime() > dtd) {
// The first check makes sure that dtd is always bigger than dt
// since dtd is supposed to add extra padding to the time. The
// second check makes it so that if the latest frameTime is past the
// latest depictTime by more than dtd than we ignore dtd by setting
// it to dt which makes it a no op.
dtd = dt;
}
// Try to find match for each frame. Dependent on valid times increasing
// monotonically in depictTimes.
for (f = f0; f <= ef; f++) {
@ -692,7 +702,17 @@ public class TimeMatcher {
vf = (frameTimes)[f].getMatchValid() + deltaTime;
v1 = vf - dt; // first usable valid time
v2 = vf + dt; // last usable valid time
if (!dataFcsts && !frameFcsts && vf > latest.getTime()) {
// if we are dealing with live data(without forecast times) then
// we want to allow extra time on the latest frame. For example
// LAPS data arrives hourly, and radar arrives every 6 minutes,
// in this scenario dt is around 36 minutes so 36 minutes after
// the hour when radar updates LAPS disappears. This code
// changes that so for the latest frame LAPS will be visible for
// 90 minutes which is enough time for the next LAPS frame to
// come in, this means that the latest frame always has data.
v1 = vf - dtd;
}
fo = frameTimes[f].getLevelValue();
spatial = fo >= 0.0 && dspatial;
best = -1; // have no best match yet