Mercurial > dive4elements > river

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added calculation of salix hw5 and salix line w
author mschaefer
date Mon, 20 Aug 2018 09:41:07 +0200
parents 2aec052d4088
children e44c1a8b0c54
comparison
equal deleted inserted replaced
9429:bd5f5d2220fa 9430:e8b1255fc89e
22 22
23 private static final long serialVersionUID = 1L; 23 private static final long serialVersionUID = 1L;
24 24
25 private final double salix_value; 25 private final double salix_value;
26 private final int deltaW; 26 private final int deltaW;
27 private final double salixW;
27 28
28 public SalixScenario(final int deltaW, final double salix_value) { 29 public SalixScenario(final int deltaW, final double salix_value, final double salixW) {
29 this.deltaW = deltaW; 30 this.deltaW = deltaW;
30 this.salix_value = salix_value; 31 this.salix_value = salix_value;
32 this.salixW = salixW;
31 } 33 }
32 34
33 public double getSalixValue() { 35 public double getSalixValue() {
34 return this.salix_value; 36 return this.salix_value;
35 } 37 }
37 public int getDeltaW() { 39 public int getDeltaW() {
38 return this.deltaW; 40 return this.deltaW;
39 } 41 }
40 42
41 public String getDeltaWFormatted() { 43 public String getDeltaWFormatted() {
42 if (Double.isNaN(this.deltaW)) 44 // if (Double.isNaN(this.deltaW))
43 return StringUtils.EMPTY; 45 // return StringUtils.EMPTY;
44 46
45 return String.valueOf(this.deltaW); 47 return String.valueOf(this.deltaW);
46 } 48 }
47 49
48 public String getSalixValueFormatted(final NumberFormat formatter) { 50 public String getSalixValueFormatted(final NumberFormat formatter) {
50 return StringUtils.EMPTY; 52 return StringUtils.EMPTY;
51 53
52 return formatter.format(this.salix_value); 54 return formatter.format(this.salix_value);
53 } 55 }
54 56
57 public double getSalixW() {
58 return this.salixW;
59 }
60
61 public String getSalixWFormatted() {
62 if (Double.isNaN(this.salixW))
63 return StringUtils.EMPTY;
64
65 return String.valueOf(this.salixW);
66 }
67
55 public static final String getScenarioValueHeader() { 68 public static final String getScenarioValueHeader() {
56 return "uinfo.export.salix_line.csv.header.scenario"; 69 return "uinfo.export.salix_line.csv.header.scenario";
57 } 70 }
58 71
59 public static final String getDeltaWHeader() { 72 public static final String getDeltaWHeader() {
http://dive4elements.wald.intevation.org