Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java @ 8050:9e79e384aa8b
Sediment load: Added more 'sums' to be calculated.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Thu, 17 Jul 2014 18:22:16 +0200 |
| parents | cde6d2a9ec32 |
| children | fbe3ba5a480e |
comparison
equal
deleted
inserted
replaced
| 8049:d49846f05108 | 8050:9e79e384aa8b |
|---|---|
| 36 /* GF_COARSE */ Station.BED_LOAD, | 36 /* GF_COARSE */ Station.BED_LOAD, |
| 37 /* GF_FINE_MIDDLE */ Station.BED_LOAD, | 37 /* GF_FINE_MIDDLE */ Station.BED_LOAD, |
| 38 /* GF_SAND */ Station.BED_LOAD, | 38 /* GF_SAND */ Station.BED_LOAD, |
| 39 /* GF_SUSP_SAND */ Station.BED_LOAD, | 39 /* GF_SUSP_SAND */ Station.BED_LOAD, |
| 40 /* GF_SUSP_SAND_BED */ Station.BED_LOAD, | 40 /* GF_SUSP_SAND_BED */ Station.BED_LOAD, |
| 41 /* GF_SUSP_SEDIMENT */ Station.SUSPENDED | 41 /* GF_SUSP_SEDIMENT */ Station.SUSPENDED, |
| 42 /* GF_TOTAL */ Station.BED_LOAD|Station.SUSPENDED, | |
| 43 /* GF_BED_LOAD */ Station.BED_LOAD, | |
| 44 /* GF_SUSPENDED_LOAD */ Station.BED_LOAD | |
| 42 }; | 45 }; |
| 43 | 46 |
| 44 public static final int measurementStationType(int grainFraction) { | 47 public static final int measurementStationType(int grainFraction) { |
| 45 return grainFraction < 0 || grainFraction >= MEASUREMENT_STATION_GF.length | 48 return grainFraction < 0 || grainFraction >= MEASUREMENT_STATION_GF.length |
| 46 ? Station.UNKNOWN | 49 ? Station.UNKNOWN |
| 171 public int getType() { | 174 public int getType() { |
| 172 return type; | 175 return type; |
| 173 } | 176 } |
| 174 | 177 |
| 175 public boolean isType(int type) { | 178 public boolean isType(int type) { |
| 176 return (this.type & type) == type; | 179 return (this.type & type) != 0; |
| 177 } | 180 } |
| 178 | 181 |
| 179 public void setNext(Station next) { | 182 public void setNext(Station next) { |
| 180 this.next = next; | 183 this.next = next; |
| 181 } | 184 } |