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

Code cleanup concerning calculations: improved error handling; improved interpolation; bed heights are now always used for spatial discretisation

comparison

equal deleted inserted replaced

-:b98fbd91f64a
+:45f1ad66560e
 import org.dive4elements.river.artifacts.model.BlackboardDataFacet;
 import org.dive4elements.river.artifacts.model.FacetTypes;
 import org.dive4elements.river.artifacts.resources.Resources;
 import org.dive4elements.river.model.BedHeight;
 import org.dive4elements.river.model.BedHeightValue;
+import org.dive4elements.river.model.BedHeightValueType;
 import gnu.trove.TDoubleArrayList;
 /**
 * More or less the same as {@link BedHeightFacet}, but was necessary to copy because else we break the old
 * @author Gernot Belger
 */
 public class BedHeightMinMaxFacet extends BlackboardDataFacet implements FacetTypes {
 private static final long serialVersionUID = 1L;
-public static enum BedHeightValueType {
-min {
-@Override
-public Double getValue(final BedHeightValue bedheightValue) {
-return bedheightValue.getMinHeight();
-}
-},
-max {
-@Override
-public Double getValue(final BedHeightValue bedheightValue) {
-return bedheightValue.getMaxHeight();
-}
-},
-value {
-@Override
-public Double getValue(final BedHeightValue bedheightValue) {
-return bedheightValue.getHeight();
-}
-};
-public abstract Double getValue(final BedHeightValue bedheightValue);
-}
 private final BedHeightValueType valueType;
 public BedHeightMinMaxFacet(final String name, final String description, final BedHeightValueType valueType) {
 super(0, name, description);

Mercurial > dive4elements > river