Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/sq/Measurements.java @ 4066:f02aa4ff3c0f
S/Q relation: Fixed problem with loosing meassurement points.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Tue, 09 Oct 2012 19:02:39 +0200 |
| parents | 22abdc45869c |
| children |
comparison
equal
deleted
inserted
replaced
| 4065:9d404069f361 | 4066:f02aa4ff3c0f |
|---|---|
| 63 | 63 |
| 64 public Measurements( | 64 public Measurements( |
| 65 List<Measurement> measuments, | 65 List<Measurement> measuments, |
| 66 List<Measurement> accumulated | 66 List<Measurement> accumulated |
| 67 ) { | 67 ) { |
| 68 if (log.isDebugEnabled()) { | |
| 69 log.debug("number of measuments: " + measuments.size()); | |
| 70 log.debug("number of accumulated: " + accumulated.size()); | |
| 71 } | |
| 68 this.measuments = measuments; | 72 this.measuments = measuments; |
| 69 this.accumulated = accumulated; | 73 this.accumulated = accumulated; |
| 70 } | 74 } |
| 71 | 75 |
| 72 public static List<SQ> extractSQ( | 76 public static List<SQ> extractSQ( |
| 73 List<Measurement> measuments, | 77 List<Measurement> measuments, |
| 74 SExtractor extractor | 78 SExtractor extractor |
| 75 ) { | 79 ) { |
| 76 List<SQ> result = new ArrayList<SQ>(measuments.size()); | 80 List<SQ> result = new ArrayList<SQ>(measuments.size()); |
| 81 int invalid = 0; | |
| 77 for (Measurement measument: measuments) { | 82 for (Measurement measument: measuments) { |
| 78 SQ sq = new SQ(extractor.getS(measument), measument.Q()); | 83 SQ sq = new SQ(extractor.getS(measument), measument.Q()); |
| 79 if (sq.isValid()) { | 84 if (sq.isValid()) { |
| 80 result.add(sq); | 85 result.add(sq); |
| 81 } | 86 } |
| 87 else { | |
| 88 ++invalid; | |
| 89 } | |
| 90 } | |
| 91 if (log.isDebugEnabled()) { | |
| 92 log.debug("Removed num invalid: " + invalid | |
| 93 + " of " + measuments.size()); | |
| 82 } | 94 } |
| 83 return result; | 95 return result; |
| 84 } | 96 } |
| 85 | 97 |
| 86 public List<SQ> S_SF() { | 98 public List<SQ> S_SF() { |