improvements

- split the 'sortby' select field into two fields
- sort by average
- legend shows plotted and total values in the date range
- removed InlineDataSeries, because it was not used anymore

pdb-ui/src/main/java/org/lucares/pdbui/domain/DataSeriesStats.java

@@ -0,0 +1,64 @@
+package org.lucares.pdbui.domain;
+
+import java.util.Collection;
+
+public class DataSeriesStats {
+	private final int values;
+	private final long maxValue;
+	private final double average;
+	private final int plottedValues;
+
+	public DataSeriesStats(final int values, final int plottedValues, final long maxValue, final double average) {
+		this.values = values;
+		this.plottedValues = plottedValues;
+		this.maxValue = maxValue;
+		this.average = average;
+	}
+
+	/**
+	 * The number of values in the date range, without applying the y-range.
+	 *
+	 * @return total number of values
+	 */
+	public int getValues() {
+		return values;
+	}
+
+	/**
+	 * The number of values in the date range <em>and</em> the y-range.
+	 *
+	 * @return number of plotted values
+	 */
+	public int getPlottedValues() {
+		return plottedValues;
+	}
+
+	public long getMaxValue() {
+		return maxValue;
+	}
+
+	public double getAverage() {
+		return average;
+	}
+
+	@Override
+	public String toString() {
+		return "[values=" + values + ", maxValue=" + maxValue + ", average=" + average + "]";
+	}
+
+	public static double average(final Collection<DataSeriesStats> stats) {
+		long n = 0;
+		double average = 0;
+
+		for (final DataSeriesStats stat : stats) {
+			final int newValues = stat.getValues();
+			final double newAverage = stat.getAverage();
+			if (newValues > 0) {
+				average = (average * n + newAverage * newValues) / (n + newValues);
+				n += newValues;
+			}
+		}
+
+		return average;
+	}
+}

pdb-ui/src/main/java/org/lucares/pdbui/domain/PlotResponseStats.java

@@ -1,5 +1,6 @@
 package org.lucares.pdbui.domain;
 
+import java.util.ArrayList;
 import java.util.List;
 
 import org.lucares.recommind.logs.DataSeries;
@@ -9,14 +10,24 @@ public class PlotResponseStats {
 
 	private int values;
 
+	private double average;
+
+	private int plottedValues;
+
+	private List<DataSeriesStats> dataSeriesStats;
+
 	public PlotResponseStats() {
 		super();
 	}
 
-	public PlotResponseStats(final long maxValue, final int values) {
+	public PlotResponseStats(final long maxValue, final int values, final int plottedValues, final double average,
+			final List<DataSeriesStats> dataSeriesStats) {
 
 		this.maxValue = maxValue;
 		this.values = values;
+		this.plottedValues = plottedValues;
+		this.average = average;
+		this.dataSeriesStats = dataSeriesStats;
 	}
 
 	public long getMaxValue() {
@@ -35,21 +46,54 @@ public class PlotResponseStats {
 		this.values = values;
 	}
 
+	public int getPlottedValues() {
+		return plottedValues;
+	}
+
+	public void setPlottedValues(final int plottedValues) {
+		this.plottedValues = plottedValues;
+	}
+
+	public double getAverage() {
+		return average;
+	}
+
+	public void setAverage(final double average) {
+		this.average = average;
+	}
+
+	public List<DataSeriesStats> getDataSeriesStats() {
+		return dataSeriesStats;
+	}
+
+	public void setDataSeriesStats(final List<DataSeriesStats> dataSeriesStats) {
+		this.dataSeriesStats = dataSeriesStats;
+	}
+
 	@Override
 	public String toString() {
-		return "PlotResponseStats [maxValue=" + maxValue + ", values=" + values + "]";
+		return "PlotResponseStats [maxValue=" + maxValue + ", values=" + values + ", average=" + average
+				+ ", plottedValues=" + plottedValues + ", dataSeriesStats=" + dataSeriesStats + "]";
 	}
 
 	public static PlotResponseStats fromDataSeries(final List<DataSeries> dataSeries) {
 
 		int values = 0;
+		int plottedValues = 0;
 		long maxValue = 0;
+		final List<DataSeriesStats> dataSeriesStats = new ArrayList<>();
 
 		for (final DataSeries dataSerie : dataSeries) {
 			values += dataSerie.getValues();
+			plottedValues += dataSerie.getPlottedValues();
 			maxValue = Math.max(maxValue, dataSerie.getMaxValue());
+
+			dataSeriesStats.add(new DataSeriesStats(dataSerie.getValues(), dataSerie.getPlottedValues(),
+					dataSerie.getMaxValue(), dataSerie.getAverage()));
 		}
 
-		return new PlotResponseStats(maxValue, values);
+		final double average = DataSeriesStats.average(dataSeriesStats);
+
+		return new PlotResponseStats(maxValue, values, plottedValues, average, dataSeriesStats);
 	}
 }