Mercurial > dive4elements > river

annotate flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/minfo/SedimentDensity.java @ 4655:cd44d28d0fbc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move the access to artifact data to the Access object Use BedHeightAccess class to receive the data from the artifact. This abstracts the data access from the actual artifact.
author Björn Ricks <bjoern.ricks@intevation.de>
date Tue, 11 Dec 2012 09:44:04 +0100
parents 2fadc6c5cdad
children 84e02b3f7a4f
rev   line source
4521
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
1 package de.intevation.flys.artifacts.model.minfo;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
2
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
3 import java.util.ArrayList;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
4 import java.util.Collections;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
5 import java.util.HashMap;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
6 import java.util.List;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
7 import java.util.Map;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
8 import java.util.Set;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
9
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
10 import org.apache.log4j.Logger;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
11
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
12
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
13 public class SedimentDensity
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
14 {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
15 private static final Logger logger = Logger
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
16 .getLogger(SedimentDensity.class);
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
17
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
18 private Map<Integer, List<SedimentDensityValue>> densities;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
19 private List<Integer> years;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
20
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
21 public SedimentDensity() {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
22 this.densities = new HashMap<Integer, List<SedimentDensityValue>>();
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
23 this.years = new ArrayList<Integer>();
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
24 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
25
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
26 public Map<Integer, List<SedimentDensityValue>> getDensities() {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
27 return densities;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
28 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
29
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
30 public void setDensities(Map<Integer, List<SedimentDensityValue>> densities) {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
31 this.densities = densities;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
32 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
33
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
34 public void addDensity(double km, double density, int year) {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
35 logger.debug("adding " + year);
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
36 if (this.densities.containsKey(year)) {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
37 List<SedimentDensityValue> list = this.densities.get(year);
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
38 list.add(new SedimentDensityValue(km, density, year));
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
39 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
40 else {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
41 List<SedimentDensityValue> list =
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
42 new ArrayList<SedimentDensityValue>();
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
43 list.add(new SedimentDensityValue(km, density, year));
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
44 densities.put(year, list);
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
45 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
46 if (!this.years.contains(new Integer(year))) {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
47 logger.debug("new year");
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
48 years.add(new Integer(year));
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
49 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
50 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
51
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
52 public List<Integer> getYears() {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
53 return years;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
54 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
55
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
56 public void setYears(List<Integer> years) {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
57 this.years = years;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
58 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
59
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
60 public double getDensity(double km, int year) {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
61 Collections.sort(this.years);
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
62 if (this.years.size() == 1) {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
63 return getDensityAtKm(densities.get(year), km);
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
64 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
65 else {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
66 for (int i = 0; i < years.size() -1; i++) {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
67 int y1 = years.get(i);
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
68 int y2 = years.get(i + 1);
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
69 int mid = Math.round((y1 + y2) / 2);
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
70 if (year < mid) {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
71 return getDensityAtKm(densities.get(y1), km);
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
72 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
73 else if (i == years.size() -1) {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
74 continue;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
75 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
76 else {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
77 return getDensityAtKm(densities.get(y2), km);
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
78 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
79 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
80 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
81 return -1d;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
82 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
83
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
84 private double getDensityAtKm(
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
85 List<SedimentDensityValue> values,
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
86 double km
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
87 ) {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
88 boolean found = true;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
89 SedimentDensityValue prev = null;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
90 SedimentDensityValue next = null;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
91 for (SedimentDensityValue sdv: values) {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
92 logger.debug("year: " + sdv.getYear());
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
93 if (sdv.getKm() == km) {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
94 prev = sdv;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
95 found = true;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
96 break;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
97 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
98 if (sdv.getKm() > km) {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
99 next = sdv;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
100 break;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
101 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
102 prev = sdv;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
103 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
104 if (found) {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
105 return prev.getDensity();
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
106 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
107 else {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
108 return spline(prev, next, km);
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
109 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
110 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
111
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
112 private double spline(
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
113 SedimentDensityValue prev,
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
114 SedimentDensityValue next,
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
115 double km
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
116 ) {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
117 double lower = prev.getKm();
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
118 double upper = next.getKm();
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
119 double upperDensity = next.getDensity();
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
120 double lowerDensity = prev.getDensity();
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
121
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
122 double m =(upperDensity - lowerDensity)/(upper - lower) * km;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
123 double b = lowerDensity -
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
124 ((upperDensity - lowerDensity)/(upper - lower) * lower);
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
125 return (m * km) + b;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
126 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
127
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
128 public void cleanUp() {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
129 Set<Integer> keys = densities.keySet();
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
130 for (Integer key : keys) {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
131 List<SedimentDensityValue> list = densities.get(key);
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
132 if (list.size() == 0) {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
133 return;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
134 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
135 List<SedimentDensityValue> cleaned =
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
136 new ArrayList<SedimentDensityValue>();
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
137 double prevkm = list.get(0).getKm();
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
138 int counter = 0;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
139 double sum = 0d;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
140 for (SedimentDensityValue value : list) {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
141 if (value.getKm() == prevkm) {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
142 sum += value.getDensity();
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
143 counter++;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
144 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
145 else {
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
146 cleaned.add(new SedimentDensityValue(
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
147 prevkm,
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
148 sum / counter,
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
149 value.getYear()));
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
150 sum = value.getDensity();
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
151 counter = 1;
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
152 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
153 prevkm = value.getKm();
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
154 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
155 this.densities.put(key, cleaned);
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
156 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
157 }
71e6fe870c1d Added objects and factory for sediment densities.
Raimund Renkert <rrenkert@intevation.de>
parents:
diff changeset
158 }
http://dive4elements.wald.intevation.org