Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedDiffYearFilterFacet.java @ 7829:1aba75321441 minfo-opt
Added morph. active width to bed height difference calculation.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Fri, 28 Mar 2014 11:20:49 +0100 |
| parents | a56fe3bc6700 |
| children | 42076d94977e |
comparison
equal
deleted
inserted
replaced
| 7828:8faa8cfd2385 | 7829:1aba75321441 |
|---|---|
| 61 newData.setStart(oldData.getStart()); | 61 newData.setStart(oldData.getStart()); |
| 62 newData.setEnd(oldData.getEnd()); | 62 newData.setEnd(oldData.getEnd()); |
| 63 double[][] diffs = MovingAverage.weighted(oldData.getDifferencesData(), radius); | 63 double[][] diffs = MovingAverage.weighted(oldData.getDifferencesData(), radius); |
| 64 double[][] heights1 = MovingAverage.weighted(oldData.getHeights1Data(), radius); | 64 double[][] heights1 = MovingAverage.weighted(oldData.getHeights1Data(), radius); |
| 65 double[][] heights2 = MovingAverage.weighted(oldData.getHeights2Data(), radius); | 65 double[][] heights2 = MovingAverage.weighted(oldData.getHeights2Data(), radius); |
| 66 double[][] morph = oldData.getMorphWidthData(); | 66 double[][] morph1 = oldData.getMorphWidth1Data(); |
| 67 double[][] morph2 = oldData.getMorphWidth2Data(); | |
| 68 double[][] sounding = oldData.getSoundingWidthData(); | |
| 67 double[][] year = MovingAverage.weighted(oldData.getHeightPerYearData(), radius); | 69 double[][] year = MovingAverage.weighted(oldData.getHeightPerYearData(), radius); |
| 68 for(int j = 0; j < diffs[0].length; j++) { | 70 for(int j = 0; j < diffs[0].length; j++) { |
| 69 newData.addKm(diffs[0][j]); | 71 newData.addKm(diffs[0][j]); |
| 70 newData.addBedHeights(year[1][j]); | 72 newData.addBedHeights(year[1][j]); |
| 71 newData.addMorphWidth(morph[1][j]); | 73 newData.addMorphWidth1(morph1[1][j]); |
| 74 newData.addMorphWidth2(morph2[1][j]); | |
| 75 newData.addSoundingWidth(sounding[1][j]); | |
| 72 newData.addDifference(diffs[1][j]); | 76 newData.addDifference(diffs[1][j]); |
| 73 newData.addHeight1(heights1[1][j]); | 77 newData.addHeight1(heights1[1][j]); |
| 74 newData.addHeight2(heights2[1][j]); | 78 newData.addHeight2(heights2[1][j]); |
| 75 } | 79 } |
| 76 return newData; | 80 return newData; |