diff artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixScenario.java @ 9430:e8b1255fc89e

Added calculation of salix hw5 and salix line w
author mschaefer
date Mon, 20 Aug 2018 09:41:07 +0200
parents 2aec052d4088
children e44c1a8b0c54
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixScenario.java	Fri Aug 17 17:48:01 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixScenario.java	Mon Aug 20 09:41:07 2018 +0200
@@ -24,10 +24,12 @@
 
     private final double salix_value;
     private final int deltaW;
+    private final double salixW;
 
-    public SalixScenario(final int deltaW, final double salix_value) {
+    public SalixScenario(final int deltaW, final double salix_value, final double salixW) {
         this.deltaW = deltaW;
         this.salix_value = salix_value;
+        this.salixW = salixW;
     }
 
     public double getSalixValue() {
@@ -39,8 +41,8 @@
     }
 
     public String getDeltaWFormatted() {
-        if (Double.isNaN(this.deltaW))
-            return StringUtils.EMPTY;
+        // if (Double.isNaN(this.deltaW))
+        // return StringUtils.EMPTY;
 
         return String.valueOf(this.deltaW);
     }
@@ -52,6 +54,17 @@
         return formatter.format(this.salix_value);
     }
 
+    public double getSalixW() {
+        return this.salixW;
+    }
+
+    public String getSalixWFormatted() {
+        if (Double.isNaN(this.salixW))
+            return StringUtils.EMPTY;
+
+        return String.valueOf(this.salixW);
+    }
+
     public static final String getScenarioValueHeader() {
         return "uinfo.export.salix_line.csv.header.scenario";
     }

http://dive4elements.wald.intevation.org