Mercurial > dive4elements > gnv-client
diff gnv-artifacts/src/main/java/de/intevation/gnv/statistics/TimeseriesStatistics.java @ 870:dfd02f8d3602
Removed trailing whitespace.
gnv-artifacts/trunk@1010 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Wed, 28 Apr 2010 06:53:44 +0000 |
parents | 05bf8534a35a |
children | f953c9a559d8 |
line wrap: on
line diff
--- a/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/TimeseriesStatistics.java Wed Apr 28 06:49:18 2010 +0000 +++ b/gnv-artifacts/src/main/java/de/intevation/gnv/statistics/TimeseriesStatistics.java Wed Apr 28 06:53:44 2010 +0000 @@ -36,10 +36,10 @@ /** * This class is used to create a statistic in timeseries products. - * + * * @author blume */ -public class TimeseriesStatistics +public class TimeseriesStatistics extends AbstractStatistics { @@ -115,19 +115,19 @@ || !break3.equals(row.getString(b3Idx)) ) { String statisticsName = generateStatisticsName( - break1, break2, - break3, parameters, + break1, break2, + break3, parameters, measurements, dates); statisticSets.add( generateStatisticsValues( - lStatistics, + lStatistics, lRegression, statisticsName)); lStatistics.clear(); lRegression.clear(); - + clearStatistics(); Double yValue = row.getDouble(yIdx); @@ -165,15 +165,15 @@ Double x = calculateXOrdinateValue(previousRow, row); lRegression.addData(x, yValue); } - + String statisticsName = generateStatisticsName( - break1, break2, - break3, parameters, + break1, break2, + break3, parameters, measurements, dates); - + statisticSets.add(generateStatisticsValues( - lStatistics, - lRegression, + lStatistics, + lRegression, statisticsName)); lStatistics.clear(); lRegression.clear(); @@ -189,9 +189,9 @@ * Nothing is done here. */ protected void clearStatistics(){} - - protected String generateStatisticsName(String break1, + + protected String generateStatisticsName(String break1, String break2, String break3, Collection<KeyValueDescibeData> parameters, @@ -201,8 +201,8 @@ return this.findValueTitle(parameters,break1)+ " "+ this.findValueTitle(measurements,break2) + "m"; } - - + + protected String findValueTitle(Collection<KeyValueDescibeData> values, String id) { log.debug("TimeseriesStatistics.findValueTitle "+ id); @@ -218,7 +218,7 @@ return ""; } - + protected double calculateXOrdinateValue(Result previousRow, Result row) throws SQLException { return new Double((row.getDate("XORDINATE")).getTime() / 1000 / 3600); }