This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 73fefcf4b34e39fc1536d13fd74f79723cd4d1e6 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Jun 20 10:30:38 2018 +0200 Correction d'un cas d'égalité pour le dépouillement du jugement majoritaire --- .../pollen/votecounting/MajorityJudgmentVoteCountingStrategy.java | 4 ++-- .../pollen/votecounting/MajorityJudgmentVoteCountingStrategyTest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCountingStrategy.java b/pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCountingStrategy.java index adc0796f..cea2398f 100644 --- a/pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCountingStrategy.java +++ b/pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCountingStrategy.java @@ -231,14 +231,14 @@ public class MajorityJudgmentVoteCountingStrategy extends AbstractVoteCountingSt result = -1; // ici on géré des cas rare : une egalité } else if (aUnderAUpper == 0 && aUnderBUnder > 0 && aUnderBUpper > 0 && bUnderBUpper < 0 // aUnder = aUpper > bUpper > bUnder - || aUnderBUnder == 0 && aUnderAUpper > 0 && aUnderBUpper > 0 && aUpperBUpper < 0 // aUnder = bUnder > bUpper > aUpper + || aUnderBUnder == 0 && aUnderAUpper > 0 && aUnderBUpper > 0 && aUpperBUpper > 0 // aUnder = bUnder > bUpper > aUpper || aUpperBUnder == 0 && aUnderAUpper < 0 && aUpperBUpper > 0 // aUpper = bUnder > aUnder, bUpper || aUpperBUpper == 0 && aUnderAUpper < 0 && aUpperBUnder > 0 && aUnderBUnder < 0 // aUpper = bUpper > bUnder > aUnder || bUnderBUpper == 0 && aUnderBUnder < 0 && aUnderBUpper < 0 && aUnderAUpper > 0 // bUnder = bUpper > aUnder > aUpper ){ result = 1; } else if (aUnderAUpper == 0 && aUnderBUnder > 0 && aUnderBUpper > 0 && bUnderBUpper > 0 // aUnder = aUpper > bUnder > bUpper - || aUnderBUnder == 0 && aUnderAUpper > 0 && aUnderBUpper > 0 && aUpperBUpper > 0 // aUnder = bUnder > aUpper > bUpper + || aUnderBUnder == 0 && aUnderAUpper > 0 && aUnderBUpper > 0 && aUpperBUpper < 0 // aUnder = bUnder > aUpper > bUpper || aUnderBUpper == 0 && aUnderAUpper > 0 && aUnderBUnder > 0 // aUnder = bUpper > bUnder, aUpper || aUpperBUpper == 0 && aUnderAUpper < 0 && aUpperBUnder > 0 && aUnderBUnder > 0 // aUpper = bUpper > aUnder > bUnder || bUnderBUpper == 0 && aUpperBUnder < 0 && aUnderBUpper < 0 && aUnderAUpper < 0 // bUnder = bUpper > aUpper > aUnder diff --git a/pollen-votecounting-majority-judgment/src/test/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCountingStrategyTest.java b/pollen-votecounting-majority-judgment/src/test/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCountingStrategyTest.java index dfe7e4a5..377bd1d9 100644 --- a/pollen-votecounting-majority-judgment/src/test/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCountingStrategyTest.java +++ b/pollen-votecounting-majority-judgment/src/test/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCountingStrategyTest.java @@ -261,8 +261,8 @@ public class MajorityJudgmentVoteCountingStrategyTest { // test médians identique avec egalité testGreaterChoice( - "00111111222222333344", - "00011111222223333444"); + "00111111222223333344", + "00011111222222333444"); testGreaterChoice( "00011112222333334444", -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.