Mercurial > dive4elements > river
changeset 9509:6146358c4842
Fixed: f2 sign corrected in vegetation zone height calculation, vegetation zone limit handling changed in the importer
| author | mschaefer |
|---|---|
| date | Mon, 01 Oct 2018 09:53:36 +0200 |
| parents | 056483975a9c |
| children | 9ea704de63ee |
| files | artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/vegetationzones/VegetationZonesCrossSectionProcessor.java backend/src/main/java/org/dive4elements/river/importer/uinfo/parsers/VegetationParser.java |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/vegetationzones/VegetationZonesCrossSectionProcessor.java Fri Sep 28 18:02:52 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/vegetationzones/VegetationZonesCrossSectionProcessor.java Mon Oct 01 09:53:36 2018 +0200 @@ -96,7 +96,7 @@ // Üfd = -70,559 ∗ ln((DGM - MW) + 0,5) + 80,711 final double f1 = -70.559; - final double f2 = -88.711; + final double f2 = 88.711; final double dgm = Math.exp((uefd - f2) / f1) + mw - 0.5; return dgm;
--- a/backend/src/main/java/org/dive4elements/river/importer/uinfo/parsers/VegetationParser.java Fri Sep 28 18:02:52 2018 +0200 +++ b/backend/src/main/java/org/dive4elements/river/importer/uinfo/parsers/VegetationParser.java Mon Oct 01 09:53:36 2018 +0200 @@ -183,7 +183,7 @@ // return null; // } this.previousClassNo = classNo; - final int minDays = this.previousDaysLimit + 1; + final int minDays = this.previousDaysLimit; this.previousDaysLimit = daysLimit; final int red = (this.cols.get(ColTitlePattern.COLOR_R) >= 0) ? Integer.parseInt(values[this.cols.get(ColTitlePattern.COLOR_R)]) : 0; final int green = (this.cols.get(ColTitlePattern.COLOR_G) >= 0) ? Integer.parseInt(values[this.cols.get(ColTitlePattern.COLOR_G)]) : 0;