Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentDensity.java @ 6949:13c2762270a6
issue1462: 1) & 4) Fix wrong density interpolation code.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Fri, 30 Aug 2013 09:48:11 +0200 |
| parents | d4108d6c4000 |
| children | 7be97faf5848 |
comparison
equal
deleted
inserted
replaced
| 6948:d4108d6c4000 | 6949:13c2762270a6 |
|---|---|
| 127 double lower = prev.getKm(); | 127 double lower = prev.getKm(); |
| 128 double upper = next.getKm(); | 128 double upper = next.getKm(); |
| 129 double upperDensity = next.getDensity(); | 129 double upperDensity = next.getDensity(); |
| 130 double lowerDensity = prev.getDensity(); | 130 double lowerDensity = prev.getDensity(); |
| 131 | 131 |
| 132 double m =(upperDensity - lowerDensity)/(upper - lower) * km; | 132 double m =(upperDensity - lowerDensity)/(upper - lower); |
| 133 double b = lowerDensity - | 133 double b = lowerDensity - (m * lower); |
| 134 ((upperDensity - lowerDensity)/(upper - lower) * lower); | |
| 135 return (m * km) + b; | 134 return (m * km) + b; |
| 136 } | 135 } |
| 137 | 136 |
| 138 | 137 |
| 139 /** If multiple values for same year and station are found, | 138 /** If multiple values for same year and station are found, |