Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentDensity.java @ 8065:fdb26fe898dc
Sediment load: Cached sediment values dont depend on year. The cached object is an index over year so there is not need to ask the factory for this.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Wed, 30 Jul 2014 19:06:35 +0200 |
| parents | 50102c41151e |
| children | e4606eae8ea5 |
comparison
equal
deleted
inserted
replaced
| 8064:50102c41151e | 8065:fdb26fe898dc |
|---|---|
| 10 | 10 |
| 11 import java.io.Serializable; | 11 import java.io.Serializable; |
| 12 import java.util.ArrayList; | 12 import java.util.ArrayList; |
| 13 import java.util.Collections; | 13 import java.util.Collections; |
| 14 import java.util.Comparator; | 14 import java.util.Comparator; |
| 15 import java.util.HashMap; | |
| 16 import java.util.Iterator; | 15 import java.util.Iterator; |
| 17 import java.util.List; | 16 import java.util.List; |
| 18 import java.util.Map; | 17 import java.util.Map; |
| 19 import java.util.Set; | 18 import java.util.Set; |
| 20 import java.util.TreeMap; | 19 import java.util.TreeMap; |
| 81 } | 80 } |
| 82 }; | 81 }; |
| 83 | 82 |
| 84 public void addDensity(double km, double density, int year) { | 83 public void addDensity(double km, double density, int year) { |
| 85 | 84 |
| 86 logger.debug("adding " + year); | 85 if (logger.isDebugEnabled()) { |
| 86 logger.debug("adding " + year); | |
| 87 } | |
| 87 | 88 |
| 88 Integer key = Integer.valueOf(year); | 89 Integer key = Integer.valueOf(year); |
| 89 | 90 |
| 90 List<SedimentDensityValue> list = densities.get(key); | 91 List<SedimentDensityValue> list = densities.get(key); |
| 91 | 92 |
| 140 } | 141 } |
| 141 if (year >= y2 && !iter.hasNext()) { | 142 if (year >= y2 && !iter.hasNext()) { |
| 142 return getDensityAtKm(current.getValue(), km); | 143 return getDensityAtKm(current.getValue(), km); |
| 143 } | 144 } |
| 144 } | 145 } |
| 146 | |
| 145 return SEDIMNET_DENSITY_FACTOR; | 147 return SEDIMNET_DENSITY_FACTOR; |
| 146 } | 148 } |
| 147 | 149 |
| 148 /** Get (sorted) map of km to density of all years. */ | 150 /** Get (sorted) map of km to density of all years. */ |
| 149 public double[][] getAllDensities() | 151 public double[][] getAllDensities() |