# HG changeset patch # User Andre Heinecke # Date 1426003302 -3600 # Node ID a8048aac8831d92b37ba3ab39a7738cde6ca0f18 # Parent c16d04f2c5bcb2f9223a618ec44129ee6fe5ab36# Parent 4dd6d89ce95eee55403e2bb9b1872c693bca0a11 Merge of MINFO improvement developments diff -r 4dd6d89ce95e -r a8048aac8831 artifacts/doc/conf/artifacts/chart.xml --- a/artifacts/doc/conf/artifacts/chart.xml Wed Feb 18 17:17:20 2015 +0100 +++ b/artifacts/doc/conf/artifacts/chart.xml Tue Mar 10 17:01:42 2015 +0100 @@ -116,6 +116,7 @@ + diff -r 4dd6d89ce95e -r a8048aac8831 artifacts/doc/conf/artifacts/minfo.xml --- a/artifacts/doc/conf/artifacts/minfo.xml Wed Feb 18 17:17:20 2015 +0100 +++ b/artifacts/doc/conf/artifacts/minfo.xml Tue Mar 10 17:01:42 2015 +0100 @@ -35,31 +35,31 @@ - + - + - + + + + + + - - - - - @@ -72,14 +72,21 @@ + + + + + + - + + @@ -545,8 +552,7 @@ - - + - + @@ -63,6 +63,12 @@ + + + + + + diff -r 4dd6d89ce95e -r a8048aac8831 artifacts/doc/conf/cache.xml --- a/artifacts/doc/conf/cache.xml Wed Feb 18 17:17:20 2015 +0100 +++ b/artifacts/doc/conf/cache.xml Tue Mar 10 17:01:42 2015 +0100 @@ -58,6 +58,16 @@ memoryStoreEvictionPolicy="LRU" /> + + + + @@ -243,72 +244,72 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + diff -r 4dd6d89ce95e -r a8048aac8831 artifacts/doc/conf/themes/default.xml --- a/artifacts/doc/conf/themes/default.xml Wed Feb 18 17:17:20 2015 +0100 +++ b/artifacts/doc/conf/themes/default.xml Tue Mar 10 17:01:42 2015 +0100 @@ -2345,6 +2345,7 @@ + - + + @@ -2391,6 +2394,7 @@ + @@ -2580,6 +2584,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 4dd6d89ce95e -r a8048aac8831 artifacts/doc/conf/themes/second.xml --- a/artifacts/doc/conf/themes/second.xml Wed Feb 18 17:17:20 2015 +0100 +++ b/artifacts/doc/conf/themes/second.xml Tue Mar 10 17:01:42 2015 +0100 @@ -2345,6 +2345,7 @@ + @@ -2356,8 +2357,10 @@ default="10" hints="hidden" /> - + + @@ -2393,6 +2396,7 @@ + @@ -2577,6 +2581,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 4dd6d89ce95e -r a8048aac8831 artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWKmsArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWKmsArtifact.java Wed Feb 18 17:17:20 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWKmsArtifact.java Tue Mar 10 17:01:42 2015 +0100 @@ -280,6 +280,14 @@ Integer.parseInt(getDataAsString("wst_id"))); } + public WKms getWKms(int idx, double from, double to) { + log.debug("StaticWKmsArtifact.getWKms"); + + return WKmsFactory.getWKms( + Integer.parseInt(getDataAsString("col_pos")), + Integer.parseInt(getDataAsString("wst_id")), + from, to); + } /** * Returns W at Km of WKms, linearly interpolated. diff -r 4dd6d89ce95e -r a8048aac8831 artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java Wed Feb 18 17:17:20 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java Tue Mar 10 17:01:42 2015 +0100 @@ -85,9 +85,6 @@ * range. */ public static final int DEFAULT_Q_STEPS = 30; - /** The default step width between the start end end kilometer. */ - public static final double DEFAULT_KM_STEPS = 0.1; - private static final String [] INACTIVES = new String[] { LONGITUDINAL_Q, DURATION_Q, @@ -176,9 +173,8 @@ return this.getWaterlevelData(null); } - // THIS IS FREAKY BULLSHIT! Felix, why do you call the calculation directly???? protected CalculationResult getDischargeLongitudinalSectionData() { - // XXX: THIS AN _EXPENSIVE_ CALCULATION! CACHE IT! + // TODO: This caluclation should be cached as it is quite expensive. return new Calculation4(new Calculation4Access(this)).calculate(); } @@ -823,42 +819,12 @@ /** * Returns the selected Kms. * - * @param distance An 2dim array with [lower, upper] values. - * - * @return the selected Kms. - */ - public double[] getKms(double[] distance) { - StateData dStep = getData("ld_step"); - - if (dStep == null) { - log.warn("No step width given. Cannot compute Kms."); - return null; - } - - double step = Double.parseDouble((String) dStep.getValue()); - - // transform step from 'm' into 'km' - step = step / 1000; - - if (step == 0d) { - step = DEFAULT_KM_STEPS; - } - - return DoubleUtil.explode(distance[0], distance[1], step); - } - - - /** - * Returns the selected Kms. - * * @return the selected kms. */ public double[] getKms() { if (isRange()) { RangeAccess rangeAccess = new RangeAccess(this); - double [] distance = rangeAccess.getKmRange(); - return getKms(distance); - + return rangeAccess.getKmSteps(); } else { return LocationDistanceSelect.getLocations(this); diff -r 4dd6d89ce95e -r a8048aac8831 artifacts/src/main/java/org/dive4elements/river/artifacts/access/BedDifferencesAccess.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/access/BedDifferencesAccess.java Wed Feb 18 17:17:20 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/access/BedDifferencesAccess.java Tue Mar 10 17:01:42 2015 +0100 @@ -19,7 +19,7 @@ public class BedDifferencesAccess -extends RiverAccess +extends RangeAccess { private static Logger log = Logger.getLogger(BedDifferencesAccess.class); diff -r 4dd6d89ce95e -r a8048aac8831 artifacts/src/main/java/org/dive4elements/river/artifacts/access/BedHeightAccess.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/access/BedHeightAccess.java Wed Feb 18 17:17:20 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/access/BedHeightAccess.java Tue Mar 10 17:01:42 2015 +0100 @@ -49,7 +49,7 @@ } - public int[] getBedHeightSingleIDs() { + public int[] getBedHeightIDs() { if (singleIDs == null) { String data = getString("soundings"); @@ -58,7 +58,7 @@ return null; } else { - log.debug("getBedHeightSingleIDs(): data=" + data); + log.debug("getBedHeightIDs(): data=" + data); } String[] parts = data.split(";"); diff -r 4dd6d89ce95e -r a8048aac8831 artifacts/src/main/java/org/dive4elements/river/artifacts/access/RangeAccess.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/access/RangeAccess.java Wed Feb 18 17:17:20 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/access/RangeAccess.java Tue Mar 10 17:01:42 2015 +0100 @@ -16,6 +16,7 @@ import org.dive4elements.river.artifacts.WINFOArtifact; import org.dive4elements.river.utils.RiverUtils; +import org.dive4elements.river.utils.DoubleUtil; /** For the moment, light-weight wrapper around RiverUtils. */ @@ -27,6 +28,9 @@ public static enum KM_MODE { RANGE, LOCATIONS, NONE }; + /** The default step width between the start end end kilometer. */ + public static final double DEFAULT_KM_STEPS = 0.1; + double[] kmRange; Double from; @@ -214,5 +218,23 @@ public double[] getKmFromTo() { return RiverUtils.getKmFromTo(this.getArtifact()); } + + /** + * Returns the selected Kms in steps as specified. + * + * @return Each step for this range. + */ + public double[] getKmSteps() { + double step = getStep(); + + // transform step from 'm' into 'km' + step = step / 1000; + + if (step == 0d) { + step = DEFAULT_KM_STEPS; + } + + return DoubleUtil.explode(getFrom(), getTo(), step); + } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : diff -r 4dd6d89ce95e -r a8048aac8831 artifacts/src/main/java/org/dive4elements/river/artifacts/access/SedimentLoadAccess.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/access/SedimentLoadAccess.java Wed Feb 18 17:17:20 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/access/SedimentLoadAccess.java Tue Mar 10 17:01:42 2015 +0100 @@ -25,12 +25,13 @@ private int [][] epochs; - private int [] period; + private int [] years; private Integer sqTiId; public SedimentLoadAccess(D4EArtifact artifact) { super(artifact); + years = null; } public Double getLowerKM() { @@ -50,21 +51,33 @@ return time; } - /** [startyear, endyear] if its about years. */ - public int[] getPeriod() { - if (period != null) { - return period; + /** [year1, years2,..] if its about years. */ + public int[] getYears() { + if (years != null) { + return years; } if (getYearEpoch().equals("year") ) { - Integer start = getInteger("start"); - Integer end = getInteger("end"); - if (start == null || end == null) { - log.warn("No 'start' or 'end' parameter specified!"); + TIntArrayList ints = new TIntArrayList(); + String yearsData = getString("years"); + if (yearsData == null || yearsData.isEmpty()) { + log.warn("No years provided"); return null; } + for (String sValue :yearsData.split(" ")) { + try { + ints.add(Integer.parseInt(sValue)); + } catch (NumberFormatException e) { + /* Client should prevent this */ + log.warn("Invalid year value: " + sValue); + continue; + } + } - period = new int[]{start.intValue(), end.intValue()}; - return period; + if (!ints.isEmpty()) { + ints.sort(); + years = ints.toNativeArray(); + } + return years; } return null; } diff -r 4dd6d89ce95e -r a8048aac8831 artifacts/src/main/java/org/dive4elements/river/artifacts/context/SessionCallContextListener.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/context/SessionCallContextListener.java Wed Feb 18 17:17:20 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/context/SessionCallContextListener.java Tue Mar 10 17:01:42 2015 +0100 @@ -67,9 +67,6 @@ public void close(CallContext context) { log.debug("SessionCallContextListener.close"); - Session session = (Session)context.getContextValue(SESSION_KEY); - session.close(); - SessionHolder.release(); } } diff -r 4dd6d89ce95e -r a8048aac8831 artifacts/src/main/java/org/dive4elements/river/artifacts/model/DifferenceCurveFacet.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/DifferenceCurveFacet.java Wed Feb 18 17:17:20 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/DifferenceCurveFacet.java Tue Mar 10 17:01:42 2015 +0100 @@ -14,6 +14,7 @@ import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; import org.dive4elements.river.artifacts.WINFOArtifact; +import org.dive4elements.river.artifacts.model.WKmsImpl; import org.dive4elements.river.artifacts.states.DefaultState.ComputeType; @@ -54,11 +55,15 @@ WKms [] wkms = (WKms [])res.getData(); - WKms result = wkms[index]; - log.debug("Got difference curve data (" + result.getName() - + ") at index: " + index); - - return result; + if (wkms.length > 0) { + WKms result = wkms[index]; + log.debug("Got difference curve data (" + result.getName() + + ") at index: " + index); + return result; + } else { + log.debug("Empty difference facet."); + return new WKmsImpl(); + } } diff -r 4dd6d89ce95e -r a8048aac8831 artifacts/src/main/java/org/dive4elements/river/artifacts/model/WKms.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WKms.java Wed Feb 18 17:17:20 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WKms.java Tue Mar 10 17:01:42 2015 +0100 @@ -21,6 +21,9 @@ TDoubleArrayList allKms(); + /** A new list of values between the km's from and to. */ + WKms filteredKms(double from, double to); + TDoubleArrayList allWs(); boolean guessWaterIncreasing(); diff -r 4dd6d89ce95e -r a8048aac8831 artifacts/src/main/java/org/dive4elements/river/artifacts/model/WKmsFactory.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WKmsFactory.java Wed Feb 18 17:17:20 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WKmsFactory.java Tue Mar 10 17:01:42 2015 +0100 @@ -39,6 +39,11 @@ "SELECT km, w FROM wst_w_values " + "WHERE wst_id = :wst_id AND column_pos = :column_pos"; + public static final String SQL_SELECT_WS_FOR_RANGE = + "SELECT km, w FROM wst_w_values " + + "WHERE wst_id = :wst_id AND column_pos = :column_pos " + + "AND km BETWEEN :kmfrom AND :kmto"; + /** Query to get name for wst_id and column_pos. */ public static final String SQL_SELECT_NAME = "SELECT name " + @@ -82,31 +87,26 @@ private WKmsFactory() { } + public static WKms getWKms(int column, int wst_id, double from, double to) { + log.debug("WKmsFactory.getWKms"); + Cache cache = CacheFactory.getCache(StaticWQKmsCacheKey.CACHE_NAME); - /** - * Get WKms for given column and wst_id, caring about the cache. - */ - public static WKms getWKms(int column, int wst_id) { - log.debug("WKmsFactory.getWKms"); - Cache cache = CacheFactory.getCache(StaticWKmsCacheKey.CACHE_NAME); - - StaticWKmsCacheKey cacheKey; + String cacheKey = Integer.toString(column) + ":" + Integer.toString(wst_id); if (cache != null) { - cacheKey = new StaticWKmsCacheKey(wst_id, column); + if (!Double.isNaN(from) && ! Double.isNaN(to)) { + cacheKey += ":" + Double.toString(from) + ":" + Double.toString(to); + } Element element = cache.get(cacheKey); if (element != null) { log.debug("Got static wst values from cache"); return (WKms)element.getValue(); } } - else { - cacheKey = null; - } - WKms values = getWKmsUncached(column, wst_id); + WKms values = getWKmsUncached(column, wst_id, from, to); - if (values != null && cacheKey != null) { + if (values != null && cache != null) { log.debug("Store static wst values in cache."); Element element = new Element(cacheKey, values); cache.put(element); @@ -114,6 +114,13 @@ return values; } + /** + * Get WKms for given column and wst_id, caring about the cache. + */ + public static WKms getWKms(int column, int wst_id) { + return getWKms(column, wst_id, Double.NaN, Double.NaN); + } + /** Get name for a WKms wrapped in W, if suitable. */ public static String getWKmsNameWWrapped(int wst_id) { return getWKmsNameWWrapped(-1, wst_id); @@ -210,7 +217,7 @@ * @param wst_id database id of the wst * @return according WKms. */ - public static WKms getWKmsUncached(int column, int wst_id) { + public static WKms getWKmsUncached(int column, int wst_id, double from, double to) { if (log.isDebugEnabled()) { log.debug("WKmsFactory.getWKmsUncached c/" + column + ", wst_id/" + wst_id); @@ -219,9 +226,17 @@ WKmsImpl wkms = new WKmsImpl(getWKmsName(column, wst_id)); Session session = SessionHolder.HOLDER.get(); - SQLQuery sqlQuery = session.createSQLQuery(SQL_SELECT_WS) - .addScalar("km", StandardBasicTypes.DOUBLE) - .addScalar("w", StandardBasicTypes.DOUBLE); + SQLQuery sqlQuery; + if (Double.isNaN(from) || Double.isNaN(to)) { + sqlQuery = session.createSQLQuery(SQL_SELECT_WS); + } else { + sqlQuery = session.createSQLQuery(SQL_SELECT_WS_FOR_RANGE); + sqlQuery.setDouble("kmfrom", from); + sqlQuery.setDouble("kmto", to); + } + + sqlQuery.addScalar("km", StandardBasicTypes.DOUBLE) + .addScalar("w", StandardBasicTypes.DOUBLE); sqlQuery.setInteger("wst_id", wst_id); sqlQuery.setInteger("column_pos", column); diff -r 4dd6d89ce95e -r a8048aac8831 artifacts/src/main/java/org/dive4elements/river/artifacts/model/WKmsImpl.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WKmsImpl.java Wed Feb 18 17:17:20 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WKmsImpl.java Tue Mar 10 17:01:42 2015 +0100 @@ -108,5 +108,17 @@ public TDoubleArrayList allWs() { return ws; } + + @Override + public WKms filteredKms(double from, double to) { + WKmsImpl retval = new WKmsImpl(getName()); + for (int i = 0; i < size(); i++) { + double km = kms.getQuick(i); + if (km >= from && km <= to) { + retval.add(ws.getQuick(i), km); + } + } + return retval; + } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : diff -r 4dd6d89ce95e -r a8048aac8831 artifacts/src/main/java/org/dive4elements/river/artifacts/model/WQKms.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WQKms.java Wed Feb 18 17:17:20 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WQKms.java Tue Mar 10 17:01:42 2015 +0100 @@ -137,6 +137,18 @@ return qs; } + @Override + public WKms filteredKms(double from, double to) { + WQKms retval = new WQKms(getName()); + for (int i = 0; i < size(); i++) { + double km = kms.getQuick(i); + if (km >= from && km <= to) { + retval.add(ws.getQuick(i), qs.getQuick(i), km); + } + } + return retval; + } + public double[] getKms() { return kms.toNativeArray(); } diff -r 4dd6d89ce95e -r a8048aac8831 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java Wed Feb 18 17:17:20 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java Tue Mar 10 17:01:42 2015 +0100 @@ -37,10 +37,12 @@ this.river = access.getRiverName(); this.heightIds = access.extractHeightIds(context); + double fromKm = access.getFrom(); + double toKm = access.getTo(); BedDiffYearResult [] results = new BedDiffYearResult[heightIds.length]; for (int i = 0; i < heightIds.length; i++) { - BedHeightSingleData [] pair = getHeightPair(heightIds[i]); + BedHeightData [] pair = getHeightPair(heightIds[i], fromKm, toKm); if (pair[0].getYear() == null || pair[1].getYear() == null) { addProblem("beddiff.missing.year"); } @@ -51,20 +53,20 @@ } /** Get two BedHeights from factory. */ - private static BedHeightSingleData [] getHeightPair(int [] ids) { - return new BedHeightSingleData [] { - (BedHeightSingleData)BedHeightFactory.getHeight("single", ids[0]), - (BedHeightSingleData)BedHeightFactory.getHeight("single", ids[1]) + private static BedHeightData [] getHeightPair(int [] ids, double from, double to) { + return new BedHeightData [] { + (BedHeightData)BedHeightFactory.getHeight("single", ids[0], from, to), + (BedHeightData)BedHeightFactory.getHeight("single", ids[1], from, to) }; } private BedDiffYearResult calculateYearDifference( - BedHeightSingleData[] pair, + BedHeightData[] pair, int[] ids ) { log.debug("BedDiffCalculation.calculateYearDifference"); - BedHeightSingleData s1 = pair[0]; - BedHeightSingleData s2 = pair[1]; + BedHeightData s1 = pair[0]; + BedHeightData s2 = pair[1]; TDoubleArrayList stations = s1.getStations(); int size = stations.size(); diff -r 4dd6d89ce95e -r a8048aac8831 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightMinFacet.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightMinFacet.java Wed Feb 18 17:17:20 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightMinFacet.java Tue Mar 10 17:01:42 2015 +0100 @@ -5,7 +5,7 @@ import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; -import org.dive4elements.river.model.BedHeightSingle; +import org.dive4elements.river.model.BedHeight; import org.dive4elements.river.artifacts.D4EArtifact; import org.dive4elements.river.artifacts.access.RiverAccess; @@ -46,7 +46,7 @@ if (resultData != null && resultData.length > index) { BedDiffYearResult data = resultData[index]; - BedHeightSingle first = BedHeightSingle.getBedHeightSingleById( + BedHeight first = BedHeight.getBedHeightById( data.getIdFirst()); this.addMetaData(Resources.getMsg( context.getMeta(), diff -r 4dd6d89ce95e -r a8048aac8831 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightMinFilterFacet.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightMinFilterFacet.java Wed Feb 18 17:17:20 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightMinFilterFacet.java Tue Mar 10 17:01:42 2015 +0100 @@ -14,7 +14,7 @@ import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; -import org.dive4elements.river.model.BedHeightSingle; +import org.dive4elements.river.model.BedHeight; import org.dive4elements.river.artifacts.D4EArtifact; import org.dive4elements.river.artifacts.access.RiverAccess; @@ -68,7 +68,7 @@ Resources.getMsg(context.getMeta(), "chart.subtitle.radius", new Object[] { radius }), ""); - BedHeightSingle first = BedHeightSingle.getBedHeightSingleById( + BedHeight first = BedHeight.getBedHeightById( oldData.getIdFirst()); this.addMetaData(Resources.getMsg( context.getMeta(), diff -r 4dd6d89ce95e -r a8048aac8831 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightSubFacet.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightSubFacet.java Wed Feb 18 17:17:20 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightSubFacet.java Tue Mar 10 17:01:42 2015 +0100 @@ -5,7 +5,7 @@ import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; -import org.dive4elements.river.model.BedHeightSingle; +import org.dive4elements.river.model.BedHeight; import org.dive4elements.river.artifacts.D4EArtifact; import org.dive4elements.river.artifacts.access.RiverAccess; @@ -46,7 +46,7 @@ if (resultData != null && resultData.length > index) { BedDiffYearResult data = resultData[index]; - BedHeightSingle second = BedHeightSingle.getBedHeightSingleById( + BedHeight second = BedHeight.getBedHeightById( data.getIdSecond()); this.addMetaData(Resources.getMsg( context.getMeta(), diff -r 4dd6d89ce95e -r a8048aac8831 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightSubFilterFacet.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightSubFilterFacet.java Wed Feb 18 17:17:20 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffHeightSubFilterFacet.java Tue Mar 10 17:01:42 2015 +0100 @@ -14,7 +14,7 @@ import org.dive4elements.artifacts.Artifact; import org.dive4elements.artifacts.CallContext; -import org.dive4elements.river.model.BedHeightSingle; +import org.dive4elements.river.model.BedHeight; import org.dive4elements.river.artifacts.D4EArtifact; import org.dive4elements.river.artifacts.access.RiverAccess; @@ -68,7 +68,7 @@ Resources.getMsg(context.getMeta(), "chart.subtitle.radius", new Object[] { radius }), ""); - BedHeightSingle second = BedHeightSingle.getBedHeightSingleById( + BedHeight second = BedHeight.getBedHeightById( oldData.getIdSecond()); this.addMetaData(Resources.getMsg( context.getMeta(), diff -r 4dd6d89ce95e -r a8048aac8831 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightData.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightData.java Wed Feb 18 17:17:20 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightData.java Tue Mar 10 17:01:42 2015 +0100 @@ -20,16 +20,23 @@ protected TDoubleArrayList heights; protected TDoubleArrayList station; + protected TDoubleArrayList data_gap; + protected TDoubleArrayList soundingWidth; + protected Integer year; public BedHeightData() { heights = new TDoubleArrayList(); station = new TDoubleArrayList(); + data_gap = new TDoubleArrayList(); + soundingWidth = new TDoubleArrayList(); } public BedHeightData(String name) { super(name); heights = new TDoubleArrayList(); station = new TDoubleArrayList(); + data_gap = new TDoubleArrayList(); + soundingWidth = new TDoubleArrayList(); } public BedHeightData(int capacity) { @@ -42,9 +49,20 @@ station = new TDoubleArrayList(capacity); } - public void add(double value, double station) { + public void add( + double value, + double station, + double gap, + double sounding, + Integer year + ) { this.heights.add(value); this.station.add(station); + if (year != null) { + this.year = year; + } + this.data_gap.add(gap); + this.soundingWidth.add(sounding); } public int size() { @@ -82,6 +100,32 @@ return index >= 0 ? heights.getQuick(index) : Double.NaN; } + public Integer getYear() { + return this.year; + } + + public double getSoundingWidth(int idx) { + return this.soundingWidth.getQuick(idx); + } + + public double getDataGap(int idx) { + return this.data_gap.getQuick(idx); + } + + public double getSoundingWidth(double station) { + int index = this.station.indexOf(station); + return index >= 0 ? soundingWidth.getQuick(index): Double.NaN; + } + + public double getDataGap(double station) { + int index = this.station.indexOf(station); + return index >= 0 ? data_gap.getQuick(index) : Double.NaN; + } + + public double[] getSoundingWidths() { + return this.soundingWidth.toNativeArray(); + } + public static void removeNaNs(TDoubleArrayList [] arrays) { diff -r 4dd6d89ce95e -r a8048aac8831 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFacet.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFacet.java Wed Feb 18 17:17:20 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFacet.java Tue Mar 10 17:01:42 2015 +0100 @@ -19,8 +19,8 @@ import org.dive4elements.river.artifacts.access.BedHeightAccess; import org.dive4elements.river.artifacts.model.BlackboardDataFacet; import org.dive4elements.river.artifacts.model.FacetTypes; -import org.dive4elements.river.model.BedHeightSingle; -import org.dive4elements.river.model.BedHeightSingleValue; +import org.dive4elements.river.model.BedHeight; +import org.dive4elements.river.model.BedHeightValue; public class BedHeightFacet extends BlackboardDataFacet @@ -52,19 +52,19 @@ BedHeightAccess access = new BedHeightAccess((D4EArtifact)artifact); if (type.equals("singlevalues")) { /* Former doc (from BedHeightAccess): - * Return a {@link List} of {@link BedHeightSingleValue}s + * Return a {@link List} of {@link BedHeightValue}s * at the range of the artifact - * @return List of {@link BedHeightSingleValue}s */ - BedHeightSingle single = BedHeightSingle.getBedHeightSingleById( + * @return List of {@link BedHeightValue}s */ + BedHeight single = BedHeight.getBedHeightById( access.getHeightId()); - List bedheightValues = - BedHeightSingleValue.getBedHeightSingleValues( + List bedheightValues = + BedHeightValue.getBedHeightValues( single, access.getFrom(), access.getTo()); double[][] values = new double[2][bedheightValues.size()]; int i = 0; - for (BedHeightSingleValue bedheightValue : bedheightValues) { + for (BedHeightValue bedheightValue : bedheightValues) { values[0][i] = bedheightValue.getStation(); values[1][i] = bedheightValue.getHeight(); i++; diff -r 4dd6d89ce95e -r a8048aac8831 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFactory.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFactory.java Wed Feb 18 17:17:20 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFactory.java Tue Mar 10 17:01:42 2015 +0100 @@ -30,13 +30,19 @@ /** Query to get km and ws for wst_id and column_pos. */ public static final String SQL_SELECT_SINGLE = - "SELECT bhsv.height, bhsv.station, bhsv.data_gap, bhsv.sounding_width," + - " bhs.year, bhsv.width" + + "SELECT bhsv.height, bhsv.station, bhsv.data_gap," + + " bhsv.sounding_width, bhs.year" + " FROM bed_height_single bhs" + - " JOIN bed_height_single_values bhsv on bhsv.bed_height_single_id = bhs.id" + + " JOIN bed_height_single_values bhsv on bhsv.bed_height_single_id = bhs.id"; + + public static final String ID_CLAUSE = " WHERE bhs.id = :height_id" + " ORDER BY bhsv.station"; + public static final String ID_STATION_CLAUSE = + " WHERE bhs.id = :height_id AND" + + " bhsv.station BETWEEN :fromkm AND :tokm" + + " ORDER BY bhsv.station"; /** Query to get name (description) for wst_id. */ public static final String SQL_SELECT_DESCR_SINGLE = @@ -46,17 +52,23 @@ private BedHeightFactory() { } - /** * Get BedHeightData for given type and height_id, caring about the cache. + * If from or to are NaN all values are returned. Otherwise only get + * values with stations between from and to. */ - public static BedHeightData getHeight(String type, int height_id) { + public static BedHeightData getHeight(String type, int height_id, double from, double to) { log.debug("BedHeightFactory.getHeight"); Cache cache = CacheFactory.getCache("bedheight-value-table-static"); - String cacheKey = Integer.toString(height_id); + String cacheKey = Integer.toString(height_id) + ":" + + Double.toString(from) + ":" + Double.toString(to); if (cache != null) { + /* We could be more intelligent here and reuse cached values for + * a complete river and filter the other stations out afterwards. + * It might even be better to cache all values first and filter + * later. */ Element element = cache.get(cacheKey); if (element != null) { log.debug("Got static bedheight values from cache"); @@ -67,7 +79,7 @@ cacheKey = null; } - BedHeightData values = getBedHeightUncached(type, height_id); + BedHeightData values = getBedHeightUncached(type, height_id, from, to); if (values != null && cacheKey != null) { log.debug("Store static bed height values in cache."); @@ -77,6 +89,13 @@ return values; } + /** + * Get BedHeightData for given type and height_id, caring about the cache. + */ + public static BedHeightData getHeight(String type, int height_id) { + return getHeight(type, height_id, Double.NaN, Double.NaN); + } + /** Get name for a BedHeight. */ public static String getHeightName(String type, int height_id) { log.debug("BedHeightFactory.getHeightName height_id/" + height_id); @@ -104,12 +123,19 @@ /** * Get BedHeightData from db. + * + * If from or to are negative all stations are returned. Otherwise + * only the values with a station betweend from and to. * @param height_id database id of the bed_height + * @param from minimum station value or NaN + * @param to maximum station value or NaN * @return according BedHeight. */ public static BedHeightData getBedHeightUncached( String type, - int height_id) + int height_id, + double from, + double to) { if (log.isDebugEnabled()) { log.debug("BedHeightFactory.getBedHeightUncached"); @@ -118,16 +144,25 @@ Session session = SessionHolder.HOLDER.get(); SQLQuery sqlQuery = null; if (type.equals("single")) { - BedHeightSingleData height = - new BedHeightSingleData(getHeightName(type, height_id)); - sqlQuery = session.createSQLQuery(SQL_SELECT_SINGLE) + BedHeightData height = + new BedHeightData(getHeightName(type, height_id)); + String queryString = SQL_SELECT_SINGLE; + if (Double.isNaN(from) || Double.isNaN(to)) { + queryString += ID_CLAUSE; + } else { + queryString += ID_STATION_CLAUSE; + } + sqlQuery = session.createSQLQuery(queryString) .addScalar("height", StandardBasicTypes.DOUBLE) .addScalar("station", StandardBasicTypes.DOUBLE) .addScalar("data_gap", StandardBasicTypes.DOUBLE) .addScalar("sounding_width", StandardBasicTypes.DOUBLE) - .addScalar("width", StandardBasicTypes.DOUBLE) .addScalar("year", StandardBasicTypes.INTEGER); sqlQuery.setInteger("height_id", height_id); + if (!Double.isNaN(from) && !Double.isNaN(to)) { + sqlQuery.setDouble("fromkm", from); + sqlQuery.setDouble("tokm", to); + } List