SAMOA-58: adding all measurements
Project: http://git-wip-us.apache.org/repos/asf/incubator-samoa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-samoa/commit/5d131e28 Tree: http://git-wip-us.apache.org/repos/asf/incubator-samoa/tree/5d131e28 Diff: http://git-wip-us.apache.org/repos/asf/incubator-samoa/diff/5d131e28 Branch: refs/heads/master Commit: 5d131e283fc717059f0067c1fef0a40da1a73448 Parents: e5ca1b2 Author: edi_bice <[email protected]> Authored: Mon Feb 22 16:48:35 2016 -0500 Committer: Gianmarco De Francisci Morales <[email protected]> Committed: Tue Apr 19 11:33:42 2016 +0300 ---------------------------------------------------------------------- .../evaluation/F1ClassificationPerformanceEvaluator.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/5d131e28/samoa-api/src/main/java/org/apache/samoa/evaluation/F1ClassificationPerformanceEvaluator.java ---------------------------------------------------------------------- diff --git a/samoa-api/src/main/java/org/apache/samoa/evaluation/F1ClassificationPerformanceEvaluator.java b/samoa-api/src/main/java/org/apache/samoa/evaluation/F1ClassificationPerformanceEvaluator.java index 7ad4292..89e74be 100644 --- a/samoa-api/src/main/java/org/apache/samoa/evaluation/F1ClassificationPerformanceEvaluator.java +++ b/samoa-api/src/main/java/org/apache/samoa/evaluation/F1ClassificationPerformanceEvaluator.java @@ -26,6 +26,10 @@ import org.apache.samoa.instances.Utils; import org.apache.samoa.moa.AbstractMOAObject; import org.apache.samoa.moa.core.Measurement; +import java.util.Collections; +import java.util.List; +import java.util.Vector; + /** * Created by Edi Bice (edi.bice gmail com) on 2/22/2016. */ @@ -84,7 +88,12 @@ public class F1ClassificationPerformanceEvaluator extends AbstractMOAObject impl @Override public Measurement[] getPerformanceMeasurements() { - return getF1Measurements(); + List<Measurement> measurements = new Vector<>(); + Collections.addAll(measurements, getSupportMeasurements()); + Collections.addAll(measurements, getPrecisionMeasurements()); + Collections.addAll(measurements, getRecallMeasurements()); + Collections.addAll(measurements, getF1Measurements()); + return measurements.toArray(new Measurement[measurements.size()]); } private Measurement[] getSupportMeasurements() {
