SAMOA-58: need more decimal digits
Project: http://git-wip-us.apache.org/repos/asf/incubator-samoa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-samoa/commit/e5ca1b27 Tree: http://git-wip-us.apache.org/repos/asf/incubator-samoa/tree/e5ca1b27 Diff: http://git-wip-us.apache.org/repos/asf/incubator-samoa/diff/e5ca1b27 Branch: refs/heads/master Commit: e5ca1b27a142fefa6997b89356e4c16afab8ea4c Parents: 1c8778e Author: edi_bice <[email protected]> Authored: Mon Feb 22 16:42:20 2016 -0500 Committer: Gianmarco De Francisci Morales <[email protected]> Committed: Tue Apr 19 11:33:42 2016 +0300 ---------------------------------------------------------------------- .../evaluation/F1ClassificationPerformanceEvaluator.java | 6 +++--- .../main/java/org/apache/samoa/moa/core/Measurement.java | 9 +++++++-- 2 files changed, 10 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/e5ca1b27/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 726f487..7ad4292 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 @@ -100,7 +100,7 @@ public class F1ClassificationPerformanceEvaluator extends AbstractMOAObject impl Measurement[] measurements = new Measurement[this.numClasses]; for (int i = 0; i < this.numClasses; i++) { String ml = String.format("class %s precision", i); - measurements[i] = new Measurement(ml, getPrecision(i)); + measurements[i] = new Measurement(ml, getPrecision(i), 10); } return measurements; } @@ -109,7 +109,7 @@ public class F1ClassificationPerformanceEvaluator extends AbstractMOAObject impl Measurement[] measurements = new Measurement[this.numClasses]; for (int i = 0; i < this.numClasses; i++) { String ml = String.format("class %s recall", i); - measurements[i] = new Measurement(ml, getRecall(i)); + measurements[i] = new Measurement(ml, getRecall(i), 10); } return measurements; } @@ -118,7 +118,7 @@ public class F1ClassificationPerformanceEvaluator extends AbstractMOAObject impl Measurement[] measurements = new Measurement[this.numClasses]; for (int i = 0; i < this.numClasses; i++) { String ml = String.format("class %s f1-score", i); - measurements[i] = new Measurement(ml, getF1Score(i)); + measurements[i] = new Measurement(ml, getF1Score(i), 10); } return measurements; } http://git-wip-us.apache.org/repos/asf/incubator-samoa/blob/e5ca1b27/samoa-api/src/main/java/org/apache/samoa/moa/core/Measurement.java ---------------------------------------------------------------------- diff --git a/samoa-api/src/main/java/org/apache/samoa/moa/core/Measurement.java b/samoa-api/src/main/java/org/apache/samoa/moa/core/Measurement.java index 8fc80c7..8a3d598 100644 --- a/samoa-api/src/main/java/org/apache/samoa/moa/core/Measurement.java +++ b/samoa-api/src/main/java/org/apache/samoa/moa/core/Measurement.java @@ -36,14 +36,19 @@ public class Measurement extends AbstractMOAObject { private static final long serialVersionUID = 1L; protected String name; - protected double value; + protected int fractionDigits; public Measurement(String name, double value) { this.name = name; this.value = value; } + public Measurement(String name, double value, int fractionDigits) { + this(name, value); + this.fractionDigits = fractionDigits; + } + public String getName() { return this.name; } @@ -110,6 +115,6 @@ public class Measurement extends AbstractMOAObject { public void getDescription(StringBuilder sb, int indent) { sb.append(getName()); sb.append(" = "); - sb.append(StringUtils.doubleToString(getValue(), 3)); + sb.append(StringUtils.doubleToString(getValue(), this.fractionDigits)); } }
