Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFraction.java @ 7015:a9ff696c2d18
Fixed misuse of x !=/== Double.NaN
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Fri, 13 Sep 2013 17:42:09 +0200 |
| parents | 56891f61e534 |
| children |
comparison
equal
deleted
inserted
replaced
| 7014:56891f61e534 | 7015:a9ff696c2d18 |
|---|---|
| 191 } | 191 } |
| 192 | 192 |
| 193 /** Returns true if all fraction values except SuspSediment are unset. */ | 193 /** Returns true if all fraction values except SuspSediment are unset. */ |
| 194 public boolean hasOnlySuspValues() { | 194 public boolean hasOnlySuspValues() { |
| 195 return | 195 return |
| 196 getSuspSediment() != Double.NaN && | 196 !Double.isNaN(getSuspSediment()) && |
| 197 getCoarse() == Double.NaN && | 197 Double.isNaN(getCoarse()) && |
| 198 getFineMiddle() == Double.NaN && | 198 Double.isNaN(getFineMiddle()) && |
| 199 getSand() == Double.NaN && | 199 Double.isNaN(getSand()) && |
| 200 getSuspSand() == Double.NaN; | 200 Double.isNaN(getSuspSand()); |
| 201 } | 201 } |
| 202 | 202 |
| 203 /** Returns true if all fraction values except SuspSediment are set. */ | 203 /** Returns true if all fraction values except SuspSediment are set. */ |
| 204 public boolean hasButSuspValues() { | 204 public boolean hasButSuspValues() { |
| 205 return | 205 return |
| 206 getSuspSediment() == Double.NaN && | 206 Double.isNaN(getSuspSediment()) && |
| 207 getCoarse() != Double.NaN && | 207 !Double.isNaN(getCoarse()) && |
| 208 getFineMiddle() != Double.NaN && | 208 !Double.isNaN(getFineMiddle()) && |
| 209 getSand() != Double.NaN && | 209 !Double.isNaN(getSand()) && |
| 210 getSuspSand() != Double.NaN; | 210 !Double.isNaN(getSuspSand()); |
| 211 } | 211 } |
| 212 | 212 |
| 213 /** Returns true if all fraction needed for total calculation are set. */ | 213 /** Returns true if all fraction needed for total calculation are set. */ |
| 214 public boolean isComplete() { | 214 public boolean isComplete() { |
| 215 return | 215 return |
| 216 getCoarse() != Double.NaN && | 216 !Double.isNaN(getCoarse()) && |
| 217 getFineMiddle() != Double.NaN && | 217 !Double.isNaN(getFineMiddle()) && |
| 218 getSand() != Double.NaN && | 218 !Double.isNaN(getSand()) && |
| 219 getSuspSand() != Double.NaN && | 219 !Double.isNaN(getSuspSand()) && |
| 220 getSuspSediment() != Double.NaN; | 220 !Double.isNaN(getSuspSediment()); |
| 221 } | 221 } |
| 222 } | 222 } |
| 223 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : | 223 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : |