This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit 138580c9b2f7462a3f4f22f15802586ab8e2026b Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 15 09:46:35 2016 +0200 Correction de l'apgorithme de comparaision de poids --- .../src/main/java/fr/ifremer/tutti/type/WeightUnit.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java index 39cd373..a2d309c 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/type/WeightUnit.java @@ -100,7 +100,7 @@ public enum WeightUnit implements Comparator<Float> { Objects.requireNonNull(v0, "can not compare null weights"); Objects.requireNonNull(v1, "can not compare null weights"); - float delta = round(v0) - round(v1); + float delta = roundWithSign(v0) - roundWithSign(v1); int result; if (delta > rawPrecision) { // v0 > v1 @@ -173,6 +173,19 @@ public enum WeightUnit implements Comparator<Float> { return result; } + public Float roundWithSign(Float weight) { + Float result; + if (weight == null) { + result = null; + } else { + + BigDecimal sumB = new BigDecimal(String.valueOf(weight)) + .setScale(numberDigits, BigDecimal.ROUND_HALF_UP); + result = sumB.floatValue(); + } + return result; + } + public String decorateLabel(String label) { return String.format("%s (%s)", label, getShortLabel()); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.