Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/SedimentLoadCalculation.java @ 5661:b6297a67823e
SedimentLoadFactory: Renamed getLoadwithData to getLoadWithData, update callers.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Thu, 11 Apr 2013 11:57:22 +0200 |
| parents | e357716cf346 |
| children | 756df79274e1 |
comparison
equal
deleted
inserted
replaced
| 5660:a3b170869c77 | 5661:b6297a67823e |
|---|---|
| 113 } | 113 } |
| 114 | 114 |
| 115 private SedimentLoadResult calculateEpoch(int i) { | 115 private SedimentLoadResult calculateEpoch(int i) { |
| 116 List<SedimentLoad> epochLoads = new ArrayList<SedimentLoad>(); | 116 List<SedimentLoad> epochLoads = new ArrayList<SedimentLoad>(); |
| 117 for (int j = epoch[i][0]; j < epoch[i][1]; j++) { | 117 for (int j = epoch[i][0]; j < epoch[i][1]; j++) { |
| 118 epochLoads.add(SedimentLoadFactory.getLoadwithData( | 118 epochLoads.add(SedimentLoadFactory.getLoadWithData( |
| 119 this.river, | 119 this.river, |
| 120 this.yearEpoch, | 120 this.yearEpoch, |
| 121 this.kmLow, | 121 this.kmLow, |
| 122 this.kmUp, | 122 this.kmUp, |
| 123 j, | 123 j, |
| 205 | 205 |
| 206 return result; | 206 return result; |
| 207 } | 207 } |
| 208 | 208 |
| 209 private SedimentLoadResult calculateOffEpoch(int i) { | 209 private SedimentLoadResult calculateOffEpoch(int i) { |
| 210 SedimentLoad load = SedimentLoadFactory.getLoadwithData( | 210 SedimentLoad load = SedimentLoadFactory.getLoadWithData( |
| 211 this.river, | 211 this.river, |
| 212 this.yearEpoch, | 212 this.yearEpoch, |
| 213 kmLow, | 213 kmLow, |
| 214 kmUp, | 214 kmUp, |
| 215 this.epoch[i][0], | 215 this.epoch[i][0], |
| 232 | 232 |
| 233 return result; | 233 return result; |
| 234 } | 234 } |
| 235 | 235 |
| 236 private SedimentLoadResult calculateYear(int y) { | 236 private SedimentLoadResult calculateYear(int y) { |
| 237 SedimentLoad load = SedimentLoadFactory.getLoadwithData( | 237 SedimentLoad load = SedimentLoadFactory.getLoadWithData( |
| 238 this.river, | 238 this.river, |
| 239 this.yearEpoch, | 239 this.yearEpoch, |
| 240 this.kmLow, | 240 this.kmLow, |
| 241 this.kmUp, | 241 this.kmUp, |
| 242 y, | 242 y, |