Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/sq/Measurements.java @ 8280:e8283197d889
Added new fraction to sq relation.
* New diagram with "Geschiebetransport gesamt(Sohlhöhenrelevant)"
* Added the new fraction to overview diagram.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Wed, 17 Sep 2014 09:01:27 +0200 |
| parents | b8f94e865875 |
| children | 84929f882fa2 |
comparison
equal
deleted
inserted
replaced
| 8276:7e54b27f4780 | 8280:e8283197d889 |
|---|---|
| 58 | 58 |
| 59 public static final SExtractor S_BL_EXTRACTOR = new SExtractor() { | 59 public static final SExtractor S_BL_EXTRACTOR = new SExtractor() { |
| 60 @Override | 60 @Override |
| 61 public double getS(Measurement measument) { | 61 public double getS(Measurement measument) { |
| 62 return measument.S_BL_1(); | 62 return measument.S_BL_1(); |
| 63 } | |
| 64 }; | |
| 65 | |
| 66 public static final SExtractor S_BL2_EXTRACTOR = new SExtractor() { | |
| 67 @Override | |
| 68 public double getS(Measurement measument) { | |
| 69 return measument.S_BL_2(); | |
| 63 } | 70 } |
| 64 }; | 71 }; |
| 65 | 72 |
| 66 protected List<Measurement> measuments; | 73 protected List<Measurement> measuments; |
| 67 protected List<Measurement> accumulated; | 74 protected List<Measurement> accumulated; |
| 129 | 136 |
| 130 public List<SQ> S_BL() { | 137 public List<SQ> S_BL() { |
| 131 return extractSQ(accumulated, S_BL_EXTRACTOR); | 138 return extractSQ(accumulated, S_BL_EXTRACTOR); |
| 132 } | 139 } |
| 133 | 140 |
| 141 public List<SQ> S_BL2() { | |
| 142 return extractSQ(accumulated, S_BL2_EXTRACTOR); | |
| 143 } | |
| 144 | |
| 134 public List<SQ> getSQs(int index) { | 145 public List<SQ> getSQs(int index) { |
| 135 switch (index) { | 146 switch (index) { |
| 136 case 0: return S_SF(); | 147 case 0: return S_SF(); |
| 137 case 1: return S_SS(); | 148 case 1: return S_SS(); |
| 138 case 2: return S_BL_S(); | 149 case 2: return S_BL_S(); |
| 139 case 3: return S_BL_FG(); | 150 case 3: return S_BL_FG(); |
| 140 case 4: return S_BL_CG(); | 151 case 4: return S_BL_CG(); |
| 141 case 5: return S_BL(); | 152 case 5: return S_BL(); |
| 153 case 6: return S_BL2(); | |
| 142 } | 154 } |
| 143 log.error("THIS SHOULD NOT HAPPEN: Tried to access SQ[" + index + "]"); | 155 log.error("THIS SHOULD NOT HAPPEN: Tried to access SQ[" + index + "]"); |
| 144 return new ArrayList<SQ>(0); | 156 return new ArrayList<SQ>(0); |
| 145 } | 157 } |
| 146 | 158 |