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

comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java @ 8036:17542d100e75

Throw out old visitor model and use grain fraction filters instead. Fixed neighborhood wirinng of measument stations.

author	Sascha L. Teichmann <teichmann@intevation.de>
date	Wed, 16 Jul 2014 11:05:59 +0200
parents	f2dc7992b8a3
children	aa622bddfdac

comparison

equal deleted inserted replaced

-:f2dc7992b8a3
+:17542d100e75
 package org.dive4elements.river.artifacts.model.minfo;
 import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 import java.util.TreeMap;
 import org.dive4elements.river.utils.EpsilonComparator;
 if ("susp_sand_bed".equals(name))      return GF_SUSP_SAND_BED;
 if ("suspended_sediment".equals(name)) return GF_SUSP_SEDIMENT;
 return -1;
 }
+public interface Visitor {
+void visit(List<Station> stations);
+}
 public static class Value implements Serializable {
+public interface Filter {
+boolean accept(Value value);
+}
 private double value;
 private Load load;
 public static class Station implements Serializable {
 public static final int BED_LOAD  = 0;
 public static final int SUSPENDED = 1;
-public interface Visitor {
-boolean accept(Station station);
-boolean accept(int grainFraction);
-boolean visit(Value value, int grainFraction);
-}
 private double station;
 private int type;
 private List<List<Value>> grainFractions;
 }
 public Station(int type, double station) {
 grainFractions = new ArrayList<List<Value>>(GF_MAX+1);
 for (int i = 0; i < GF_MAX+1; ++i) {
-grainFractions.add(new ArrayList<Value>());
+grainFractions.add(null);
 }
 this.type = type;
 this.station = station;
 }
 public Station getPrev() {
 return prev;
 }
+public Station getNext(boolean isKMUp) {
+return isKMUp ? getNext() : getPrev();
+}
+public Station getPrev(boolean isKMUp) {
+return isKMUp ? getPrev() : getNext();
+}
 public void addValue(int grainFraction, Value value) {
-grainFractions.get(grainFraction).add(value);
+List<Value> values = grainFractions.get(grainFraction);
+if (values == null) {
+values = new ArrayList<Value>();
+grainFractions.set(grainFraction, values);
+}
+values.add(value);
 }
 public boolean hasGrainFraction(String grainFraction) {
 return hasGrainFraction(grainFractionIndex(grainFraction));
 }
 public boolean hasGrainFraction(int grainFraction) {
 List<Value> values = grainFractions.get(grainFraction);
-return !values.isEmpty();
+return values != null && !values.isEmpty();
 }
-public void visit(Visitor visitor) {
+public List<Value> filterGrainFraction(int grainFraction, Value.Filter filter) {
-if (!visitor.accept(this)) {
+List<Value> values = grainFractions.get(grainFraction);
-return;
+if (values == null || values.isEmpty()) {
-}
+return Collections.<Value>emptyList();
+}
-for (int i = 0; i < GF_MAX+1; ++i) {
+List<Value> result = new ArrayList<Value>(values.size());
-List<Value> values = grainFractions.get(i);
+for (Value value: values) {
-if (values.isEmpty() || !visitor.accept(i)) {
+if (filter.accept(value)) {
-continue;
+result.add(value);
 }
-for (Value value: values) {
+}
-if (!visitor.visit(value, i)) {
+return result;
-break;
-}
-}
-}
-}
-public boolean inside(double a, double b) {
-return station >= a && station <= b;
 }
 public double findValueByLoadId(int id) {
 for (List<Value> values: grainFractions) {
 double value = findValueByLoadId(values, id);
 private static final double findValueByLoadId(
 List<Value> values,
 int         id
 ) {
+if (values == null) {
+return Double.NaN;
+}
 // List is ordered by station id -> binary search.
 int lo = 0, hi = values.size()-1;
 while (lo <= hi) {
 int mid = (lo + hi)/2;
 Value v = values.get(mid);
 else return v.getValue();
 }
 return Double.NaN;
 }
+public static Station firstOfType(List<Station> stations, int type) {
+for (Station station: stations) {
+if (station.getType() == type) {
+return station;
+}
+}
+return null;
+}
 } // class Station
 private List<List<Station>> stations;
 this.stations = new ArrayList<List<Station>>(same.values());
 wireNeighbors();
 }
 private void wireNeighbors() {
-for (int i = 0, N = stations.size()-1; i < N; ++i) {
+for (int i = 0, N = stations.size(); i < N-1; ++i) {
 for (Station current: stations.get(i)) {
 int type = current.getType();
 NEXT: for (int j = i+1; j < N; ++j) {
 for (Station next: stations.get(j)) {
 if (next.getType() == type) {
 }
 }
 }
 }
 }
-}
-public interface Visitor {
-void visit(List<Station> stations);
 }
 private void recursiveFindStations(
 double a, double b,
 int lo, int hi,

Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadData.java @ 8036:17542d100e75