src/java/cfa/FlowStatistics.java
| @@ -13,7 +13,7 @@ |
| import java.util.GregorianCalendar; |
| |
| /** |
| -* Last Updated: 29-January-2015 |
| +* Last Updated: 29-May-2015 |
| * @author Tyler Wible |
| * @since 29-June-2011 |
| */ |
| @@ -74,8 +74,8 @@ |
| String period3End) throws IOException, ParseException{ |
| //Get today's date for output purposes |
| Date currentDate = new Date(); |
| - SimpleDateFormat desiredDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); |
| - String today = desiredDateFormat.format(currentDate); |
| + SimpleDateFormat outputOnlyDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm"); |
| + String today = outputOnlyDateFormat.format(currentDate); |
| stationName = stationName.replace(",", ""); |
| |
| //Initialize the summary result table |
| @@ -285,6 +285,7 @@ |
| |
| //Calculate data statistics for each period |
| Arrays.sort(flowData, new DateComparator()); |
| + SimpleDateFormat desiredDateFormat = new SimpleDateFormat("yyyy-MM-dd"); |
| if(!period1Begin.isEmpty() && !period1End.isEmpty()){ |
| Date period1Begin_date = desiredDateFormat.parse(period1Begin); |
| Date period1End_date = desiredDateFormat.parse(period1End); |
src/java/cfa/guiTimeseries_Model.java
| @@ -40,7 +40,7 @@ |
| import org.jfree.data.xy.XYSeriesCollection; |
| |
| /** |
| -* Last Updated: 30-January-2015 |
| +* Last Updated: 29-May-2015 |
| * @author Tyler Wible |
| * @since 24-June-2011 |
| */ |
| @@ -57,7 +57,7 @@ |
| String timeStep = "Daily";//"Yearly";//"Monthly";// |
| String method = "Max";//"Min";//"Average";//"Total";// |
| int numBins = 10; |
| - boolean logarithmicTF = true; |
| + boolean logarithmicBinsTF = true; |
| String seasonBegin = "06-01";//"MM-dd" |
| String seasonEnd = "09-30";//"MM-dd" |
| String period1Begin = ""; |
| @@ -455,8 +455,8 @@ |
| public void setNumberOfBins(int numBins) { |
| this.numBins = numBins; |
| } |
| - public void setLogarithmicHistogramBins(boolean logarithmicTF) { |
| - this.logarithmicTF = logarithmicTF; |
| + public void setLogarithmicHistogramBins(boolean logarithmicBinsTF) { |
| + this.logarithmicBinsTF = logarithmicBinsTF; |
| } |
| public void setSeasonBegin(String seasonBegin) { |
| this.seasonBegin = seasonBegin; |
| @@ -1043,7 +1043,7 @@ |
| //Determine bin type (arithmetic/logarithmic) and then range |
| double[] lowerLimit = new double[numBins]; |
| double[] upperLimit = new double[numBins]; |
| - if(logarithmicTF){ |
| + if(logarithmicBinsTF){ |
| if(min != 0){ |
| double exponent = (Math.log10(max) - Math.log10(min)) / numBins; |
| for(int i=0; i<numBins; i++){ |