dive4elements/river: artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java comparison

Sediment load: Fixed findStations() and add findLoads().

author	Sascha L. Teichmann <teichmann@intevation.de>
date	Mon, 25 Aug 2014 12:05:37 +0200
parents	786bb4f87e8d
children	8c5eb9edc3f3

comparison

equal deleted inserted replaced

-:aca5d1c87755
+:4a2ef6895557
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.List;
 import java.util.TreeMap;
+import java.util.TreeSet;
 import org.dive4elements.river.utils.EpsilonComparator;
 public class SedimentLoadData implements Serializable
 {
 }
 this.type = type;
 this.station = station;
 }
+public void allLoads(Collection<Load> loads) {
+for (List<Value> values: grainFractions) {
+if (values != null) {
+for (Value value: values) {
+loads.add(value.getLoad());
+}
+}
+}
+}
 public double getStation() {
 return station;
 }
 public int getType() {
 private void recursiveFindStations(
 double a, double b,
 int lo, int hi,
 Visitor visitor
 ) {
-while (lo >= hi) {
+while (lo <= hi) {
 int mid = (lo+hi)/2;
 Station st = stations[mid];
 double station = st.getStation();
 if (station < a) {
 hi = mid-1;
 lo = mid+1;
 }
 }
 }
+public static final Comparator<Load> LOAD_ID_CMP = new Comparator<Load>() {
+@Override
+public int compare(Load a, Load b) {
+return a.getId() - b.getId();
+}
+};
+public Collection<Load> findLoads(double a, double b) {
+final TreeSet loads = new TreeSet<Load>(LOAD_ID_CMP);
+findStations(a, b, new Visitor() {
+@Override
+public void visit(Station station) {
+station.allLoads(loads);
+}
+});
+return loads;
+}
 public void findStations(double a, double b, Visitor visitor) {
 if (a > b) {
 double t = a; a = b; b = t;
 }
 recursiveFindStations(a, b, 0, stations.length-1, visitor);

Mercurial > dive4elements > river