[PATCH 1 of 2] Fixed: f2 sign corrected in vegetation zone height calculation, vegetation zone limit handling changed in the importer
Wald Commits
scm-commit at wald.intevation.org
Mon Oct 1 09:56:30 CEST 2018
# HG changeset patch
# User mschaefer
# Date 1538380416 -7200
# Node ID 6146358c48427f365f21c47e3db16e130e2cb7b0
# Parent 056483975a9cbf47ef1d092b605c2114f2d02ebc
Fixed: f2 sign corrected in vegetation zone height calculation, vegetation zone limit handling changed in the importer
diff -r 056483975a9c -r 6146358c4842 artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/vegetationzones/VegetationZonesCrossSectionProcessor.java
--- 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;
diff -r 056483975a9c -r 6146358c4842 backend/src/main/java/org/dive4elements/river/importer/uinfo/parsers/VegetationParser.java
--- 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;
More information about the Dive4Elements-commits
mailing list