Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightSingleData.java @ 8169:856701739443
Handle missing years in bed height differences without assuming an unknown year to be BC 1.
| author | "Tom Gottfried <tom@intevation.de>" |
|---|---|
| date | Mon, 01 Sep 2014 09:43:55 +0200 |
| parents | 42076d94977e |
| children | 3a0522f1a532 |
comparison
equal
deleted
inserted
replaced
| 8168:75a6ac0c73ef | 8169:856701739443 |
|---|---|
| 12 | 12 |
| 13 | 13 |
| 14 public class BedHeightSingleData | 14 public class BedHeightSingleData |
| 15 extends BedHeightData | 15 extends BedHeightData |
| 16 { | 16 { |
| 17 protected int year; | 17 protected Integer year; |
| 18 protected TDoubleArrayList data_gap; | 18 protected TDoubleArrayList data_gap; |
| 19 protected TDoubleArrayList soundingWidth; | 19 protected TDoubleArrayList soundingWidth; |
| 20 protected TDoubleArrayList width; | 20 protected TDoubleArrayList width; |
| 21 | 21 |
| 22 public BedHeightSingleData() { | 22 public BedHeightSingleData() { |
| 23 super(); | 23 super(); |
| 24 this.year = -1; | |
| 25 data_gap = new TDoubleArrayList(); | 24 data_gap = new TDoubleArrayList(); |
| 26 soundingWidth = new TDoubleArrayList(); | 25 soundingWidth = new TDoubleArrayList(); |
| 27 width = new TDoubleArrayList(); | 26 width = new TDoubleArrayList(); |
| 28 } | 27 } |
| 29 | 28 |
| 30 public BedHeightSingleData(String name) { | 29 public BedHeightSingleData(String name) { |
| 31 super(name); | 30 super(name); |
| 32 this.year = -1; | |
| 33 data_gap = new TDoubleArrayList(); | 31 data_gap = new TDoubleArrayList(); |
| 34 soundingWidth = new TDoubleArrayList(); | 32 soundingWidth = new TDoubleArrayList(); |
| 35 width = new TDoubleArrayList(); | 33 width = new TDoubleArrayList(); |
| 36 } | 34 } |
| 37 | 35 |
| 39 double value, | 37 double value, |
| 40 double station, | 38 double station, |
| 41 double gap, | 39 double gap, |
| 42 double sounding, | 40 double sounding, |
| 43 double width, | 41 double width, |
| 44 int year | 42 Integer year |
| 45 ) { | 43 ) { |
| 46 super.add(value, station); | 44 super.add(value, station); |
| 47 this.year = year; | 45 if (year != null) { |
| 46 this.year = year; | |
| 47 } | |
| 48 this.data_gap.add(gap); | 48 this.data_gap.add(gap); |
| 49 this.soundingWidth.add(sounding); | 49 this.soundingWidth.add(sounding); |
| 50 this.width.add(width); | 50 this.width.add(width); |
| 51 } | 51 } |
| 52 | 52 |
| 53 public int getYear() { | 53 public Integer getYear() { |
| 54 return this.year; | 54 return this.year; |
| 55 } | 55 } |
| 56 | 56 |
| 57 public double getSoundingWidth(int idx) { | 57 public double getSoundingWidth(int idx) { |
| 58 return this.soundingWidth.getQuick(idx); | 58 return this.soundingWidth.getQuick(idx); |