Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixScenario.java @ 9504:76c0665888a3
No rounding during calculation (Meilenstein-2 2.4.2 and 2.9), delta-w-cm as double (for historical scenario)
| author | mschaefer |
|---|---|
| date | Fri, 28 Sep 2018 10:13:09 +0200 |
| parents | e44c1a8b0c54 |
| children |
comparison
equal
deleted
inserted
replaced
| 9503:83e6acdf8fc6 | 9504:76c0665888a3 |
|---|---|
| 21 public class SalixScenario implements Serializable { | 21 public class SalixScenario implements Serializable { |
| 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 double deltaW; |
| 27 private final double salixW; | 27 private final double salixW; |
| 28 | 28 |
| 29 public SalixScenario(final int deltaW, final double salix_value, final double salixW) { | 29 public SalixScenario(final double deltaW, final double salix_value, final double salixW) { |
| 30 this.deltaW = deltaW; | 30 this.deltaW = deltaW; |
| 31 this.salix_value = salix_value; | 31 this.salix_value = salix_value; |
| 32 this.salixW = salixW; | 32 this.salixW = salixW; |
| 33 } | 33 } |
| 34 | 34 |
| 35 public double getSalixValue() { | 35 public double getSalixValue() { |
| 36 return this.salix_value; | 36 return this.salix_value; |
| 37 } | 37 } |
| 38 | 38 |
| 39 public int getDeltaW() { | 39 public double getDeltaW() { |
| 40 return this.deltaW; | 40 return this.deltaW; |
| 41 } | 41 } |
| 42 | 42 |
| 43 public String getDeltaWFormatted() { | 43 public String getDeltaWFormatted(final NumberFormat formatter) { |
| 44 // if (Double.isNaN(this.deltaW)) | 44 if (Double.isNaN(this.deltaW)) |
| 45 // return StringUtils.EMPTY; | 45 return StringUtils.EMPTY; |
| 46 | 46 |
| 47 return String.valueOf(this.deltaW); | 47 return formatter.format(this.deltaW); |
| 48 } | 48 } |
| 49 | 49 |
| 50 public String getSalixValueFormatted(final NumberFormat formatter) { | 50 public String getSalixValueFormatted(final NumberFormat formatter) { |
| 51 if (Double.isNaN(this.salix_value)) | 51 if (Double.isNaN(this.salix_value)) |
| 52 return StringUtils.EMPTY; | 52 return StringUtils.EMPTY; |