Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/DischargeTables.java @ 4138:1d9c9a3493ea
#904 Use the correct scale to convert discharge table values into [cm].
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Mon, 15 Oct 2012 16:05:20 +0200 |
| parents | b2ea89a665bc |
| children | cb9f22c3553f |
comparison
equal
deleted
inserted
replaced
| 4136:b6ba9bbb5122 | 4138:1d9c9a3493ea |
|---|---|
| 24 implements Serializable | 24 implements Serializable |
| 25 { | 25 { |
| 26 /** Private logger. */ | 26 /** Private logger. */ |
| 27 private static Logger log = Logger.getLogger(DischargeTables.class); | 27 private static Logger log = Logger.getLogger(DischargeTables.class); |
| 28 | 28 |
| 29 public static final double DEFAULT_SCALE = 100.0; | 29 /** Scale to convert discharge table values of master table into [cm] */ |
| 30 public static final double MASTER_SCALE = 100d; | |
| 31 | |
| 32 /** Scale to convert discharge table values of historical tables into [cm] */ | |
| 33 public static final double HISTORICAL_SCALE = 1d; | |
| 30 | 34 |
| 31 public static final int MASTER = 0; | 35 public static final int MASTER = 0; |
| 32 | 36 |
| 33 protected List<String> gaugeNames; | 37 protected List<String> gaugeNames; |
| 34 | 38 |
| 69 this.riverName = riverName; | 73 this.riverName = riverName; |
| 70 this.gaugeNames = gaugeNames; | 74 this.gaugeNames = gaugeNames; |
| 71 } | 75 } |
| 72 | 76 |
| 73 public double [][] getFirstTable() { | 77 public double [][] getFirstTable() { |
| 74 return getFirstTable(DEFAULT_SCALE); | 78 return getFirstTable(MASTER_SCALE); |
| 75 } | 79 } |
| 76 | 80 |
| 77 public double [][] getFirstTable(double scale) { | 81 public double [][] getFirstTable(double scale) { |
| 78 Map<String, double [][]> values = getValues(scale); | 82 Map<String, double [][]> values = getValues(scale); |
| 79 for (double [][] table: values.values()) { | 83 for (double [][] table: values.values()) { |
| 81 } | 85 } |
| 82 return null; | 86 return null; |
| 83 } | 87 } |
| 84 | 88 |
| 85 public Map<String, double [][]> getValues() { | 89 public Map<String, double [][]> getValues() { |
| 86 return getValues(DEFAULT_SCALE); | 90 return getValues(MASTER_SCALE); |
| 87 } | 91 } |
| 88 | 92 |
| 89 public Map<String, double [][]> getValues(double scale) { | 93 public Map<String, double [][]> getValues(double scale) { |
| 90 if (values == null || scale != this.scale) { | 94 if (values == null || scale != this.scale) { |
| 91 values = loadValues(scale); | 95 values = loadValues(scale); |