Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java @ 1929:6b0ae0f2cae6
(Minor) cosmetics, docs.
flys-artifacts/trunk@3309 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Wed, 23 Nov 2011 14:04:01 +0000 |
parents | db68806e6563 |
children | 59af81364eb1 |
comparison
equal
deleted
inserted
replaced
1928:305a338c43c2 | 1929:6b0ae0f2cae6 |
---|---|
89 this.scale = scale; | 89 this.scale = scale; |
90 } | 90 } |
91 return values; | 91 return values; |
92 } | 92 } |
93 | 93 |
94 /** | |
95 * Returns mapping of gauge name to values. | |
96 */ | |
94 protected Map<String, double [][]> loadValues(double scale) { | 97 protected Map<String, double [][]> loadValues(double scale) { |
95 Map<String, double [][]> values = new HashMap<String, double [][]>(); | 98 Map<String, double [][]> values = new HashMap<String, double [][]>(); |
96 | 99 |
97 Session session = SessionHolder.HOLDER.get(); | 100 Session session = SessionHolder.HOLDER.get(); |
98 | 101 |
215 | 218 |
216 double q; | 219 double q; |
217 if (w1 == w2) { | 220 if (w1 == w2) { |
218 q = 0.5*(q1 + q2); | 221 q = 0.5*(q1 + q2); |
219 if (debug) { | 222 if (debug) { |
220 log.debug("same w1 and w1: " + w1); | 223 log.debug("same w1 and w2: " + w1); |
221 } | 224 } |
222 } | 225 } |
223 else { | 226 else { |
224 double m = (q2 - q1)/(w2 - w1); | 227 double m = (q2 - q1)/(w2 - w1); |
225 double b = q1 - m*w1; | 228 double b = q1 - m*w1; |