# HG changeset patch # User Tom Gottfried # Date 1375894395 -7200 # Node ID dd5355775ce11b287b883ee2e0d5a72f36ad4e8c # Parent 1a7f5d09b9d8c0b6c2f158a9b32e7a2790a3dffc# Parent 9479cb7c8cd5651d6979dfb85fe98ff0653f87af merge changes from default into longitudinal-symmetrie branch and make it build diff -r 1a7f5d09b9d8 -r dd5355775ce1 .hgtags --- a/.hgtags Fri Jun 28 21:08:23 2013 +0200 +++ b/.hgtags Wed Aug 07 18:53:15 2013 +0200 @@ -54,3 +54,15 @@ 5733d7f27196c5a8cf18231fbf187738f8fea560 3.0.7 eec895f6ec801a7faaed96e9f01721e1143e7bb8 3.0.8 41152c3a532d63a25e9fa348ca4286bdd76069ef 3.0.9 +5f4893db41e4fed644ddbd91bf4cdf0ac7952161 3.0.10 +5f4893db41e4fed644ddbd91bf4cdf0ac7952161 3.0.10 +0000000000000000000000000000000000000000 3.0.10 +0000000000000000000000000000000000000000 3.0.10 +bfcb513c1fdace07ce39616bc9fda3899e8ee914 3.0.10 +63baa1873b1f86a78ab10d19ae4221ec01cc75a2 3.0.11 +3999162f474fb5a6bced33521f81c9ccf274c4e7 3.0.12 +3999162f474fb5a6bced33521f81c9ccf274c4e7 3.0.12 +0000000000000000000000000000000000000000 3.0.12 +0000000000000000000000000000000000000000 3.0.12 +da197a9236fde564d45379c0826510c69a5709ce 3.0.12 +71da3d4ffb4a46a2f8de7e6a9e1e4a32657802aa 3.0.13 diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/doc/conf/artifacts/chart.xml --- a/artifacts/doc/conf/artifacts/chart.xml Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/doc/conf/artifacts/chart.xml Wed Aug 07 18:53:15 2013 +0200 @@ -58,8 +58,18 @@ + + + + + + + + + + @@ -83,6 +93,13 @@ + + + + + + + diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/doc/conf/artifacts/fixanalysis.xml --- a/artifacts/doc/conf/artifacts/fixanalysis.xml Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/doc/conf/artifacts/fixanalysis.xml Wed Aug 07 18:53:15 2013 +0200 @@ -171,8 +171,8 @@ - - + + diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/doc/conf/artifacts/gaugedischarge.xml --- a/artifacts/doc/conf/artifacts/gaugedischarge.xml Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/doc/conf/artifacts/gaugedischarge.xml Wed Aug 07 18:53:15 2013 +0200 @@ -8,8 +8,15 @@ - - + + + + + + + + + diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/doc/conf/artifacts/gaugedischargecurve.xml --- a/artifacts/doc/conf/artifacts/gaugedischargecurve.xml Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/doc/conf/artifacts/gaugedischargecurve.xml Wed Aug 07 18:53:15 2013 +0200 @@ -6,11 +6,18 @@ - + - - + + + + + + + + + diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/doc/conf/artifacts/minfo.xml --- a/artifacts/doc/conf/artifacts/minfo.xml Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/doc/conf/artifacts/minfo.xml Wed Aug 07 18:53:15 2013 +0200 @@ -524,6 +524,14 @@ + + + + + + diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/doc/conf/artifacts/winfo.xml --- a/artifacts/doc/conf/artifacts/winfo.xml Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/doc/conf/artifacts/winfo.xml Wed Aug 07 18:53:15 2013 +0200 @@ -271,6 +271,14 @@ + + + + + + + + @@ -444,10 +452,12 @@ + @@ -631,8 +641,8 @@ - - + + diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/doc/conf/datacage.sql --- a/artifacts/doc/conf/datacage.sql Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/doc/conf/datacage.sql Wed Aug 07 18:53:15 2013 +0200 @@ -41,7 +41,7 @@ artifact_id INT NOT NULL REFERENCES artifacts(id) ON DELETE CASCADE, kind VARCHAR(256) NOT NULL, k VARCHAR(256) NOT NULL, - v VARCHAR(256), -- Maybe too short + v TEXT, UNIQUE (artifact_id, k) ); diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/doc/conf/meta-data.xml --- a/artifacts/doc/conf/meta-data.xml Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/doc/conf/meta-data.xml Wed Aug 07 18:53:15 2013 +0200 @@ -36,6 +36,7 @@ + Generate system content with variables: {dc:dump-variables()}

@@ -44,6 +45,7 @@ Recommendations (client shall load immediately). + Rec out iteration for: {$out}

@@ -82,14 +84,20 @@

+ + +

@@ -113,6 +121,7 @@ Non - Recommendations. + Non Rec out iteration for: {$out}

@@ -129,12 +138,34 @@

+ + + + + + + + + + + + - + + + + + + + + + +

@@ -151,14 +182,14 @@

+ +

- -

@@ -244,7 +275,8 @@

- + +

@@ -262,6 +294,16 @@

+ + + + + + + + + +

@@ -313,6 +355,7 @@

@@ -320,9 +363,6 @@

- - -

@@ -334,16 +374,18 @@

+ + + +

- - -

@@ -352,7 +394,7 @@

- +

@@ -369,20 +411,20 @@

- +

@@ -405,9 +447,10 @@ @@ -434,31 +477,52 @@

- - + + + + + SELECT g.id AS gauge_id, + g.name AS gauge_name, + dt.id AS dt_id, + t.start_time AS start_time, + t.stop_time AS stop_time, + dt.description AS desc, + dt.bfg_id AS bfg_id + FROM gauges g + JOIN discharge_tables dt ON g.id = dt.gauge_id + LEFT JOIN time_intervals t ON dt.time_interval_id = t.id + WHERE g.river_id = ${river_id} + AND dt.kind <> 0 + AND g.station = ${fromkm} + AND g.station = ${tokm} + ORDER BY start_time + - - - - - - - - - - - - + + + + + + Hallo ANDRE23 {dc:dump-variables()} + + + + + - + +

- + @@ -477,7 +541,7 @@ - + Aheinecke: Why is this grouping different from the rest?

@@ -501,7 +565,7 @@ - + Aheinecke: Why is this grouping different from the rest?

@@ -529,7 +593,7 @@ starts-with($facet_name, 'fix_reference_events_ls'))"> - +

@@ -557,7 +621,7 @@ starts-with($facet_name, 'fix_sector_average_dwt'))"> - +

@@ -582,7 +646,7 @@ starts-with($facet_name, 'fix_deviation_dwt'))"> - +

@@ -605,7 +669,7 @@ - +

@@ -632,7 +696,7 @@ $facet_name = 'fix_wq_curve')"> - +

@@ -676,7 +740,7 @@ (not ($current-state-id = 'state.winfo.uesk.wsp' and $ld_m = 'location'))"> - +

@@ -704,6 +768,77 @@

+ + + + No diffs between beddiffs and others, for now. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + No grouping in this? @@ -728,7 +863,7 @@ $facet_name = 'bed_longitudinal_section.bed_diameter_sublayer')"> - +

@@ -752,7 +887,7 @@ $facet_name = 'bed_longitudinal_section.bedload_diameter'"> - +

@@ -777,7 +912,7 @@ $facet_name = 'bed_longitudinal_section.sediment_density_sublayer')"> - +

@@ -802,7 +937,7 @@ $facet_name = 'bed_longitudinal_section.porosity_sublayer')"> - +

@@ -829,7 +964,7 @@ $facet_name = 'flow_velocity.mainchannel.filtered')">

- +

@@ -852,7 +987,7 @@

- +

@@ -875,31 +1010,31 @@ - - + +

- - - + + +

- +

@@ -1187,36 +1322,30 @@ - SELECT id AS gauge_id, - name AS gauge_name - FROM gauges WHERE river_id = ${river_id} + SELECT g.id AS gauge_id, + g.name AS gauge_name, + t.start_time AS start_time, + t.stop_time AS stop_time + FROM gauges g + JOIN discharge_tables dt ON g.id = dt.gauge_id + LEFT JOIN time_intervals t ON dt.time_interval_id = t.id + WHERE g.river_id = ${river_id} + AND dt.kind = 0 + AND g.station = ${fromkm} + AND g.station = ${tokm} - - - - - - - + + + + + - TODO: Why is this just a copy of the discharge_table_gauge? - - - - - TODO: Why is this just a copy of the discharge_table_gauge? - - - - @@ -1839,7 +1968,6 @@ FROM floodplain fp JOIN floodplain_kinds flk on fp.kind_id = flk.id WHERE river_id = ${river_id} - AND kind_id=1 @@ -2326,8 +2454,8 @@

+ ids="official-wstv-{$wstcolpos}-{$wstid}" + factory="staticwqkms" target_out="{$out}"/>

@@ -2361,17 +2489,21 @@ - Select collections and masterartifacts. + Select collections and masterartifacts. + XXX: The cast is a quick hack because the ld_* values are + now TEXT fields. To properly fix / asses the problems here + an SLT evaluation is needed. + SELECT c.name AS collection_name, ma.id AS a_id, ma.state AS a_state, ma.gid AS a_gid, ma.creation AS a_creation, - COALESCE(ma.ld_mode, '') AS ld_m, - COALESCE(ma.ld_locations, '') AS ld_l, - COALESCE(ma.ld_from, '') AS ld_f, - COALESCE(ma.ld_to, '') AS ld_t, + CAST(COALESCE(ma.ld_mode, '') AS VARCHAR(255)) AS ld_m, + CAST(COALESCE(ma.ld_locations, '') AS VARCHAR(255)) AS ld_l, + CAST(COALESCE(ma.ld_from, '') AS VARCHAR(255)) AS ld_f, + CAST(COALESCE(ma.ld_to, '') AS VARCHAR(255)) AS ld_t, o.name AS out_name, o.id AS out_id, f.name AS facet_name, diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/doc/conf/themes/default.xml --- a/artifacts/doc/conf/themes/default.xml Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/doc/conf/themes/default.xml Wed Aug 07 18:53:15 2013 +0200 @@ -834,11 +834,26 @@ - + + + + + + + + /> + + + @@ -1124,7 +1139,7 @@ display="Beschriftung anzeigen" default="false" hints="hidden" /> - + @@ -1399,12 +1414,14 @@ - + + diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/doc/conf/themes/second.xml --- a/artifacts/doc/conf/themes/second.xml Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/doc/conf/themes/second.xml Wed Aug 07 18:53:15 2013 +0200 @@ -834,11 +834,26 @@ - + + + + + + + + /> + + + @@ -1124,7 +1139,7 @@ display="Beschriftung anzeigen" default="false" hints="hidden" /> - + @@ -1399,12 +1414,14 @@ - + + diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/doc/conf/themes/virtual.xml --- a/artifacts/doc/conf/themes/virtual.xml Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/doc/conf/themes/virtual.xml Wed Aug 07 18:53:15 2013 +0200 @@ -30,6 +30,17 @@ + + + + + + + + 0) { - min = range[0]; + this.addStringData(DATA_KM, Double.toString(range[0])); + this.addStringData(PARENT_KM, Double.toString(range[0])); } - this.addStringData(DATA_KM, Double.toString(min)); } @@ -242,6 +244,20 @@ /** + * Return position (km) from parent (initial km), 0 if not found. + */ + private double getParentKm() { + String val = getDataAsString(PARENT_KM); + try { + return Double.valueOf(val); + } + catch (NumberFormatException e) { + logger.warn("Could not get data " + PARENT_KM + " as double", e); + return 0; + } + } + + /** * Return position (km) from data, 0 if not found. */ protected double getKm() { diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/GaugeDischargeArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/GaugeDischargeArtifact.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/GaugeDischargeArtifact.java Wed Aug 07 18:53:15 2013 +0200 @@ -12,6 +12,7 @@ import java.util.Arrays; import java.util.List; import java.util.Map; +import java.util.HashMap; import org.apache.log4j.Logger; @@ -35,6 +36,7 @@ import org.dive4elements.river.model.Gauge; import org.dive4elements.river.model.River; +import org.dive4elements.river.model.DischargeTable; import org.dive4elements.river.utils.RiverUtils; @@ -52,6 +54,8 @@ /** The name of the artifact. */ public static final String ARTIFACT_NAME = "gaugedischarge"; + /** The name a facet should have */ + protected String facetWishName; /** * Trivial Constructor. @@ -79,6 +83,13 @@ String ids = StaticD4EArtifact.getDatacageIDValue(data); addStringData("ids", ids); logger.debug("id for gaugedischarge: " + ids); + String[] splitIds = ids.split(";"); + /* We assume that if an id's string with a ; is given that the + * format is ;; + * so that a specific discharge table can be selected */ + if (splitIds.length > 2) { + facetWishName = splitIds[2]; + } super.setup(identifier, factory, context, callMeta, data); } @@ -121,7 +132,10 @@ /** Get the Gauges name which came with datacage data-document. */ public String getGaugeName() { - return this.getDataAsString("ids"); + if (getDataAsString("ids") == null) { + return null; + } + return getDataAsString("ids").split(";")[0]; } @@ -166,13 +180,34 @@ } */ - DischargeTables dt = new DischargeTables(river.getName(), getDataAsString("ids")); + Map map; - Map map = dt.getValues(); + String[] ids = getDataAsString("ids").split(";"); + if (ids.length > 1) { + /* We assume that if an id's string with a ; is given that the + * format is ;; + * so that a specific discharge table can be selected */ + int tableId = 0; + try { + tableId = Integer.parseInt(ids[1]); + } catch (NumberFormatException e) { + logger.error("Discharge tables ids string is wrong." + + " Fromat is ;;" + + " Fix your Datacage!"); + // Let's rather break down completly then show the wrong data. + return null; + } + DischargeTable table = DischargeTable.getDischargeTableById(tableId); + map = new HashMap(); + map.put(getGaugeName(), DischargeTables.loadDischargeTableValues(table)); + } else { + DischargeTables dt = new DischargeTables(river.getName(), getGaugeName()); + map = dt.getValues(); + } ArrayList res = new ArrayList(); - Gauge gauge = river.determineGaugeByName(this.getDataAsString("ids")); + Gauge gauge = river.determineGaugeByName(getGaugeName()); String name = getGaugeName(); double [][] values = map.get(name); @@ -191,5 +226,13 @@ res.toArray(new WQKms[res.size()]), new Calculation()); } + + /** Gets the facet wish name. + * + * This is a hack to enable setting the name of the facet / theme in the + * UI from the datacage setting. */ + public String getFacetWishName() { + return facetWishName; + } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/MainValuesArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/MainValuesArtifact.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/MainValuesArtifact.java Wed Aug 07 18:53:15 2013 +0200 @@ -81,7 +81,10 @@ String outputName ) { return outputName.equals("computed_discharge_curve") - || outputName.equals("duration_curve"); + || outputName.equals("duration_curve") + || outputName.equals("discharge_curve") + || outputName.equals("fix_wq_curve") + || outputName.equals("historical_discharge_wq"); } }); } @@ -316,6 +319,21 @@ return spawnState(); } + /** + * Access the Gauge that the mainvalues are taken from. + * @return Gauge that main values are taken from or null in case of + * invalid parameterization. + */ + protected Gauge getGauge(double km) { + River river = RiverUtils.getRiver(this); + + if (river == null) { + logger.error("River is null"); + return null; + } + + return river.determineGaugeByPosition(km); + } /** * Access the Gauge that the mainvalues are taken from. @@ -358,6 +376,41 @@ * Get a list of "Q" main values. * @return list of Q main values. */ + public List getMainValuesQ(double[] kms) { + List filteredList = new ArrayList(); + boolean atGauge = false; + Gauge gauge = getGauge(kms[0]); + WstValueTable interpolator = WstValueTableFactory.getTable(RiverUtils.getRiver(this)); + Calculation c = new Calculation(); + double w_out[] = {0.0f}; + double q_out[] = {0.0f}; + if (gauge != null) { + double gaugeStation = gauge.getStation().doubleValue(); + atGauge = Math.abs(kms[0] - gaugeStation) < 1e-4; + List orig = gauge.getMainValues(); + for (MainValue mv : orig) { + if (mv.getMainValue().getType().getName().equals("Q")) { + if (atGauge) { + q_out[0] = mv.getValue().doubleValue(); + } + else { + interpolator.interpolate(mv.getValue().doubleValue(), + gaugeStation, kms, w_out, q_out, c); + } + filteredList.add(new NamedDouble( + mv.getMainValue().getName(), + q_out[0] + )); + } + } + } + return filteredList; + } + + /** + * Get a list of "Q" main values. + * @return list of Q main values. + */ public List getMainValuesQ(boolean atGauge) { List filteredList = new ArrayList(); Gauge gauge = getGauge(); @@ -366,8 +419,8 @@ double w_out[] = {0.0f}; double q_out[] = {0.0f}; double kms[] = {getLocation()}; - double gaugeStation = gauge.getStation().doubleValue(); if (gauge != null) { + double gaugeStation = gauge.getStation().doubleValue(); List orig = gauge.getMainValues(); for (MainValue mv : orig) { if (mv.getMainValue().getType().getName().equals("Q")) { @@ -389,21 +442,26 @@ } - /** - * Get a list of "W" main values. - * @param atGauge if true, do not interpolate - * @return list of W main values. - */ - public List getMainValuesW(boolean atGauge) { + /** Get main values of km. */ + public List getMainValuesW(double[] kms) { List filteredList = new ArrayList(); - Gauge gauge = getGauge(); + boolean atGauge = false; + double gaugeDatum = 0d; + Gauge gauge = getGauge(kms[0]); + if (gauge == null) { + return filteredList; + } + else if (Math.abs(kms[0] - gauge.getStation().doubleValue()) < 1e-4) { + atGauge = true; + gaugeDatum = gauge.getDatum().doubleValue(); + } + WstValueTable interpolator = WstValueTableFactory.getTable(RiverUtils.getRiver(this)); Calculation c = new Calculation(); double gaugeStation = gauge.getStation().doubleValue(); double w_out[] = {0.0f}; double q_out[] = {0.0f}; - double kms[] = {getLocation()}; if (gauge != null) { List orig = gauge.getMainValues(); for (MainValue mv : orig) { @@ -411,6 +469,41 @@ if (mv.getMainValue().getType().getName().equals("W")) { filteredList.add(new NamedDouble(mv.getMainValue().getName(), mv.getValue().doubleValue())); + } + } else + // We cannot interpolate the W values, so derive them + // from given Q values. + if (mv.getMainValue().getType().getName().equals("Q")) { + interpolator.interpolate(mv.getValue().doubleValue(), + gaugeStation, kms, w_out, q_out, c); + + filteredList.add(new NamedDouble( + "W(" + mv.getMainValue().getName() +")", + w_out[0] + )); + } + } + } + return filteredList; + } + + + public List getMainValuesW(boolean atGauge, double[] kms) { + List filteredList = new ArrayList(); + Gauge gauge = getGauge(); + WstValueTable interpolator = WstValueTableFactory.getTable(RiverUtils.getRiver(this)); + Calculation c = new Calculation(); + + double w_out[] = {0.0f}; + double q_out[] = {0.0f}; + if (gauge != null) { + double gaugeStation = gauge.getStation().doubleValue(); + List orig = gauge.getMainValues(); + for (MainValue mv : orig) { + if (atGauge) { + if (mv.getMainValue().getType().getName().equals("W")) { + filteredList.add(new NamedDouble(mv.getMainValue().getName(), + mv.getValue().doubleValue())); } } else @@ -431,6 +524,16 @@ /** + * Get a list of "W" main values. + * @param atGauge if true, do not interpolate + * @return list of W main values. + */ + public List getMainValuesW(boolean atGauge) { + return getMainValuesW(atGauge, new double[] {getLocation()}); + } + + + /** * Returns the name of this artifact ('mainvalue'). * * @return 'mainvalue' diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/RiverAxisArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/RiverAxisArtifact.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/RiverAxisArtifact.java Wed Aug 07 18:53:15 2013 +0200 @@ -91,6 +91,10 @@ super(artifact); } + private boolean isUnofficial() { + return getIdPart(2) != null && !getIdPart(2).equals("1"); + } + @Override protected String getFacetType() { return FLOODMAP_RIVERAXIS; @@ -98,12 +102,19 @@ @Override protected String getLayer() { + if (isUnofficial()) { + return super.getLayer(); + } return RiverFactory.getRiver(getRiverId()).getName(); } @Override protected String getUrl() { - return RiverUtils.getRiverWMSUrl(); + if (isUnofficial()) { + return RiverUtils.getUserWMSUrl(artifact.identifier()); + } else { + return RiverUtils.getRiverWMSUrl(); + } } @Override diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWKmsArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWKmsArtifact.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWKmsArtifact.java Wed Aug 07 18:53:15 2013 +0200 @@ -310,7 +310,7 @@ return -1; } - // Do linear interpolation + // Do linear interpolation. int mod = kmIncreasing ? -1 : +1; return Linear.linear(km, wkms.getKm(idx+mod), wkms.getKm(idx), wkms.getW(idx+mod), wkms.getW(idx)); } diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWQKmsArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWQKmsArtifact.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/StaticWQKmsArtifact.java Wed Aug 07 18:53:15 2013 +0200 @@ -59,6 +59,8 @@ private static final String NAME = "staticwqkms"; + private boolean official = false; + static { // TODO: Move to configuration. FacetActivity.Registry.getInstance().register( @@ -85,6 +87,10 @@ /** * Gets called from factory, to set things up. + * + * If the id's string starts with official- it will be treated as + * an Artifact containing official data for the according special + * case handling. */ @Override public void setup( @@ -106,6 +112,10 @@ if (code != null) { String [] parts = code.split("-"); + if (parts.length >= 1) { + official = parts[0].toLowerCase().equals("official"); + } + if (parts.length >= 4) { int col = Integer.parseInt(parts[2]); int wst = Integer.parseInt(parts[3]); @@ -222,5 +232,10 @@ return Lines.createWaterLines(points, wAtKm); } // TODO implement deepCopy. + + public boolean isOfficial() + { + return official; + } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf-8 : diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/WINFOArtifact.java Wed Aug 07 18:53:15 2013 +0200 @@ -197,15 +197,26 @@ String calculationMode = getDataAsString("calculation_mode"); - if (calculationMode.equals("calc.discharge.longitudinal.section") - ) { - return getDischargeLongitudinalSectionData(); - } - else if (calculationMode.equals("calc.extreme.curve")) { - return (CalculationResult) - this.compute(context, ComputeType.ADVANCE, false); + // If this WINFO-Artifact has a calculation trait. + if (calculationMode != null) { + if (calculationMode.equals("calc.discharge.longitudinal.section") + ) { + return getDischargeLongitudinalSectionData(); + } + else if (calculationMode.equals("calc.extreme.curve")) { + return (CalculationResult) + this.compute(context, ComputeType.ADVANCE, false); + } + else if (calculationMode.equals("calc.w.differences")) { + return (CalculationResult) + this.compute(context, ComputeType.ADVANCE, true); + } + else { + logger.warn("Unhandled calculation_mode " + calculationMode); + } } + // Otherwise get it from parameterization. River river = RiverUtils.getRiver(this); if (river == null) { return error(new WQKms[0], "no.river.selected"); diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/access/FixAnalysisAccess.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/access/FixAnalysisAccess.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/access/FixAnalysisAccess.java Wed Aug 07 18:53:15 2013 +0200 @@ -33,6 +33,7 @@ super(artifact); } + /** Access the reference date period, return null in case of 'errors'. */ public DateRange getReferencePeriod() { if (referencePeriod == null) { StateData refStart = artifact.getData("ref_start"); diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/access/SedimentLoadAccess.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/access/SedimentLoadAccess.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/access/SedimentLoadAccess.java Wed Aug 07 18:53:15 2013 +0200 @@ -91,6 +91,7 @@ return null; } + /** Returns the selected unit (t/a or m3/a). */ public String getUnit () { if (unit == null) { unit = getString("unit"); diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/Datacage.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/Datacage.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/Datacage.java Wed Aug 07 18:53:15 2013 +0200 @@ -70,6 +70,7 @@ private String SQL_ARTIFACT_ID_NEXTVAL = "artifact.id.nextval"; private String SQL_INSERT_ARTIFACT = "insert.artifact"; private String SQL_ARTIFACT_DATA_ID_NEXTVAL = "artifact.data.id.nextval"; + private String SQL_UPDATE_ARTIFACT_STATE = "update.artifact.state"; private String SQL_INSERT_ARTIFACT_DATA = "insert.artifact.data"; private String SQL_OUT_ID_NEXTVALUE = "out.id.nextval"; private String SQL_INSERT_OUT = "insert.out"; @@ -382,6 +383,7 @@ SQL_INSERT_ARTIFACT = sql.get(SQL_INSERT_ARTIFACT); SQL_ARTIFACT_DATA_ID_NEXTVAL = sql.get(SQL_ARTIFACT_DATA_ID_NEXTVAL); SQL_INSERT_ARTIFACT_DATA = sql.get(SQL_INSERT_ARTIFACT_DATA); + SQL_UPDATE_ARTIFACT_STATE = sql.get(SQL_UPDATE_ARTIFACT_STATE); SQL_OUT_ID_NEXTVALUE = sql.get(SQL_OUT_ID_NEXTVALUE); SQL_INSERT_OUT = sql.get(SQL_INSERT_OUT); SQL_FACET_ID_NEXTVAL = sql.get(SQL_FACET_ID_NEXTVAL); @@ -401,6 +403,7 @@ sql.get(SQL_DELETE_ARTIFACT_BY_GID); } + /** Sum over facets in outs. */ protected static final int numFacets(List outs) { int sum = 0; for (Output out: outs) { @@ -608,6 +611,7 @@ // write new data storeData(res[0], flys); storeOuts(res[0], flys, context); + storeState(res[0], flys); } public void createdUser( @@ -884,9 +888,30 @@ } } + /** Update state of artifact. */ + protected void storeState( + final int artifactId, + final D4EArtifact artifact) { + SQLExecutor.Instance exec = sqlExecutor.new Instance() { + @Override + public boolean doIt() throws SQLException { + prepareStatement(SQL_UPDATE_ARTIFACT_STATE); + stmnt.setInt(1, artifactId); + stmnt.setString(2, artifact.getCurrentStateId()); + stmnt.execute(); + conn.commit(); + return true; + } + }; + + if (!exec.runWrite()) { + log.error("storing state of artifact failed ("+artifactId+","+artifact.getCurrentStateId()+")"); + } + } + protected void storeData( - final int artifactId, - D4EArtifact artifact + final int artifactId, + D4EArtifact artifact ) { final Collection data = artifact.getAllData(); diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/DatacageBackendListener.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/DatacageBackendListener.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/DatacageBackendListener.java Wed Aug 07 18:53:15 2013 +0200 @@ -61,6 +61,7 @@ } } + /** Stores the artifact in artifact-db, if any. */ @Override public void storedArtifact(Artifact artifact, Backend backend) { log.debug("storedArtifact"); diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/Recommendations.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/Recommendations.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/datacage/Recommendations.java Wed Aug 07 18:53:15 2013 +0200 @@ -173,7 +173,7 @@ /** * Append recommendations to \param result. - * @param extraParameters parameters (typicall example: 'recommended') + * @param extraParameters parameters (typical example: 'recommended') */ public void recommend( D4EArtifact artifact, diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/math/StdDevOutlier.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/math/StdDevOutlier.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/math/StdDevOutlier.java Wed Aug 07 18:53:15 2013 +0200 @@ -10,9 +10,13 @@ import java.util.List; -import org.apache.commons.math.stat.descriptive.moment.StandardDeviation; +import org.apache.log4j.Logger; -import org.apache.log4j.Logger; +/* XXX: + * Warning: This class is called StdDevOutlier because it caculates the + * Standard Deviation method for outlier removal as the BFG calls it. + * But the actual calculation used to remove the outliers calculates + * the Standard Error and not the Standard Deviation! */ public class StdDevOutlier { @@ -30,12 +34,12 @@ public static Integer findOutlier( List values, double factor, - double [] stdDevResult + double [] stdErrResult ) { boolean debug = log.isDebugEnabled(); if (debug) { - log.debug("factor for std dev: " + factor); + log.debug("factor for std dev test (that calculates std err): " + factor); } int N = values.size(); @@ -48,31 +52,34 @@ return null; } - StandardDeviation stdDev = new StandardDeviation(); - double maxValue = -Double.MAX_VALUE; int maxIndex = -1; + + double squareSumResiduals = 0; + for (Double db: values) { + squareSumResiduals += Math.pow(db, 2); + } + + double stdErr = Math.sqrt(squareSumResiduals / (N - 2)); + + double accepted = factor * stdErr; + for (int i = N-1; i >= 0; --i) { double value = Math.abs(values.get(i)); - stdDev.increment(value); if (value > maxValue) { maxValue = value; maxIndex = i; } } - double sd = stdDev.getResult(); - - double accepted = factor * sd; - if (debug) { - log.debug("std dev: " + stdDev); + log.debug("std err: " + stdErr); log.debug("accepted: " + accepted); log.debug("max value: " + maxValue); } - if (stdDevResult != null) { - stdDevResult[0] = sd; + if (stdErrResult != null) { + stdErrResult[0] = stdErr; } return maxValue > accepted ? maxIndex : null; diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/model/CrossSectionFactory.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/CrossSectionFactory.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/CrossSectionFactory.java Wed Aug 07 18:53:15 2013 +0200 @@ -59,30 +59,6 @@ } - /** - * True if the given section is the "newest" for that river. - * @param section Given section - * @return true if the section has the most advanced end of its validity interval - * or the most advanced start of its validity interval. - */ - public static boolean isNewest(CrossSection section) { - Session session = SessionHolder.HOLDER.get(); - Query query = session.createQuery( - "from CrossSection where river.id = :riverid " - + " order by timeInterval.stopTime desc, timeInterval.startTime desc"); - query.setParameter("riverid", section.getRiver().getId()); - - List result = query.list(); - - if (result == null || result.isEmpty()) { - return true; - } - else { - CrossSection cs = (CrossSection) result.get(0); - return section.getId().equals(cs.getId()); - } - } - /** * Get a specific CrossSection from db. diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/model/FacetTypes.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FacetTypes.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FacetTypes.java Wed Aug 07 18:53:15 2013 +0200 @@ -313,7 +313,7 @@ String SEDIMENT_LOAD_SUSP_SEDIMENT = "sedimentload.susp_sediment"; String SEDIMENT_LOAD_TOTAL = "sedimentload.total"; String SEDIMENT_LOAD_TOTAL_LOAD = "sedimentload.total_load"; - String SEDIMENT_LOAD_UNKOWN = "sedimentload.unknown"; + String SEDIMENT_LOAD_UNKNOWN = "sedimentload.unknown"; String SQ_OVERVIEW = "sq_overview"; diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/model/FastCrossSectionChunk.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FastCrossSectionChunk.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/FastCrossSectionChunk.java Wed Aug 07 18:53:15 2013 +0200 @@ -19,6 +19,10 @@ import org.apache.log4j.Logger; +/** + * Number of FastCrossSectionLines, e.g. to store in cache and retrieve + * a single contain CrossSectionLine by its km. + */ public class FastCrossSectionChunk implements Serializable { diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/model/MainValuesQFacet.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/MainValuesQFacet.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/MainValuesQFacet.java Wed Aug 07 18:53:15 2013 +0200 @@ -25,6 +25,7 @@ import org.dive4elements.river.jfree.StickyAxisAnnotation; import org.dive4elements.river.exports.DurationCurveGenerator; +import org.dive4elements.river.exports.fixings.FixChartGenerator; /** @@ -89,7 +90,8 @@ * Returns the data this facet requires. * * @param artifact the owner artifact. - * @param context the CallContext (ignored). + * @param context the CallContext (can be used to find out if in + * navigable fixation-setting, or durationcurve). * * @return the data. */ @@ -105,6 +107,15 @@ getDataProvider(DurationCurveFacet.BB_DURATIONCURVE); if (providers.size() < 1) { logger.warn("Could not find durationcurve data provider."); + // Do we have a current km in context? + // If so, we are likely fetching data for a navigable + // diagram (i.e. in fixation branch). + if (context.getContextValue(FixChartGenerator.CURRENT_KM) != null) { + Double ckm = (Double) context.getContextValue(FixChartGenerator.CURRENT_KM); + // Return linearly interpolated values, in m if not at gauge, + // in cm if at gauge. + qs = mvArtifact.getMainValuesQ(new double[] {ckm}); + } } else { wqdays = (WQDay) providers.get(0).provideData( @@ -117,6 +128,10 @@ StickyAxisAnnotation annotation = null; if (this.name.equals(DURATION_MAINVALUES_Q)) { for (NamedDouble q: qs) { + if (Double.isNaN(q.getValue())) { + logger.warn("NaN MainValue " + q.getName()); + continue; + } annotation = new StickyAxisAnnotation( q.getName(), @@ -131,6 +146,10 @@ } else { for (NamedDouble q: qs) { + if (Double.isNaN(q.getValue())) { + logger.warn("NaN MainValue " + q.getName()); + continue; + } annotation = new StickyAxisAnnotation( q.getName(), diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/model/MainValuesWFacet.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/MainValuesWFacet.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/MainValuesWFacet.java Wed Aug 07 18:53:15 2013 +0200 @@ -23,6 +23,7 @@ import org.dive4elements.river.artifacts.math.Linear; import org.dive4elements.river.jfree.RiverAnnotation; import org.dive4elements.river.jfree.StickyAxisAnnotation; +import org.dive4elements.river.exports.fixings.FixChartGenerator; /** @@ -85,7 +86,8 @@ * Returns the data this facet provides. * * @param artifact the owner artifact. - * @param context the CallContext (ignored). + * @param context the CallContext (can be used to find out if in + * navigable fixation-setting, or durationcurve). * * @return the data. */ @@ -102,6 +104,15 @@ getDataProvider(DurationCurveFacet.BB_DURATIONCURVE); if (providers.size() < 1) { logger.warn("Could not find durationcurve data provider."); + // Do we have a current km in context? + // If so, we are likely fetching data for a navigable + // diagram (i.e. in fixation branch). + if (context.getContextValue(FixChartGenerator.CURRENT_KM) != null) { + Double ckm = (Double) context.getContextValue(FixChartGenerator.CURRENT_KM); + // Return linearly interpolated values, in m if not at gauge, + // in cm over datum if at gauge. + ws = mvArtifact.getMainValuesW(new double[] {ckm}); + } } else { wqdays = (WQDay) providers.get(0).provideData( @@ -111,6 +122,11 @@ } for (NamedDouble w: ws) { + logger.debug("W Annotation at " + w.getValue() + " ("+w.getName()+")"+ wqdays); + if (Double.isNaN(w.getValue())) { + logger.warn("NaN MainValue " + w.getName()); + continue; + } StickyAxisAnnotation annotation = new StickyAxisAnnotation( w.getName(), diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/model/OfficialLineFinder.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/OfficialLineFinder.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/OfficialLineFinder.java Wed Aug 07 18:53:15 2013 +0200 @@ -114,7 +114,9 @@ " wstId: " + wstId + " pos: " + columnPos + " source: " + source + - " date: " + date +"]"; + " date: " + date + + " from: " + start + + " to: " + end + "]"; } } @@ -168,9 +170,8 @@ NamedMainValue tnmv = mainValue.getMainValue(); if (tnmv.getId().equals(mnvId)) { // found gauge with this main value - double from = gauge.getRange().getA().doubleValue(); - double to = gauge.getRange().getA().doubleValue(); + double to = gauge.getRange().getB().doubleValue(); double value = mainValue.getValue().doubleValue(); int wstId = wst.getId(); int pos = wc.getPosition(); diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/model/WQKms.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WQKms.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WQKms.java Wed Aug 07 18:53:15 2013 +0200 @@ -143,5 +143,15 @@ double to = getKm(size()-1); return from + " - " + to; } + + /** + * Returns an array of two double values the first and last kilometer. + * + * @return a double array with the first and last km + */ + public double[] getFirstLastKM() { + /* Behold the first km might be larger then the last! */ + return new double[] {getKm(0), getKm(size()-1)}; + } } // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/model/WQKmsResult.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WQKmsResult.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WQKmsResult.java Wed Aug 07 18:53:15 2013 +0200 @@ -12,4 +12,4 @@ public interface WQKmsResult { public WQKms[] getWQKms(); } - +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/model/WstValueTable.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WstValueTable.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/WstValueTable.java Wed Aug 07 18:53:15 2013 +0200 @@ -850,6 +850,12 @@ q, referenceKm, kms, ws, qs, 0, kms.length, errors); } + /** + * Interpolate Q at given positions. + * @param kms positions for which to calculate qs and ws + * @param ws [out] calculated ws for kms + * @param qs [out] looked up qs for kms. + */ public QPosition interpolate( double q, double referenceKm, diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixAnalysisCalculation.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixAnalysisCalculation.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/fixings/FixAnalysisCalculation.java Wed Aug 07 18:53:15 2013 +0200 @@ -172,7 +172,7 @@ ArrayList allQWDs = new ArrayList(); // for all Q sectors. - for (int qSector = qSectorStart; qSector < qSectorEnd; ++qSector) { + for (int qSector = qSectorStart; qSector <= qSectorEnd; ++qSector) { Filter filter = new AndFilter() .add(kmFilter) @@ -289,6 +289,7 @@ return results; } + /** Returns the mapped value of colIdx or the size of the hashmap. */ private static final int getIndex(TIntIntHashMap map, int colIdx) { if (map.containsKey(colIdx)) { return map.get(colIdx); diff -r 1a7f5d09b9d8 -r dd5355775ce1 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 Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffCalculation.java Wed Aug 07 18:53:15 2013 +0200 @@ -18,7 +18,10 @@ import org.dive4elements.river.artifacts.model.Calculation; import org.dive4elements.river.artifacts.model.CalculationResult; - +/** + * Perform calculation of differences of bed height (german Sohlhoehe). + * The input are either single year data or epochs. + */ public class BedDiffCalculation extends Calculation { @@ -84,6 +87,7 @@ */ } + /** Get two BedHeights from factory. */ private static BedHeight [] getHeightPair(int [] ids, String type) { return new BedHeight [] { BedHeightFactory.getHeight(type, ids[0], 0), diff -r 1a7f5d09b9d8 -r dd5355775ce1 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 Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFactory.java Wed Aug 07 18:53:15 2013 +0200 @@ -62,7 +62,7 @@ /** - * Get WKms for given column and wst_id, caring about the cache. + * Get BedHeight for given type and height_id, caring about the cache. */ public static BedHeight getHeight(String type, int height_id, int time) { log.debug("BedHeightFactory.getHeight"); @@ -92,7 +92,7 @@ return values; } - /** Get name for a WKms. */ + /** Get name for a BedHeight. */ public static String getHeightName(String type, int height_id) { log.debug("BedHeightFactory.getHeightName height_id/" + height_id); @@ -123,10 +123,9 @@ /** - * Get WKms from db. - * @param column the position columns value - * @param wst_id database id of the wst - * @return according WKms. + * Get BedHeight from db. + * @param height_id database id of the bed_height + * @return according BedHeight. */ public static BedHeight getBedHeightUncached( String type, diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/QualityMeasurement.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/QualityMeasurement.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/QualityMeasurement.java Wed Aug 07 18:53:15 2013 +0200 @@ -11,8 +11,11 @@ import java.util.Date; import java.util.Map; +import org.apache.log4j.Logger; +/** A measurement of the bed quality, serving different diameter at given km. */ public class QualityMeasurement { + private static Logger logger = Logger.getLogger(QualityMeasurements.class); private double km; private Date date; @@ -61,8 +64,16 @@ this.charDiameter = charDiameter; } + /** + * Get the stored diameter for given key (e.g. d10). + * @return NaN if no data found in this measurement. + */ public double getDiameter(String key) { - return charDiameter.get(key); + Double diameter = charDiameter.get(key); + if (diameter == null) { + logger.warn("No Diameter at km " + km + " for " + key); + } + return (diameter != null) ? diameter : Double.NaN; } public void setDiameter(String key, double value) { diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentDensity.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentDensity.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentDensity.java Wed Aug 07 18:53:15 2013 +0200 @@ -93,7 +93,7 @@ List values, double km ) { - boolean found = true; + boolean found = false; SedimentDensityValue prev = null; SedimentDensityValue next = null; for (SedimentDensityValue sdv: values) { diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadCalculation.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadCalculation.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadCalculation.java Wed Aug 07 18:53:15 2013 +0200 @@ -36,12 +36,14 @@ protected double kmUp; protected double kmLow; protected int[] period; + /** Years of chosen epochs. */ protected int[][] epoch; protected String unit; public SedimentLoadCalculation() { } + /** Returns CalculationResult with array of SedimentLoadResults. */ public CalculationResult calculate(SedimentLoadAccess access) { logger.info("SedimentLoadCalculation.calculate"); @@ -87,6 +89,7 @@ return new CalculationResult(); } + /** Returns CalculationResult with array of SedimentLoadResults. */ private CalculationResult internalCalculate() { logger.debug("internalCalulate; mode:" + yearEpoch); if (yearEpoch.equals("year")) { @@ -187,12 +190,28 @@ } } SedimentLoadFraction fr = resLoad.getFraction(km); - resLoad.setCoarse(km, fr.getCoarse()/cSum, fr.getCoarseRange()); - resLoad.setFineMiddle(km, fr.getFineMiddle()/fmSum, fr.getFineMiddleRange()); - resLoad.setSand(km, fr.getSand()/sSum, fr.getSandRange()); - resLoad.setSuspSand(km, fr.getSuspSand()/ssSum, fr.getSuspSandRange()); - resLoad.setSuspSandBed(km, fr.getSuspSandBed()/ssbSum, fr.getSuspSandBedRange()); - resLoad.setSuspSediment(km, fr.getSuspSediment()/sseSum, fr.getSuspSedimentRange()); + // Prevent divisions by zero, the fraction defaults to 0d. + if (cSum != 0) { + resLoad.setCoarse(km, fr.getCoarse()/cSum, fr.getCoarseRange()); + } + if (fmSum != 0) { + resLoad.setFineMiddle(km, fr.getFineMiddle()/fmSum, + fr.getFineMiddleRange()); + } + if (sSum != 0) { + resLoad.setSand(km, fr.getSand()/sSum, fr.getSandRange()); + } + if (ssSum != 0) { + resLoad.setSuspSand(km, fr.getSuspSand()/ssSum, + fr.getSuspSandRange()); + } + if (ssbSum != 0) { + resLoad.setSuspSandBed(km, fr.getSuspSandBed()/ssbSum, + fr.getSuspSandBedRange()); + } + if (sseSum != 0) { + resLoad.setSuspSediment(km, fr.getSuspSediment()/sseSum, fr.getSuspSedimentRange()); + } } resLoad.setDescription(""); resLoad.setEpoch(true); @@ -216,6 +235,7 @@ return result; } + /** Calculate/Fetch values at off. epochs. */ private SedimentLoadResult calculateOffEpoch(int i) { SedimentLoad load = SedimentLoadFactory.getLoadWithData( this.river, @@ -243,8 +263,11 @@ return result; } - /** Fetch loads for a single year, calculate total and - * return the result containing both. */ + /** + * Fetch loads for a single year, calculate total and + * return the result containing both. + * @param y year, e.g. 1980 + */ private SedimentLoadResult calculateYear(int y) { SedimentLoad load = SedimentLoadFactory.getLoadWithData( this.river, @@ -330,12 +353,15 @@ /** * Set total values in load. - * Therefore, run over the kms and find ranges where either all + * + * Therefore, run over the sorted kms and find ranges where either all * or all Geschiebe or just the Schwebstoff fractions are set. * Merge these ranges and add (maybe new) respective fractions to - * load. + * load. In the process, remember any 'unfished' ends from measurements + * where the km-ranges did not completely match. + * * @param load SedimentLoad to add total values (and ranges) to. - * @return input param load. + * @return input param load, with total values set. */ private SedimentLoad partialTotal(SedimentLoad load) { SedimentLoad fairLoad = load; @@ -485,6 +511,11 @@ } + /** + * Transform values in load. + * @param load The load of which values should be transformed. + * @return parameter load with transformed values. + */ private SedimentLoad calculateUnit(SedimentLoad load, int year) { SedimentDensity density = SedimentDensityFactory.getSedimentDensity(river, kmLow, kmUp, year); diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFacet.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFacet.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFacet.java Wed Aug 07 18:53:15 2013 +0200 @@ -55,6 +55,7 @@ super(idx, name, description, type, hash, stateId); } + @Override public Object getData(Artifact artifact, CallContext context) { logger.debug("Get data for sediment load at index: " + index); diff -r 1a7f5d09b9d8 -r dd5355775ce1 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java --- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java Fri Jun 28 21:08:23 2013 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java Wed Aug 07 18:53:15 2013 +0200 @@ -29,16 +29,19 @@ import org.hibernate.Session; import org.hibernate.type.StandardBasicTypes; + /** Pull Sediment Loads out of db. */ public class SedimentLoadFactory { /** Private logger to use here. */ private static Logger log = Logger.getLogger(SedimentLoadFactory.class); + // Cache name/keys public static final String LOADS_CACHE_NAME = "sedimentloads"; public static final String LOAD_DATA_CACHE_NAME = "sedimentload-data"; - /** Query to get km and ws for wst_id and column_pos. */ + /** Query to get description and start year of single type + * sediment_yields. */ public static final String SQL_SELECT_SINGLES = "SELECT DISTINCT " + " sy.description AS description, " + @@ -51,7 +54,23 @@ " AND ti.stop_time IS NULL " + " AND syv.station BETWEEN :startKm AND :endKm"; - /** Query to get name for wst_id and column_pos. */ + /** Query to get description, name and time range for official + * epoch-type sediment yields. */ + public static final String SQL_SELECT_OFFEPOCHS = + "SELECT DISTINCT " + + " ti.start_time AS startYear, " + + " ti.stop_time AS end " + + " FROM sediment_yield sy " + + " JOIN rivers r ON sy.river_id = r.id " + + " JOIN sediment_yield_values syv ON sy.id = syv.sediment_yield_id " + + " JOIN time_intervals ti ON sy.time_interval_id = ti.id " + + " WHERE r.name = :name " + + " AND ti.stop_time IS NOT NULL " + + " AND syv.station BETWEEN :startKm AND :endKm " + + " AND sy.kind = 1"; + + /** Query to get description, name and time range for epoch-type + * sediment yields. */ public static final String SQL_SELECT_EPOCHS = "SELECT DISTINCT " + " sy.description AS description, " + @@ -115,8 +134,11 @@ " JOIN rivers r ON sy.river_id = r.id " + " JOIN time_intervals ti ON sy.time_interval_id = ti.id " + " JOIN grain_fraction gf ON sy.grain_fraction_id = gf.id " + - "WHERE r.name = :river" + - " AND gf.name = 'unknown'"; + " JOIN units u ON sy.unit_id = u.id " + + "WHERE r.name = :river " + + " AND gf.name = 'unknown' " + + " AND sy.kind = :type " + + " AND u.name = :unit"; public static final String SQL_SELECT_EPOCHS_DATA = "SELECT" + @@ -143,7 +165,8 @@ } /** - * + * @param river name of river. + * @param type */ public static SedimentLoad[] getLoads( String river, @@ -180,6 +203,10 @@ return values; } + /** + * Get a sedimentLoad filled with data from db (or cache). + * @param type "epoch","off_epoch" or "single" + */ public static SedimentLoad getLoadWithData( String river, String type, @@ -287,13 +314,37 @@ } return loads; } + else if (type.equals("off_epoch")) { + sqlQuery = session.createSQLQuery(SQL_SELECT_OFFEPOCHS) + .addScalar("startYear", StandardBasicTypes.DATE) + .addScalar("end", StandardBasicTypes.DATE); + sqlQuery.setString("name", river); + sqlQuery.setDouble("startKm", startKm); + sqlQuery.setDouble("endKm", endKm); + List