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

Merge "Issue #1445 fix time range for accumulations" into development

Browse source 
Former-commit-id: 3057efc842920e3843a90005d4166c5b5d4814a6
This commit is contained in:
Richard Peter 2012-12-21 10:14:10 -06:00 • committed by Gerrit Code Review
commit 312f5ea6c3
1 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cave/com.raytheon.uf.viz.derivparam/src/com/raytheon/uf/viz/derivparam/tree/TimeRangeLevelNode.java
View file

@ -93,6 +93,9 @@ public class TimeRangeLevelNode extends AbstractAliasLevelNode {
Set<AbstractRequestableData> records = new HashSet<AbstractRequestableData>();
for (TimeAndSpace ast : availability) {
Set<TimeAndSpace> needed = calculateNeededAvailability(ast);
if (needed.isEmpty()) {
continue;
}
Map<TimeAndSpace, MatchResult> matched = matcher.match(needed,
dataMap.keySet());
if (TimeAndSpaceMatcher.getAll1(matched).containsAll(needed)) {
@ -123,12 +126,13 @@ public class TimeRangeLevelNode extends AbstractAliasLevelNode {
Set<TimeAndSpace> goodAvail = new HashSet<TimeAndSpace>();
for (TimeAndSpace ast : allAvail) {
Set<TimeAndSpace> needed = calculateNeededAvailability(ast);
if (!needed.isEmpty()) {
Set<TimeAndSpace> matchedNeeded = TimeAndSpaceMatcher
.getAll1(matcher.match(needed, allAvail));
if (matchedNeeded.containsAll(needed)) {
goodAvail.add(ast);
}
}
}
return goodAvail;
}
@ -139,14 +143,10 @@ public class TimeRangeLevelNode extends AbstractAliasLevelNode {
AvailabilityContainer availabilityContainer) {
TimeAndSpaceMatcher matcher = new TimeAndSpaceMatcher();
matcher.setIgnoreRange(true);
Set<TimeAndSpace> sourceAvailability = new HashSet<TimeAndSpace>(
availability);
Set<TimeAndSpace> sourceAvailability = new HashSet<TimeAndSpace>();
for (TimeAndSpace ast : availability) {
Set<TimeAndSpace> needed = calculateNeededAvailability(ast);
Set<TimeAndSpace> matchedAvail = TimeAndSpaceMatcher
.getAll1(matcher.match(needed, availability));
sourceAvailability.addAll(matchedAvail);
sourceAvailability.addAll(needed);
}
Map<AbstractRequestableNode, Set<TimeAndSpace>> result = new HashMap<AbstractRequestableNode, Set<TimeAndSpace>>();
result.put(sourceNode, sourceAvailability);