June 2012 - Pollen-commits - mailman.cloud.codelutin.com

r3560 - in trunk: . pollen-votecounting-api/src pollen-votecounting-strategy-condorcet/src
by tchemit＠users.chorem.org 26 Jun '12

26 Jun '12

Author: tchemit Date: 2012-06-26 05:19:01 +0200 (Tue, 26 Jun 2012) New Revision: 3560 Url: http://chorem.org/repositories/revision/pollen/3560 Log: ref #590 remove bad directory and obsolete domain module (never revamp bad code...) Removed: trunk/pollen-domain/ trunk/pollen-votecounting-api/src/src/ trunk/pollen-votecounting-strategy-condorcet/src/src/

1 0

r3559 - in trunk: . pollen-services/src/main/java/org/chorem/pollen pollen-services/src/main/java/org/chorem/pollen/services pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-services/src/test/java/org/chorem/pollen/services pollen-ui-struts2 pollen-ui-struts2/src/main/java/org/chorem/pollen/ui pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll pollen-votecounting-api/src pollen-votecounting-api/s
by tchemit＠users.chorem.org 26 Jun '12

26 Jun '12

Author: tchemit Date: 2012-06-26 05:16:11 +0200 (Tue, 26 Jun 2012) New Revision: 3559 Url: http://chorem.org/repositories/revision/pollen/3559 Log: refs #590 (improve packaging + add aggregator module with all strategies) Added: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceToVoteRenderType.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/strategy/ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/strategy/AbstractVoteCountingStrategy.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/strategy/VoteCountigStrategyNotFound.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategy.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProvider.java trunk/pollen-votecounting-api/src/site/ trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/strategy/ trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/votecounting/strategy/ trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/votecounting/strategy/CondorcetStrategy.java trunk/pollen-votecounting-strategy-condorcet/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.strategy.VoteCountingStrategy trunk/pollen-votecounting-strategy-condorcet/src/site/ trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/strategy/ trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/strategy/CondorcetStrategyTest.java trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java trunk/pollen-votecounting-strategy-normal/src/main/java/org/chorem/pollen/votecounting/strategy/ trunk/pollen-votecounting-strategy-normal/src/main/java/org/chorem/pollen/votecounting/strategy/NormalStrategy.java trunk/pollen-votecounting-strategy-normal/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.strategy.VoteCountingStrategy trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/strategy/ trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/strategy/NormalStrategyTest.java trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java trunk/pollen-votecounting-strategy-number/src/main/java/org/chorem/pollen/votecounting/strategy/ trunk/pollen-votecounting-strategy-number/src/main/java/org/chorem/pollen/votecounting/strategy/NumberStrategy.java trunk/pollen-votecounting-strategy-number/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.strategy.VoteCountingStrategy trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/strategy/ trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/strategy/NumberStrategyTest.java trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java trunk/pollen-votecounting-strategy-percentage/src/main/java/org/chorem/pollen/votecounting/strategy/ trunk/pollen-votecounting-strategy-percentage/src/main/java/org/chorem/pollen/votecounting/strategy/PercentageStrategy.java trunk/pollen-votecounting-strategy-percentage/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.strategy.VoteCountingStrategy trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/strategy/ trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/strategy/PercentageStrategyTest.java trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java trunk/pollen-votecounting-strategy/ trunk/pollen-votecounting-strategy/LICENSE.txt trunk/pollen-votecounting-strategy/README.txt trunk/pollen-votecounting-strategy/changelog.txt trunk/pollen-votecounting-strategy/pom.xml trunk/pollen-votecounting-strategy/src/ trunk/pollen-votecounting-strategy/src/site/ trunk/pollen-votecounting-strategy/src/site/site_en.xml trunk/pollen-votecounting-strategy/src/site/site_fr.xml Removed: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/ChoiceToVoteRenderType.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountigStrategyNotFound.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingService.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategy.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategyProvider.java trunk/pollen-votecounting-api/src/src/site/ trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetStrategy.java trunk/pollen-votecounting-strategy-condorcet/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy trunk/pollen-votecounting-strategy-condorcet/src/src/site/ trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetStrategyTest.java trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java trunk/pollen-votecounting-strategy-normal/src/main/java/org/chorem/pollen/votecounting/NormalStrategy.java trunk/pollen-votecounting-strategy-normal/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/NormalStrategyTest.java trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java trunk/pollen-votecounting-strategy-number/src/main/java/org/chorem/pollen/votecounting/NumberStrategy.java trunk/pollen-votecounting-strategy-number/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/NumberStrategyTest.java trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java trunk/pollen-votecounting-strategy-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageStrategy.java trunk/pollen-votecounting-strategy-percentage/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageStrategyTest.java trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/PollenApplicationContext.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollVoteCountingService.java trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java trunk/pollen-ui-struts2/pom.xml trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/PollenApplicationContext.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/PollenApplicationContext.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/PollenApplicationContext.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -24,7 +24,7 @@ import com.opensymphony.xwork2.ActionContext; import org.chorem.pollen.services.PollenNotifierWorker; -import org.chorem.pollen.votecounting.VoteCountingStrategyProvider; +import org.chorem.pollen.votecounting.strategy.VoteCountingStrategyProvider; import org.nuiton.topia.TopiaContext; import javax.servlet.ServletContext; Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -24,7 +24,7 @@ import com.google.common.base.Preconditions; import org.chorem.pollen.PollenConfiguration; -import org.chorem.pollen.votecounting.VoteCountingStrategyProvider; +import org.chorem.pollen.votecounting.strategy.VoteCountingStrategyProvider; import org.nuiton.topia.TopiaContext; import java.net.URL; Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -24,7 +24,7 @@ package org.chorem.pollen.services; import org.chorem.pollen.PollenConfiguration; -import org.chorem.pollen.votecounting.VoteCountingStrategyProvider; +import org.chorem.pollen.votecounting.strategy.VoteCountingStrategyProvider; import org.nuiton.topia.TopiaContext; import java.net.URL; Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollVoteCountingService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollVoteCountingService.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollVoteCountingService.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -22,11 +22,23 @@ */ package org.chorem.pollen.services.impl; +import com.google.common.base.Preconditions; +import com.google.common.collect.Maps; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.pollen.services.PollenServiceSupport; -import org.chorem.pollen.votecounting.VoteCountingService; +import org.chorem.pollen.votecounting.model.ChoiceScore; +import org.chorem.pollen.votecounting.model.GroupOfVoter; +import org.chorem.pollen.votecounting.model.GroupVoteCountingResult; +import org.chorem.pollen.votecounting.model.VoteCountingResult; +import org.chorem.pollen.votecounting.model.VoteForChoice; +import org.chorem.pollen.votecounting.model.Voter; +import org.chorem.pollen.votecounting.strategy.VoteCountingStrategy; +import org.chorem.pollen.votecounting.strategy.VoteCountingStrategyProvider; +import java.util.Map; +import java.util.Set; + /** * New Poll vote counting service. * @@ -39,14 +51,107 @@ private static final Log log = LogFactory.getLog(PollVoteCountingService.class); - protected VoteCountingService delegateService; + /** + * Provider of {@link VoteCountingStrategy}. + * <p/> + * <strong>Note:</strong> this provider should be injected via method + * {@link #setProvider(VoteCountingStrategyProvider)}. + */ + private VoteCountingStrategyProvider provider; - public VoteCountingService getDelegateService() { - if (delegateService == null) { - delegateService = new VoteCountingService(); - delegateService.setProvider( - serviceContext.getVoteCountingStrategyProvider()); + public VoteCountingStrategyProvider getProvider() { + if (provider == null) { + provider = serviceContext.getVoteCountingStrategyProvider(); } - return delegateService; + return provider; } + + public void setProvider(VoteCountingStrategyProvider provider) { + this.provider = provider; + } + + /** + * Execute a vote counting for a given strategy (by his id) and the + * given {@code voters}. + * + * @param strategyId the id of the vote counting strategy to use + * @param voter the votes to vote count + * @return vote counting result + */ + public VoteCountingResult voteCount(int strategyId, Set<Voter> voter) { + + Preconditions.checkNotNull(getProvider()); + Preconditions.checkNotNull(voter); + + VoteCountingStrategy strategy = getProvider().getStrategy(strategyId); + Preconditions.checkNotNull(strategy); + + VoteCountingResult result = strategy.votecount(voter); + return result; + } + + /** + * Execute a vote counting for a given strategy (by his id) and the + * given {@code voters}. + * + * @param strategyId the id of the vote counting strategy to use + * @param voter the votes to vote count + * @return vote counting result + */ + public GroupVoteCountingResult voteCountByGroup(int strategyId, Set<Voter> voter) { + + Preconditions.checkNotNull(getProvider()); + Preconditions.checkNotNull(voter); + + VoteCountingStrategy strategy = getProvider().getStrategy(strategyId); + Preconditions.checkNotNull(strategy); + + // Create a groupVoter including of the root voters + GroupOfVoter group = GroupOfVoter.newVoter(null, 1.0, null, voter); + + + Map<GroupOfVoter, VoteCountingResult> groupResults = Maps.newHashMap(); + voteCount(strategy, group, groupResults); + + // get result for main group (and remove it from groups) + VoteCountingResult mainResult = groupResults.remove(group); + + GroupVoteCountingResult result = GroupVoteCountingResult.newResult( + mainResult, groupResults); + return result; + } + + protected void voteCount(VoteCountingStrategy strategy, + GroupOfVoter group, + Map<GroupOfVoter, VoteCountingResult> results) { + + // all childs of this group + Set<Voter> voters = group.getVoters(); + + // treat before all his group childs + for (Voter voter : voters) { + if (voter instanceof GroupOfVoter) { + + // treat group child before all + voteCount(strategy, (GroupOfVoter) voter, results); + } + } + + // once here, all childs has been treated, can votecount this group + VoteCountingResult voteCountingResult = strategy.votecount(voters); + + // store the result for this group + results.put(group, voteCountingResult); + + // result of the group is now the voteForChoice for it + + for (ChoiceScore choiceScore : voteCountingResult.getScores()) { + VoteForChoice voteForChoice = VoteForChoice.newVote( + choiceScore.getChoiceId(), + //FIXME-tchemit-2012-06-26 Which is the value to set as choice for each result? + choiceScore.getScoreValue().doubleValue()); + group.addVoteForChoice(voteForChoice); + } + + } } Modified: trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java =================================================================== --- trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -28,7 +28,7 @@ import org.chorem.pollen.PollenConfiguration; import org.chorem.pollen.PollenIOUtil; import org.chorem.pollen.PollenTopiaRootContextFactory; -import org.chorem.pollen.votecounting.VoteCountingStrategyProvider; +import org.chorem.pollen.votecounting.strategy.VoteCountingStrategyProvider; import org.junit.rules.TestWatcher; import org.junit.runner.Description; import org.nuiton.topia.TopiaContext; Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-ui-struts2/pom.xml 2012-06-26 03:16:11 UTC (rev 3559) @@ -26,30 +26,13 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>pollen-votecounting-strategy-condorcet</artifactId> + <artifactId>pollen-votecounting-strategy-all</artifactId> <version>${project.version}</version> + <type>pom</type> <scope>runtime</scope> </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>pollen-votecounting-strategy-normal</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>pollen-votecounting-strategy-number</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>pollen-votecounting-strategy-percentage</artifactId> - <version>${project.version}</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>${project.groupId}</groupId> <artifactId>pollen-votecounting</artifactId> <version>${project.version}</version> </dependency> Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -37,7 +37,7 @@ import org.chorem.pollen.services.PollenServiceContext; import org.chorem.pollen.services.PollenServiceFactory; import org.chorem.pollen.services.impl.UserService; -import org.chorem.pollen.votecounting.VoteCountingStrategyProvider; +import org.chorem.pollen.votecounting.strategy.VoteCountingStrategyProvider; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.topia.TopiaContext; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -46,8 +46,8 @@ import org.chorem.pollen.services.impl.UserService; import org.chorem.pollen.services.impl.VoteService; import org.chorem.pollen.ui.PollenSession; -import org.chorem.pollen.votecounting.VoteCountingStrategy; -import org.chorem.pollen.votecounting.VoteCountingStrategyProvider; +import org.chorem.pollen.votecounting.strategy.VoteCountingStrategy; +import org.chorem.pollen.votecounting.strategy.VoteCountingStrategyProvider; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.framework.TopiaTransactionAware; import org.nuiton.web.filter.TopiaTransactionFilter; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -66,8 +66,8 @@ import org.chorem.pollen.ui.actions.PageSkin; import org.chorem.pollen.ui.actions.PollenActionSupport; import org.chorem.pollen.ui.converters.DateConverter; -import org.chorem.pollen.votecounting.VoteCountingStrategy; -import org.chorem.pollen.votecounting.VoteCountingStrategyProvider; +import org.chorem.pollen.votecounting.strategy.VoteCountingStrategy; +import org.chorem.pollen.votecounting.strategy.VoteCountingStrategyProvider; import org.nuiton.util.StringUtil; import javax.servlet.http.HttpServletRequest; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -47,7 +47,7 @@ import org.chorem.pollen.services.impl.SecurityService; import org.chorem.pollen.ui.PollenUIUtils; import org.chorem.pollen.ui.actions.PageSkin; -import org.chorem.pollen.votecounting.VoteCountingStrategy; +import org.chorem.pollen.votecounting.strategy.VoteCountingStrategy; import javax.servlet.http.HttpServletRequest; import java.io.UnsupportedEncodingException; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -43,7 +43,7 @@ import org.chorem.pollen.ui.PollenUIUtils; import org.chorem.pollen.ui.actions.PageSkin; import org.chorem.pollen.ui.converters.DateConverter; -import org.chorem.pollen.votecounting.VoteCountingStrategy; +import org.chorem.pollen.votecounting.strategy.VoteCountingStrategy; import org.nuiton.util.StringUtil; import java.net.URL; Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -34,7 +34,7 @@ import org.chorem.pollen.business.persistence.VoteToChoice; import org.chorem.pollen.common.PollType; import org.chorem.pollen.services.impl.VoteService; -import org.chorem.pollen.votecounting.VoteCountingStrategy; +import org.chorem.pollen.votecounting.strategy.VoteCountingStrategy; /** * Votes to a poll. Deleted: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -1,103 +0,0 @@ -/* - * #%L - * Pollen :: VoteCounting Api - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.votecounting; - -import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; -import org.chorem.pollen.votecounting.model.ChoiceIdAble; -import org.chorem.pollen.votecounting.model.ChoiceScore; -import org.chorem.pollen.votecounting.model.VoteCountingResult; -import org.chorem.pollen.votecounting.model.Voter; - -import java.util.Collections; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.Set; - -import static org.nuiton.i18n.I18n.l_; - -/** - * Base abstract implementation of a {@link VoteCountingStrategy}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.5 - */ -public abstract class AbstractVoteCountingStrategy implements VoteCountingStrategy { - - @Override - public String getStrategyName(Locale locale) { - String result = l_(locale, getI18nName()); - return result; - } - - @Override - public String getStrategyHelp(Locale locale) { - String voteName = l_(locale, getI18nName()); - String voteHelp = l_(locale, getI18nHelp()); - String result = l_(locale, "pollen.voteCountingType.help", voteName, voteHelp); - return result; - } - - public Map<String, ChoiceScore> votersToResult(Set<Voter> voters) { - // get all choice Id - Set<String> choiceIds = getAllChoiceIds(voters); - - Map<String, ChoiceScore> resultByChoice = Maps.newTreeMap(); - - // creates all empty result for choice - for (String choiceId : choiceIds) { - ChoiceScore choiceScore = ChoiceScore.newScore(choiceId, null); - resultByChoice.put(choiceId, choiceScore); - } - return resultByChoice; - } - - public VoteCountingResult resultToList(Voter voter, - Map<String, ChoiceScore> resultByChoice) { - List<ChoiceScore> score = toChoiceScore(resultByChoice); - return VoteCountingResult.newResult(score); - } - - public List<ChoiceScore> toChoiceScore(Map<String, ChoiceScore> resultByChoice) { - List<ChoiceScore> score = Lists.newArrayList(resultByChoice.values()); - Collections.sort(score); - Collections.reverse(score); - return score; - } - - public Set<String> getAllChoiceIds(Set<Voter> voters) { - ChoiceIdAble.ChoiceIdAbleById function = new ChoiceIdAble.ChoiceIdAbleById(); - Set<String> result = Sets.newHashSet(); - for (Voter voter : voters) { - Iterable<String> transform = Iterables.transform( - voter.getVoteForChoices(), function); - Iterables.addAll(result, transform); - - } - return result; - } - -} Deleted: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/ChoiceToVoteRenderType.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/ChoiceToVoteRenderType.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/ChoiceToVoteRenderType.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -1,42 +0,0 @@ -/* - * #%L - * Pollen :: VoteCounting Api - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.votecounting; - -/** - * To define how to render a vote. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.5 - */ -public enum ChoiceToVoteRenderType { - - /** - * To render as a check box. - * <p/> - * If check box is checked, then result should be value 1, otherwise - * result will be null. - */ - CHECKBOX, - /** To render as a text field. */ - TEXTFIELD -} Deleted: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountigStrategyNotFound.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountigStrategyNotFound.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountigStrategyNotFound.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -1,41 +0,0 @@ -/* - * #%L - * Pollen :: VoteCounting Api - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.votecounting; - -/** - * Exception when a vote counting could not be found. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.5 - */ -public class VoteCountigStrategyNotFound extends RuntimeException { - private static final long serialVersionUID = 1L; - - public VoteCountigStrategyNotFound(String message) { - super(message); - } - - public VoteCountigStrategyNotFound(String message, Throwable cause) { - super(message, cause); - } -} Deleted: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingService.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingService.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingService.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -1,141 +0,0 @@ -/* - * #%L - * Pollen :: VoteCounting Api - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.votecounting; - -import com.google.common.base.Preconditions; -import com.google.common.collect.Maps; -import org.chorem.pollen.votecounting.model.ChoiceScore; -import org.chorem.pollen.votecounting.model.GroupOfVoter; -import org.chorem.pollen.votecounting.model.GroupVoteCountingResult; -import org.chorem.pollen.votecounting.model.VoteCountingResult; -import org.chorem.pollen.votecounting.model.VoteForChoice; -import org.chorem.pollen.votecounting.model.Voter; - -import java.util.Map; -import java.util.Set; - -/** - * Service to vote count. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.5 - */ -public class VoteCountingService { - - /** - * Provider of {@link VoteCountingStrategy}. - * <p/> - * <strong>Note:</strong> this provider should be injected via method - * {@link #setProvider(VoteCountingStrategyProvider)}. - */ - private VoteCountingStrategyProvider provider; - - public void setProvider(VoteCountingStrategyProvider provider) { - this.provider = provider; - } - - /** - * Execute a vote counting for a given strategy (by his id) and the - * given {@code voters}. - * - * @param strategyId the id of the vote counting strategy to use - * @param voter the votes to vote count - * @return vote counting result - */ - public VoteCountingResult voteCount(int strategyId, Set<Voter> voter) { - - Preconditions.checkNotNull(provider); - Preconditions.checkNotNull(voter); - - VoteCountingStrategy strategy = provider.getStrategy(strategyId); - Preconditions.checkNotNull(strategy); - - VoteCountingResult result = strategy.votecount(voter); - return result; - } - - /** - * Execute a vote counting for a given strategy (by his id) and the - * given {@code voters}. - * - * @param strategyId the id of the vote counting strategy to use - * @param voter the votes to vote count - * @return vote counting result - */ - public GroupVoteCountingResult voteCountByGroup(int strategyId, Set<Voter> voter) { - - Preconditions.checkNotNull(provider); - Preconditions.checkNotNull(voter); - - VoteCountingStrategy strategy = provider.getStrategy(strategyId); - Preconditions.checkNotNull(strategy); - - // Create a groupVoter including of the root voters - GroupOfVoter group = GroupOfVoter.newVoter(null, 1.0, null, voter); - - - Map<GroupOfVoter, VoteCountingResult> groupResults = Maps.newHashMap(); - voteCount(strategy, group, groupResults); - - // get result for main group (and remove it from groups) - VoteCountingResult mainResult = groupResults.remove(group); - - GroupVoteCountingResult result = GroupVoteCountingResult.newResult( - mainResult, groupResults); - return result; - } - - protected void voteCount(VoteCountingStrategy strategy, - GroupOfVoter group, - Map<GroupOfVoter, VoteCountingResult> results) { - - // all childs of this group - Set<Voter> voters = group.getVoters(); - - // treat before all his group childs - for (Voter voter : voters) { - if (voter instanceof GroupOfVoter) { - - // treat group child before all - voteCount(strategy, (GroupOfVoter) voter, results); - } - } - - // once here, all childs has been treated, can votecount this group - VoteCountingResult voteCountingResult = strategy.votecount(voters); - - // store the result for this group - results.put(group, voteCountingResult); - - // result of the group is now the voteForChoice for it - - for (ChoiceScore choiceScore : voteCountingResult.getScores()) { - VoteForChoice voteForChoice = VoteForChoice.newVote( - choiceScore.getChoiceId(), - //FIXME-tchemit-2012-06-26 Which is the value to set as choice for each result? - choiceScore.getScoreValue().doubleValue()); - group.addVoteForChoice(voteForChoice); - } - - } -} Deleted: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategy.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategy.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategy.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -1,91 +0,0 @@ -/* - * #%L - * Pollen :: VoteCounting Api - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.votecounting; - -import org.chorem.pollen.votecounting.model.VoteCountingResult; -import org.chorem.pollen.votecounting.model.Voter; - -import java.util.Locale; -import java.util.Set; - -import static org.nuiton.i18n.I18n.l_; - -/** - * Contract of a vote counting method. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.5 - */ -public interface VoteCountingStrategy { - - /** - * Obtains the unique id of this strategy. - * - * @return the unique id of this strategy. - */ - int getId(); - - /** - * Obtains the i18n name of this strategy. - * - * @return the i18n name of this strategy. - */ - String getI18nName(); - - /** - * Obtains the i18n help of this strategy. - * - * @return the i18n help of this strategy. - */ - String getI18nHelp(); - - /** - * Vote count for the given {@code voter} and return the result of it. - * - * @param voter the voter and their votes. - * @return the result of the vote counting for the given voter. - */ - VoteCountingResult votecount(Set<Voter> voter); - - String getDisplayVoteValue(Integer voteValue); - - boolean isChoiceInVote(Integer voteValue); - - String getStrategyName(Locale locale); - - String getStrategyHelp(Locale locale); - - boolean isVoteValueValid(Integer voteValue); - - String getVoteValueNotValidMessage(); - - boolean isTotalVoteValueValid(int totalValues); - - String getTotalVoteValueNotValidMessage(); - - boolean isVoteValueNull(Integer value); - - ChoiceToVoteRenderType getRenderType(); - - boolean isDisplayResultsByChoice(); -} Deleted: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategyProvider.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategyProvider.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategyProvider.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -1,101 +0,0 @@ -/* - * #%L - * Pollen :: VoteCounting Api - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.votecounting; - -import com.google.common.collect.ImmutableSet; -import com.google.common.collect.Maps; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -import java.util.Map; -import java.util.ServiceLoader; -import java.util.Set; - -/** - * Provider of {@link VoteCountingStrategy}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.5 - */ -public class VoteCountingStrategyProvider { - - /** Logger. */ - private static final Log log = - LogFactory.getLog(VoteCountingStrategyProvider.class); - - /** - * List of available strageries detected via the {@link ServiceLoader} - * mecanism no contract {@link VoteCountingStrategy}. - */ - private final Map<Integer, VoteCountingStrategy> strategies; - - public VoteCountingStrategyProvider() { - strategies = load(); - } - - public Set<Integer> getStrategyIds() { - return ImmutableSet.copyOf(strategies.keySet()); - } - - public VoteCountingStrategy getStrategy(int strategyId) throws VoteCountigStrategyNotFound { - VoteCountingStrategy type = strategies.get(strategyId); - - if (type == null) { - throw new VoteCountigStrategyNotFound( - "Could not find strategy with id " + strategyId); - } - try { - //FIXME-tchemit-2012-06-24 : should we reinstanciate each time ? - return type.getClass().newInstance(); - } catch (Exception e) { - - throw new VoteCountigStrategyNotFound( - "Could not instanciate stragegy " + strategyId, e); - } - } - - protected Map<Integer, VoteCountingStrategy> load() { - Map<Integer, VoteCountingStrategy> result = Maps.newTreeMap(); - ServiceLoader<VoteCountingStrategy> loader = - ServiceLoader.load(VoteCountingStrategy.class); - - for (VoteCountingStrategy strategy : loader) { - int id = strategy.getId(); - if (result.containsKey(id)) { - throw new IllegalStateException( - "Strategy [" + - strategy.getI18nName() + "] with id " + id + - ", can not be used since the id is already used " + - "by strategy [" + result.get(id).getI18nName() + "] "); - } - if (log.isInfoEnabled()) { - log.info("Detected strategy [" + id + "-" + - strategy.getI18nName() + "] : " + - strategy.getClass().getName()); - } - result.put(id, strategy); - } - return result; - } - -} Copied: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceToVoteRenderType.java (from rev 3548, trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/ChoiceToVoteRenderType.java) =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceToVoteRenderType.java (rev 0) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceToVoteRenderType.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -0,0 +1,42 @@ +/* + * #%L + * Pollen :: VoteCounting Api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting.model; + +/** + * To define how to render a vote. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public enum ChoiceToVoteRenderType { + + /** + * To render as a check box. + * <p/> + * If check box is checked, then result should be value 1, otherwise + * result will be null. + */ + CHECKBOX, + /** To render as a text field. */ + TEXTFIELD +} Property changes on: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceToVoteRenderType.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/strategy/AbstractVoteCountingStrategy.java (from rev 3558, trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java) =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/strategy/AbstractVoteCountingStrategy.java (rev 0) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/strategy/AbstractVoteCountingStrategy.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -0,0 +1,187 @@ +/* + * #%L + * Pollen :: VoteCounting Api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting.strategy; + +import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import org.chorem.pollen.votecounting.model.ChoiceIdAble; +import org.chorem.pollen.votecounting.model.ChoiceScore; +import org.chorem.pollen.votecounting.model.VoteCountingResult; +import org.chorem.pollen.votecounting.model.VoteForChoice; +import org.chorem.pollen.votecounting.model.Voter; + +import java.io.Serializable; +import java.util.Collection; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.Set; + +import static org.nuiton.i18n.I18n.l_; + +/** + * Base abstract implementation of a {@link VoteCountingStrategy}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public abstract class AbstractVoteCountingStrategy implements VoteCountingStrategy { + + @Override + public String getStrategyName(Locale locale) { + String result = l_(locale, getI18nName()); + return result; + } + + @Override + public String getStrategyHelp(Locale locale) { + String voteName = l_(locale, getI18nName()); + String voteHelp = l_(locale, getI18nHelp()); + String result = l_(locale, "pollen.voteCountingType.help", voteName, voteHelp); + return result; + } + + public Map<String, ChoiceScore> votersToResult(Set<Voter> voters) { + // get all choice Id + Set<String> choiceIds = getAllChoiceIds(voters); + + Map<String, ChoiceScore> resultByChoice = Maps.newTreeMap(); + + // creates all empty result for choice + for (String choiceId : choiceIds) { + ChoiceScore choiceScore = ChoiceScore.newScore(choiceId, null); + resultByChoice.put(choiceId, choiceScore); + } + return resultByChoice; + } + + public VoteCountingResult resultToList(Map<String, ChoiceScore> resultByChoice) { + List<ChoiceScore> score = toChoiceScore(resultByChoice); + return VoteCountingResult.newResult(score); + } + + public List<ChoiceScore> toChoiceScore(Map<String, ChoiceScore> resultByChoice) { + List<ChoiceScore> score = Lists.newArrayList(resultByChoice.values()); + Collections.sort(score); + Collections.reverse(score); + return score; + } + + public Set<String> getAllChoiceIds(Set<Voter> voters) { + ChoiceIdAble.ChoiceIdAbleById function = new ChoiceIdAble.ChoiceIdAbleById(); + Set<String> result = Sets.newHashSet(); + for (Voter voter : voters) { + Iterable<String> transform = Iterables.transform( + voter.getVoteForChoices(), function); + Iterables.addAll(result, transform); + + } + return result; + } + + public Map<Voter, List<Set<String>>> buildVoterSortedChoices(Set<Voter> voters) { + + VoteForChoiceComparator comparator = new VoteForChoiceComparator(); + + Map<Voter, List<Set<String>>> voterSortedChoices = Maps.newHashMap(); + + for (Voter voter : voters) { + + List<Set<String>> sortedChoices = sortVoteForChoices( + voter.getVoteForChoices(), comparator); + voterSortedChoices.put(voter, sortedChoices); + } + return voterSortedChoices; + } + + public List<Set<String>> sortVoteForChoices(Set<VoteForChoice> voteForChoices, + Comparator<VoteForChoice> comparator) { + // get sort vote for choices + List<VoteForChoice> sortedChoices = Lists.newArrayList(voteForChoices); + Collections.sort(sortedChoices, comparator); + + // build ranks + List<Set<String>> result = Lists.newArrayList(); + + Set<String> set = Sets.newHashSet(); + result.add(set); + VoteForChoice lastVoteForChoice = null; + for (VoteForChoice voteForChoice : sortedChoices) { + if (lastVoteForChoice != null && + comparator.compare(lastVoteForChoice, voteForChoice) != 0) { + + // new rank found + // register it + result.add(set = Sets.newHashSet()); + } + + set.add(voteForChoice.getChoiceId()); + lastVoteForChoice = voteForChoice; + } + return result; + } + + public Set<String> getDirectWinners(Collection<List<Set<String>>> values) { + Set<String> result = null; + for (List<Set<String>> value : values) { + + Set<String> topChoices = value.get(0); + + if (result == null) { + // first time coming here + result = topChoices; + } else { + + if (!result.equals(topChoices)) { + + // not same first ranking, not direct winner + result = null; + break; + } + } + } + return result; + } + + public static class VoteForChoiceComparator implements Comparator<VoteForChoice>, Serializable { + + private static final long serialVersionUID = 1L; + + @Override + public int compare(VoteForChoice o1, VoteForChoice o2) { + Double v1 = o1.getVoteValue(); + Double v2 = o2.getVoteValue(); + if (v1 == null) { + v1 = Double.MAX_VALUE; + } + if (v2 == null) { + v2 = Double.MAX_VALUE; + } + return v1.intValue() - v2.intValue(); + } + } +} Property changes on: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/strategy/AbstractVoteCountingStrategy.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/strategy/VoteCountigStrategyNotFound.java (from rev 3548, trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountigStrategyNotFound.java) =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/strategy/VoteCountigStrategyNotFound.java (rev 0) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/strategy/VoteCountigStrategyNotFound.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -0,0 +1,41 @@ +/* + * #%L + * Pollen :: VoteCounting Api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting.strategy; + +/** + * Exception when a vote counting could not be found. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class VoteCountigStrategyNotFound extends RuntimeException { + private static final long serialVersionUID = 1L; + + public VoteCountigStrategyNotFound(String message) { + super(message); + } + + public VoteCountigStrategyNotFound(String message, Throwable cause) { + super(message, cause); + } +} Property changes on: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/strategy/VoteCountigStrategyNotFound.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategy.java (from rev 3548, trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategy.java) =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategy.java (rev 0) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategy.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -0,0 +1,90 @@ +/* + * #%L + * Pollen :: VoteCounting Api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting.strategy; + +import org.chorem.pollen.votecounting.model.ChoiceToVoteRenderType; +import org.chorem.pollen.votecounting.model.VoteCountingResult; +import org.chorem.pollen.votecounting.model.Voter; + +import java.util.Locale; +import java.util.Set; + +/** + * Contract of a vote counting method. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public interface VoteCountingStrategy { + + /** + * Obtains the unique id of this strategy. + * + * @return the unique id of this strategy. + */ + int getId(); + + /** + * Obtains the i18n name of this strategy. + * + * @return the i18n name of this strategy. + */ + String getI18nName(); + + /** + * Obtains the i18n help of this strategy. + * + * @return the i18n help of this strategy. + */ + String getI18nHelp(); + + /** + * Vote count for the given {@code voter} and return the result of it. + * + * @param voter the voter and their votes. + * @return the result of the vote counting for the given voter. + */ + VoteCountingResult votecount(Set<Voter> voter); + + String getDisplayVoteValue(Integer voteValue); + + boolean isChoiceInVote(Integer voteValue); + + String getStrategyName(Locale locale); + + String getStrategyHelp(Locale locale); + + boolean isVoteValueValid(Integer voteValue); + + String getVoteValueNotValidMessage(); + + boolean isTotalVoteValueValid(int totalValues); + + String getTotalVoteValueNotValidMessage(); + + boolean isVoteValueNull(Integer value); + + ChoiceToVoteRenderType getRenderType(); + + boolean isDisplayResultsByChoice(); +} Property changes on: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategy.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProvider.java (from rev 3548, trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingStrategyProvider.java) =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProvider.java (rev 0) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProvider.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -0,0 +1,101 @@ +/* + * #%L + * Pollen :: VoteCounting Api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting.strategy; + +import com.google.common.collect.ImmutableSet; +import com.google.common.collect.Maps; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import java.util.Map; +import java.util.ServiceLoader; +import java.util.Set; + +/** + * Provider of {@link VoteCountingStrategy}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class VoteCountingStrategyProvider { + + /** Logger. */ + private static final Log log = + LogFactory.getLog(VoteCountingStrategyProvider.class); + + /** + * List of available strageries detected via the {@link ServiceLoader} + * mecanism no contract {@link VoteCountingStrategy}. + */ + private final Map<Integer, VoteCountingStrategy> strategies; + + public VoteCountingStrategyProvider() { + strategies = load(); + } + + public Set<Integer> getStrategyIds() { + return ImmutableSet.copyOf(strategies.keySet()); + } + + public VoteCountingStrategy getStrategy(int strategyId) throws VoteCountigStrategyNotFound { + VoteCountingStrategy type = strategies.get(strategyId); + + if (type == null) { + throw new VoteCountigStrategyNotFound( + "Could not find strategy with id " + strategyId); + } + try { + //FIXME-tchemit-2012-06-24 : should we reinstanciate each time ? + return type.getClass().newInstance(); + } catch (Exception e) { + + throw new VoteCountigStrategyNotFound( + "Could not instanciate stragegy " + strategyId, e); + } + } + + protected Map<Integer, VoteCountingStrategy> load() { + Map<Integer, VoteCountingStrategy> result = Maps.newTreeMap(); + ServiceLoader<VoteCountingStrategy> loader = + ServiceLoader.load(VoteCountingStrategy.class); + + for (VoteCountingStrategy strategy : loader) { + int id = strategy.getId(); + if (result.containsKey(id)) { + throw new IllegalStateException( + "Strategy [" + + strategy.getI18nName() + "] with id " + id + + ", can not be used since the id is already used " + + "by strategy [" + result.get(id).getI18nName() + "] "); + } + if (log.isInfoEnabled()) { + log.info("Detected strategy [" + id + "-" + + strategy.getI18nName() + "] : " + + strategy.getClass().getName()); + } + result.put(id, strategy); + } + return result; + } + +} Property changes on: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProvider.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java =================================================================== --- trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -1,50 +0,0 @@ -/* - * #%L - * Pollen :: VoteCounting Api - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.votecounting; - -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Tests the {@link VoteCountingStrategyProvider}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.5 - */ -public class VoteCountingStrategyProviderTest { - - protected static VoteCountingStrategyProvider provider; - - - @BeforeClass - public static void beforeClass() throws Exception { - provider = new VoteCountingStrategyProvider(); - } - - @Test(expected = VoteCountigStrategyNotFound.class) - public void getStrategy() throws Exception { - - Assert.assertNull(provider.getStrategy(-1)); - } -} Copied: trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java (from rev 3548, trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java) =================================================================== --- trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java (rev 0) +++ trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -0,0 +1,50 @@ +/* + * #%L + * Pollen :: VoteCounting Api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting.strategy; + +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * Tests the {@link VoteCountingStrategyProvider}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class VoteCountingStrategyProviderTest { + + protected static VoteCountingStrategyProvider provider; + + + @BeforeClass + public static void beforeClass() throws Exception { + provider = new VoteCountingStrategyProvider(); + } + + @Test(expected = VoteCountigStrategyNotFound.class) + public void getStrategy() throws Exception { + + Assert.assertNull(provider.getStrategy(-1)); + } +} Property changes on: trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-votecounting-strategy ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml .idea .project .classpath .settings Added: trunk/pollen-votecounting-strategy/LICENSE.txt =================================================================== Added: trunk/pollen-votecounting-strategy/README.txt =================================================================== Added: trunk/pollen-votecounting-strategy/changelog.txt =================================================================== Added: trunk/pollen-votecounting-strategy/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy/pom.xml (rev 0) +++ trunk/pollen-votecounting-strategy/pom.xml 2012-06-26 03:16:11 UTC (rev 3559) @@ -0,0 +1,119 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + +  +  +  + + <parent> + <groupId>org.chorem</groupId> + <artifactId>pollen</artifactId> + <version>1.5-SNAPSHOT</version> + </parent> + + <groupId>org.chorem.pollen</groupId> + <artifactId>pollen-votecounting-strategy</artifactId> + + <modules> + <module>../pollen-votecounting-strategy-normal</module> + <module>../pollen-votecounting-strategy-percentage</module> + <module>../pollen-votecounting-strategy-condorcet</module> + <module>../pollen-votecounting-strategy-number</module> + <module>../pollen-votecounting-strategy-borda</module> + <module>../pollen-votecounting-strategy-instant-runoff</module> + <module>../pollen-votecounting-strategy-coombs</module> + </modules> + + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-votecounting-strategy-normal</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-votecounting-strategy-percentage</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-votecounting-strategy-condorcet</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-votecounting-strategy-number</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-votecounting-strategy-borda</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-votecounting-strategy-instant-runoff</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-votecounting-strategy-coombs</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> + + <name>Pollen :: VoteCounting strategy</name> + <description> + Aggregator of all implementations of votecounting strategy + </description> + + + <packaging>pom</packaging> + + <profiles> + + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <build> + <plugins> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <reportPlugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <reports> + <report>index</report> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + </reports> + </plugin> + </reportPlugins> + </configuration> + </plugin> + </plugins> + </build> + + </profile> + + </profiles> + +</project> + Added: trunk/pollen-votecounting-strategy/src/site/site_en.xml =================================================================== --- trunk/pollen-votecounting-strategy/src/site/site_en.xml (rev 0) +++ trunk/pollen-votecounting-strategy/src/site/site_en.xml 2012-06-26 03:16:11 UTC (rev 3559) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="${project.name}"> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="User"> + <item name="About" href="./index.html"/> + </menu> + + <menu name="Language"> + <item name="Français" href="index.html"/> + <item name="English" href="../index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> + +</project> + Added: trunk/pollen-votecounting-strategy/src/site/site_fr.xml =================================================================== --- trunk/pollen-votecounting-strategy/src/site/site_fr.xml (rev 0) +++ trunk/pollen-votecounting-strategy/src/site/site_fr.xml 2012-06-26 03:16:11 UTC (rev 3559) @@ -0,0 +1,46 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<project name="${project.name}"> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="A propos" href="./index.html"/> + </menu> + + <menu name="Language"> + <item name="Français" href="index.html"/> + <item name="English" href="../index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> + +</project> + Deleted: trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetStrategy.java =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetStrategy.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetStrategy.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -1,331 +0,0 @@ -/* - * #%L - * Pollen :: VoteCounting strategy :: Condorcet - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.votecounting; - -import com.google.common.collect.Lists; -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.pollen.votecounting.model.ChoiceIdAble; -import org.chorem.pollen.votecounting.model.ChoiceScore; -import org.chorem.pollen.votecounting.model.VoteCountingResult; -import org.chorem.pollen.votecounting.model.VoteForChoice; -import org.chorem.pollen.votecounting.model.Voter; - -import java.io.Serializable; -import java.math.BigDecimal; -import java.util.Arrays; -import java.util.Comparator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import static org.nuiton.i18n.I18n.n_; - -/** - * Condorcet. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.5 - */ -public class CondorcetStrategy extends AbstractVoteCountingStrategy { - - public static final int ID = 2; - - /** Logger. */ - private static final Log log = LogFactory.getLog(CondorcetStrategy.class); - - @Override - public int getId() { - return ID; - } - - @Override - public String getI18nName() { - return n_("pollen.voteCountingType.condorcet"); - } - - @Override - public String getI18nHelp() { - return n_("pollen.voteCountingType.condorcet.help"); - } - - @Override - public String getTotalVoteValueNotValidMessage() { - // no validation on total value, so no message - return null; - } - - @Override - public String getVoteValueNotValidMessage() { - return n_("pollen.error.vote.invalidCondorcetVoteValue"); - } - - @Override - public String getDisplayVoteValue(Integer voteValue) { - return voteValue == null ? "" : String.valueOf(voteValue); - } - - @Override - public ChoiceToVoteRenderType getRenderType() { - return ChoiceToVoteRenderType.TEXTFIELD; - } - - @Override - public boolean isChoiceInVote(Integer voteValue) { - return voteValue != null && voteValue > 0 && voteValue < 100; - } - - @Override - public boolean isVoteValueNull(Integer voteValue) { - return voteValue == null; - } - - @Override - public boolean isDisplayResultsByChoice() { - return false; - } - - @Override - public boolean isVoteValueValid(Integer voteValue) { - return voteValue != null && voteValue > 0; - } - - @Override - public boolean isTotalVoteValueValid(int totalValues) { - // no validation on total value - return true; - } - - @Override - public VoteCountingResult votecount(Set<Voter> voters) { - - // get empty result by choice - Map<String, ChoiceScore> resultByChoice = votersToResult(voters); - - // get order over choices (needed to get coordinates over matrix) - List<String> choiceIds = Lists.newArrayList(resultByChoice.keySet()); - - // nb of choices - int nbChoices = choiceIds.size(); - - //matrix of pairwise - double[][] matrix = new double[nbChoices][nbChoices]; - - // compute pairwise battle matrix and try to have a direct winner(s) - Set<String> winners = computePairWiseMatrix(choiceIds, voters, matrix); - - // compute nb battles wins for each choice - // and store it as choice score value - computeNbBattlesByChoice(resultByChoice, choiceIds, matrix); - - // get choice score ordered by their number of win battles - List<ChoiceScore> choiceScores = toChoiceScore(resultByChoice); - - if (winners != null) { - - // there is winner(s), re-add them to - - if (log.isDebugEnabled()) { - log.debug("Direct winners : " + winners); - } - for (String choiceId : winners) { - ChoiceScore choiceScore = resultByChoice.get(choiceId); - choiceScores.remove(choiceScore); - choiceScores.add(0, choiceScore); - } - } else { - - // no direct winner, must resolv conflicts - - resolvConflicts(choiceScores, matrix); - } - - // transform map of result to list of them (and sort them) - VoteCountingResult result = resultToList(null, resultByChoice); - return result; - } - - protected void resolvConflicts(List<ChoiceScore> choiceScores, - double[][] matrix) { - - // for the moment we use only number of win battles - // so nothing more to do here... - } - - protected void computeNbBattlesByChoice(Map<String, ChoiceScore> resultByChoice, - List<String> choiceIds, - double[][] matrix) { - - int nbChoices = choiceIds.size(); - - for (String choiceId : choiceIds) { - - int i = choiceIds.indexOf(choiceId); - - double nbBattles = 0; - for (int j = 0; j < nbChoices; j++) { - double aRow = matrix[i][j]; - nbBattles += aRow; - } - - resultByChoice.get(choiceId).setScoreValue( - BigDecimal.valueOf(nbBattles)); - - if (log.isDebugEnabled()) { - log.debug("Nb battle wins for choice " + choiceId + ": " + nbBattles); - } - } - } - - private Set<String> computePairWiseMatrix(List<String> choiceIds, - Set<Voter> voters, - double[][] matrix) { - - int nbChoices = choiceIds.size(); - - Set<String> winners = null; - - VoteForChoiceComparator comparator = new VoteForChoiceComparator(); - - double[] currentVoteWinner = new double[choiceIds.size()]; - - boolean firstVoter = true; - for (Voter voter : voters) { - - if (log.isDebugEnabled()) { - log.debug("Start count for voter " + voter.getVoterId()); - } - double voterWeight = voter.getWeight(); - - Arrays.fill(currentVoteWinner, 0); - - Map<String, VoteForChoice> voteByChoiceIds = - Maps.uniqueIndex(voter.getVoteForChoices(), - new ChoiceIdAble.ChoiceIdAbleById()); - - double maxBattleWins = 0; - - for (String choiceId : choiceIds) { - - // get vote for this choice - VoteForChoice voteForChoice = voteByChoiceIds.get(choiceId); - - int x = choiceIds.indexOf(choiceId); - - for (VoteForChoice voteForChoice1 : voter.getVoteForChoices()) { - - String choiceId1 = voteForChoice1.getChoiceId(); - if (choiceId.equals(choiceId1)) { - - // can not battle same choice - continue; - } - - int y = choiceIds.indexOf(choiceId1); - - int compare = comparator.compare(voteForChoice, - voteForChoice1); - - if (compare > 0) { - - // voteForChoice wins his battle - - int pos = x * nbChoices + y; - - matrix[x][y] = matrix[x][y] + voterWeight; - if (log.isTraceEnabled()) { - log.trace("battle [" + choiceId + "<" + - voteForChoice.getVoteValue() + "> - " + - choiceId1 + "<" + - voteForChoice1.getVoteValue() + - ">] wins (store to " + pos + - ", new value=" + matrix[x][y] + ")"); - } - maxBattleWins = Math.max( - maxBattleWins, - currentVoteWinner[x] = - currentVoteWinner[x] + voterWeight); - } - } - } - - if (firstVoter || winners != null) { - - // still have a winner, le'ts compute current winner - Set<String> currentVoteWinners = Sets.newHashSet(); - - // find winners of this vote - for (int i = 0; i < currentVoteWinner.length; i++) { - if (maxBattleWins == currentVoteWinner[i]) { - - // this is a winner for this vote - String choiceId = choiceIds.get(i); - currentVoteWinners.add(choiceId); - } - } - if (log.isDebugEnabled()) { - log.debug("Winners of this vote : " + currentVoteWinners); - } - - - if (firstVoter) { - - // keep this first result - winners = currentVoteWinners; - } else if (!winners.equals(currentVoteWinners)) { - - // current vote has not same winners than previous, - // so will need resolution - winners = null; - - if (log.isDebugEnabled()) { - log.debug("Dismatch winners (will need resolv...)"); - } - } - } - - firstVoter = false; - } - return winners; - } - - public static class VoteForChoiceComparator implements Comparator<VoteForChoice>, Serializable { - - private static final long serialVersionUID = 1L; - - @Override - public int compare(VoteForChoice o1, VoteForChoice o2) { - Double v1 = o1.getVoteValue(); - Double v2 = o2.getVoteValue(); - if (v1 == null) { - v1 = Double.MAX_VALUE; - } - if (v2 == null) { - v2 = Double.MAX_VALUE; - } - return v2.intValue() - v1.intValue(); - } - } -} Copied: trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/votecounting/strategy/CondorcetStrategy.java (from rev 3557, trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetStrategy.java) =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/votecounting/strategy/CondorcetStrategy.java (rev 0) +++ trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/votecounting/strategy/CondorcetStrategy.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -0,0 +1,313 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Condorcet + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting.strategy; + +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.votecounting.model.ChoiceIdAble; +import org.chorem.pollen.votecounting.model.ChoiceScore; +import org.chorem.pollen.votecounting.model.ChoiceToVoteRenderType; +import org.chorem.pollen.votecounting.model.VoteCountingResult; +import org.chorem.pollen.votecounting.model.VoteForChoice; +import org.chorem.pollen.votecounting.model.Voter; + +import java.math.BigDecimal; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import static org.nuiton.i18n.I18n.n_; + +/** + * Condorcet. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class CondorcetStrategy extends AbstractVoteCountingStrategy { + + public static final int ID = 2; + + /** Logger. */ + private static final Log log = LogFactory.getLog(CondorcetStrategy.class); + + @Override + public int getId() { + return ID; + } + + @Override + public String getI18nName() { + return n_("pollen.voteCountingType.condorcet"); + } + + @Override + public String getI18nHelp() { + return n_("pollen.voteCountingType.condorcet.help"); + } + + @Override + public String getTotalVoteValueNotValidMessage() { + // no validation on total value, so no message + return null; + } + + @Override + public String getVoteValueNotValidMessage() { + return n_("pollen.error.vote.invalidCondorcetVoteValue"); + } + + @Override + public String getDisplayVoteValue(Integer voteValue) { + return voteValue == null ? "" : String.valueOf(voteValue); + } + + @Override + public ChoiceToVoteRenderType getRenderType() { + return ChoiceToVoteRenderType.TEXTFIELD; + } + + @Override + public boolean isChoiceInVote(Integer voteValue) { + return voteValue != null && voteValue > 0 && voteValue < 100; + } + + @Override + public boolean isVoteValueNull(Integer voteValue) { + return voteValue == null; + } + + @Override + public boolean isDisplayResultsByChoice() { + return false; + } + + @Override + public boolean isVoteValueValid(Integer voteValue) { + return voteValue != null && voteValue > 0; + } + + @Override + public boolean isTotalVoteValueValid(int totalValues) { + // no validation on total value + return true; + } + + @Override + public VoteCountingResult votecount(Set<Voter> voters) { + + // get empty result by choice + Map<String, ChoiceScore> resultByChoice = votersToResult(voters); + + // get order over choices (needed to get coordinates over matrix) + List<String> choiceIds = Lists.newArrayList(resultByChoice.keySet()); + + // nb of choices + int nbChoices = choiceIds.size(); + + //matrix of pairwise + double[][] matrix = new double[nbChoices][nbChoices]; + + // compute pairwise battle matrix and try to have a direct winner(s) + Set<String> winners = computePairWiseMatrix(choiceIds, voters, matrix); + + // compute nb battles wins for each choice + // and store it as choice score value + computeNbBattlesByChoice(resultByChoice, choiceIds, matrix); + + // get choice score ordered by their number of win battles + List<ChoiceScore> choiceScores = toChoiceScore(resultByChoice); + + if (winners != null) { + + // there is winner(s), re-add them to + + if (log.isDebugEnabled()) { + log.debug("Direct winners : " + winners); + } + for (String choiceId : winners) { + ChoiceScore choiceScore = resultByChoice.get(choiceId); + choiceScores.remove(choiceScore); + choiceScores.add(0, choiceScore); + } + } else { + + // no direct winner, must resolv conflicts + + resolvConflicts(choiceScores, matrix); + } + + // transform map of result to list of them (and sort them) + VoteCountingResult result = resultToList(resultByChoice); + return result; + } + + protected void resolvConflicts(List<ChoiceScore> choiceScores, + double[][] matrix) { + + // for the moment we use only number of win battles + // so nothing more to do here... + } + + protected void computeNbBattlesByChoice(Map<String, ChoiceScore> resultByChoice, + List<String> choiceIds, + double[][] matrix) { + + int nbChoices = choiceIds.size(); + + for (String choiceId : choiceIds) { + + int i = choiceIds.indexOf(choiceId); + + double nbBattles = 0; + for (int j = 0; j < nbChoices; j++) { + double aRow = matrix[i][j]; + nbBattles += aRow; + } + + resultByChoice.get(choiceId).setScoreValue( + BigDecimal.valueOf(nbBattles)); + + if (log.isDebugEnabled()) { + log.debug("Nb battle wins for choice " + choiceId + ": " + nbBattles); + } + } + } + + private Set<String> computePairWiseMatrix(List<String> choiceIds, + Set<Voter> voters, + double[][] matrix) { + + int nbChoices = choiceIds.size(); + + Set<String> winners = null; + + VoteForChoiceComparator comparator = new VoteForChoiceComparator(); + + double[] currentVoteWinner = new double[choiceIds.size()]; + + boolean firstVoter = true; + for (Voter voter : voters) { + + if (log.isDebugEnabled()) { + log.debug("Start count for voter " + voter.getVoterId()); + } + double voterWeight = voter.getWeight(); + + Arrays.fill(currentVoteWinner, 0); + + Map<String, VoteForChoice> voteByChoiceIds = + Maps.uniqueIndex(voter.getVoteForChoices(), + new ChoiceIdAble.ChoiceIdAbleById()); + + double maxBattleWins = 0; + + for (String choiceId : choiceIds) { + + // get vote for this choice + VoteForChoice voteForChoice = voteByChoiceIds.get(choiceId); + + int x = choiceIds.indexOf(choiceId); + + for (VoteForChoice voteForChoice1 : voter.getVoteForChoices()) { + + String choiceId1 = voteForChoice1.getChoiceId(); + if (choiceId.equals(choiceId1)) { + + // can not battle same choice + continue; + } + + int y = choiceIds.indexOf(choiceId1); + + int compare = comparator.compare(voteForChoice, + voteForChoice1); + + if (compare < 0) { + + // voteForChoice wins his battle + + int pos = x * nbChoices + y; + + matrix[x][y] = matrix[x][y] + voterWeight; + if (log.isTraceEnabled()) { + log.trace("battle [" + choiceId + "<" + + voteForChoice.getVoteValue() + "> - " + + choiceId1 + "<" + + voteForChoice1.getVoteValue() + + ">] wins (store to " + pos + + ", new value=" + matrix[x][y] + ")"); + } + maxBattleWins = Math.max( + maxBattleWins, + currentVoteWinner[x] = + currentVoteWinner[x] + voterWeight); + } + } + } + + if (firstVoter || winners != null) { + + // still have a winner, le'ts compute current winner + Set<String> currentVoteWinners = Sets.newHashSet(); + + // find winners of this vote + for (int i = 0; i < currentVoteWinner.length; i++) { + if (maxBattleWins == currentVoteWinner[i]) { + + // this is a winner for this vote + String choiceId = choiceIds.get(i); + currentVoteWinners.add(choiceId); + } + } + if (log.isDebugEnabled()) { + log.debug("Winners of this vote : " + currentVoteWinners); + } + + + if (firstVoter) { + + // keep this first result + winners = currentVoteWinners; + } else if (!winners.equals(currentVoteWinners)) { + + // current vote has not same winners than previous, + // so will need resolution + winners = null; + + if (log.isDebugEnabled()) { + log.debug("Dismatch winners (will need resolv...)"); + } + } + } + + firstVoter = false; + } + return winners; + } + +} Property changes on: trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/votecounting/strategy/CondorcetStrategy.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/pollen-votecounting-strategy-condorcet/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-votecounting-strategy-condorcet/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy 2012-06-26 03:16:11 UTC (rev 3559) @@ -1 +0,0 @@ -org.chorem.pollen.votecounting.CondorcetStrategy Copied: trunk/pollen-votecounting-strategy-condorcet/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.strategy.VoteCountingStrategy (from rev 3552, trunk/pollen-votecounting-strategy-condorcet/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy) =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.strategy.VoteCountingStrategy (rev 0) +++ trunk/pollen-votecounting-strategy-condorcet/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.strategy.VoteCountingStrategy 2012-06-26 03:16:11 UTC (rev 3559) @@ -0,0 +1 @@ +org.chorem.pollen.votecounting.strategy.CondorcetStrategy Property changes on: trunk/pollen-votecounting-strategy-condorcet/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.strategy.VoteCountingStrategy ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetStrategyTest.java =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetStrategyTest.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetStrategyTest.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -1,316 +0,0 @@ -/* - * #%L - * Pollen :: VoteCounting strategy :: Condorcet - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.votecounting; - -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; -import org.chorem.pollen.votecounting.model.ChoiceIdAble; -import org.chorem.pollen.votecounting.model.ChoiceScore; -import org.chorem.pollen.votecounting.model.VoteCountingResult; -import org.chorem.pollen.votecounting.model.Voter; -import org.chorem.pollen.votecounting.model.VoterBuilder; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -import java.math.BigDecimal; -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * Tests the {@link CondorcetStrategy}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.5 - */ -public class CondorcetStrategyTest { - - public static final String CHOICE_A = "a"; - - public static final String CHOICE_B = "b"; - - public static final String CHOICE_C = "c"; - - protected static VoteCountingStrategyProvider provider; - - protected VoteCountingStrategy strategy; - - @BeforeClass - public static void beforeClass() throws Exception { - provider = new VoteCountingStrategyProvider(); - } - - @Before - public void setUp() throws Exception { - strategy = provider.getStrategy(CondorcetStrategy.ID); - } - - @Test - public void simpleVotecount() throws Exception { - - // Simple poll (all weight to 1) - // 1 (a=1 b=2 c=null) - // 2 (a=1 b=3 c=2) - // 3 (a=1 b=null c=2) - // Result (a=6 b=1 c=2) - - Set<Voter> voters = new VoterBuilder(). - newVoter("1", 1.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, 2.). - addVoteForChoice(CHOICE_C, null). - newVoter("2", 1.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, 3.). - addVoteForChoice(CHOICE_C, 2.). - newVoter("3", 1.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, null). - addVoteForChoice(CHOICE_C, 2.). - getVoters(); - - VoteCountingResult result = strategy.votecount(voters); - - Assert.assertNotNull(result); - List<ChoiceScore> scores = result.getScores(); - Assert.assertNotNull(scores); - Assert.assertEquals(3, scores.size()); - - assertChoiceScore(scores.get(0), CHOICE_A, BigDecimal.valueOf(6.)); - assertChoiceScore(scores.get(1), CHOICE_C, BigDecimal.valueOf(2.)); - assertChoiceScore(scores.get(2), CHOICE_B, BigDecimal.valueOf(1.)); - } - - @Test - public void simpleVotecount0() throws Exception { - - // Simple poll (all weight to 1) - // 1 (a=1 b=2 c=null) - // 2 (a=3 b=2 c=1) - // 3 (a=1 b=null c=2) - // Result (a=4 b=2 c=3) - - Set<Voter> voters = new VoterBuilder(). - newVoter("1", 1.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, 2.). - addVoteForChoice(CHOICE_C, null). - newVoter("2", 1.). - addVoteForChoice(CHOICE_A, 3.). - addVoteForChoice(CHOICE_B, 2.). - addVoteForChoice(CHOICE_C, 1.). - newVoter("3", 1.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, null). - addVoteForChoice(CHOICE_C, 2.). - getVoters(); - - VoteCountingResult result = strategy.votecount(voters); - - Assert.assertNotNull(result); - List<ChoiceScore> scores = result.getScores(); - Assert.assertNotNull(scores); - Assert.assertEquals(3, scores.size()); - - assertChoiceScore(scores.get(0), CHOICE_A, BigDecimal.valueOf(4.)); - assertChoiceScore(scores.get(1), CHOICE_C, BigDecimal.valueOf(3.)); - assertChoiceScore(scores.get(2), CHOICE_B, BigDecimal.valueOf(2.)); - } - - @Test - public void simpleVotecount2() throws Exception { - - // Simple poll (all weight to 1) - // 1 (a=1 b=2 c=null) - // 2 (a=1 b=2 c=1) - // 3 (a=null b=null c=2) - // Result (a=3 b=1 c=3) - - Set<Voter> voters = new VoterBuilder(). - newVoter("1", 1.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, 2.). - addVoteForChoice(CHOICE_C, null). - newVoter("2", 1.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, 2.). - addVoteForChoice(CHOICE_C, 1.). - newVoter("3", 1.). - addVoteForChoice(CHOICE_A, null). - addVoteForChoice(CHOICE_B, null). - addVoteForChoice(CHOICE_C, 2.). - getVoters(); - - VoteCountingResult result = strategy.votecount(voters); - - Assert.assertNotNull(result); - List<ChoiceScore> scores = result.getScores(); - Assert.assertNotNull(scores); - Assert.assertEquals(3, scores.size()); - - assertChoiceScoreEquals(BigDecimal.valueOf(3.), - Sets.newHashSet(scores.get(0), - scores.get(1)), - CHOICE_A, CHOICE_C); - assertChoiceScore(scores.get(2), CHOICE_B, BigDecimal.valueOf(1.)); - } - - @Test - public void simpleVotecount3() throws Exception { - - // Simple poll (all weight to 1) - // 1 (a=1 b=null c=null) - // 2 (a=null b=1 c=null) - // 3 (a=null b=null c=1) - // Result (a=2 b=2 c=2) - - Set<Voter> voters = new VoterBuilder(). - newVoter("1", 1.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, null). - addVoteForChoice(CHOICE_C, null). - newVoter("2", 1.). - addVoteForChoice(CHOICE_A, null). - addVoteForChoice(CHOICE_B, 1.). - addVoteForChoice(CHOICE_C, null). - newVoter("3", 1.). - addVoteForChoice(CHOICE_A, null). - addVoteForChoice(CHOICE_B, null). - addVoteForChoice(CHOICE_C, 1.). - getVoters(); - - VoteCountingResult result = strategy.votecount(voters); - - Assert.assertNotNull(result); - List<ChoiceScore> scores = result.getScores(); - Assert.assertNotNull(scores); - Assert.assertEquals(3, scores.size()); - - assertChoiceScoreEquals(BigDecimal.valueOf(2.), - Sets.newHashSet(scores.get(0), - scores.get(1), - scores.get(2) - ), - CHOICE_A, CHOICE_B, CHOICE_C); - } - - @Test - public void weightedVotecount1() throws Exception { - - // poll with weighted vote - // 1 (x2) (a=1 b=null c=null) - // 2 (x1) (a=null b=1 c=null) - // 3 (x1) (a=null b=1 c=2) - // Result (a=2 b=2 c=1) - - Set<Voter> voters = new VoterBuilder(). - newVoter("1", 2.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, null). - addVoteForChoice(CHOICE_C, null). - newVoter("2", 1.). - addVoteForChoice(CHOICE_A, null). - addVoteForChoice(CHOICE_B, 1.). - addVoteForChoice(CHOICE_C, null). - newVoter("3", 1.). - addVoteForChoice(CHOICE_A, null). - addVoteForChoice(CHOICE_B, 1.). - addVoteForChoice(CHOICE_C, 2.). - getVoters(); - - VoteCountingResult result = strategy.votecount(voters); - - Assert.assertNotNull(result); - List<ChoiceScore> scores = result.getScores(); - Assert.assertNotNull(scores); - Assert.assertEquals(3, scores.size()); - - assertChoiceScoreEquals(BigDecimal.valueOf(4.), - Sets.newHashSet(scores.get(0), - scores.get(1)), - CHOICE_A, CHOICE_B); - assertChoiceScore(scores.get(2), CHOICE_C, BigDecimal.valueOf(1.)); - } - - @Test - public void weightedVotecount2() throws Exception { - - // poll with weighted vote - // 1 (x2) (a=1 b=null c=null) - // 2 (x1) (a=null b=1 c=null) - // 3 (x3) (a=null b=2 c=1) - // Result (a=2 b=4 c=3) - - Set<Voter> voters = new VoterBuilder(). - newVoter("1", 2.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, null). - addVoteForChoice(CHOICE_C, null). - newVoter("2", 1.). - addVoteForChoice(CHOICE_A, null). - addVoteForChoice(CHOICE_B, 1.). - addVoteForChoice(CHOICE_C, null). - newVoter("3", 3.). - addVoteForChoice(CHOICE_A, null). - addVoteForChoice(CHOICE_B, 2.). - addVoteForChoice(CHOICE_C, 1.). - getVoters(); - - VoteCountingResult result = strategy.votecount(voters); - - Assert.assertNotNull(result); - List<ChoiceScore> scores = result.getScores(); - Assert.assertNotNull(scores); - Assert.assertEquals(3, scores.size()); - - assertChoiceScore(scores.get(0), CHOICE_C, BigDecimal.valueOf(6.)); - assertChoiceScore(scores.get(1), CHOICE_B, BigDecimal.valueOf(5.)); - assertChoiceScore(scores.get(2), CHOICE_A, BigDecimal.valueOf(4.)); - } - - public static void assertChoiceScore(ChoiceScore choiceScore, - String choiceId, - BigDecimal choiceResult) { - Assert.assertNotNull(choiceScore); - Assert.assertEquals(choiceId, choiceScore.getChoiceId()); - Assert.assertEquals(choiceResult, choiceScore.getScoreValue()); - } - - public static void assertChoiceScoreEquals(BigDecimal choiceResult, - Set<ChoiceScore> choiceScores, - String... choiceIds) { - - Assert.assertNotNull(choiceScores); - Map<String, ChoiceScore> choicesById = Maps.uniqueIndex( - choiceScores, new ChoiceIdAble.ChoiceIdAbleById()); - for (String choiceId : choiceIds) { - - ChoiceScore choiceScore = choicesById.get(choiceId); - Assert.assertNotNull(choiceScore); - assertChoiceScore(choiceScore, choiceId, choiceResult); - } - } - -} Deleted: trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -1,49 +0,0 @@ -/* - * #%L - * Pollen :: VoteCounting strategy :: Condorcet - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.votecounting; - -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Tests the {@link VoteCountingStrategyProvider}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.5 - */ -public class VoteCountingStrategyProviderTest { - - protected static VoteCountingStrategyProvider provider; - - @BeforeClass - public static void beforeClass() throws Exception { - provider = new VoteCountingStrategyProvider(); - } - - @Test - public void getStrategy() throws Exception { - - Assert.assertNotNull(provider.getStrategy(CondorcetStrategy.ID)); - } -} Copied: trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/strategy/CondorcetStrategyTest.java (from rev 3557, trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetStrategyTest.java) =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/strategy/CondorcetStrategyTest.java (rev 0) +++ trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/strategy/CondorcetStrategyTest.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -0,0 +1,316 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Condorcet + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting.strategy; + +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import org.chorem.pollen.votecounting.model.ChoiceIdAble; +import org.chorem.pollen.votecounting.model.ChoiceScore; +import org.chorem.pollen.votecounting.model.VoteCountingResult; +import org.chorem.pollen.votecounting.model.Voter; +import org.chorem.pollen.votecounting.model.VoterBuilder; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Tests the {@link CondorcetStrategy}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class CondorcetStrategyTest { + + public static final String CHOICE_A = "a"; + + public static final String CHOICE_B = "b"; + + public static final String CHOICE_C = "c"; + + protected static VoteCountingStrategyProvider provider; + + protected VoteCountingStrategy strategy; + + @BeforeClass + public static void beforeClass() throws Exception { + provider = new VoteCountingStrategyProvider(); + } + + @Before + public void setUp() throws Exception { + strategy = provider.getStrategy(CondorcetStrategy.ID); + } + + @Test + public void simpleVotecount() throws Exception { + + // Simple poll (all weight to 1) + // 1 (a=1 b=2 c=null) + // 2 (a=1 b=3 c=2) + // 3 (a=1 b=null c=2) + // Result (a=6 b=1 c=2) + + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 2.). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 3.). + addVoteForChoice(CHOICE_C, 2.). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, 2.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScore(scores.get(0), CHOICE_A, BigDecimal.valueOf(6.)); + assertChoiceScore(scores.get(1), CHOICE_C, BigDecimal.valueOf(2.)); + assertChoiceScore(scores.get(2), CHOICE_B, BigDecimal.valueOf(1.)); + } + + @Test + public void simpleVotecount0() throws Exception { + + // Simple poll (all weight to 1) + // 1 (a=1 b=2 c=null) + // 2 (a=3 b=2 c=1) + // 3 (a=1 b=null c=2) + // Result (a=4 b=2 c=3) + + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 2.). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, 3.). + addVoteForChoice(CHOICE_B, 2.). + addVoteForChoice(CHOICE_C, 1.). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, 2.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScore(scores.get(0), CHOICE_A, BigDecimal.valueOf(4.)); + assertChoiceScore(scores.get(1), CHOICE_C, BigDecimal.valueOf(3.)); + assertChoiceScore(scores.get(2), CHOICE_B, BigDecimal.valueOf(2.)); + } + + @Test + public void simpleVotecount2() throws Exception { + + // Simple poll (all weight to 1) + // 1 (a=1 b=2 c=null) + // 2 (a=1 b=2 c=1) + // 3 (a=null b=null c=2) + // Result (a=3 b=1 c=3) + + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 2.). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 2.). + addVoteForChoice(CHOICE_C, 1.). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, 2.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScoreEquals(BigDecimal.valueOf(3.), + Sets.newHashSet(scores.get(0), + scores.get(1)), + CHOICE_A, CHOICE_C); + assertChoiceScore(scores.get(2), CHOICE_B, BigDecimal.valueOf(1.)); + } + + @Test + public void simpleVotecount3() throws Exception { + + // Simple poll (all weight to 1) + // 1 (a=1 b=null c=null) + // 2 (a=null b=1 c=null) + // 3 (a=null b=null c=1) + // Result (a=2 b=2 c=2) + + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, 1.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScoreEquals(BigDecimal.valueOf(2.), + Sets.newHashSet(scores.get(0), + scores.get(1), + scores.get(2) + ), + CHOICE_A, CHOICE_B, CHOICE_C); + } + + @Test + public void weightedVotecount1() throws Exception { + + // poll with weighted vote + // 1 (x2) (a=1 b=null c=null) + // 2 (x1) (a=null b=1 c=null) + // 3 (x1) (a=null b=1 c=2) + // Result (a=2 b=2 c=1) + + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 2.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, 2.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScoreEquals(BigDecimal.valueOf(4.), + Sets.newHashSet(scores.get(0), + scores.get(1)), + CHOICE_A, CHOICE_B); + assertChoiceScore(scores.get(2), CHOICE_C, BigDecimal.valueOf(1.)); + } + + @Test + public void weightedVotecount2() throws Exception { + + // poll with weighted vote + // 1 (x2) (a=1 b=null c=null) + // 2 (x1) (a=null b=1 c=null) + // 3 (x3) (a=null b=2 c=1) + // Result (a=2 b=4 c=3) + + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 2.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 3.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 2.). + addVoteForChoice(CHOICE_C, 1.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScore(scores.get(0), CHOICE_C, BigDecimal.valueOf(6.)); + assertChoiceScore(scores.get(1), CHOICE_B, BigDecimal.valueOf(5.)); + assertChoiceScore(scores.get(2), CHOICE_A, BigDecimal.valueOf(4.)); + } + + public static void assertChoiceScore(ChoiceScore choiceScore, + String choiceId, + BigDecimal choiceResult) { + Assert.assertNotNull(choiceScore); + Assert.assertEquals(choiceId, choiceScore.getChoiceId()); + Assert.assertEquals(choiceResult, choiceScore.getScoreValue()); + } + + public static void assertChoiceScoreEquals(BigDecimal choiceResult, + Set<ChoiceScore> choiceScores, + String... choiceIds) { + + Assert.assertNotNull(choiceScores); + Map<String, ChoiceScore> choicesById = Maps.uniqueIndex( + choiceScores, new ChoiceIdAble.ChoiceIdAbleById()); + for (String choiceId : choiceIds) { + + ChoiceScore choiceScore = choicesById.get(choiceId); + Assert.assertNotNull(choiceScore); + assertChoiceScore(choiceScore, choiceId, choiceResult); + } + } + +} Property changes on: trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/strategy/CondorcetStrategyTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java (from rev 3552, trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java) =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java (rev 0) +++ trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -0,0 +1,49 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Condorcet + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting.strategy; + +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * Tests the {@link VoteCountingStrategyProvider}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class VoteCountingStrategyProviderTest { + + protected static VoteCountingStrategyProvider provider; + + @BeforeClass + public static void beforeClass() throws Exception { + provider = new VoteCountingStrategyProvider(); + } + + @Test + public void getStrategy() throws Exception { + + Assert.assertNotNull(provider.getStrategy(CondorcetStrategy.ID)); + } +} Property changes on: trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/pollen-votecounting-strategy-normal/src/main/java/org/chorem/pollen/votecounting/NormalStrategy.java =================================================================== --- trunk/pollen-votecounting-strategy-normal/src/main/java/org/chorem/pollen/votecounting/NormalStrategy.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-votecounting-strategy-normal/src/main/java/org/chorem/pollen/votecounting/NormalStrategy.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -1,146 +0,0 @@ -/* - * #%L - * Pollen :: VoteCounting strategy :: Normal - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.votecounting; - -import org.chorem.pollen.votecounting.model.ChoiceScore; -import org.chorem.pollen.votecounting.model.VoteCountingResult; -import org.chorem.pollen.votecounting.model.VoteForChoice; -import org.chorem.pollen.votecounting.model.Voter; - -import java.util.Map; -import java.util.Set; - -import static org.nuiton.i18n.I18n.n_; - -/** - * Condorcet. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.5 - */ -public class NormalStrategy extends AbstractVoteCountingStrategy { - - public static final int ID = 0; - - @Override - public int getId() { - return ID; - } - - @Override - public String getI18nName() { - return n_("pollen.voteCountingType.normal"); - } - - @Override - public String getI18nHelp() { - return n_("pollen.voteCountingType.normal.help"); - } - - @Override - public VoteCountingResult votecount(Set<Voter> voters) { - - // get empty result by choice - Map<String, ChoiceScore> resultByChoice = votersToResult(voters); - - for (Voter voter : voters) { - // add this voter votes to result - addVoterChoices(voter, resultByChoice); - } - // transform map of result to list of them (and sort them) - VoteCountingResult result = resultToList(null, resultByChoice); - return result; - } - - @Override - public String getDisplayVoteValue(Integer voteValue) { - return voteValue != null ? "OK" : ""; - } - - @Override - public boolean isChoiceInVote(Integer voteValue) { - return voteValue != null && voteValue > 0; - } - - @Override - public boolean isVoteValueNull(Integer voteValue) { - return voteValue == null || voteValue == 0; - } - - @Override - public ChoiceToVoteRenderType getRenderType() { - return ChoiceToVoteRenderType.CHECKBOX; - } - - @Override - public boolean isDisplayResultsByChoice() { - return false; - } - - @Override - public boolean isVoteValueValid(Integer voteValue) { - // no validation on not null vote value - return true; - } - - @Override - public boolean isTotalVoteValueValid(int totalValues) { - // no validation on total value - return true; - } - - @Override - public String getVoteValueNotValidMessage() { - // no validation on not null vote value, so no message - return null; - } - - @Override - public String getTotalVoteValueNotValidMessage() { - // no validation on total values, so no message - return null; - } - - public void addVoterChoices(Voter voter, - Map<String, ChoiceScore> resultByChoice) { - - double voterWeight = voter.getWeight(); - - for (VoteForChoice voteForChoice : voter.getVoteForChoices()) { - Double voteValue = voteForChoice.getVoteValue(); - if (voteValue != null) { - - // get score for choice - String choiceId = voteForChoice.getChoiceId(); - ChoiceScore choiceScore = resultByChoice.get(choiceId); - - // compute score to add - double scoreToAdd = voteValue * voterWeight; - - // add to score this weighted vote - choiceScore.addScoreValue(scoreToAdd); - } - } - } - -} Copied: trunk/pollen-votecounting-strategy-normal/src/main/java/org/chorem/pollen/votecounting/strategy/NormalStrategy.java (from rev 3549, trunk/pollen-votecounting-strategy-normal/src/main/java/org/chorem/pollen/votecounting/NormalStrategy.java) =================================================================== --- trunk/pollen-votecounting-strategy-normal/src/main/java/org/chorem/pollen/votecounting/strategy/NormalStrategy.java (rev 0) +++ trunk/pollen-votecounting-strategy-normal/src/main/java/org/chorem/pollen/votecounting/strategy/NormalStrategy.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -0,0 +1,147 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Normal + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting.strategy; + +import org.chorem.pollen.votecounting.model.ChoiceScore; +import org.chorem.pollen.votecounting.model.ChoiceToVoteRenderType; +import org.chorem.pollen.votecounting.model.VoteCountingResult; +import org.chorem.pollen.votecounting.model.VoteForChoice; +import org.chorem.pollen.votecounting.model.Voter; + +import java.util.Map; +import java.util.Set; + +import static org.nuiton.i18n.I18n.n_; + +/** + * Condorcet. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class NormalStrategy extends AbstractVoteCountingStrategy { + + public static final int ID = 0; + + @Override + public int getId() { + return ID; + } + + @Override + public String getI18nName() { + return n_("pollen.voteCountingType.normal"); + } + + @Override + public String getI18nHelp() { + return n_("pollen.voteCountingType.normal.help"); + } + + @Override + public VoteCountingResult votecount(Set<Voter> voters) { + + // get empty result by choice + Map<String, ChoiceScore> resultByChoice = votersToResult(voters); + + for (Voter voter : voters) { + // add this voter votes to result + addVoterChoices(voter, resultByChoice); + } + // transform map of result to list of them (and sort them) + VoteCountingResult result = resultToList(resultByChoice); + return result; + } + + @Override + public String getDisplayVoteValue(Integer voteValue) { + return voteValue != null ? "OK" : ""; + } + + @Override + public boolean isChoiceInVote(Integer voteValue) { + return voteValue != null && voteValue > 0; + } + + @Override + public boolean isVoteValueNull(Integer voteValue) { + return voteValue == null || voteValue == 0; + } + + @Override + public ChoiceToVoteRenderType getRenderType() { + return ChoiceToVoteRenderType.CHECKBOX; + } + + @Override + public boolean isDisplayResultsByChoice() { + return false; + } + + @Override + public boolean isVoteValueValid(Integer voteValue) { + // no validation on not null vote value + return true; + } + + @Override + public boolean isTotalVoteValueValid(int totalValues) { + // no validation on total value + return true; + } + + @Override + public String getVoteValueNotValidMessage() { + // no validation on not null vote value, so no message + return null; + } + + @Override + public String getTotalVoteValueNotValidMessage() { + // no validation on total values, so no message + return null; + } + + public void addVoterChoices(Voter voter, + Map<String, ChoiceScore> resultByChoice) { + + double voterWeight = voter.getWeight(); + + for (VoteForChoice voteForChoice : voter.getVoteForChoices()) { + Double voteValue = voteForChoice.getVoteValue(); + if (voteValue != null) { + + // get score for choice + String choiceId = voteForChoice.getChoiceId(); + ChoiceScore choiceScore = resultByChoice.get(choiceId); + + // compute score to add + double scoreToAdd = voteValue * voterWeight; + + // add to score this weighted vote + choiceScore.addScoreValue(scoreToAdd); + } + } + } + +} Property changes on: trunk/pollen-votecounting-strategy-normal/src/main/java/org/chorem/pollen/votecounting/strategy/NormalStrategy.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/pollen-votecounting-strategy-normal/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy =================================================================== --- trunk/pollen-votecounting-strategy-normal/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-votecounting-strategy-normal/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy 2012-06-26 03:16:11 UTC (rev 3559) @@ -1 +0,0 @@ -org.chorem.pollen.votecounting.NormalStrategy Copied: trunk/pollen-votecounting-strategy-normal/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.strategy.VoteCountingStrategy (from rev 3549, trunk/pollen-votecounting-strategy-normal/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy) =================================================================== --- trunk/pollen-votecounting-strategy-normal/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.strategy.VoteCountingStrategy (rev 0) +++ trunk/pollen-votecounting-strategy-normal/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.strategy.VoteCountingStrategy 2012-06-26 03:16:11 UTC (rev 3559) @@ -0,0 +1 @@ +org.chorem.pollen.votecounting.strategy.NormalStrategy Property changes on: trunk/pollen-votecounting-strategy-normal/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.strategy.VoteCountingStrategy ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/NormalStrategyTest.java =================================================================== --- trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/NormalStrategyTest.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/NormalStrategyTest.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -1,276 +0,0 @@ -/* - * #%L - * Pollen :: VoteCounting strategy :: Normal - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.votecounting; - -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; -import org.chorem.pollen.votecounting.model.ChoiceIdAble; -import org.chorem.pollen.votecounting.model.ChoiceScore; -import org.chorem.pollen.votecounting.model.VoteCountingResult; -import org.chorem.pollen.votecounting.model.Voter; -import org.chorem.pollen.votecounting.model.VoterBuilder; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -import java.math.BigDecimal; -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * Tests the {@link NormalStrategy}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.5 - */ -public class NormalStrategyTest { - - public static final String CHOICE_A = "a"; - - public static final String CHOICE_B = "b"; - - public static final String CHOICE_C = "c"; - - protected static VoteCountingStrategyProvider provider; - - protected VoteCountingStrategy strategy; - - @BeforeClass - public static void beforeClass() throws Exception { - provider = new VoteCountingStrategyProvider(); - } - - @Before - public void setUp() throws Exception { - strategy = provider.getStrategy(NormalStrategy.ID); - } - - @Test - public void simpleVotecount() throws Exception { - - // Simple poll (all weight to 1) - // 1 (a=1 b=null c=null) - // 2 (a=null b=1 c=null) - // 3 (a=null b=1 c=1) - // Result (a=1 b=2 c=1) - - Set<Voter> voters = new VoterBuilder(). - newVoter("1", 1.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, null). - addVoteForChoice(CHOICE_C, null). - newVoter("2", 1.). - addVoteForChoice(CHOICE_A, null). - addVoteForChoice(CHOICE_B, 1.). - addVoteForChoice(CHOICE_C, null). - newVoter("3", 1.). - addVoteForChoice(CHOICE_A, null). - addVoteForChoice(CHOICE_B, 1.). - addVoteForChoice(CHOICE_C, 1.). - getVoters(); - - VoteCountingResult result = strategy.votecount(voters); - - Assert.assertNotNull(result); - List<ChoiceScore> scores = result.getScores(); - Assert.assertNotNull(scores); - Assert.assertEquals(3, scores.size()); - - assertChoiceScore(scores.get(0), CHOICE_B, BigDecimal.valueOf(2.)); - - assertChoiceScoreEquals(BigDecimal.valueOf(1.), - Sets.newHashSet(scores.get(1), - scores.get(2)), - CHOICE_A, CHOICE_C); - } - - @Test - public void simpleVotecount2() throws Exception { - - // Simple poll (all weight to 1) - // 1 (a=1 b=null c=null) - // 2 (a=1 b=1 c=null) - // 3 (a=1 b=1 c=null) - // Result (a=3 b=2 c=null) - Set<Voter> voters = new VoterBuilder(). - newVoter("1", 1.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, null). - addVoteForChoice(CHOICE_C, null). - newVoter("2", 1.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, 1.). - addVoteForChoice(CHOICE_C, null). - newVoter("3", 1.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, 1.). - addVoteForChoice(CHOICE_C, null). - getVoters(); - - VoteCountingResult result = strategy.votecount(voters); - - Assert.assertNotNull(result); - List<ChoiceScore> scores = result.getScores(); - Assert.assertNotNull(scores); - Assert.assertEquals(3, scores.size()); - - assertChoiceScore(scores.get(0), CHOICE_A, BigDecimal.valueOf(3.)); - assertChoiceScore(scores.get(1), CHOICE_B, BigDecimal.valueOf(2.)); - assertChoiceScore(scores.get(2), CHOICE_C, null); - } - - @Test - public void simpleVotecount3() throws Exception { - - // Simple poll (all weight to 1) - // 1 (a=1 b=1 c=null) - // 2 (a=1 b=1 c=null) - // 3 (a=1 b=1 c=null) - // Result (a=3 b=3 c=null) - Set<Voter> voters = new VoterBuilder(). - newVoter("1", 1.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, 1.). - addVoteForChoice(CHOICE_C, null). - newVoter("2", 1.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, 1.). - addVoteForChoice(CHOICE_C, null). - newVoter("3", 1.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, 1.). - addVoteForChoice(CHOICE_C, null). - getVoters(); - - VoteCountingResult result = strategy.votecount(voters); - - Assert.assertNotNull(result); - List<ChoiceScore> scores = result.getScores(); - Assert.assertNotNull(scores); - Assert.assertEquals(3, scores.size()); - - assertChoiceScoreEquals(BigDecimal.valueOf(3.), - Sets.newHashSet(scores.get(0), - scores.get(1)), - CHOICE_A, CHOICE_B); - assertChoiceScore(scores.get(2), CHOICE_C, null); - } - - @Test - public void weightedVotecount1() throws Exception { - - // poll with weighted vote - // 1 (x2) (a=1 b=null c=null) - // 2 (x1) (a=null b=1 c=null) - // 3 (x1) (a=null b=1 c=1) - // Result (a=2 b=2 c=1) - Set<Voter> voters = new VoterBuilder(). - newVoter("1", 2.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, null). - addVoteForChoice(CHOICE_C, null). - newVoter("2", 1.). - addVoteForChoice(CHOICE_A, null). - addVoteForChoice(CHOICE_B, 1.). - addVoteForChoice(CHOICE_C, null). - newVoter("3", 1.). - addVoteForChoice(CHOICE_A, null). - addVoteForChoice(CHOICE_B, 1.). - addVoteForChoice(CHOICE_C, 1.). - getVoters(); - - VoteCountingResult result = strategy.votecount(voters); - - Assert.assertNotNull(result); - List<ChoiceScore> scores = result.getScores(); - Assert.assertNotNull(scores); - Assert.assertEquals(3, scores.size()); - - assertChoiceScoreEquals(BigDecimal.valueOf(2.), - Sets.newHashSet(scores.get(0), - scores.get(1)), - CHOICE_A, CHOICE_B); - assertChoiceScore(scores.get(2), CHOICE_C, BigDecimal.valueOf(1.)); - } - - @Test - public void weightedVotecount2() throws Exception { - - // poll with weighted vote - // 1 (x2) (a=1 b=null c=null) - // 2 (x1) (a=null b=1 c=null) - // 3 (x3) (a=null b=1 c=1) - // Result (a=2 b=4 c=3) - Set<Voter> voters = new VoterBuilder(). - newVoter("1", 2.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, null). - addVoteForChoice(CHOICE_C, null). - newVoter("2", 1.). - addVoteForChoice(CHOICE_A, null). - addVoteForChoice(CHOICE_B, 1.). - addVoteForChoice(CHOICE_C, null). - newVoter("3", 3.). - addVoteForChoice(CHOICE_A, null). - addVoteForChoice(CHOICE_B, 1.). - addVoteForChoice(CHOICE_C, 1.). - getVoters(); - - VoteCountingResult result = strategy.votecount(voters); - - Assert.assertNotNull(result); - List<ChoiceScore> scores = result.getScores(); - Assert.assertNotNull(scores); - Assert.assertEquals(3, scores.size()); - - assertChoiceScore(scores.get(0), CHOICE_B, BigDecimal.valueOf(4.)); - assertChoiceScore(scores.get(1), CHOICE_C, BigDecimal.valueOf(3.)); - assertChoiceScore(scores.get(2), CHOICE_A, BigDecimal.valueOf(2.)); - } - - public static void assertChoiceScore(ChoiceScore choiceScore, - String choiceId, - BigDecimal choiceResult) { - Assert.assertNotNull(choiceScore); - Assert.assertEquals(choiceId, choiceScore.getChoiceId()); - Assert.assertEquals(choiceResult, choiceScore.getScoreValue()); - } - - public static void assertChoiceScoreEquals(BigDecimal choiceResult, - Set<ChoiceScore> choiceScores, - String... choiceIds) { - - Assert.assertNotNull(choiceScores); - Map<String, ChoiceScore> choicesById = Maps.uniqueIndex( - choiceScores, new ChoiceIdAble.ChoiceIdAbleById()); - for (String choiceId : choiceIds) { - - ChoiceScore choiceScore = choicesById.get(choiceId); - Assert.assertNotNull(choiceScore); - assertChoiceScore(choiceScore, choiceId, choiceResult); - } - } - -} Deleted: trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java =================================================================== --- trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -1,49 +0,0 @@ -/* - * #%L - * Pollen :: VoteCounting strategy :: Normal - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.votecounting; - -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Tests the {@link VoteCountingStrategyProvider}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.5 - */ -public class VoteCountingStrategyProviderTest { - - protected static VoteCountingStrategyProvider provider; - - @BeforeClass - public static void beforeClass() throws Exception { - provider = new VoteCountingStrategyProvider(); - } - - @Test - public void getStrategy() throws Exception { - - Assert.assertNotNull(provider.getStrategy(NormalStrategy.ID)); - } -} Copied: trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/strategy/NormalStrategyTest.java (from rev 3558, trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/NormalStrategyTest.java) =================================================================== --- trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/strategy/NormalStrategyTest.java (rev 0) +++ trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/strategy/NormalStrategyTest.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -0,0 +1,276 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Normal + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting.strategy; + +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import org.chorem.pollen.votecounting.model.ChoiceIdAble; +import org.chorem.pollen.votecounting.model.ChoiceScore; +import org.chorem.pollen.votecounting.model.VoteCountingResult; +import org.chorem.pollen.votecounting.model.Voter; +import org.chorem.pollen.votecounting.model.VoterBuilder; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Tests the {@link NormalStrategy}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class NormalStrategyTest { + + public static final String CHOICE_A = "a"; + + public static final String CHOICE_B = "b"; + + public static final String CHOICE_C = "c"; + + protected static VoteCountingStrategyProvider provider; + + protected VoteCountingStrategy strategy; + + @BeforeClass + public static void beforeClass() throws Exception { + provider = new VoteCountingStrategyProvider(); + } + + @Before + public void setUp() throws Exception { + strategy = provider.getStrategy(NormalStrategy.ID); + } + + @Test + public void simpleVotecount() throws Exception { + + // Simple poll (all weight to 1) + // 1 (a=1 b=null c=null) + // 2 (a=null b=1 c=null) + // 3 (a=null b=1 c=1) + // Result (a=1 b=2 c=1) + + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, 1.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScore(scores.get(0), CHOICE_B, BigDecimal.valueOf(2.)); + + assertChoiceScoreEquals(BigDecimal.valueOf(1.), + Sets.newHashSet(scores.get(1), + scores.get(2)), + CHOICE_A, CHOICE_C); + } + + @Test + public void simpleVotecount2() throws Exception { + + // Simple poll (all weight to 1) + // 1 (a=1 b=null c=null) + // 2 (a=1 b=1 c=null) + // 3 (a=1 b=1 c=null) + // Result (a=3 b=2 c=null) + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScore(scores.get(0), CHOICE_A, BigDecimal.valueOf(3.)); + assertChoiceScore(scores.get(1), CHOICE_B, BigDecimal.valueOf(2.)); + assertChoiceScore(scores.get(2), CHOICE_C, null); + } + + @Test + public void simpleVotecount3() throws Exception { + + // Simple poll (all weight to 1) + // 1 (a=1 b=1 c=null) + // 2 (a=1 b=1 c=null) + // 3 (a=1 b=1 c=null) + // Result (a=3 b=3 c=null) + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScoreEquals(BigDecimal.valueOf(3.), + Sets.newHashSet(scores.get(0), + scores.get(1)), + CHOICE_A, CHOICE_B); + assertChoiceScore(scores.get(2), CHOICE_C, null); + } + + @Test + public void weightedVotecount1() throws Exception { + + // poll with weighted vote + // 1 (x2) (a=1 b=null c=null) + // 2 (x1) (a=null b=1 c=null) + // 3 (x1) (a=null b=1 c=1) + // Result (a=2 b=2 c=1) + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 2.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, 1.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScoreEquals(BigDecimal.valueOf(2.), + Sets.newHashSet(scores.get(0), + scores.get(1)), + CHOICE_A, CHOICE_B); + assertChoiceScore(scores.get(2), CHOICE_C, BigDecimal.valueOf(1.)); + } + + @Test + public void weightedVotecount2() throws Exception { + + // poll with weighted vote + // 1 (x2) (a=1 b=null c=null) + // 2 (x1) (a=null b=1 c=null) + // 3 (x3) (a=null b=1 c=1) + // Result (a=2 b=4 c=3) + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 2.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 3.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, 1.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScore(scores.get(0), CHOICE_B, BigDecimal.valueOf(4.)); + assertChoiceScore(scores.get(1), CHOICE_C, BigDecimal.valueOf(3.)); + assertChoiceScore(scores.get(2), CHOICE_A, BigDecimal.valueOf(2.)); + } + + public static void assertChoiceScore(ChoiceScore choiceScore, + String choiceId, + BigDecimal choiceResult) { + Assert.assertNotNull(choiceScore); + Assert.assertEquals(choiceId, choiceScore.getChoiceId()); + Assert.assertEquals(choiceResult, choiceScore.getScoreValue()); + } + + public static void assertChoiceScoreEquals(BigDecimal choiceResult, + Set<ChoiceScore> choiceScores, + String... choiceIds) { + + Assert.assertNotNull(choiceScores); + Map<String, ChoiceScore> choicesById = Maps.uniqueIndex( + choiceScores, new ChoiceIdAble.ChoiceIdAbleById()); + for (String choiceId : choiceIds) { + + ChoiceScore choiceScore = choicesById.get(choiceId); + Assert.assertNotNull(choiceScore); + assertChoiceScore(choiceScore, choiceId, choiceResult); + } + } + +} Property changes on: trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/strategy/NormalStrategyTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java (from rev 3549, trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java) =================================================================== --- trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java (rev 0) +++ trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -0,0 +1,49 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Normal + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting.strategy; + +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * Tests the {@link VoteCountingStrategyProvider}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class VoteCountingStrategyProviderTest { + + protected static VoteCountingStrategyProvider provider; + + @BeforeClass + public static void beforeClass() throws Exception { + provider = new VoteCountingStrategyProvider(); + } + + @Test + public void getStrategy() throws Exception { + + Assert.assertNotNull(provider.getStrategy(NormalStrategy.ID)); + } +} Property changes on: trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/pollen-votecounting-strategy-number/src/main/java/org/chorem/pollen/votecounting/NumberStrategy.java =================================================================== --- trunk/pollen-votecounting-strategy-number/src/main/java/org/chorem/pollen/votecounting/NumberStrategy.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-votecounting-strategy-number/src/main/java/org/chorem/pollen/votecounting/NumberStrategy.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -1,145 +0,0 @@ -/* - * #%L - * Pollen :: VoteCounting strategy :: Number - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.votecounting; - -import org.chorem.pollen.votecounting.model.ChoiceScore; -import org.chorem.pollen.votecounting.model.VoteCountingResult; -import org.chorem.pollen.votecounting.model.VoteForChoice; -import org.chorem.pollen.votecounting.model.Voter; - -import java.util.Map; -import java.util.Set; - -import static org.nuiton.i18n.I18n.n_; - -/** - * Number strategy. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.5 - */ -public class NumberStrategy extends AbstractVoteCountingStrategy { - - public static final int ID = 3; - - @Override - public int getId() { - return ID; - } - - @Override - public String getI18nName() { - return n_("pollen.voteCountingType.number"); - } - - @Override - public String getI18nHelp() { - return n_("pollen.voteCountingType.number.help"); - } - - @Override - public VoteCountingResult votecount(Set<Voter> voters) { - - // get empty result by choice - Map<String, ChoiceScore> resultByChoice = votersToResult(voters); - - for (Voter voter : voters) { - // add this voter votes to result - addVoterChoices(voter, resultByChoice); - } - // transform map of result to list of them (and sort them) - VoteCountingResult result = resultToList(null, resultByChoice); - return result; - } - - @Override - public String getDisplayVoteValue(Integer voteValue) { - return voteValue == null ? "" : String.valueOf(voteValue); - } - - @Override - public boolean isChoiceInVote(Integer voteValue) { - return voteValue != null && voteValue >= 0; - } - - @Override - public boolean isVoteValueNull(Integer voteValue) { - return voteValue == null || voteValue == 0; - } - - @Override - public ChoiceToVoteRenderType getRenderType() { - return ChoiceToVoteRenderType.TEXTFIELD; - } - - @Override - public boolean isDisplayResultsByChoice() { - return true; - } - - @Override - public boolean isVoteValueValid(Integer voteValue) { - // no validation on not null vote value - return true; - } - - @Override - public boolean isTotalVoteValueValid(int totalValues) { - // no validation on total value - return true; - } - - @Override - public String getTotalVoteValueNotValidMessage() { - // no validation on total values, so no message - return null; - } - - @Override - public String getVoteValueNotValidMessage() { - // no validation on not null vote value, so no message - return null; - } - - public void addVoterChoices(Voter voter, - Map<String, ChoiceScore> resultByChoice) { - - double voterWeight = voter.getWeight(); - - for (VoteForChoice voteForChoice : voter.getVoteForChoices()) { - Double voteValue = voteForChoice.getVoteValue(); - if (voteValue != null) { - - // get score for choice - String choiceId = voteForChoice.getChoiceId(); - ChoiceScore choiceScore = resultByChoice.get(choiceId); - - // compute score to add - double scoreToAdd = voteValue * voterWeight; - - // add to score this weighted vote - choiceScore.addScoreValue(scoreToAdd); - } - } - } -} Copied: trunk/pollen-votecounting-strategy-number/src/main/java/org/chorem/pollen/votecounting/strategy/NumberStrategy.java (from rev 3550, trunk/pollen-votecounting-strategy-number/src/main/java/org/chorem/pollen/votecounting/NumberStrategy.java) =================================================================== --- trunk/pollen-votecounting-strategy-number/src/main/java/org/chorem/pollen/votecounting/strategy/NumberStrategy.java (rev 0) +++ trunk/pollen-votecounting-strategy-number/src/main/java/org/chorem/pollen/votecounting/strategy/NumberStrategy.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -0,0 +1,146 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Number + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting.strategy; + +import org.chorem.pollen.votecounting.model.ChoiceScore; +import org.chorem.pollen.votecounting.model.ChoiceToVoteRenderType; +import org.chorem.pollen.votecounting.model.VoteCountingResult; +import org.chorem.pollen.votecounting.model.VoteForChoice; +import org.chorem.pollen.votecounting.model.Voter; + +import java.util.Map; +import java.util.Set; + +import static org.nuiton.i18n.I18n.n_; + +/** + * Number strategy. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class NumberStrategy extends AbstractVoteCountingStrategy { + + public static final int ID = 3; + + @Override + public int getId() { + return ID; + } + + @Override + public String getI18nName() { + return n_("pollen.voteCountingType.number"); + } + + @Override + public String getI18nHelp() { + return n_("pollen.voteCountingType.number.help"); + } + + @Override + public VoteCountingResult votecount(Set<Voter> voters) { + + // get empty result by choice + Map<String, ChoiceScore> resultByChoice = votersToResult(voters); + + for (Voter voter : voters) { + // add this voter votes to result + addVoterChoices(voter, resultByChoice); + } + // transform map of result to list of them (and sort them) + VoteCountingResult result = resultToList(resultByChoice); + return result; + } + + @Override + public String getDisplayVoteValue(Integer voteValue) { + return voteValue == null ? "" : String.valueOf(voteValue); + } + + @Override + public boolean isChoiceInVote(Integer voteValue) { + return voteValue != null && voteValue >= 0; + } + + @Override + public boolean isVoteValueNull(Integer voteValue) { + return voteValue == null || voteValue == 0; + } + + @Override + public ChoiceToVoteRenderType getRenderType() { + return ChoiceToVoteRenderType.TEXTFIELD; + } + + @Override + public boolean isDisplayResultsByChoice() { + return true; + } + + @Override + public boolean isVoteValueValid(Integer voteValue) { + // no validation on not null vote value + return true; + } + + @Override + public boolean isTotalVoteValueValid(int totalValues) { + // no validation on total value + return true; + } + + @Override + public String getTotalVoteValueNotValidMessage() { + // no validation on total values, so no message + return null; + } + + @Override + public String getVoteValueNotValidMessage() { + // no validation on not null vote value, so no message + return null; + } + + public void addVoterChoices(Voter voter, + Map<String, ChoiceScore> resultByChoice) { + + double voterWeight = voter.getWeight(); + + for (VoteForChoice voteForChoice : voter.getVoteForChoices()) { + Double voteValue = voteForChoice.getVoteValue(); + if (voteValue != null) { + + // get score for choice + String choiceId = voteForChoice.getChoiceId(); + ChoiceScore choiceScore = resultByChoice.get(choiceId); + + // compute score to add + double scoreToAdd = voteValue * voterWeight; + + // add to score this weighted vote + choiceScore.addScoreValue(scoreToAdd); + } + } + } +} Property changes on: trunk/pollen-votecounting-strategy-number/src/main/java/org/chorem/pollen/votecounting/strategy/NumberStrategy.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/pollen-votecounting-strategy-number/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy =================================================================== --- trunk/pollen-votecounting-strategy-number/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-votecounting-strategy-number/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy 2012-06-26 03:16:11 UTC (rev 3559) @@ -1 +0,0 @@ -org.chorem.pollen.votecounting.NumberStrategy Copied: trunk/pollen-votecounting-strategy-number/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.strategy.VoteCountingStrategy (from rev 3550, trunk/pollen-votecounting-strategy-number/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy) =================================================================== --- trunk/pollen-votecounting-strategy-number/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.strategy.VoteCountingStrategy (rev 0) +++ trunk/pollen-votecounting-strategy-number/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.strategy.VoteCountingStrategy 2012-06-26 03:16:11 UTC (rev 3559) @@ -0,0 +1 @@ +org.chorem.pollen.votecounting.strategy.NumberStrategy Property changes on: trunk/pollen-votecounting-strategy-number/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.strategy.VoteCountingStrategy ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/NumberStrategyTest.java =================================================================== --- trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/NumberStrategyTest.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/NumberStrategyTest.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -1,273 +0,0 @@ -/* - * #%L - * Pollen :: VoteCounting strategy :: Number - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.votecounting; - -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; -import org.chorem.pollen.votecounting.model.ChoiceIdAble; -import org.chorem.pollen.votecounting.model.ChoiceScore; -import org.chorem.pollen.votecounting.model.VoteCountingResult; -import org.chorem.pollen.votecounting.model.Voter; -import org.chorem.pollen.votecounting.model.VoterBuilder; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -import java.math.BigDecimal; -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * Tests the {@link NumberStrategy}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.5 - */ -public class NumberStrategyTest { - - public static final String CHOICE_A = "a"; - - public static final String CHOICE_B = "b"; - - public static final String CHOICE_C = "c"; - - protected static VoteCountingStrategyProvider provider; - - protected VoteCountingStrategy strategy; - - @BeforeClass - public static void beforeClass() throws Exception { - provider = new VoteCountingStrategyProvider(); - } - - @Before - public void setUp() throws Exception { - strategy = provider.getStrategy(NumberStrategy.ID); - } - - @Test - public void simpleVotecount() throws Exception { - - // Simple poll (all weight to 1) - // 1 (a=1 b=2 c=null) - // 2 (a=2 b=null c=3) - // 3 (a=7 b=12 c=20) - // Result (a=10 b=14 c=23) - - Set<Voter> voters = new VoterBuilder(). - newVoter("1", 1.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, 2.). - addVoteForChoice(CHOICE_C, null). - newVoter("2", 1.). - addVoteForChoice(CHOICE_A, 2.). - addVoteForChoice(CHOICE_B, null). - addVoteForChoice(CHOICE_C, 3.). - newVoter("3", 1.). - addVoteForChoice(CHOICE_A, 7.). - addVoteForChoice(CHOICE_B, 12.). - addVoteForChoice(CHOICE_C, 20.). - getVoters(); - - VoteCountingResult result = strategy.votecount(voters); - - Assert.assertNotNull(result); - List<ChoiceScore> scores = result.getScores(); - Assert.assertNotNull(scores); - Assert.assertEquals(3, scores.size()); - - assertChoiceScore(scores.get(0), CHOICE_C, BigDecimal.valueOf(23.)); - assertChoiceScore(scores.get(1), CHOICE_B, BigDecimal.valueOf(14.)); - assertChoiceScore(scores.get(2), CHOICE_A, BigDecimal.valueOf(10.)); - } - - @Test - public void simpleVotecount2() throws Exception { - - // Simple poll (all weight to 1) - // 1 (a=1 b=null c=null) - // 2 (a=1 b=1 c=null) - // 3 (a=1 b=1 c=null) - // Result (a=3 b=2 c=null) - Set<Voter> voters = new VoterBuilder(). - newVoter("1", 1.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, null). - addVoteForChoice(CHOICE_C, null). - newVoter("2", 1.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, 1.). - addVoteForChoice(CHOICE_C, null). - newVoter("3", 1.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, 1.). - addVoteForChoice(CHOICE_C, null). - getVoters(); - - VoteCountingResult result = strategy.votecount(voters); - - Assert.assertNotNull(result); - List<ChoiceScore> scores = result.getScores(); - Assert.assertNotNull(scores); - Assert.assertEquals(3, scores.size()); - - assertChoiceScore(scores.get(0), CHOICE_A, BigDecimal.valueOf(3.)); - assertChoiceScore(scores.get(1), CHOICE_B, BigDecimal.valueOf(2.)); - assertChoiceScore(scores.get(2), CHOICE_C, null); - } - - @Test - public void simpleVotecount3() throws Exception { - - // Simple poll (all weight to 1) - // 1 (a=1 b=1 c=null) - // 2 (a=1 b=1 c=null) - // 3 (a=1 b=1 c=null) - // Result (a=3 b=3 c=null) - Set<Voter> voters = new VoterBuilder(). - newVoter("1", 1.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, 1.). - addVoteForChoice(CHOICE_C, null). - newVoter("2", 1.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, 1.). - addVoteForChoice(CHOICE_C, null). - newVoter("3", 1.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, 1.). - addVoteForChoice(CHOICE_C, null). - getVoters(); - - VoteCountingResult result = strategy.votecount(voters); - - Assert.assertNotNull(result); - List<ChoiceScore> scores = result.getScores(); - Assert.assertNotNull(scores); - Assert.assertEquals(3, scores.size()); - - assertChoiceScoreEquals(BigDecimal.valueOf(3.), - Sets.newHashSet(scores.get(0), - scores.get(1)), - CHOICE_A, CHOICE_B); - assertChoiceScore(scores.get(2), CHOICE_C, null); - } - - @Test - public void weightedVotecount1() throws Exception { - - // poll with weighted vote - // 1 (x2) (a=1 b=null c=null) - // 2 (x1) (a=null b=1 c=null) - // 3 (x1) (a=null b=1 c=1) - // Result (a=2 b=2 c=1) - Set<Voter> voters = new VoterBuilder(). - newVoter("1", 2.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, null). - addVoteForChoice(CHOICE_C, null). - newVoter("2", 1.). - addVoteForChoice(CHOICE_A, null). - addVoteForChoice(CHOICE_B, 1.). - addVoteForChoice(CHOICE_C, null). - newVoter("3", 1.). - addVoteForChoice(CHOICE_A, null). - addVoteForChoice(CHOICE_B, 1.). - addVoteForChoice(CHOICE_C, 1.). - getVoters(); - - VoteCountingResult result = strategy.votecount(voters); - - Assert.assertNotNull(result); - List<ChoiceScore> scores = result.getScores(); - Assert.assertNotNull(scores); - Assert.assertEquals(3, scores.size()); - - assertChoiceScoreEquals(BigDecimal.valueOf(2.), - Sets.newHashSet(scores.get(0), - scores.get(1)), - CHOICE_A, CHOICE_B); - assertChoiceScore(scores.get(2), CHOICE_C, BigDecimal.valueOf(1.)); - } - - @Test - public void weightedVotecount2() throws Exception { - - // poll with weighted vote - // 1 (x2) (a=1 b=null c=null) - // 2 (x1) (a=null b=1 c=null) - // 3 (x3) (a=null b=1 c=1) - // Result (a=2 b=4 c=3) - Set<Voter> voters = new VoterBuilder(). - newVoter("1", 2.). - addVoteForChoice(CHOICE_A, 1.). - addVoteForChoice(CHOICE_B, null). - addVoteForChoice(CHOICE_C, null). - newVoter("2", 1.). - addVoteForChoice(CHOICE_A, null). - addVoteForChoice(CHOICE_B, 1.). - addVoteForChoice(CHOICE_C, null). - newVoter("3", 3.). - addVoteForChoice(CHOICE_A, null). - addVoteForChoice(CHOICE_B, 1.). - addVoteForChoice(CHOICE_C, 1.). - getVoters(); - - VoteCountingResult result = strategy.votecount(voters); - - Assert.assertNotNull(result); - List<ChoiceScore> scores = result.getScores(); - Assert.assertNotNull(scores); - Assert.assertEquals(3, scores.size()); - - assertChoiceScore(scores.get(0), CHOICE_B, BigDecimal.valueOf(4.)); - assertChoiceScore(scores.get(1), CHOICE_C, BigDecimal.valueOf(3.)); - assertChoiceScore(scores.get(2), CHOICE_A, BigDecimal.valueOf(2.)); - } - - public static void assertChoiceScore(ChoiceScore choiceScore, - String choiceId, - BigDecimal choiceResult) { - Assert.assertNotNull(choiceScore); - Assert.assertEquals(choiceId, choiceScore.getChoiceId()); - Assert.assertEquals(choiceResult, choiceScore.getScoreValue()); - } - - public static void assertChoiceScoreEquals(BigDecimal choiceResult, - Set<ChoiceScore> choiceScores, - String... choiceIds) { - - Assert.assertNotNull(choiceScores); - Map<String, ChoiceScore> choicesById = Maps.uniqueIndex( - choiceScores, new ChoiceIdAble.ChoiceIdAbleById()); - for (String choiceId : choiceIds) { - - ChoiceScore choiceScore = choicesById.get(choiceId); - Assert.assertNotNull(choiceScore); - assertChoiceScore(choiceScore, choiceId, choiceResult); - } - } - -} Deleted: trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java =================================================================== --- trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -1,49 +0,0 @@ -/* - * #%L - * Pollen :: VoteCounting strategy :: Number - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.votecounting; - -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Tests the {@link VoteCountingStrategyProvider}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.5 - */ -public class VoteCountingStrategyProviderTest { - - protected static VoteCountingStrategyProvider provider; - - @BeforeClass - public static void beforeClass() throws Exception { - provider = new VoteCountingStrategyProvider(); - } - - @Test - public void getStrategy() throws Exception { - - Assert.assertNotNull(provider.getStrategy(NumberStrategy.ID)); - } -} Copied: trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/strategy/NumberStrategyTest.java (from rev 3558, trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/NumberStrategyTest.java) =================================================================== --- trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/strategy/NumberStrategyTest.java (rev 0) +++ trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/strategy/NumberStrategyTest.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -0,0 +1,273 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Number + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting.strategy; + +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import org.chorem.pollen.votecounting.model.ChoiceIdAble; +import org.chorem.pollen.votecounting.model.ChoiceScore; +import org.chorem.pollen.votecounting.model.VoteCountingResult; +import org.chorem.pollen.votecounting.model.Voter; +import org.chorem.pollen.votecounting.model.VoterBuilder; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Tests the {@link NumberStrategy}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class NumberStrategyTest { + + public static final String CHOICE_A = "a"; + + public static final String CHOICE_B = "b"; + + public static final String CHOICE_C = "c"; + + protected static VoteCountingStrategyProvider provider; + + protected VoteCountingStrategy strategy; + + @BeforeClass + public static void beforeClass() throws Exception { + provider = new VoteCountingStrategyProvider(); + } + + @Before + public void setUp() throws Exception { + strategy = provider.getStrategy(NumberStrategy.ID); + } + + @Test + public void simpleVotecount() throws Exception { + + // Simple poll (all weight to 1) + // 1 (a=1 b=2 c=null) + // 2 (a=2 b=null c=3) + // 3 (a=7 b=12 c=20) + // Result (a=10 b=14 c=23) + + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 2.). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, 2.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, 3.). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, 7.). + addVoteForChoice(CHOICE_B, 12.). + addVoteForChoice(CHOICE_C, 20.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScore(scores.get(0), CHOICE_C, BigDecimal.valueOf(23.)); + assertChoiceScore(scores.get(1), CHOICE_B, BigDecimal.valueOf(14.)); + assertChoiceScore(scores.get(2), CHOICE_A, BigDecimal.valueOf(10.)); + } + + @Test + public void simpleVotecount2() throws Exception { + + // Simple poll (all weight to 1) + // 1 (a=1 b=null c=null) + // 2 (a=1 b=1 c=null) + // 3 (a=1 b=1 c=null) + // Result (a=3 b=2 c=null) + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScore(scores.get(0), CHOICE_A, BigDecimal.valueOf(3.)); + assertChoiceScore(scores.get(1), CHOICE_B, BigDecimal.valueOf(2.)); + assertChoiceScore(scores.get(2), CHOICE_C, null); + } + + @Test + public void simpleVotecount3() throws Exception { + + // Simple poll (all weight to 1) + // 1 (a=1 b=1 c=null) + // 2 (a=1 b=1 c=null) + // 3 (a=1 b=1 c=null) + // Result (a=3 b=3 c=null) + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScoreEquals(BigDecimal.valueOf(3.), + Sets.newHashSet(scores.get(0), + scores.get(1)), + CHOICE_A, CHOICE_B); + assertChoiceScore(scores.get(2), CHOICE_C, null); + } + + @Test + public void weightedVotecount1() throws Exception { + + // poll with weighted vote + // 1 (x2) (a=1 b=null c=null) + // 2 (x1) (a=null b=1 c=null) + // 3 (x1) (a=null b=1 c=1) + // Result (a=2 b=2 c=1) + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 2.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, 1.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScoreEquals(BigDecimal.valueOf(2.), + Sets.newHashSet(scores.get(0), + scores.get(1)), + CHOICE_A, CHOICE_B); + assertChoiceScore(scores.get(2), CHOICE_C, BigDecimal.valueOf(1.)); + } + + @Test + public void weightedVotecount2() throws Exception { + + // poll with weighted vote + // 1 (x2) (a=1 b=null c=null) + // 2 (x1) (a=null b=1 c=null) + // 3 (x3) (a=null b=1 c=1) + // Result (a=2 b=4 c=3) + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 2.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 3.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, 1.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScore(scores.get(0), CHOICE_B, BigDecimal.valueOf(4.)); + assertChoiceScore(scores.get(1), CHOICE_C, BigDecimal.valueOf(3.)); + assertChoiceScore(scores.get(2), CHOICE_A, BigDecimal.valueOf(2.)); + } + + public static void assertChoiceScore(ChoiceScore choiceScore, + String choiceId, + BigDecimal choiceResult) { + Assert.assertNotNull(choiceScore); + Assert.assertEquals(choiceId, choiceScore.getChoiceId()); + Assert.assertEquals(choiceResult, choiceScore.getScoreValue()); + } + + public static void assertChoiceScoreEquals(BigDecimal choiceResult, + Set<ChoiceScore> choiceScores, + String... choiceIds) { + + Assert.assertNotNull(choiceScores); + Map<String, ChoiceScore> choicesById = Maps.uniqueIndex( + choiceScores, new ChoiceIdAble.ChoiceIdAbleById()); + for (String choiceId : choiceIds) { + + ChoiceScore choiceScore = choicesById.get(choiceId); + Assert.assertNotNull(choiceScore); + assertChoiceScore(choiceScore, choiceId, choiceResult); + } + } + +} Property changes on: trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/strategy/NumberStrategyTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java (from rev 3550, trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java) =================================================================== --- trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java (rev 0) +++ trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -0,0 +1,49 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Number + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting.strategy; + +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * Tests the {@link VoteCountingStrategyProvider}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class VoteCountingStrategyProviderTest { + + protected static VoteCountingStrategyProvider provider; + + @BeforeClass + public static void beforeClass() throws Exception { + provider = new VoteCountingStrategyProvider(); + } + + @Test + public void getStrategy() throws Exception { + + Assert.assertNotNull(provider.getStrategy(NumberStrategy.ID)); + } +} Property changes on: trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/pollen-votecounting-strategy-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageStrategy.java =================================================================== --- trunk/pollen-votecounting-strategy-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageStrategy.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-votecounting-strategy-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageStrategy.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -1,143 +0,0 @@ -/* - * #%L - * Pollen :: VoteCounting strategy :: Percentage - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.votecounting; - -import org.chorem.pollen.votecounting.model.ChoiceScore; -import org.chorem.pollen.votecounting.model.VoteCountingResult; -import org.chorem.pollen.votecounting.model.VoteForChoice; -import org.chorem.pollen.votecounting.model.Voter; - -import java.util.Map; -import java.util.Set; - -import static org.nuiton.i18n.I18n.n_; - -/** - * Percentage strategy. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.5 - */ -public class PercentageStrategy extends AbstractVoteCountingStrategy { - - public static final int ID = 1; - - @Override - public int getId() { - return ID; - } - - @Override - public String getI18nName() { - return n_("pollen.voteCountingType.percentage"); - } - - @Override - public String getI18nHelp() { - return n_("pollen.voteCountingType.percentage.help"); - } - - @Override - public VoteCountingResult votecount(Set<Voter> voters) { - // get empty result by choice - Map<String, ChoiceScore> resultByChoice = votersToResult(voters); - - for (Voter voter : voters) { - // add this voter votes to result - addVoterChoices(voter, resultByChoice); - } - // transform map of result to list of them (and sort them) - VoteCountingResult result = resultToList(null, resultByChoice); - return result; - } - - @Override - public String getDisplayVoteValue(Integer voteValue) { - return voteValue == null ? "" : String.valueOf(voteValue); - } - - @Override - public boolean isChoiceInVote(Integer voteValue) { - return voteValue != null && voteValue >= 0 && voteValue <= 100; - } - - - @Override - public boolean isVoteValueNull(Integer value) { - return value == null || value == 0; - } - - @Override - public ChoiceToVoteRenderType getRenderType() { - return ChoiceToVoteRenderType.TEXTFIELD; - } - - @Override - public boolean isDisplayResultsByChoice() { - return false; - } - - @Override - public boolean isVoteValueValid(Integer voteValue) { - // no validation on not null vote value - return true; - } - - @Override - public boolean isTotalVoteValueValid(int totalValues) { - return totalValues == 100; - } - - @Override - public String getVoteValueNotValidMessage() { - // no validation on not null vote value, so no message - return null; - } - - @Override - public String getTotalVoteValueNotValidMessage() { - return n_("pollen.error.vote.percentage"); - } - - public void addVoterChoices(Voter voter, - Map<String, ChoiceScore> resultByChoice) { - - double voterWeight = voter.getWeight(); - - for (VoteForChoice voteForChoice : voter.getVoteForChoices()) { - Double voteValue = voteForChoice.getVoteValue(); - if (voteValue != null) { - - // get score for choice - String choiceId = voteForChoice.getChoiceId(); - ChoiceScore choiceScore = resultByChoice.get(choiceId); - - // compute score to add - double scoreToAdd = voteValue * voterWeight; - - // add to score this weighted vote - choiceScore.addScoreValue(scoreToAdd); - } - } - } -} Copied: trunk/pollen-votecounting-strategy-percentage/src/main/java/org/chorem/pollen/votecounting/strategy/PercentageStrategy.java (from rev 3551, trunk/pollen-votecounting-strategy-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageStrategy.java) =================================================================== --- trunk/pollen-votecounting-strategy-percentage/src/main/java/org/chorem/pollen/votecounting/strategy/PercentageStrategy.java (rev 0) +++ trunk/pollen-votecounting-strategy-percentage/src/main/java/org/chorem/pollen/votecounting/strategy/PercentageStrategy.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -0,0 +1,144 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Percentage + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting.strategy; + +import org.chorem.pollen.votecounting.model.ChoiceScore; +import org.chorem.pollen.votecounting.model.ChoiceToVoteRenderType; +import org.chorem.pollen.votecounting.model.VoteCountingResult; +import org.chorem.pollen.votecounting.model.VoteForChoice; +import org.chorem.pollen.votecounting.model.Voter; + +import java.util.Map; +import java.util.Set; + +import static org.nuiton.i18n.I18n.n_; + +/** + * Percentage strategy. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class PercentageStrategy extends AbstractVoteCountingStrategy { + + public static final int ID = 1; + + @Override + public int getId() { + return ID; + } + + @Override + public String getI18nName() { + return n_("pollen.voteCountingType.percentage"); + } + + @Override + public String getI18nHelp() { + return n_("pollen.voteCountingType.percentage.help"); + } + + @Override + public VoteCountingResult votecount(Set<Voter> voters) { + // get empty result by choice + Map<String, ChoiceScore> resultByChoice = votersToResult(voters); + + for (Voter voter : voters) { + // add this voter votes to result + addVoterChoices(voter, resultByChoice); + } + // transform map of result to list of them (and sort them) + VoteCountingResult result = resultToList(resultByChoice); + return result; + } + + @Override + public String getDisplayVoteValue(Integer voteValue) { + return voteValue == null ? "" : String.valueOf(voteValue); + } + + @Override + public boolean isChoiceInVote(Integer voteValue) { + return voteValue != null && voteValue >= 0 && voteValue <= 100; + } + + + @Override + public boolean isVoteValueNull(Integer value) { + return value == null || value == 0; + } + + @Override + public ChoiceToVoteRenderType getRenderType() { + return ChoiceToVoteRenderType.TEXTFIELD; + } + + @Override + public boolean isDisplayResultsByChoice() { + return false; + } + + @Override + public boolean isVoteValueValid(Integer voteValue) { + // no validation on not null vote value + return true; + } + + @Override + public boolean isTotalVoteValueValid(int totalValues) { + return totalValues == 100; + } + + @Override + public String getVoteValueNotValidMessage() { + // no validation on not null vote value, so no message + return null; + } + + @Override + public String getTotalVoteValueNotValidMessage() { + return n_("pollen.error.vote.percentage"); + } + + public void addVoterChoices(Voter voter, + Map<String, ChoiceScore> resultByChoice) { + + double voterWeight = voter.getWeight(); + + for (VoteForChoice voteForChoice : voter.getVoteForChoices()) { + Double voteValue = voteForChoice.getVoteValue(); + if (voteValue != null) { + + // get score for choice + String choiceId = voteForChoice.getChoiceId(); + ChoiceScore choiceScore = resultByChoice.get(choiceId); + + // compute score to add + double scoreToAdd = voteValue * voterWeight; + + // add to score this weighted vote + choiceScore.addScoreValue(scoreToAdd); + } + } + } +} Property changes on: trunk/pollen-votecounting-strategy-percentage/src/main/java/org/chorem/pollen/votecounting/strategy/PercentageStrategy.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/pollen-votecounting-strategy-percentage/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy =================================================================== --- trunk/pollen-votecounting-strategy-percentage/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-votecounting-strategy-percentage/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy 2012-06-26 03:16:11 UTC (rev 3559) @@ -1 +0,0 @@ -org.chorem.pollen.votecounting.PercentageStrategy Copied: trunk/pollen-votecounting-strategy-percentage/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.strategy.VoteCountingStrategy (from rev 3551, trunk/pollen-votecounting-strategy-percentage/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy) =================================================================== --- trunk/pollen-votecounting-strategy-percentage/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.strategy.VoteCountingStrategy (rev 0) +++ trunk/pollen-votecounting-strategy-percentage/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.strategy.VoteCountingStrategy 2012-06-26 03:16:11 UTC (rev 3559) @@ -0,0 +1 @@ +org.chorem.pollen.votecounting.strategy.PercentageStrategy Property changes on: trunk/pollen-votecounting-strategy-percentage/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.strategy.VoteCountingStrategy ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageStrategyTest.java =================================================================== --- trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageStrategyTest.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageStrategyTest.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -1,273 +0,0 @@ -/* - * #%L - * Pollen :: VoteCounting strategy :: Percentage - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.votecounting; - -import com.google.common.collect.Maps; -import com.google.common.collect.Sets; -import org.chorem.pollen.votecounting.model.ChoiceIdAble; -import org.chorem.pollen.votecounting.model.ChoiceScore; -import org.chorem.pollen.votecounting.model.VoteCountingResult; -import org.chorem.pollen.votecounting.model.Voter; -import org.chorem.pollen.votecounting.model.VoterBuilder; -import org.junit.Assert; -import org.junit.Before; -import org.junit.BeforeClass; -import org.junit.Test; - -import java.math.BigDecimal; -import java.util.List; -import java.util.Map; -import java.util.Set; - -/** - * Tests the {@link PercentageStrategy}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.5 - */ -public class PercentageStrategyTest { - - public static final String CHOICE_A = "a"; - - public static final String CHOICE_B = "b"; - - public static final String CHOICE_C = "c"; - - protected static VoteCountingStrategyProvider provider; - - protected VoteCountingStrategy strategy; - - @BeforeClass - public static void beforeClass() throws Exception { - provider = new VoteCountingStrategyProvider(); - } - - @Before - public void setUp() throws Exception { - strategy = provider.getStrategy(PercentageStrategy.ID); - } - - @Test - public void simpleVotecount() throws Exception { - - // Simple poll (all weight to 1) - // 1 (a=100 b=null c=null) - // 2 (a=null b=100 c=null) - // 3 (a=50 b=50 c=null) - // Result (a=100 b=150 c=null) - - Set<Voter> voters = new VoterBuilder(). - newVoter("1", 1.). - addVoteForChoice(CHOICE_A, 100.). - addVoteForChoice(CHOICE_B, null). - addVoteForChoice(CHOICE_C, null). - newVoter("2", 1.). - addVoteForChoice(CHOICE_A, null). - addVoteForChoice(CHOICE_B, 100.). - addVoteForChoice(CHOICE_C, null). - newVoter("3", 1.). - addVoteForChoice(CHOICE_A, 50.). - addVoteForChoice(CHOICE_B, 50.). - addVoteForChoice(CHOICE_C, null). - getVoters(); - - VoteCountingResult result = strategy.votecount(voters); - - Assert.assertNotNull(result); - List<ChoiceScore> scores = result.getScores(); - Assert.assertNotNull(scores); - Assert.assertEquals(3, scores.size()); - - assertChoiceScoreEquals(BigDecimal.valueOf(150.), - Sets.newHashSet(scores.get(0), - scores.get(1)), - CHOICE_A, CHOICE_B); - - assertChoiceScore(scores.get(2), CHOICE_C, null); - } - - @Test - public void simpleVotecount2() throws Exception { - - // Simple poll (all weight to 1) - // 1 (a=20 b=30 c=50) - // 2 (a=50 b=20 c=30) - // 3 (a=10 b=50 c=40) - // Result (a=80 b=100 c=120) - Set<Voter> voters = new VoterBuilder(). - newVoter("1", 1.). - addVoteForChoice(CHOICE_A, 20.). - addVoteForChoice(CHOICE_B, 30.). - addVoteForChoice(CHOICE_C, 50.). - newVoter("2", 1.). - addVoteForChoice(CHOICE_A, 50.). - addVoteForChoice(CHOICE_B, 20.). - addVoteForChoice(CHOICE_C, 30.). - newVoter("3", 1.). - addVoteForChoice(CHOICE_A, 10.). - addVoteForChoice(CHOICE_B, 50.). - addVoteForChoice(CHOICE_C, 40.). - getVoters(); - - VoteCountingResult result = strategy.votecount(voters); - - Assert.assertNotNull(result); - List<ChoiceScore> scores = result.getScores(); - Assert.assertNotNull(scores); - Assert.assertEquals(3, scores.size()); - - assertChoiceScore(scores.get(0), CHOICE_C, BigDecimal.valueOf(120.)); - assertChoiceScore(scores.get(1), CHOICE_B, BigDecimal.valueOf(100.)); - assertChoiceScore(scores.get(2), CHOICE_A, BigDecimal.valueOf(80.)); - } - - @Test - public void simpleVotecount3() throws Exception { - - // Simple poll (all weight to 1) - // 1 (a=50 b=50 c=null) - // 2 (a=50 b=50 c=null) - // 3 (a=50 b=50 c=null) - // Result (a=150 b=150 c=null) - Set<Voter> voters = new VoterBuilder(). - newVoter("1", 1.). - addVoteForChoice(CHOICE_A, 50.). - addVoteForChoice(CHOICE_B, 50.). - addVoteForChoice(CHOICE_C, null). - newVoter("2", 1.). - addVoteForChoice(CHOICE_A, 50.). - addVoteForChoice(CHOICE_B, 50.). - addVoteForChoice(CHOICE_C, null). - newVoter("3", 1.). - addVoteForChoice(CHOICE_A, 50.). - addVoteForChoice(CHOICE_B, 50.). - addVoteForChoice(CHOICE_C, null). - getVoters(); - - VoteCountingResult result = strategy.votecount(voters); - - Assert.assertNotNull(result); - List<ChoiceScore> scores = result.getScores(); - Assert.assertNotNull(scores); - Assert.assertEquals(3, scores.size()); - - assertChoiceScoreEquals(BigDecimal.valueOf(150.), - Sets.newHashSet(scores.get(0), - scores.get(1)), - CHOICE_A, CHOICE_B); - assertChoiceScore(scores.get(2), CHOICE_C, null); - } - - @Test - public void weightedVotecount1() throws Exception { - - // poll with weighted vote - // 1 (x2) (a=100 b=null c=null) - // 2 (x1) (a=null b=100 c=null) - // 3 (x1) (a=null b=50 c=50) - // Result (a=200 b=150 c=50) - Set<Voter> voters = new VoterBuilder(). - newVoter("1", 2.). - addVoteForChoice(CHOICE_A, 100.). - addVoteForChoice(CHOICE_B, null). - addVoteForChoice(CHOICE_C, null). - newVoter("2", 1.). - addVoteForChoice(CHOICE_A, null). - addVoteForChoice(CHOICE_B, 100.). - addVoteForChoice(CHOICE_C, null). - newVoter("3", 1.). - addVoteForChoice(CHOICE_A, null). - addVoteForChoice(CHOICE_B, 50.). - addVoteForChoice(CHOICE_C, 50.). - getVoters(); - - VoteCountingResult result = strategy.votecount(voters); - - Assert.assertNotNull(result); - List<ChoiceScore> scores = result.getScores(); - Assert.assertNotNull(scores); - Assert.assertEquals(3, scores.size()); - assertChoiceScore(scores.get(0), CHOICE_A, BigDecimal.valueOf(200.)); - assertChoiceScore(scores.get(1), CHOICE_B, BigDecimal.valueOf(150.)); - assertChoiceScore(scores.get(2), CHOICE_C, BigDecimal.valueOf(50.)); - } - - @Test - public void weightedVotecount2() throws Exception { - - // poll with weighted vote - // 1 (x2) (a=100 b=null c=null) - // 2 (x1) (a=null b=100 c=null) - // 3 (x3) (a=null b=50 c=50) - // Result (a=200 b=250 c=150) - Set<Voter> voters = new VoterBuilder(). - newVoter("1", 2.). - addVoteForChoice(CHOICE_A, 100.). - addVoteForChoice(CHOICE_B, null). - addVoteForChoice(CHOICE_C, null). - newVoter("2", 1.). - addVoteForChoice(CHOICE_A, null). - addVoteForChoice(CHOICE_B, 100.). - addVoteForChoice(CHOICE_C, null). - newVoter("3", 3.). - addVoteForChoice(CHOICE_A, null). - addVoteForChoice(CHOICE_B, 50.). - addVoteForChoice(CHOICE_C, 50.). - getVoters(); - - VoteCountingResult result = strategy.votecount(voters); - - Assert.assertNotNull(result); - List<ChoiceScore> scores = result.getScores(); - Assert.assertNotNull(scores); - Assert.assertEquals(3, scores.size()); - - assertChoiceScore(scores.get(0), CHOICE_B, BigDecimal.valueOf(250.)); - assertChoiceScore(scores.get(1), CHOICE_A, BigDecimal.valueOf(200.)); - assertChoiceScore(scores.get(2), CHOICE_C, BigDecimal.valueOf(150.)); - } - - public static void assertChoiceScore(ChoiceScore choiceScore, - String choiceId, - BigDecimal choiceResult) { - Assert.assertNotNull(choiceScore); - Assert.assertEquals(choiceId, choiceScore.getChoiceId()); - Assert.assertEquals(choiceResult, choiceScore.getScoreValue()); - } - - public static void assertChoiceScoreEquals(BigDecimal choiceResult, - Set<ChoiceScore> choiceScores, - String... choiceIds) { - - Assert.assertNotNull(choiceScores); - Map<String, ChoiceScore> choicesById = Maps.uniqueIndex( - choiceScores, new ChoiceIdAble.ChoiceIdAbleById()); - for (String choiceId : choiceIds) { - - ChoiceScore choiceScore = choicesById.get(choiceId); - Assert.assertNotNull(choiceScore); - assertChoiceScore(choiceScore, choiceId, choiceResult); - } - } - -} Deleted: trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java =================================================================== --- trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java 2012-06-25 22:53:17 UTC (rev 3558) +++ trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -1,49 +0,0 @@ -/* - * #%L - * Pollen :: VoteCounting strategy :: Percentage - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.votecounting; - -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * Tests the {@link VoteCountingStrategyProvider}. - * - * @author tchemit <chemit(a)codelutin.com> - * @since 1.5 - */ -public class VoteCountingStrategyProviderTest { - - protected static VoteCountingStrategyProvider provider; - - @BeforeClass - public static void beforeClass() throws Exception { - provider = new VoteCountingStrategyProvider(); - } - - @Test - public void getStrategy() throws Exception { - - Assert.assertNotNull(provider.getStrategy(PercentageStrategy.ID)); - } -} Copied: trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/strategy/PercentageStrategyTest.java (from rev 3558, trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageStrategyTest.java) =================================================================== --- trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/strategy/PercentageStrategyTest.java (rev 0) +++ trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/strategy/PercentageStrategyTest.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -0,0 +1,273 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Percentage + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting.strategy; + +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import org.chorem.pollen.votecounting.model.ChoiceIdAble; +import org.chorem.pollen.votecounting.model.ChoiceScore; +import org.chorem.pollen.votecounting.model.VoteCountingResult; +import org.chorem.pollen.votecounting.model.Voter; +import org.chorem.pollen.votecounting.model.VoterBuilder; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Tests the {@link PercentageStrategy}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class PercentageStrategyTest { + + public static final String CHOICE_A = "a"; + + public static final String CHOICE_B = "b"; + + public static final String CHOICE_C = "c"; + + protected static VoteCountingStrategyProvider provider; + + protected VoteCountingStrategy strategy; + + @BeforeClass + public static void beforeClass() throws Exception { + provider = new VoteCountingStrategyProvider(); + } + + @Before + public void setUp() throws Exception { + strategy = provider.getStrategy(PercentageStrategy.ID); + } + + @Test + public void simpleVotecount() throws Exception { + + // Simple poll (all weight to 1) + // 1 (a=100 b=null c=null) + // 2 (a=null b=100 c=null) + // 3 (a=50 b=50 c=null) + // Result (a=100 b=150 c=null) + + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 1.). + addVoteForChoice(CHOICE_A, 100.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 100.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, 50.). + addVoteForChoice(CHOICE_B, 50.). + addVoteForChoice(CHOICE_C, null). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScoreEquals(BigDecimal.valueOf(150.), + Sets.newHashSet(scores.get(0), + scores.get(1)), + CHOICE_A, CHOICE_B); + + assertChoiceScore(scores.get(2), CHOICE_C, null); + } + + @Test + public void simpleVotecount2() throws Exception { + + // Simple poll (all weight to 1) + // 1 (a=20 b=30 c=50) + // 2 (a=50 b=20 c=30) + // 3 (a=10 b=50 c=40) + // Result (a=80 b=100 c=120) + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 1.). + addVoteForChoice(CHOICE_A, 20.). + addVoteForChoice(CHOICE_B, 30.). + addVoteForChoice(CHOICE_C, 50.). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, 50.). + addVoteForChoice(CHOICE_B, 20.). + addVoteForChoice(CHOICE_C, 30.). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, 10.). + addVoteForChoice(CHOICE_B, 50.). + addVoteForChoice(CHOICE_C, 40.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScore(scores.get(0), CHOICE_C, BigDecimal.valueOf(120.)); + assertChoiceScore(scores.get(1), CHOICE_B, BigDecimal.valueOf(100.)); + assertChoiceScore(scores.get(2), CHOICE_A, BigDecimal.valueOf(80.)); + } + + @Test + public void simpleVotecount3() throws Exception { + + // Simple poll (all weight to 1) + // 1 (a=50 b=50 c=null) + // 2 (a=50 b=50 c=null) + // 3 (a=50 b=50 c=null) + // Result (a=150 b=150 c=null) + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 1.). + addVoteForChoice(CHOICE_A, 50.). + addVoteForChoice(CHOICE_B, 50.). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, 50.). + addVoteForChoice(CHOICE_B, 50.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, 50.). + addVoteForChoice(CHOICE_B, 50.). + addVoteForChoice(CHOICE_C, null). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScoreEquals(BigDecimal.valueOf(150.), + Sets.newHashSet(scores.get(0), + scores.get(1)), + CHOICE_A, CHOICE_B); + assertChoiceScore(scores.get(2), CHOICE_C, null); + } + + @Test + public void weightedVotecount1() throws Exception { + + // poll with weighted vote + // 1 (x2) (a=100 b=null c=null) + // 2 (x1) (a=null b=100 c=null) + // 3 (x1) (a=null b=50 c=50) + // Result (a=200 b=150 c=50) + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 2.). + addVoteForChoice(CHOICE_A, 100.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 100.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 50.). + addVoteForChoice(CHOICE_C, 50.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + assertChoiceScore(scores.get(0), CHOICE_A, BigDecimal.valueOf(200.)); + assertChoiceScore(scores.get(1), CHOICE_B, BigDecimal.valueOf(150.)); + assertChoiceScore(scores.get(2), CHOICE_C, BigDecimal.valueOf(50.)); + } + + @Test + public void weightedVotecount2() throws Exception { + + // poll with weighted vote + // 1 (x2) (a=100 b=null c=null) + // 2 (x1) (a=null b=100 c=null) + // 3 (x3) (a=null b=50 c=50) + // Result (a=200 b=250 c=150) + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 2.). + addVoteForChoice(CHOICE_A, 100.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 100.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 3.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 50.). + addVoteForChoice(CHOICE_C, 50.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScore(scores.get(0), CHOICE_B, BigDecimal.valueOf(250.)); + assertChoiceScore(scores.get(1), CHOICE_A, BigDecimal.valueOf(200.)); + assertChoiceScore(scores.get(2), CHOICE_C, BigDecimal.valueOf(150.)); + } + + public static void assertChoiceScore(ChoiceScore choiceScore, + String choiceId, + BigDecimal choiceResult) { + Assert.assertNotNull(choiceScore); + Assert.assertEquals(choiceId, choiceScore.getChoiceId()); + Assert.assertEquals(choiceResult, choiceScore.getScoreValue()); + } + + public static void assertChoiceScoreEquals(BigDecimal choiceResult, + Set<ChoiceScore> choiceScores, + String... choiceIds) { + + Assert.assertNotNull(choiceScores); + Map<String, ChoiceScore> choicesById = Maps.uniqueIndex( + choiceScores, new ChoiceIdAble.ChoiceIdAbleById()); + for (String choiceId : choiceIds) { + + ChoiceScore choiceScore = choicesById.get(choiceId); + Assert.assertNotNull(choiceScore); + assertChoiceScore(choiceScore, choiceId, choiceResult); + } + } + +} Property changes on: trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/strategy/PercentageStrategyTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Copied: trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java (from rev 3551, trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java) =================================================================== --- trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java (rev 0) +++ trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java 2012-06-26 03:16:11 UTC (rev 3559) @@ -0,0 +1,49 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Percentage + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting.strategy; + +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * Tests the {@link VoteCountingStrategyProvider}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class VoteCountingStrategyProviderTest { + + protected static VoteCountingStrategyProvider provider; + + @BeforeClass + public static void beforeClass() throws Exception { + provider = new VoteCountingStrategyProvider(); + } + + @Test + public void getStrategy() throws Exception { + + Assert.assertNotNull(provider.getStrategy(PercentageStrategy.ID)); + } +} Property changes on: trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r3558 - in trunk: pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting
by tchemit＠users.chorem.org 25 Jun '12

25 Jun '12

Author: tchemit Date: 2012-06-26 00:53:17 +0200 (Tue, 26 Jun 2012) New Revision: 3558 Url: http://chorem.org/repositories/revision/pollen/3558 Log: ref #590 implements generic votecounting for groups (need now to test it...) Added: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupOfVoter.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupVoteCountingResult.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/SimpleVoter.java Modified: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingService.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteCountingResult.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/Voter.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoterBuilder.java trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/NormalStrategyTest.java trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/NumberStrategyTest.java trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageStrategyTest.java Modified: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java 2012-06-25 22:51:43 UTC (rev 3557) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/AbstractVoteCountingStrategy.java 2012-06-25 22:53:17 UTC (rev 3558) @@ -77,10 +77,15 @@ public VoteCountingResult resultToList(Voter voter, Map<String, ChoiceScore> resultByChoice) { + List<ChoiceScore> score = toChoiceScore(resultByChoice); + return VoteCountingResult.newResult(score); + } + + public List<ChoiceScore> toChoiceScore(Map<String, ChoiceScore> resultByChoice) { List<ChoiceScore> score = Lists.newArrayList(resultByChoice.values()); Collections.sort(score); Collections.reverse(score); - return VoteCountingResult.newResult(voter, score); + return score; } public Set<String> getAllChoiceIds(Set<Voter> voters) { Modified: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingService.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingService.java 2012-06-25 22:51:43 UTC (rev 3557) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/VoteCountingService.java 2012-06-25 22:53:17 UTC (rev 3558) @@ -23,9 +23,15 @@ package org.chorem.pollen.votecounting; import com.google.common.base.Preconditions; +import com.google.common.collect.Maps; +import org.chorem.pollen.votecounting.model.ChoiceScore; +import org.chorem.pollen.votecounting.model.GroupOfVoter; +import org.chorem.pollen.votecounting.model.GroupVoteCountingResult; import org.chorem.pollen.votecounting.model.VoteCountingResult; +import org.chorem.pollen.votecounting.model.VoteForChoice; import org.chorem.pollen.votecounting.model.Voter; +import java.util.Map; import java.util.Set; /** @@ -68,4 +74,68 @@ return result; } + /** + * Execute a vote counting for a given strategy (by his id) and the + * given {@code voters}. + * + * @param strategyId the id of the vote counting strategy to use + * @param voter the votes to vote count + * @return vote counting result + */ + public GroupVoteCountingResult voteCountByGroup(int strategyId, Set<Voter> voter) { + + Preconditions.checkNotNull(provider); + Preconditions.checkNotNull(voter); + + VoteCountingStrategy strategy = provider.getStrategy(strategyId); + Preconditions.checkNotNull(strategy); + + // Create a groupVoter including of the root voters + GroupOfVoter group = GroupOfVoter.newVoter(null, 1.0, null, voter); + + + Map<GroupOfVoter, VoteCountingResult> groupResults = Maps.newHashMap(); + voteCount(strategy, group, groupResults); + + // get result for main group (and remove it from groups) + VoteCountingResult mainResult = groupResults.remove(group); + + GroupVoteCountingResult result = GroupVoteCountingResult.newResult( + mainResult, groupResults); + return result; + } + + protected void voteCount(VoteCountingStrategy strategy, + GroupOfVoter group, + Map<GroupOfVoter, VoteCountingResult> results) { + + // all childs of this group + Set<Voter> voters = group.getVoters(); + + // treat before all his group childs + for (Voter voter : voters) { + if (voter instanceof GroupOfVoter) { + + // treat group child before all + voteCount(strategy, (GroupOfVoter) voter, results); + } + } + + // once here, all childs has been treated, can votecount this group + VoteCountingResult voteCountingResult = strategy.votecount(voters); + + // store the result for this group + results.put(group, voteCountingResult); + + // result of the group is now the voteForChoice for it + + for (ChoiceScore choiceScore : voteCountingResult.getScores()) { + VoteForChoice voteForChoice = VoteForChoice.newVote( + choiceScore.getChoiceId(), + //FIXME-tchemit-2012-06-26 Which is the value to set as choice for each result? + choiceScore.getScoreValue().doubleValue()); + group.addVoteForChoice(voteForChoice); + } + + } } Added: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupOfVoter.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupOfVoter.java (rev 0) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupOfVoter.java 2012-06-25 22:53:17 UTC (rev 3558) @@ -0,0 +1,117 @@ +/* + * #%L + * Pollen :: VoteCounting Api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting.model; + +import com.google.common.collect.Sets; + +import java.util.Set; + +/** + * Group of voters. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class GroupOfVoter implements Voter { + + /** Id of the group of voters. */ + private String voterId; + + /** Weight of the group of voters. */ + private double weight; + + /** All votes for this group of voters. */ + private Set<VoteForChoice> voteForChoices; + + /** Set of voters for this group. */ + private Set<Voter> voters; + + /** Result for this group. */ + private VoteCountingResult result; + + public static GroupOfVoter newVoter(String voterId, + double weight, + Set<VoteForChoice> voteForChoices, + Set<Voter> voters) { + GroupOfVoter result = new GroupOfVoter(); + result.setVoterId(voterId); + result.setWeight(weight); + result.setVoteForChoices(voteForChoices); + result.setVoters(voters); + return result; + } + + @Override + public String getVoterId() { + return voterId; + } + + @Override + public double getWeight() { + return weight; + } + + @Override + public Set<VoteForChoice> getVoteForChoices() { + if (voteForChoices == null) { + voteForChoices = Sets.newHashSet(); + } + return voteForChoices; + } + + public Set<Voter> getVoters() { + return voters; + } + + public VoteCountingResult getResult() { + return result; + } + + @Override + public void setVoterId(String voterId) { + this.voterId = voterId; + } + + @Override + public void setWeight(double weight) { + this.weight = weight; + } + + @Override + public void addVoteForChoice(VoteForChoice voteForChoice) { + getVoteForChoices().add(voteForChoice); + } + + @Override + public void setVoteForChoices(Set<VoteForChoice> voteForChoices) { + this.voteForChoices = voteForChoices; + } + + public void setVoters(Set<Voter> voters) { + this.voters = voters; + } + + public void setResult(VoteCountingResult result) { + this.result = result; + } +} Property changes on: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupOfVoter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupVoteCountingResult.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupVoteCountingResult.java (rev 0) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupVoteCountingResult.java 2012-06-25 22:53:17 UTC (rev 3558) @@ -0,0 +1,63 @@ +/* + * #%L + * Pollen :: VoteCounting Api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting.model; + +import java.util.Map; + +/** + * TODO + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class GroupVoteCountingResult { + + protected VoteCountingResult mainResult; + + protected Map<GroupOfVoter, VoteCountingResult> groupResults; + + public static GroupVoteCountingResult newResult( + VoteCountingResult mainResult, + Map<GroupOfVoter, VoteCountingResult> groupResults) { + GroupVoteCountingResult result = new GroupVoteCountingResult(); + result.setMainResult(mainResult); + result.setGroupResults(groupResults); + return result; + } + + public VoteCountingResult getMainResult() { + return mainResult; + } + + public void setMainResult(VoteCountingResult mainResult) { + this.mainResult = mainResult; + } + + public Map<GroupOfVoter, VoteCountingResult> getGroupResults() { + return groupResults; + } + + public void setGroupResults(Map<GroupOfVoter, VoteCountingResult> groupResults) { + this.groupResults = groupResults; + } +} Property changes on: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupVoteCountingResult.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/SimpleVoter.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/SimpleVoter.java (rev 0) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/SimpleVoter.java 2012-06-25 22:53:17 UTC (rev 3558) @@ -0,0 +1,94 @@ +/* + * #%L + * Pollen :: VoteCounting Api + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting.model; + +import com.google.common.collect.Sets; + +import java.util.Set; + +/** + * Physical voter. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class SimpleVoter implements Voter { + + /** Id of the voter. */ + private String voterId; + + /** Weight of the voter. */ + private double weight; + + /** All votes for this voter (or group of voter). */ + private Set<VoteForChoice> voteForChoices; + + public static SimpleVoter newVoter(String voterId, + double weight, + Set<VoteForChoice> voteForChoices) { + SimpleVoter result = new SimpleVoter(); + result.setVoterId(voterId); + result.setWeight(weight); + result.setVoteForChoices(voteForChoices); + return result; + } + + @Override + public String getVoterId() { + return voterId; + } + + @Override + public double getWeight() { + return weight; + } + + @Override + public void addVoteForChoice(VoteForChoice voteForChoice) { + getVoteForChoices().add(voteForChoice); + } + + @Override + public Set<VoteForChoice> getVoteForChoices() { + if (voteForChoices == null) { + voteForChoices = Sets.newHashSet(); + } + return voteForChoices; + } + + @Override + public void setVoterId(String voterId) { + this.voterId = voterId; + } + + @Override + public void setWeight(double weight) { + this.weight = weight; + } + + @Override + public void setVoteForChoices(Set<VoteForChoice> voteForChoices) { + this.voteForChoices = voteForChoices; + } + +} Property changes on: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/SimpleVoter.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteCountingResult.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteCountingResult.java 2012-06-25 22:51:43 UTC (rev 3557) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoteCountingResult.java 2012-06-25 22:53:17 UTC (rev 3558) @@ -32,37 +32,15 @@ */ public class VoteCountingResult { - /** - * Group of voters which obtains this result. - * <p/> - * <strong>Note:</strong> If this is the result of a poll (says a normal - * votecouting), this value is null, only used for a grouped votecouting. - */ - private Voter voter; - - /** - * Results for each choice. - * <p/> - * <strong>Note:</strong> - */ + /** Results for each choice. */ private List<ChoiceScore> scores; - public static VoteCountingResult newResult(Voter voter, - List<ChoiceScore> scores) { + public static VoteCountingResult newResult(List<ChoiceScore> scores) { VoteCountingResult result = new VoteCountingResult(); - result.setVoter(voter); result.setScores(scores); return result; } - public Voter getVoter() { - return voter; - } - - public void setVoter(Voter voter) { - this.voter = voter; - } - public List<ChoiceScore> getScores() { return scores; } Modified: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/Voter.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/Voter.java 2012-06-25 22:51:43 UTC (rev 3557) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/Voter.java 2012-06-25 22:53:17 UTC (rev 3558) @@ -30,61 +30,20 @@ * @author tchemit <chemit(a)codelutin.com> * @since 1.5 */ -public class Voter { +public interface Voter { - /** Id of the voter (or the group of voters). */ - private String voterId; + String getVoterId(); - /** Weight of the voter (or group of voters). */ - private double weight; + double getWeight(); - /** All votes for this voter (or group of voter). */ - private Set<VoteForChoice> voteForChoices; + void addVoteForChoice(VoteForChoice voteForChoice); - /** Set of voters (only when the voter is a group of voters). */ - private Set<Voter> voters; + Set<VoteForChoice> getVoteForChoices(); - public static Voter newVoter(String voterId, - double weight, - Set<VoteForChoice> voteForChoices, - Set<Voter> voters) { - Voter result = new Voter(); - result.setVoterId(voterId); - result.setWeight(weight); - result.setVoteForChoices(voteForChoices); - result.setVoters(voters); - return result; - } + void setVoterId(String voterId); - public String getVoterId() { - return voterId; - } + void setWeight(double weight); - public double getWeight() { - return weight; - } + void setVoteForChoices(Set<VoteForChoice> voteForChoices); - public Set<VoteForChoice> getVoteForChoices() { - return voteForChoices; - } - - public Set<Voter> getVoters() { - return voters; - } - - public void setVoterId(String voterId) { - this.voterId = voterId; - } - - public void setWeight(double weight) { - this.weight = weight; - } - - public void setVoteForChoices(Set<VoteForChoice> voteForChoices) { - this.voteForChoices = voteForChoices; - } - - public void setVoters(Set<Voter> voters) { - this.voters = voters; - } } Modified: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoterBuilder.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoterBuilder.java 2012-06-25 22:51:43 UTC (rev 3557) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/VoterBuilder.java 2012-06-25 22:53:17 UTC (rev 3558) @@ -41,16 +41,14 @@ public VoterBuilder newVoter(String voterId, double weight) { flushVoter(); - voter = Voter.newVoter(voterId, weight, - Sets.<VoteForChoice>newHashSet(), null); + voter = SimpleVoter.newVoter(voterId, weight, null); return this; } public VoterBuilder addVoteForChoice(String choiceId, Double voteValue) { Preconditions.checkState(voter != null); - VoteForChoice voteForChoice = VoteForChoice.newVote(choiceId, - voteValue); - voter.getVoteForChoices().add(voteForChoice); + VoteForChoice voteForChoice = VoteForChoice.newVote(choiceId, voteValue); + voter.addVoteForChoice(voteForChoice); return this; } Modified: trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/NormalStrategyTest.java =================================================================== --- trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/NormalStrategyTest.java 2012-06-25 22:51:43 UTC (rev 3557) +++ trunk/pollen-votecounting-strategy-normal/src/test/java/org/chorem/pollen/votecounting/NormalStrategyTest.java 2012-06-25 22:53:17 UTC (rev 3558) @@ -94,7 +94,6 @@ VoteCountingResult result = strategy.votecount(voters); Assert.assertNotNull(result); - Assert.assertNull(result.getVoter()); List<ChoiceScore> scores = result.getScores(); Assert.assertNotNull(scores); Assert.assertEquals(3, scores.size()); @@ -133,7 +132,6 @@ VoteCountingResult result = strategy.votecount(voters); Assert.assertNotNull(result); - Assert.assertNull(result.getVoter()); List<ChoiceScore> scores = result.getScores(); Assert.assertNotNull(scores); Assert.assertEquals(3, scores.size()); @@ -169,7 +167,6 @@ VoteCountingResult result = strategy.votecount(voters); Assert.assertNotNull(result); - Assert.assertNull(result.getVoter()); List<ChoiceScore> scores = result.getScores(); Assert.assertNotNull(scores); Assert.assertEquals(3, scores.size()); @@ -207,7 +204,6 @@ VoteCountingResult result = strategy.votecount(voters); Assert.assertNotNull(result); - Assert.assertNull(result.getVoter()); List<ChoiceScore> scores = result.getScores(); Assert.assertNotNull(scores); Assert.assertEquals(3, scores.size()); @@ -245,7 +241,6 @@ VoteCountingResult result = strategy.votecount(voters); Assert.assertNotNull(result); - Assert.assertNull(result.getVoter()); List<ChoiceScore> scores = result.getScores(); Assert.assertNotNull(scores); Assert.assertEquals(3, scores.size()); Modified: trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/NumberStrategyTest.java =================================================================== --- trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/NumberStrategyTest.java 2012-06-25 22:51:43 UTC (rev 3557) +++ trunk/pollen-votecounting-strategy-number/src/test/java/org/chorem/pollen/votecounting/NumberStrategyTest.java 2012-06-25 22:53:17 UTC (rev 3558) @@ -94,7 +94,6 @@ VoteCountingResult result = strategy.votecount(voters); Assert.assertNotNull(result); - Assert.assertNull(result.getVoter()); List<ChoiceScore> scores = result.getScores(); Assert.assertNotNull(scores); Assert.assertEquals(3, scores.size()); @@ -130,7 +129,6 @@ VoteCountingResult result = strategy.votecount(voters); Assert.assertNotNull(result); - Assert.assertNull(result.getVoter()); List<ChoiceScore> scores = result.getScores(); Assert.assertNotNull(scores); Assert.assertEquals(3, scores.size()); @@ -166,7 +164,6 @@ VoteCountingResult result = strategy.votecount(voters); Assert.assertNotNull(result); - Assert.assertNull(result.getVoter()); List<ChoiceScore> scores = result.getScores(); Assert.assertNotNull(scores); Assert.assertEquals(3, scores.size()); @@ -204,7 +201,6 @@ VoteCountingResult result = strategy.votecount(voters); Assert.assertNotNull(result); - Assert.assertNull(result.getVoter()); List<ChoiceScore> scores = result.getScores(); Assert.assertNotNull(scores); Assert.assertEquals(3, scores.size()); @@ -242,7 +238,6 @@ VoteCountingResult result = strategy.votecount(voters); Assert.assertNotNull(result); - Assert.assertNull(result.getVoter()); List<ChoiceScore> scores = result.getScores(); Assert.assertNotNull(scores); Assert.assertEquals(3, scores.size()); Modified: trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageStrategyTest.java =================================================================== --- trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageStrategyTest.java 2012-06-25 22:51:43 UTC (rev 3557) +++ trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageStrategyTest.java 2012-06-25 22:53:17 UTC (rev 3558) @@ -94,7 +94,6 @@ VoteCountingResult result = strategy.votecount(voters); Assert.assertNotNull(result); - Assert.assertNull(result.getVoter()); List<ChoiceScore> scores = result.getScores(); Assert.assertNotNull(scores); Assert.assertEquals(3, scores.size()); @@ -133,7 +132,6 @@ VoteCountingResult result = strategy.votecount(voters); Assert.assertNotNull(result); - Assert.assertNull(result.getVoter()); List<ChoiceScore> scores = result.getScores(); Assert.assertNotNull(scores); Assert.assertEquals(3, scores.size()); @@ -169,7 +167,6 @@ VoteCountingResult result = strategy.votecount(voters); Assert.assertNotNull(result); - Assert.assertNull(result.getVoter()); List<ChoiceScore> scores = result.getScores(); Assert.assertNotNull(scores); Assert.assertEquals(3, scores.size()); @@ -207,7 +204,6 @@ VoteCountingResult result = strategy.votecount(voters); Assert.assertNotNull(result); - Assert.assertNull(result.getVoter()); List<ChoiceScore> scores = result.getScores(); Assert.assertNotNull(scores); Assert.assertEquals(3, scores.size()); @@ -242,7 +238,6 @@ VoteCountingResult result = strategy.votecount(voters); Assert.assertNotNull(result); - Assert.assertNull(result.getVoter()); List<ChoiceScore> scores = result.getScores(); Assert.assertNotNull(scores); Assert.assertEquals(3, scores.size());

1 0

r3557 - in trunk/pollen-votecounting-strategy-condorcet: . src/main/java/org/chorem/pollen/votecounting src/test/java/org/chorem/pollen/votecounting
by tchemit＠users.chorem.org 25 Jun '12

25 Jun '12

Author: tchemit Date: 2012-06-26 00:51:43 +0200 (Tue, 26 Jun 2012) New Revision: 3557 Url: http://chorem.org/repositories/revision/pollen/3557 Log: refs #590 : finish implementation of condorcet strategy Modified: trunk/pollen-votecounting-strategy-condorcet/pom.xml trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetStrategy.java trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetStrategyTest.java Modified: trunk/pollen-votecounting-strategy-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/pom.xml 2012-06-25 17:56:45 UTC (rev 3556) +++ trunk/pollen-votecounting-strategy-condorcet/pom.xml 2012-06-25 22:51:43 UTC (rev 3557) @@ -38,6 +38,10 @@ <artifactId>nuiton-i18n</artifactId> </dependency> <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> + <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <scope>test</scope> Modified: trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetStrategy.java =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetStrategy.java 2012-06-25 17:56:45 UTC (rev 3556) +++ trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetStrategy.java 2012-06-25 22:51:43 UTC (rev 3557) @@ -22,12 +22,22 @@ */ package org.chorem.pollen.votecounting; -import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.votecounting.model.ChoiceIdAble; import org.chorem.pollen.votecounting.model.ChoiceScore; import org.chorem.pollen.votecounting.model.VoteCountingResult; import org.chorem.pollen.votecounting.model.VoteForChoice; import org.chorem.pollen.votecounting.model.Voter; +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; import java.util.Map; import java.util.Set; @@ -43,6 +53,9 @@ public static final int ID = 2; + /** Logger. */ + private static final Log log = LogFactory.getLog(CondorcetStrategy.class); + @Override public int getId() { return ID; @@ -59,18 +72,14 @@ } @Override - public VoteCountingResult votecount(Set<Voter> voters) { + public String getTotalVoteValueNotValidMessage() { + // no validation on total value, so no message + return null; + } - // get empty result by choice - Map<String, ChoiceScore> resultByChoice = votersToResult(voters); - - for (Voter voter : voters) { - // add this voter votes to result - addVoterChoices(voter, resultByChoice); - } - // transform map of result to list of them (and sort them) - VoteCountingResult result = resultToList(null, resultByChoice); - return result; + @Override + public String getVoteValueNotValidMessage() { + return n_("pollen.error.vote.invalidCondorcetVoteValue"); } @Override @@ -79,6 +88,11 @@ } @Override + public ChoiceToVoteRenderType getRenderType() { + return ChoiceToVoteRenderType.TEXTFIELD; + } + + @Override public boolean isChoiceInVote(Integer voteValue) { return voteValue != null && voteValue > 0 && voteValue < 100; } @@ -89,11 +103,6 @@ } @Override - public ChoiceToVoteRenderType getRenderType() { - return ChoiceToVoteRenderType.TEXTFIELD; - } - - @Override public boolean isDisplayResultsByChoice() { return false; } @@ -110,62 +119,213 @@ } @Override - public String getTotalVoteValueNotValidMessage() { - // no validation on total value, so no message - return null; - } + public VoteCountingResult votecount(Set<Voter> voters) { - @Override - public String getVoteValueNotValidMessage() { - return n_("pollen.error.vote.invalidCondorcetVoteValue"); - } + // get empty result by choice + Map<String, ChoiceScore> resultByChoice = votersToResult(voters); - public void addVoterChoices(Voter voter, - Map<String, ChoiceScore> resultByChoice) { + // get order over choices (needed to get coordinates over matrix) + List<String> choiceIds = Lists.newArrayList(resultByChoice.keySet()); - double voterWeight = voter.getWeight(); + // nb of choices + int nbChoices = choiceIds.size(); - Set<VoteForChoice> voteForChoices = voter.getVoteForChoices(); + //matrix of pairwise + double[][] matrix = new double[nbChoices][nbChoices]; - for (VoteForChoice voteForChoice : voteForChoices) { + // compute pairwise battle matrix and try to have a direct winner(s) + Set<String> winners = computePairWiseMatrix(choiceIds, voters, matrix); - Double voteValue = voteForChoice.getVoteValue(); + // compute nb battles wins for each choice + // and store it as choice score value + computeNbBattlesByChoice(resultByChoice, choiceIds, matrix); - if (voteValue != null) { + // get choice score ordered by their number of win battles + List<ChoiceScore> choiceScores = toChoiceScore(resultByChoice); - // get nb victories for this choice among voter choices - int victories = getVictories(voteForChoice, voteForChoices); + if (winners != null) { - // get score for choice - String choiceId = voteForChoice.getChoiceId(); + // there is winner(s), re-add them to + + if (log.isDebugEnabled()) { + log.debug("Direct winners : " + winners); + } + for (String choiceId : winners) { ChoiceScore choiceScore = resultByChoice.get(choiceId); + choiceScores.remove(choiceScore); + choiceScores.add(0, choiceScore); + } + } else { - // compute score to add - double scoreToAdd = (double) victories * voterWeight; + // no direct winner, must resolv conflicts - // add to score this weighted vote - choiceScore.addScoreValue(scoreToAdd); + resolvConflicts(choiceScores, matrix); + } + + // transform map of result to list of them (and sort them) + VoteCountingResult result = resultToList(null, resultByChoice); + return result; + } + + protected void resolvConflicts(List<ChoiceScore> choiceScores, + double[][] matrix) { + + // for the moment we use only number of win battles + // so nothing more to do here... + } + + protected void computeNbBattlesByChoice(Map<String, ChoiceScore> resultByChoice, + List<String> choiceIds, + double[][] matrix) { + + int nbChoices = choiceIds.size(); + + for (String choiceId : choiceIds) { + + int i = choiceIds.indexOf(choiceId); + + double nbBattles = 0; + for (int j = 0; j < nbChoices; j++) { + double aRow = matrix[i][j]; + nbBattles += aRow; } + + resultByChoice.get(choiceId).setScoreValue( + BigDecimal.valueOf(nbBattles)); + + if (log.isDebugEnabled()) { + log.debug("Nb battle wins for choice " + choiceId + ": " + nbBattles); + } } } - public int getVictories(VoteForChoice voteForChoice, - Set<VoteForChoice> voteForChoices) { - int result = 0; - Preconditions.checkNotNull(voteForChoice); - Double refValue = voteForChoice.getVoteValue(); - Preconditions.checkNotNull(refValue); - String currentCHoiceId = voteForChoice.getChoiceId(); - for (VoteForChoice forChoice : voteForChoices) { - if (!currentCHoiceId.equals(forChoice.getChoiceId())) { - Double voteValue = forChoice.getVoteValue(); - if (voteValue == null || refValue < voteValue) { + private Set<String> computePairWiseMatrix(List<String> choiceIds, + Set<Voter> voters, + double[][] matrix) { - // ref choice wins against current choice - result++; + int nbChoices = choiceIds.size(); + + Set<String> winners = null; + + VoteForChoiceComparator comparator = new VoteForChoiceComparator(); + + double[] currentVoteWinner = new double[choiceIds.size()]; + + boolean firstVoter = true; + for (Voter voter : voters) { + + if (log.isDebugEnabled()) { + log.debug("Start count for voter " + voter.getVoterId()); + } + double voterWeight = voter.getWeight(); + + Arrays.fill(currentVoteWinner, 0); + + Map<String, VoteForChoice> voteByChoiceIds = + Maps.uniqueIndex(voter.getVoteForChoices(), + new ChoiceIdAble.ChoiceIdAbleById()); + + double maxBattleWins = 0; + + for (String choiceId : choiceIds) { + + // get vote for this choice + VoteForChoice voteForChoice = voteByChoiceIds.get(choiceId); + + int x = choiceIds.indexOf(choiceId); + + for (VoteForChoice voteForChoice1 : voter.getVoteForChoices()) { + + String choiceId1 = voteForChoice1.getChoiceId(); + if (choiceId.equals(choiceId1)) { + + // can not battle same choice + continue; + } + + int y = choiceIds.indexOf(choiceId1); + + int compare = comparator.compare(voteForChoice, + voteForChoice1); + + if (compare > 0) { + + // voteForChoice wins his battle + + int pos = x * nbChoices + y; + + matrix[x][y] = matrix[x][y] + voterWeight; + if (log.isTraceEnabled()) { + log.trace("battle [" + choiceId + "<" + + voteForChoice.getVoteValue() + "> - " + + choiceId1 + "<" + + voteForChoice1.getVoteValue() + + ">] wins (store to " + pos + + ", new value=" + matrix[x][y] + ")"); + } + maxBattleWins = Math.max( + maxBattleWins, + currentVoteWinner[x] = + currentVoteWinner[x] + voterWeight); + } } } + + if (firstVoter || winners != null) { + + // still have a winner, le'ts compute current winner + Set<String> currentVoteWinners = Sets.newHashSet(); + + // find winners of this vote + for (int i = 0; i < currentVoteWinner.length; i++) { + if (maxBattleWins == currentVoteWinner[i]) { + + // this is a winner for this vote + String choiceId = choiceIds.get(i); + currentVoteWinners.add(choiceId); + } + } + if (log.isDebugEnabled()) { + log.debug("Winners of this vote : " + currentVoteWinners); + } + + + if (firstVoter) { + + // keep this first result + winners = currentVoteWinners; + } else if (!winners.equals(currentVoteWinners)) { + + // current vote has not same winners than previous, + // so will need resolution + winners = null; + + if (log.isDebugEnabled()) { + log.debug("Dismatch winners (will need resolv...)"); + } + } + } + + firstVoter = false; } - return result; + return winners; } + + public static class VoteForChoiceComparator implements Comparator<VoteForChoice>, Serializable { + + private static final long serialVersionUID = 1L; + + @Override + public int compare(VoteForChoice o1, VoteForChoice o2) { + Double v1 = o1.getVoteValue(); + Double v2 = o2.getVoteValue(); + if (v1 == null) { + v1 = Double.MAX_VALUE; + } + if (v2 == null) { + v2 = Double.MAX_VALUE; + } + return v2.intValue() - v1.intValue(); + } + } } Modified: trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetStrategyTest.java =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetStrategyTest.java 2012-06-25 17:56:45 UTC (rev 3556) +++ trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetStrategyTest.java 2012-06-25 22:51:43 UTC (rev 3557) @@ -72,6 +72,42 @@ // Simple poll (all weight to 1) // 1 (a=1 b=2 c=null) + // 2 (a=1 b=3 c=2) + // 3 (a=1 b=null c=2) + // Result (a=6 b=1 c=2) + + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 2.). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 3.). + addVoteForChoice(CHOICE_C, 2.). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, 2.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScore(scores.get(0), CHOICE_A, BigDecimal.valueOf(6.)); + assertChoiceScore(scores.get(1), CHOICE_C, BigDecimal.valueOf(2.)); + assertChoiceScore(scores.get(2), CHOICE_B, BigDecimal.valueOf(1.)); + } + + @Test + public void simpleVotecount0() throws Exception { + + // Simple poll (all weight to 1) + // 1 (a=1 b=2 c=null) // 2 (a=3 b=2 c=1) // 3 (a=1 b=null c=2) // Result (a=4 b=2 c=3) @@ -94,7 +130,6 @@ VoteCountingResult result = strategy.votecount(voters); Assert.assertNotNull(result); - Assert.assertNull(result.getVoter()); List<ChoiceScore> scores = result.getScores(); Assert.assertNotNull(scores); Assert.assertEquals(3, scores.size()); @@ -131,7 +166,6 @@ VoteCountingResult result = strategy.votecount(voters); Assert.assertNotNull(result); - Assert.assertNull(result.getVoter()); List<ChoiceScore> scores = result.getScores(); Assert.assertNotNull(scores); Assert.assertEquals(3, scores.size()); @@ -170,7 +204,6 @@ VoteCountingResult result = strategy.votecount(voters); Assert.assertNotNull(result); - Assert.assertNull(result.getVoter()); List<ChoiceScore> scores = result.getScores(); Assert.assertNotNull(scores); Assert.assertEquals(3, scores.size()); @@ -210,7 +243,6 @@ VoteCountingResult result = strategy.votecount(voters); Assert.assertNotNull(result); - Assert.assertNull(result.getVoter()); List<ChoiceScore> scores = result.getScores(); Assert.assertNotNull(scores); Assert.assertEquals(3, scores.size()); @@ -249,7 +281,6 @@ VoteCountingResult result = strategy.votecount(voters); Assert.assertNotNull(result); - Assert.assertNull(result.getVoter()); List<ChoiceScore> scores = result.getScores(); Assert.assertNotNull(scores); Assert.assertEquals(3, scores.size());

1 0

r3556 - in trunk: . pollen-persistence/src/main/java/org/chorem/pollen pollen-persistence/src/main/xmi pollen-services pollen-services/src/main/java/org/chorem/pollen pollen-services/src/main/java/org/chorem/pollen/bean pollen-services/src/main/java/org/chorem/pollen/entities/migration pollen-services/src/main/java/org/chorem/pollen/services pollen-services/src/main/java/org/chorem/pollen/services/impl pollen-services/src/test/java/org/chorem/pollen/services pollen-ui-struts2 pollen-ui-stru
by tchemit＠users.chorem.org 25 Jun '12

25 Jun '12

Author: tchemit Date: 2012-06-25 19:56:45 +0200 (Mon, 25 Jun 2012) New Revision: 3556 Url: http://chorem.org/repositories/revision/pollen/3556 Log: refs #642 : remove some bi-direction refs #590 : - replace VoteCountingType enum by a simple int (coming from votecounting-api) - usage of votecouting-api (in ui will no more kow anything about votecouting strategies :)) Added: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollVoteCountingService.java trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVote_CHECKBOX.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVote_TEXTFIELD.jsp Removed: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/VoteCountingType.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java trunk/pollen-persistence/src/main/xmi/pollen.zargo trunk/pollen-services/pom.xml trunk/pollen-services/src/main/java/org/chorem/pollen/PollenApplicationContext.java trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollResult.java trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollResultsService.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java trunk/pollen-ui-struts2/pom.xml trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp trunk/pollen-ui-struts2/src/main/webapp/img/7terOk.jpg trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateFreeDatePollSIT.java trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateRestrictedTextPollSIT.java trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateTextPollForGroupSIT.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/CondorcetMethod.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/StandardMethod.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteCountingResultDTO.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ImportExportService.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExportImpl.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/VoteCountingService.java trunk/pom.xml Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfiguration.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -29,7 +29,6 @@ import org.apache.commons.logging.LogFactory; import org.chorem.pollen.common.ChoiceType; import org.chorem.pollen.common.PollType; -import org.chorem.pollen.common.VoteCountingType; import org.nuiton.util.ApplicationConfig; import org.nuiton.util.ArgumentsParserException; import org.nuiton.util.FileUtil; @@ -103,9 +102,8 @@ return result; } - public VoteCountingType getDefaultVoteCountingType() { - VoteCountingType result = applicationConfig.getOption( - VoteCountingType.class, + public int getDefaultVoteCountingType() { + int result = applicationConfig.getOptionAsInt( PollenConfigurationOption.DEFAULT_VOTE_COUNTING_TYPE.key); return result; } Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenConfigurationOption.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -24,7 +24,6 @@ import org.chorem.pollen.common.ChoiceType; import org.chorem.pollen.common.PollType; -import org.chorem.pollen.common.VoteCountingType; import org.hibernate.dialect.H2Dialect; import org.nuiton.util.ApplicationConfig; @@ -90,7 +89,7 @@ DEFAULT_POLL_TYPE("pollen.default.pollType", n_("pollen.configuration.defaultPollType"), PollType.FREE.name(), PollType.class), /** Default vote counting type to use at a new poll creation. */ - DEFAULT_VOTE_COUNTING_TYPE("pollen.default.voteCountingType", n_("pollen.configuration.defaultVoteCountingType"), VoteCountingType.NORMAL.name(), VoteCountingType.class), + DEFAULT_VOTE_COUNTING_TYPE("pollen.default.voteCountingType", n_("pollen.configuration.defaultVoteCountingType"), "0", Integer.class), /** Default choice type to use at a new poll creation. */ DEFAULT_CHOICE_TYPE("pollen.default.choiceType", n_("pollen.configuration.defaultChoiceType"), ChoiceType.TEXT.name(), ChoiceType.class), Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenFunctions.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -99,7 +99,7 @@ if (!input.isVotingListEmpty()) { result.setVotingGroups(Lists.transform(input.getVotingList(), - VOTING_LIST_TO_BEAN + newVotingListToBean(input) )); } else { // un groupe par défaut si il y en a pas @@ -136,27 +136,50 @@ } }; - public static final Function<VotingList, VotingGroupDTO> VOTING_LIST_TO_BEAN = new Function<VotingList, VotingGroupDTO>() { - @Override - public VotingGroupDTO apply(VotingList input) { - VotingGroupDTO result = new VotingGroupDTO( - input.getTopiaId(), - input.getWeight()); + public static Function<VotingList, VotingGroupDTO> newVotingListToBean(final Poll poll) { + return new Function<VotingList, VotingGroupDTO>() { + @Override + public VotingGroupDTO apply(VotingList input) { + VotingGroupDTO result = new VotingGroupDTO( + input.getTopiaId(), + input.getWeight()); - result.setName(input.getName()); + result.setName(input.getName()); - for (PersonToList pToList : input.getPollAccountPersonToList()) { - Vote vote = input.getPoll().getVoteByPollAccount(pToList.getPollAccount()); - if (vote != null) { - // Pas de vote pour cette personne : doit engendrer erreur ?!? - VotingPersonDTO bean = VOTE_TO_BEAN.apply(vote); - result.getVotingPersons().add(bean); + for (PersonToList pToList : input.getPollAccountPersonToList()) { + Vote vote = poll.getVoteByPollAccount(pToList.getPollAccount()); + if (vote != null) { + // Pas de vote pour cette personne : doit engendrer erreur ?!? + VotingPersonDTO bean = VOTE_TO_BEAN.apply(vote); + result.getVotingPersons().add(bean); + } } + return result; } - return result; - } - }; + }; + } +// public static final Function<VotingList, VotingGroupDTO> VOTING_LIST_TO_BEAN = new Function<VotingList, VotingGroupDTO>() { +// @Override +// public VotingGroupDTO apply(VotingList input) { +// VotingGroupDTO result = new VotingGroupDTO( +// input.getTopiaId(), +// input.getWeight()); +// +// result.setName(input.getName()); +// +// for (PersonToList pToList : input.getPollAccountPersonToList()) { +// Vote vote = input.getPoll().getVoteByPollAccount(pToList.getPollAccount()); +// if (vote != null) { +// // Pas de vote pour cette personne : doit engendrer erreur ?!? +// VotingPersonDTO bean = VOTE_TO_BEAN.apply(vote); +// result.getVotingPersons().add(bean); +// } +// } +// return result; +// } +// }; + public static final Function<Vote, VotingPersonDTO> VOTE_TO_BEAN = new Function<Vote, VotingPersonDTO>() { @Override public VotingPersonDTO apply(Vote input) { Modified: trunk/pollen-persistence/src/main/xmi/pollen.zargo =================================================================== (Binary files differ) Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-services/pom.xml 2012-06-25 17:56:45 UTC (rev 3556) @@ -19,6 +19,11 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>pollen-votecounting-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>pollen-votecounting</artifactId> <version>${project.version}</version> </dependency> Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/PollenApplicationContext.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/PollenApplicationContext.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/PollenApplicationContext.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -24,6 +24,7 @@ import com.opensymphony.xwork2.ActionContext; import org.chorem.pollen.services.PollenNotifierWorker; +import org.chorem.pollen.votecounting.VoteCountingStrategyProvider; import org.nuiton.topia.TopiaContext; import javax.servlet.ServletContext; @@ -45,6 +46,8 @@ protected PollenNotifierWorker pollenNotifierWorker; + protected VoteCountingStrategyProvider voteCountingStrategyProvider; + public static PollenApplicationContext get(ActionContext actionContext) { Map<String, Object> application = actionContext.getApplication(); PollenApplicationContext applicationContext = @@ -98,4 +101,12 @@ public void setPollenNotifierWorker(PollenNotifierWorker pollenNotifierWorker) { this.pollenNotifierWorker = pollenNotifierWorker; } + + public VoteCountingStrategyProvider getVoteCountingStrategyProvider() { + return voteCountingStrategyProvider; + } + + public void setVoteCountingStrategyProvider(VoteCountingStrategyProvider voteCountingStrategyProvider) { + this.voteCountingStrategyProvider = voteCountingStrategyProvider; + } } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollResult.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollResult.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/bean/PollResult.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -24,7 +24,6 @@ import org.apache.commons.lang3.builder.ToStringBuilder; import org.chorem.pollen.common.ChoiceType; -import org.chorem.pollen.common.VoteCountingType; import java.io.Serializable; @@ -47,7 +46,7 @@ private ChoiceType choiceType; - private VoteCountingType voteCountingType; + private int voteCountingType; private boolean byGroup; @@ -64,7 +63,7 @@ public PollResult(String name, String pollId, ChoiceType choiceType, - VoteCountingType voteCountingType) { + int voteCountingType) { super(); this.name = name; this.pollId = pollId; @@ -112,11 +111,11 @@ this.choiceType = choiceType; } - public VoteCountingType getVoteCountingType() { + public int getVoteCountingType() { return voteCountingType; } - public void setVoteCountingType(VoteCountingType voteCountingType) { + public void setVoteCountingType(int voteCountingType) { this.voteCountingType = voteCountingType; } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_3.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -28,7 +28,6 @@ import org.chorem.pollen.PollenTechnicalException; import org.chorem.pollen.common.ChoiceType; import org.chorem.pollen.common.PollType; -import org.chorem.pollen.common.VoteCountingType; import org.nuiton.topia.TopiaException; import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.framework.TopiaSQLQuery; @@ -192,9 +191,17 @@ queries.add("DROP TABLE polltype;"); } + enum VoteCountingType { + NORMAL, + PERCENTAGE, + CONDORCET, + NUMBER + } + private void migrateVoteCountingTypes(TopiaContextImplementor tx, List<String> queries) throws TopiaException { + // build the new mapping between old id associated to new enum ordinal Map<String, Integer> mapping = getMapping(tx, "votecounting", VoteCountingType.values()); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/entities/migration/PollenMigrationCallbackV1_4.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -139,7 +139,8 @@ Locale.getDefault(), tx, configuration, - serviceFactory + serviceFactory, + applicationContext.getVoteCountingStrategyProvider() ); List<Pair<String, String>> choiceIds = @@ -213,7 +214,8 @@ Locale.getDefault(), tx, configuration, - serviceFactory + serviceFactory, + applicationContext.getVoteCountingStrategyProvider() ); PollFeedService feedService = sContext.newService(PollFeedService.class); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/DefaultPollenServiceContext.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -24,6 +24,7 @@ import com.google.common.base.Preconditions; import org.chorem.pollen.PollenConfiguration; +import org.chorem.pollen.votecounting.VoteCountingStrategyProvider; import org.nuiton.topia.TopiaContext; import java.net.URL; @@ -46,13 +47,16 @@ protected Locale locale; + protected VoteCountingStrategyProvider voteCountingStrategyProvider; + public static PollenServiceContext newContext( PollenServiceContext serviceContext, TopiaContext transaction) { return newContext(serviceContext.getLocale(), transaction, serviceContext.getConfiguration(), - serviceContext.getServiceFactory() + serviceContext.getServiceFactory(), + serviceContext.getVoteCountingStrategyProvider() ); } @@ -61,21 +65,26 @@ Locale locale, TopiaContext transaction, PollenConfiguration configuration, - PollenServiceFactory serviceFactory) { + PollenServiceFactory serviceFactory, + VoteCountingStrategyProvider voteCountingStrategyProvider) { return new DefaultPollenServiceContext(locale, transaction, configuration, - serviceFactory); + serviceFactory, + voteCountingStrategyProvider); } - protected DefaultPollenServiceContext(Locale locale, - TopiaContext transaction, - PollenConfiguration configuration, - PollenServiceFactory serviceFactory) { + protected DefaultPollenServiceContext( + Locale locale, + TopiaContext transaction, + PollenConfiguration configuration, + PollenServiceFactory serviceFactory, + VoteCountingStrategyProvider voteCountingStrategyProvider) { this.locale = locale; this.transaction = transaction; this.configuration = configuration; this.serviceFactory = serviceFactory; + this.voteCountingStrategyProvider = voteCountingStrategyProvider; } @Override @@ -123,4 +132,9 @@ public Date getCurrentTime() { return new Date(); } + + @Override + public VoteCountingStrategyProvider getVoteCountingStrategyProvider() { + return voteCountingStrategyProvider; + } } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenNotifierWorker.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -33,6 +33,7 @@ import java.io.Closeable; import java.io.IOException; +import java.util.Date; import java.util.List; import java.util.Timer; import java.util.TimerTask; @@ -84,7 +85,9 @@ serviceContext.newService(PreventRuleService.class); // Récupération des sondages en cours - List<Poll> polls = pollService.getRunningPolls(true); + Date currentTime = serviceContext.getCurrentTime(); + List<Poll> polls = + pollService.getRunningPolls(currentTime); for (Poll poll : polls) { Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceContext.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -24,6 +24,7 @@ package org.chorem.pollen.services; import org.chorem.pollen.PollenConfiguration; +import org.chorem.pollen.votecounting.VoteCountingStrategyProvider; import org.nuiton.topia.TopiaContext; import java.net.URL; @@ -59,4 +60,6 @@ /** @return the current date */ Date getCurrentTime(); + VoteCountingStrategyProvider getVoteCountingStrategyProvider(); + } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/PollenServiceFunctions.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -35,14 +35,19 @@ import org.chorem.pollen.business.persistence.PollAccount; import org.chorem.pollen.business.persistence.PollAccountImpl; import org.chorem.pollen.business.persistence.Result; +import org.chorem.pollen.business.persistence.Vote; +import org.chorem.pollen.business.persistence.VoteToChoice; import org.chorem.pollen.business.persistence.VotingList; import org.chorem.pollen.business.persistence.VotingListImpl; import org.chorem.pollen.common.ChoiceType; import org.chorem.pollen.votecounting.business.NumberMethod; +import org.chorem.pollen.votecounting.model.Voter; +import org.chorem.pollen.votecounting.model.VoterBuilder; import org.nuiton.topia.persistence.TopiaEntity; import java.util.Date; import java.util.List; +import java.util.Set; /** * Usefull functions for the service (and higher) layers. @@ -73,6 +78,28 @@ } } + public static final Function<Poll, Set<Voter>> POLL_TO_VOTERS = new Function<Poll, Set<Voter>>() { + @Override + public Set<Voter> apply(Poll input) { + + VoterBuilder builder = new VoterBuilder(); + for (Vote vote : input.getVote()) { + + String voterId = vote.getPollAccount().getAccountId(); + double voteWeight = vote.getWeight(); + builder.newVoter(voterId, voteWeight); + + for (VoteToChoice voteToChoice : vote.getChoiceVoteToChoice()) { + String choiceId = voteToChoice.getChoice().getTopiaId(); + Double voteValue = Double.valueOf(voteToChoice.getVoteValue()); + builder.addVoteForChoice(choiceId, voteValue); + } + } + Set<Voter> result = builder.getVoters(); + return result; + } + }; + public static final Function<Choice, String> CHOICE_TO_NAME = new Function<Choice, String>() { @Override public String apply(Choice input) { Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -50,6 +50,7 @@ TopiaFilterPagerUtil.FilterPagerBean pager) { Preconditions.checkNotNull(user); + Preconditions.checkNotNull(pager); try { PersonListDAO dao = getDAO(PersonList.class); Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollResultsService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollResultsService.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollResultsService.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -37,7 +37,6 @@ import org.chorem.pollen.business.persistence.ResultDAO; import org.chorem.pollen.common.ChoiceType; import org.chorem.pollen.common.PollType; -import org.chorem.pollen.common.VoteCountingType; import org.chorem.pollen.services.PollenServiceFunctions; import org.chorem.pollen.services.PollenServiceSupport; import org.chorem.pollen.services.exceptions.PollNotFoundException; @@ -103,7 +102,7 @@ boolean byGroup = poll.getPollType() == PollType.GROUP; - VoteCountingType voteCountingType = poll.getVoteCountingType(); + int voteCountingType = poll.getVoteCountingType(); // Conversion des résultats List<PollResult> list = Lists.transform( @@ -116,12 +115,6 @@ while (it.hasNext()) { PollResult currentResult = it.next(); - // Cas d'un dépouillement particulier - // Suppression des resultats qui ne sont pas de se dépouillement - if (currentResult.getVoteCountingType() != voteCountingType) { - it.remove(); - } - // Cas d'un sondage de type GROUP avec filtre if (byGroup) { @@ -129,11 +122,6 @@ if (!currentResult.isByGroup()) { it.remove(); } - - // Suppression des autres resultats de depouillements differents - if (currentResult.getVoteCountingType() != voteCountingType) { - it.remove(); - } } } @@ -179,7 +167,7 @@ eResult.setByGroup(result.isByGroup()); // eResult.setPoll(poll); eResult.setResultValue(String.valueOf(choice.getValue())); - eResult.setVoteCountingType(result.getTypeVoteCounting()); + eResult.setVoteCountingType(poll.getVoteCountingType()); poll.addResult(eResult); } Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollService.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -384,11 +384,11 @@ } } - public List<Poll> getRunningPolls(boolean withEndDate) { + public List<Poll> getRunningPolls(Date currentTime) { try { PollDAO dao = getDAO(Poll.class); - List<Poll> results = dao.getRunningPolls(withEndDate); + List<Poll> results = dao.getRunningPolls(currentTime); return results; } catch (TopiaException e) { throw new PollenTechnicalException("Could not obtain running polls", e); @@ -955,7 +955,7 @@ PollAccount pollAccount2 = newInstance(getDAO(PollAccount.class)); result.setPollAccount(pollAccount2); if (pollAccount != null) { - pollAccount2.setComment(pollAccount.getComment()); +// pollAccount2.setComment(pollAccount.getComment()); pollAccount2.setEmail(pollAccount.getEmail()); pollAccount2.setUserAccount(pollAccount.getUserAccount()); pollAccount2.setVotingId(pollAccount.getVotingId()); @@ -979,9 +979,6 @@ } else { result = poll.getVotingListByTopiaId(votingList.getTopiaId()); - - // FIXME-fdesbois-2012-04-05 : why the poll association is not keeped ?!? because of the clear - result.setPoll(poll); } result.setName(votingList.getName()); @@ -1017,11 +1014,13 @@ } else { // reuse the existing account - pollAccountLoaded = pollAccountDAO.findByAccountId(accountId); + pollAccountLoaded = + pollAccountDAO.findByAccountId(accountId); } } else { - personToListLoaded = getEntityById(PersonToList.class, personToList.getTopiaId()); + personToListLoaded = getEntityById(PersonToList.class, + personToList.getTopiaId()); pollAccountLoaded = personToListLoaded.getPollAccount(); } personToListsUpdated.add(personToListLoaded); @@ -1041,7 +1040,8 @@ // Update the account (otherwise a saving error will occurs if // already exists on delete cascade) - PollAccount pollAccountUpdated = update(pollAccountDAO, pollAccountLoaded); + PollAccount pollAccountUpdated = update(pollAccountDAO, + pollAccountLoaded); personToListLoaded.setPollAccount(pollAccountUpdated); } result.setPollAccountPersonToList(personToListsUpdated); @@ -1052,7 +1052,8 @@ PreventRuleDAO preventRuleDAO = getDAO(PreventRule.class); // For the moment only one rule by scope - PreventRule preventRuleLoaded = poll.getPreventRuleByScope(preventRule.getScope()); + PreventRule preventRuleLoaded = poll.getPreventRuleByScope( + preventRule.getScope()); if (preventRuleLoaded == null) { preventRuleLoaded = create(preventRuleDAO); Added: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollVoteCountingService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollVoteCountingService.java (rev 0) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollVoteCountingService.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -0,0 +1,52 @@ +/* + * #%L + * Pollen :: Services + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.services.impl; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.pollen.services.PollenServiceSupport; +import org.chorem.pollen.votecounting.VoteCountingService; + +/** + * New Poll vote counting service. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class PollVoteCountingService extends PollenServiceSupport { + + /** log. */ + private static final Log log = + LogFactory.getLog(PollVoteCountingService.class); + + protected VoteCountingService delegateService; + + public VoteCountingService getDelegateService() { + if (delegateService == null) { + delegateService = new VoteCountingService(); + delegateService.setProvider( + serviceContext.getVoteCountingStrategyProvider()); + } + return delegateService; + } +} Property changes on: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/PollVoteCountingService.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java =================================================================== --- trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-services/src/test/java/org/chorem/pollen/services/FakeServiceContext.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -28,6 +28,7 @@ import org.chorem.pollen.PollenConfiguration; import org.chorem.pollen.PollenIOUtil; import org.chorem.pollen.PollenTopiaRootContextFactory; +import org.chorem.pollen.votecounting.VoteCountingStrategyProvider; import org.junit.rules.TestWatcher; import org.junit.runner.Description; import org.nuiton.topia.TopiaContext; @@ -127,6 +128,11 @@ return fakeCurrentTime; } + @Override + public VoteCountingStrategyProvider getVoteCountingStrategyProvider() { + return null; + } + public void setCurrentTime(Date fakeCurrentTime) { this.fakeCurrentTime = fakeCurrentTime; } Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-ui-struts2/pom.xml 2012-06-25 17:56:45 UTC (rev 3556) @@ -1,5 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -19,6 +21,35 @@ <dependencies> <dependency> <groupId>${project.groupId}</groupId> + <artifactId>pollen-votecounting-api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-votecounting-strategy-condorcet</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-votecounting-strategy-normal</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-votecounting-strategy-number</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-votecounting-strategy-percentage</artifactId> + <version>${project.version}</version> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>${project.groupId}</groupId> <artifactId>pollen-votecounting</artifactId> <version>${project.version}</version> </dependency> @@ -249,7 +280,8 @@ <deployFiles>target/${project.build.finalName}.war</deployFiles> <defaultWebContextPath>pollen</defaultWebContextPath> - <defaultSiteUrl>http://localhost:8080/${defaultWebContextPath}</defaultSiteUrl> + <defaultSiteUrl>http://localhost:8080/${defaultWebContextPath} + </defaultSiteUrl> <defaultLogDir>${basedir}/target</defaultLogDir> </properties> @@ -370,7 +402,8 @@ <phase>generate-resources</phase> <configuration> <target> - <mkdir dir="${basedir}/target/pollen-embedded-temp-${project.version}/WEB-INF/classes" /> + <mkdir + dir="${basedir}/target/pollen-embedded-temp-${project.version}/WEB-INF/classes"/> </target> </configuration> <goals> @@ -553,7 +586,9 @@ </activation--> <properties> <pollenTestServerPort>8765</pollenTestServerPort> - <pollenTestUrl>http://localhost:${pollenTestServerPort}/${defaultWebContextPath}</pollenTestUrl> + <pollenTestUrl> + http://localhost:${pollenTestServerPort}/${defaultWebContextPath} + </pollenTestUrl> </properties> <build> @@ -573,7 +608,8 @@ <configuration> <daemon>true</daemon> <webAppConfig> - <descriptor>${basedir}/src/test/resources/web-test.xml</descriptor> + <descriptor>${basedir}/src/test/resources/web-test.xml + </descriptor> <contextPath>/${defaultWebContextPath}</contextPath> </webAppConfig> @@ -630,7 +666,9 @@ <id>selenium-server</id> <properties> <pollenTestServerPort>8765</pollenTestServerPort> - <pollenTestUrl>http://localhost:${pollenTestServerPort}/${defaultWebContextPath}</pollenTestUrl> + <pollenTestUrl> + http://localhost:${pollenTestServerPort}/${defaultWebContextPath} + </pollenTestUrl> <maven.test.skip>true</maven.test.skip> </properties> @@ -651,7 +689,8 @@ <configuration> <daemon>false</daemon> <webAppConfig> - <descriptor>${basedir}/src/test/resources/web-test.xml</descriptor> + <descriptor>${basedir}/src/test/resources/web-test.xml + </descriptor> <contextPath>/${defaultWebContextPath}</contextPath> </webAppConfig> Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenApplicationListener.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -37,6 +37,7 @@ import org.chorem.pollen.services.PollenServiceContext; import org.chorem.pollen.services.PollenServiceFactory; import org.chorem.pollen.services.impl.UserService; +import org.chorem.pollen.votecounting.VoteCountingStrategyProvider; import org.nuiton.i18n.I18n; import org.nuiton.i18n.init.DefaultI18nInitializer; import org.nuiton.topia.TopiaContext; @@ -96,9 +97,10 @@ PollenConfiguration configuration = prepareConfiguration(); if (log.isInfoEnabled()) { - log.info("Base url "+configuration.getApplicationUrl()); + log.info("Base url " + configuration.getApplicationUrl()); } applicationContext.setConfiguration(configuration); + applicationContext.setVoteCountingStrategyProvider(new VoteCountingStrategyProvider()); File temporaryDirectory = configuration.getTemporaryDirectory(); try { @@ -123,11 +125,11 @@ // init db try { - TopiaContext rootContext - = new PollenTopiaRootContextFactory().newDatabaseFromConfig(configuration); + PollenTopiaRootContextFactory f = + new PollenTopiaRootContextFactory(); + TopiaContext rootContext = f.newDatabaseFromConfig(configuration); applicationContext.setRootContext(rootContext); - initDB(applicationContext); } catch (TopiaException e) { @@ -159,8 +161,6 @@ // close topia root context to pollen db closeRootcontext(applicationContext.getRootContext()); - - } } @@ -171,7 +171,6 @@ * override configuration for tests environnements. * * @return the instanciated configuration - * @see PollenTestApplicationListener * @since 1.4 */ protected PollenConfiguration prepareConfiguration() { @@ -184,7 +183,8 @@ Locale.getDefault(), null, applicationContext.getConfiguration(), - new PollenServiceFactory() + new PollenServiceFactory(), + applicationContext.getVoteCountingStrategyProvider() ); PollenNotifierWorker pollenNotifierWorker = new PollenNotifierWorker( serviceContext, @@ -258,7 +258,8 @@ Locale.getDefault(), transaction, configuration, - serviceFactory + serviceFactory, + applicationContext.getVoteCountingStrategyProvider() ); UserService service = Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/PollenUIUtils.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -22,11 +22,15 @@ */ package org.chorem.pollen.ui; +import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.services.impl.SecurityService; import javax.servlet.ServletContext; import javax.servlet.ServletRequest; +import java.util.Locale; +import static org.nuiton.i18n.I18n.l_; + /** * Useful ui methods. * @@ -59,6 +63,20 @@ return result; } + public static String getVoteSizeMessage(Poll poll, Locale locale) { + + int i = poll.sizeVote(); + String result; + if (i == 0) { + result = l_(locale, "pollen.common.voteNoVote"); + } else if (i == 1) { + result = l_(locale, "pollen.common.voteOneVote"); + } else { + result = l_(locale, "pollen.common.voteNbVotes", i); + } + return result; + } + protected PollenUIUtils() { // helper can not be instanciated } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/PollenActionSupport.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -27,9 +27,10 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.struts2.ServletActionContext; import org.apache.struts2.StrutsStatics; +import org.chorem.pollen.PollenApplicationContext; import org.chorem.pollen.PollenConfiguration; +import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.business.persistence.UserAccount; -import org.chorem.pollen.common.VoteCountingType; import org.chorem.pollen.services.DefaultPollenServiceContext; import org.chorem.pollen.services.PollenService; import org.chorem.pollen.services.PollenServiceContext; @@ -44,8 +45,9 @@ import org.chorem.pollen.services.impl.SecurityService; import org.chorem.pollen.services.impl.UserService; import org.chorem.pollen.services.impl.VoteService; -import org.chorem.pollen.PollenApplicationContext; import org.chorem.pollen.ui.PollenSession; +import org.chorem.pollen.votecounting.VoteCountingStrategy; +import org.chorem.pollen.votecounting.VoteCountingStrategyProvider; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.framework.TopiaTransactionAware; import org.nuiton.web.filter.TopiaTransactionFilter; @@ -171,7 +173,8 @@ getLocale(), getTransaction(), getConfiguration(), - getServiceFactory() + getServiceFactory(), + getVoteCountingStrategyProvider() ); } return serviceContext; @@ -184,6 +187,17 @@ return serviceFactory; } + public VoteCountingStrategyProvider getVoteCountingStrategyProvider() { + return getPollenApplicationContext().getVoteCountingStrategyProvider(); + } + + protected VoteCountingStrategy getVoteCountingStrategy(Poll poll) { + int voteCountingType = poll.getVoteCountingType(); + VoteCountingStrategy result = + getVoteCountingStrategyProvider().getStrategy(voteCountingType); + return result; + } + /** * Sub-classes should use this method to easily get a service instance. * @@ -230,30 +244,6 @@ return new Date(); } - public String getVoteCountingTypeHelp(VoteCountingType voteCountingType) { - String result; - switch (voteCountingType) { - - default: - case NORMAL: - result = - _("pollen.common.voteCountingTypeHelp.normal"); - break; - case PERCENTAGE: - result = - _("pollen.common.voteCountingTypeHelp.percentage"); - break; - case CONDORCET: - result = - _("pollen.common.voteCountingTypeHelp.condorcet"); - break; - case NUMBER: - result = - _("pollen.common.voteCountingTypeHelp.number"); - } - return result; - } - public String getCurrentUrl() { HttpServletRequest request = ServletActionContext.getRequest(); String result = request.getRequestURL().toString(); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractPollForm.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -58,7 +58,6 @@ import org.chorem.pollen.common.ChoiceType; import org.chorem.pollen.common.I18nAble; import org.chorem.pollen.common.PollType; -import org.chorem.pollen.common.VoteCountingType; import org.chorem.pollen.services.PollenServiceFunctions; import org.chorem.pollen.services.exceptions.PollNotFoundException; import org.chorem.pollen.services.impl.PollService; @@ -67,6 +66,8 @@ import org.chorem.pollen.ui.actions.PageSkin; import org.chorem.pollen.ui.actions.PollenActionSupport; import org.chorem.pollen.ui.converters.DateConverter; +import org.chorem.pollen.votecounting.VoteCountingStrategy; +import org.chorem.pollen.votecounting.VoteCountingStrategyProvider; import org.nuiton.util.StringUtil; import javax.servlet.http.HttpServletRequest; @@ -725,14 +726,38 @@ } } + public String getVoteCountingHelp() { + + StringBuilder builder = new StringBuilder(); + VoteCountingStrategyProvider strategyProvider = + getVoteCountingStrategyProvider(); + Set<Integer> strategyIds = strategyProvider.getStrategyIds(); + for (Integer strategyId : strategyIds) { + VoteCountingStrategy strategy = strategyProvider.getStrategy(strategyId); + String strategyHelp = strategy.getStrategyHelp(getLocale()); + builder.append(strategyHelp).append("<br/><br/>"); + } + return builder.toString(); + } + public void prepareFormPage() throws Exception { getPollenSession().removeDynamicDataWithPrefix(IMAGECHOICES_THUMB_PREFIX); pollTypes = decorateToName(PollType.values()); choiceTypes = decorateToName(ChoiceType.values()); - voteCountingTypes = decorateToName(VoteCountingType.values()); + voteCountingTypes = Maps.newTreeMap(); + VoteCountingStrategyProvider strategyProvider = + getVoteCountingStrategyProvider(); + Set<Integer> strategyIds = strategyProvider.getStrategyIds(); + for (Integer strategyId : strategyIds) { + VoteCountingStrategy strategy = strategyProvider.getStrategy(strategyId); + String strategyHelp = strategy.getStrategyName(getLocale()); + voteCountingTypes.put(strategyId + "", strategyHelp); + } +// decorateToName(VoteCountingType.values()); + textChoices = Lists.newArrayList(); imageChoices = Lists.newArrayList(); dateChoices = Lists.newArrayList(); Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -42,12 +42,12 @@ import org.chorem.pollen.business.persistence.VoteToChoice; import org.chorem.pollen.common.ChoiceType; import org.chorem.pollen.common.PollType; -import org.chorem.pollen.common.VoteCountingType; import org.chorem.pollen.services.exceptions.PollAccountNotFound; import org.chorem.pollen.services.exceptions.PollNotFoundException; import org.chorem.pollen.services.impl.SecurityService; import org.chorem.pollen.ui.PollenUIUtils; import org.chorem.pollen.ui.actions.PageSkin; +import org.chorem.pollen.votecounting.VoteCountingStrategy; import javax.servlet.http.HttpServletRequest; import java.io.UnsupportedEncodingException; @@ -220,19 +220,68 @@ } public String getVoteSizeMessage() { - int i = getPoll().sizeVote(); + String result = PollenUIUtils.getVoteSizeMessage(getPoll(), + getLocale()); + return result; + } - String result; - if (i==0) { - result = _("pollen.common.voteNoVote"); - } else if (i==1) { - result = _("pollen.common.voteOneVote"); - }else { - result = _("pollen.common.voteNbVotes", i); - } + public String getVoteCountingTypeName() { + VoteCountingStrategy strategy = getVoteCountingStrategy(getPoll()); + String result = strategy.getStrategyName(getLocale()); return result; } + public String getVoteCountingTypeHelp() { + VoteCountingStrategy strategy = getVoteCountingStrategy(getPoll()); + String result = strategy.getStrategyHelp(getLocale()); + return result; + } + + /** + * Retourne si le choix fait partie du vote (s'il a été renseigné par le + * votant). + * + * @param choice le choix concerné + * @return true si le choix est dans le vote + */ + public boolean isChoiceInVote(VoteToChoice choice) { + VoteCountingStrategy strategy = getVoteCountingStrategy(getPoll()); + boolean result = strategy.isChoiceInVote(choice.getVoteValue()); + return result; +// Integer voteValue = choice.getVoteValue(); +// boolean result = false; +// if (choice != null) { +// switch (poll.getVoteCountingType()) { +// case NORMAL: +// result = voteValue > 0; +// break; +// case PERCENTAGE: +// result = true; +// break; +// case CONDORCET: +// result = voteValue < 100; +// break; +// case NUMBER: +// result = voteValue >= 0; +// } +// } +// return result; + } + + public String getChoiceValue(VoteToChoice choice) { + VoteCountingStrategy strategy = getVoteCountingStrategy(getPoll()); + String result = strategy.getDisplayVoteValue(choice.getVoteValue()); + return result; +// switch (poll.getVoteCountingType()) { +// case NORMAL: +// result = "OK"; +// break; +// default: +// result = choice.getVoteValue() + ""; +// } +// return result; + } + public String getCommentAuthor() { if (commentAuthor == null) { @@ -332,22 +381,22 @@ return poll.getChoiceType() == ChoiceType.IMAGE; } - public boolean isNormalVoteCounting() { - return poll.getVoteCountingType() == VoteCountingType.NORMAL; - } +// public boolean isNormalVoteCounting() { +// return poll.getVoteCountingType() == VoteCountingType.NORMAL; +// } +// +// public boolean isPercentageVoteCounting() { +// return poll.getVoteCountingType() == VoteCountingType.PERCENTAGE; +// } +// +// public boolean isCondorcetVoteCounting() { +// return poll.getVoteCountingType() == VoteCountingType.CONDORCET; +// } +// +// public boolean isNumberVoteCounting() { +// return poll.getVoteCountingType() == VoteCountingType.NUMBER; +// } - public boolean isPercentageVoteCounting() { - return poll.getVoteCountingType() == VoteCountingType.PERCENTAGE; - } - - public boolean isCondorcetVoteCounting() { - return poll.getVoteCountingType() == VoteCountingType.CONDORCET; - } - - public boolean isNumberVoteCounting() { - return poll.getVoteCountingType() == VoteCountingType.NUMBER; - } - public boolean isVoteAllowed() { return voteAllowed; } @@ -387,30 +436,10 @@ return val; } - /** - * Retourne si le choix fait partie du vote (s'il a été renseigné par le - * votant). - * - * @param choice le choix concerné - * @return true si le choix est dans le vote - */ - public boolean isChoiceInVote(VoteToChoice choice) { - boolean result = false; - if (choice != null) { - switch (poll.getVoteCountingType()) { - case NORMAL: - result = choice.getVoteValue() > 0; - break; - case PERCENTAGE: - result = true; - break; - case CONDORCET: - result = choice.getVoteValue() < 100; - break; - case NUMBER: - result = choice.getVoteValue() >= 0; - } - } + public String getChoiceFragment() { + VoteCountingStrategy strategy = getVoteCountingStrategy(poll); + String result = + "displayVote_" + strategy.getRenderType().name() + ".jsp"; return result; } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/ResultForPoll.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -39,10 +39,11 @@ import org.chorem.pollen.business.persistence.Poll; import org.chorem.pollen.common.ChoiceType; import org.chorem.pollen.common.PollType; -import org.chorem.pollen.common.VoteCountingType; import org.chorem.pollen.services.impl.PollResultsService; +import org.chorem.pollen.ui.PollenUIUtils; import org.chorem.pollen.ui.actions.PageSkin; import org.chorem.pollen.ui.converters.DateConverter; +import org.chorem.pollen.votecounting.VoteCountingStrategy; import org.nuiton.util.StringUtil; import java.net.URL; @@ -147,12 +148,34 @@ return feedFileExisting; } + public String getVoteCountingTypeName() { + VoteCountingStrategy strategy = getVoteCountingStrategy(getPoll()); + String result = strategy.getStrategyName(getLocale()); + return result; + } + + public String getVoteCountingTypeHelp() { + VoteCountingStrategy strategy = getVoteCountingStrategy(getPoll()); + String result = strategy.getStrategyHelp(getLocale()); + return result; + } + public String getSummaryUrl() { PollUrl url = getPollUrlService().getPollSummaryUrl(poll); url.getPollUri().setAccountId(getAccountId()); return url.getUrl(); } + public String getResultUrl(boolean byGroup) { + PollUrl url = getPollUrlService().getPollResultUrl(poll); + url.getPollUri().setAccountId(getAccountId()); + String result = url.getUrl(); + if (!byGroup) { + result += "?byGroup=false"; + } + return result; + } + public String getVoteUrl() { PollUrl url = getPollUrlService().getPollVoteUrl(poll); url.getPollUri().setAccountId(getAccountId()); @@ -183,16 +206,8 @@ } public String getVoteSizeMessage() { - int i = getPoll().sizeVote(); - - String result; - if (i==0) { - result = _("pollen.common.voteNoVote"); - } else if (i==1) { - result = _("pollen.common.voteOneVote"); - }else { - result = _("pollen.common.voteNbVotes", i); - } + String result = PollenUIUtils.getVoteSizeMessage(getPoll(), + getLocale()); return result; } @@ -200,7 +215,11 @@ String victoryMessage; - if (poll.getVoteCountingType() == VoteCountingType.NUMBER) { + VoteCountingStrategy strategy = getVoteCountingStrategy(getPoll()); + boolean displayResultsByChoice = strategy.isDisplayResultsByChoice(); + //FIXME-tchemit-2012-06-24, why doing this ??? Should remove this... +// if (isNumberVoteCounting()) { + if (displayResultsByChoice) { victoryMessage = null; } else if (CollectionUtils.isEmpty(topRanking)) { victoryMessage = ""; @@ -267,7 +286,8 @@ } } - if (isNumberVoteCounting()) { + VoteCountingStrategy strategy = getVoteCountingStrategy(poll); + if (strategy.isDisplayResultsByChoice()) { // resultats des choix cachés choicesResults = LinkedHashMultimap.create(); @@ -318,22 +338,23 @@ return poll.getChoiceType() == ChoiceType.IMAGE; } - public boolean isNormalVoteCounting() { - return poll.getVoteCountingType() == VoteCountingType.NORMAL; - } + // public boolean isNormalVoteCounting() { +// return poll.getVoteCountingType() == VoteCountingType.NORMAL; +// } +// +// public boolean isPercentageVoteCounting() { +// return poll.getVoteCountingType() == VoteCountingType.PERCENTAGE; +// } +// +// public boolean isCondorcetVoteCounting() { +// return poll.getVoteCountingType() == VoteCountingType.CONDORCET; +// } +// + //FIXME-tchemit-2012-06-24, why doing this ??? Should remove this... +// public boolean isNumberVoteCounting() { +// return poll.getVoteCountingType() == 3; +// } - public boolean isPercentageVoteCounting() { - return poll.getVoteCountingType() == VoteCountingType.PERCENTAGE; - } - - public boolean isCondorcetVoteCounting() { - return poll.getVoteCountingType() == VoteCountingType.CONDORCET; - } - - public boolean isNumberVoteCounting() { - return poll.getVoteCountingType() == VoteCountingType.NUMBER; - } - public boolean isByGroup() { return byGroup; } Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -34,6 +34,7 @@ import org.chorem.pollen.business.persistence.VoteToChoice; import org.chorem.pollen.common.PollType; import org.chorem.pollen.services.impl.VoteService; +import org.chorem.pollen.votecounting.VoteCountingStrategy; /** * Votes to a poll. @@ -100,45 +101,82 @@ int nbVotes = 0; int totalValues = 0; + + VoteCountingStrategy voteCountingStrategy = + getVoteCountingStrategy(getPoll()); + + boolean voteValid = true; for (VoteToChoice voteToChoice : vote.getChoiceVoteToChoice()) { Integer value = voteToChoice.getVoteValue(); - if (value == null) { - // not vote + + // check if vote is null ? + boolean voteNull = voteCountingStrategy.isVoteValueNull(value); + + if (voteNull) { + // null vote, can skip his validation continue; } - // XXX-fdesbois-2012-04-11 : for a VoteCountingType#NUMBER the difference between 0 and null value could be important - if (isCondorcetVoteCounting()) { - if (value > 0) { - // for condorcet vote, must be strictly greater than 0 - // see http://chorem.org/issues/574 - // see http://chorem.org/issues/576 - nbVotes++; - totalValues += value; - } else { + // check if vote value is valid ? + boolean valid = voteCountingStrategy.isVoteValueValid(value); - addFieldError("vote.choices", - _("pollen.error.vote.invalidCondorcetVoteValue")); - } - // for other vote type, value must be > 0 - } else if (value != 0) { + if (valid) { + + // ok this vote value is valid, use it nbVotes++; totalValues += value; + } else { + + // not a valid vote value, mark it and skip other fields validation + String validMessage = + voteCountingStrategy.getVoteValueNotValidMessage(); + addFieldError("vote.choices", _(validMessage)); + voteValid = false; + break; } - } - // check that the number of choices is not greater than maxChoiceNb - int maxChoice = getPoll().getMaxChoiceNb(); - if (maxChoice != 0 && nbVotes > maxChoice) { - addFieldError("vote.choices", - _("pollen.error.vote.maxChoiceNb", maxChoice)); +// // XXX-fdesbois-2012-04-11 : for a VoteCountingType#NUMBER the difference between 0 and null value could be important +// if (isCondorcetVoteCounting()) { +// if (value > 0) { +// +// // for condorcet vote, must be strictly greater than 0 +// // see http://chorem.org/issues/574 +// // see http://chorem.org/issues/576 +// nbVotes++; +// totalValues += value; +// } else { +// +// addFieldError("vote.choices", +// _("pollen.error.vote.invalidCondorcetVoteValue")); +// } +// // for other vote type, value must be > 0 +// } else if (value != 0) { +// nbVotes++; +// totalValues += value; +// } } + if (voteValid) { - // check for percentage that the sum of all values equals 100 - if (isPercentageVoteCounting() && totalValues != 100) { - addFieldError("vote.choices", _("pollen.error.vote.percentage")); + // check that the number of choices is not greater than maxChoiceNb + int maxChoice = getPoll().getMaxChoiceNb(); + if (maxChoice != 0 && nbVotes > maxChoice) { + addFieldError("vote.choices", + _("pollen.error.vote.maxChoiceNb", maxChoice)); + } + + // check that total vote value is ok + if (!voteCountingStrategy.isTotalVoteValueValid(totalValues)) { + + // not valid + String errorMessage = voteCountingStrategy.getTotalVoteValueNotValidMessage(); + addFieldError("vote.choices", _(errorMessage)); + } } +// // check for percentage that the sum of all values equals 100 +// if (isPercentageVoteCounting() && totalValues != 100) { +// addFieldError("vote.choices", _("pollen.error.vote.percentage")); +// } } // @InputConfig(methodName = PREPARE_VOTE_PAGE) Modified: trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java =================================================================== --- trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/security/AbstractPollenAuthorization.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -146,10 +146,8 @@ } if (log.isDebugEnabled()) { - log.debug("Can access to this poll " + - pollUri.getPollId()); + log.debug("Can access to this poll " + pollUri.getPollId()); } - } } @@ -177,7 +175,8 @@ locale, transaction, applicationContext.getConfiguration(), - serviceFactory + serviceFactory, + applicationContext.getVoteCountingStrategyProvider() ); } Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_en_GB.properties 2012-06-25 17:56:45 UTC (rev 3556) @@ -151,11 +151,6 @@ pollen.common.voteAction=Vote pollen.common.voteAnonymous=Anonymous vote pollen.common.voteCountingType=Response type -pollen.common.voteCountingType.help=Normal\: selecting 1 to n choices among available choices <br/><br/> Percentage\: allocating a percentage to each choice <br/><br/> Condorcet\: ranking choices in order of preference <br/><br/> Number \: Free response. Summed and the average numbers. -pollen.common.voteCountingTypeHelp.condorcet=Condorcet vote\: rank choices by preference order from 1 to N (1\=favorite). Only the rank is taken into account, not the values. Two choices can have the same value. -pollen.common.voteCountingTypeHelp.normal=Normal vote\: vote for your favorite choice. -pollen.common.voteCountingTypeHelp.number=Voting by number\: The answer is free, leave blank or enter a integer. -pollen.common.voteCountingTypeHelp.percentage=Percentage vote\: allocate choices to get a 100%% total. pollen.common.voteNbVotes=%d existing votes pollen.common.voteNoVote=No existing vote pollen.common.voteOneVote=1 existing vote Modified: trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties =================================================================== --- trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-ui-struts2/src/main/resources/i18n/pollen-ui-struts2_fr_FR.properties 2012-06-25 17:56:45 UTC (rev 3556) @@ -152,10 +152,6 @@ pollen.common.voteAnonymous=Vote anonyme pollen.common.voteCountingType=Type de Réponse pollen.common.voteCountingType.help=Normal \: sélection de 1 ou n choix parmis les choix possibles <br/><br/> Pourcentage \: attribution d'un pourcentage à chaque choix <br/><br/> Condorcet \: classement des choix par ordre de préférence <br/><br/> Nombre \: Réponse libre. Fait la somme et la moyenne des nombres -pollen.common.voteCountingTypeHelp.condorcet=Vote Condorcet \: classer les choix par ordre de préférence de 1 à N (1\=préféré). Seul l'ordre des choix compte, peu importe les valeurs. Deux choix peuvent avoir la même valeur. -pollen.common.voteCountingTypeHelp.normal=Vote normal \: voter pour le ou les choix préférés. -pollen.common.voteCountingTypeHelp.number=Vote par nombre \: La réponse est libre, laissez vide ou entrez un nombre entier -pollen.common.voteCountingTypeHelp.percentage=Vote par pourcentage \: répartir les choix de manière à obtenir 100%% au total. pollen.common.voteNbVotes=%d votes existants pollen.common.voteNoVote=Pas de vote existant pollen.common.voteOneVote=1 vote existant Added: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVote_CHECKBOX.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVote_CHECKBOX.jsp (rev 0) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVote_CHECKBOX.jsp 2012-06-25 17:56:45 UTC (rev 3556) @@ -0,0 +1,27 @@ +<%-- + #%L + Pollen :: UI (struts2) + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<s:checkbox theme="simple" + name="vote.choiceVoteToChoice[%{#status.index}].voteValue" + value="%{vote.choiceVoteToChoice[#status.index].voteValue}"/> Property changes on: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVote_CHECKBOX.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVote_TEXTFIELD.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVote_TEXTFIELD.jsp (rev 0) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVote_TEXTFIELD.jsp 2012-06-25 17:56:45 UTC (rev 3556) @@ -0,0 +1,27 @@ +<%-- + #%L + Pollen :: UI (struts2) + $Id$ + $HeadURL$ + %% + Copyright (C) 2009 - 2012 CodeLutin + %% + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + #L% + --%> +<%@page contentType="text/html" pageEncoding="UTF-8" %> +<%@ taglib prefix="s" uri="/struts-tags" %> +<s:textfield required="true" size="3" theme="simple" + name="vote.choiceVoteToChoice[%{#status.index}].voteValue" + value="%{vote.choiceVoteToChoice[#status.index].voteValue}"/> Property changes on: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/displayVote_TEXTFIELD.jsp ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/pollForm.jsp 2012-06-25 17:56:45 UTC (rev 3556) @@ -111,8 +111,8 @@ <legend> <s:text name="pollen.common.voteCountingType"/> <img src="<s:url value='/img/tooltip.png'/>" class="tooltip" - alt="<s:text name='pollen.common.voteCountingType.help'/>" - title="<s:text name='pollen.common.voteCountingType.help'/>"/> + alt="<s:property value='voteCountingHelp'/>" + title="<s:property value='voteCountingHelp'/>"/> </legend> <s:radio key='poll.voteCountingType' list="voteCountingTypes" label='' theme="simple"/> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/result.jsp 2012-06-25 17:56:45 UTC (rev 3556) @@ -101,9 +101,9 @@ <s:label value="%{poll.beginDate}" key='pollen.common.beginDate'/> <s:label value="%{poll.endDate}" label='%{getText("pollen.common.endDate")}'/> - <s:label value="%{poll.voteCountingType}" + <s:label value="%{voteCountingTypeName}" label='%{getText("pollen.common.voteCountingType")}' - tooltip="%{getVoteCountingTypeHelp(poll.voteCountingType)}" + tooltip="%{voteCountingTypeHelp}" tooltipIconPath="/img/tooltip.png"/> </fieldset> </div> @@ -169,15 +169,14 @@ <s:if test="groupPoll"> <s:text name="pollen.common.results"/> <s:if test="byGroup"> - <s:a namespace="/poll" action="results/%{poll.pollId}"> - <s:param name="byGroup" value="false"/> + <s:a href="%{getResultUrl(false)}"> <s:text name="pollen.common.normal"/> </s:a> - <s:text name="pollen.common.group"/> </s:if> <s:else> <s:text name="pollen.common.normal"/> - - <s:a namespace="/poll" action="results/%{poll.pollId}"> + <s:a href="%{getResultUrl(true)}"> <s:text name="pollen.common.group"/> </s:a> </s:else> @@ -195,8 +194,7 @@ <s:iterator value="choicesResultNames" var="choicesResultName" status="status"> <img id='chart_<s:property value="#status.index"/>' - alt="<s:property/>" - title="<s:property/>" + alt="<s:property/>" title="<s:property/>" src="<s:property value='%{getChoicesResultCharUrl(400,300, #choicesResultName)}'/>"> </s:iterator> </div> Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/poll/vote.jsp 2012-06-25 17:56:45 UTC (rev 3556) @@ -147,9 +147,9 @@ <s:label value="%{creatorName}" key='pollen.common.pollCreator'/> <s:label value="%{poll.beginDate}" key='pollen.common.beginDate'/> <s:label value="%{poll.endDate}" key='pollen.common.endDate'/> - <s:label value="%{poll.voteCountingType}" + <s:label value="%{voteCountingTypeName}" label='%{getText("pollen.common.voteCountingType")}' - tooltip="%{getVoteCountingTypeHelp(poll.voteCountingType)}" + tooltip="%{voteCountingTypeHelp}" tooltipIconPath="/img/tooltip.png"/> </fieldset> </div> @@ -290,30 +290,12 @@ <s:else> <th></th> </s:else> + <s:set name="template" value="%{choiceFragment}"/> <s:iterator value="poll.choice" var="choice" status="status"> <s:if test="!isChoiceHidden(#choice)"> <th> - <s:if test="normalVoteCounting"> - <s:checkbox theme="simple" - name="vote.choiceVoteToChoice[%{#status.index}].voteValue" - value="%{vote.choiceVoteToChoice[#status.index].voteValue}"/> - </s:if> - <s:if test="percentageVoteCounting"> - <s:textfield required="true" size="3" theme="simple" - name="vote.choiceVoteToChoice[%{#status.index}].voteValue" - value="%{vote.choiceVoteToChoice[#status.index].voteValue}"/> - </s:if> - <s:if test="condorcetVoteCounting"> - <s:textfield id="condorcetInput" size="3" theme="simple" - name="vote.choiceVoteToChoice[%{#status.index}].voteValue" - value="%{vote.choiceVoteToChoice[#status.index].voteValue}"/> - </s:if> - <s:if test="numberVoteCounting"> - <s:textfield size="3" theme="simple" - name="vote.choiceVoteToChoice[%{#status.index}].voteValue" - value="%{vote.choiceVoteToChoice[#status.index].voteValue}"/> - </s:if> + <jsp:include page="${template}"/> </th> </s:if> </s:iterator> @@ -359,44 +341,14 @@ <td class="anonymous">?</td> </s:if> <s:else> - <s:if test="normalVoteCounting"> - <s:if test="isChoiceInVote(#currentVoteChoice)"> - <td class="voted">OK</td> - </s:if> - <s:else> - <td class="notVoted"></td> - </s:else> + <s:if test="isChoiceInVote(#currentVoteChoice)"> + <td class="voted"> + <s:property value="%{getChoiceValue(#currentVoteChoice)}"/> + </td> </s:if> - <s:if test="percentageVoteCounting"> - <s:if test="isChoiceInVote(#currentVoteChoice)"> - <td class="voted"> - <s:property value="%{#currentVoteChoice.voteValue}"/> % - </td> - </s:if> - <s:else> - <td class="notVoted"></td> - </s:else> - </s:if> - <s:if test="condorcetVoteCounting"> - <s:if test="isChoiceInVote(#currentVoteChoice)"> - <td class="voted"> - <s:property value="%{#currentVoteChoice.voteValue}"/> - </td> - </s:if> - <s:else> - <td class="notVoted"></td> - </s:else> - </s:if> - <s:if test="numberVoteCounting"> - <s:if test="isChoiceInVote(#currentVoteChoice)"> - <td class="voted"> - <s:property value="%{#currentVoteChoice.voteValue}"/> - </td> - </s:if> - <s:else> - <td class="notVoted"></td> - </s:else> - </s:if> + <s:else> + <td class="notVoted"></td> + </s:else> </s:else> </s:if> </s:iterator> Property changes on: trunk/pollen-ui-struts2/src/main/webapp/img/7terOk.jpg ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateFreeDatePollSIT.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateFreeDatePollSIT.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateFreeDatePollSIT.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -1,8 +1,8 @@ /* * #%L * Pollen :: UI (struts2) - * $Id: CreateFreeTextPollSIT.java 3481 2012-06-15 15:12:06Z ymartel $ - * $HeadURL: http://svn.chorem.org/svn/pollen/trunk/pollen-ui-struts2/src/test/java/org/… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateFreeDatePollSIT.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateRestrictedTextPollSIT.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateRestrictedTextPollSIT.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateRestrictedTextPollSIT.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -1,8 +1,8 @@ /* * #%L * Pollen :: UI (struts2) - * $Id: CreateFreeTextPollSIT.java 3507 2012-06-18 09:45:47Z ymartel $ - * $HeadURL: http://svn.chorem.org/svn/pollen/trunk/pollen-ui-struts2/src/test/java/org/… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateRestrictedTextPollSIT.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateTextPollForGroupSIT.java =================================================================== --- trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateTextPollForGroupSIT.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateTextPollForGroupSIT.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -1,8 +1,8 @@ /* * #%L * Pollen :: UI (struts2) - * $Id: CreateFreeTextPollSIT.java 3507 2012-06-18 09:45:47Z ymartel $ - * $HeadURL: http://svn.chorem.org/svn/pollen/trunk/pollen-ui-struts2/src/test/java/org/… $ + * $Id$ + * $HeadURL$ * %% * Copyright (C) 2009 - 2012 CodeLutin * %% Property changes on: trunk/pollen-ui-struts2/src/test/java/org/chorem/pollen/ui/its/CreateTextPollForGroupSIT.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Deleted: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/VoteCountingType.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/VoteCountingType.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/common/VoteCountingType.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -1,54 +0,0 @@ -/* - * #%L - * Pollen :: Vote Counting - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * #L% - */ -package org.chorem.pollen.common; - -import static org.nuiton.i18n.I18n.n_; - -public enum VoteCountingType implements I18nAble { - NORMAL(n_("pollen.voteCountingType.normal")), - PERCENTAGE(n_("pollen.voteCountingType.percentage")), - CONDORCET(n_("pollen.voteCountingType.condorcet")), - NUMBER(n_("pollen.voteCountingType.number")); - - private final String i18nKey; - - VoteCountingType(String i18nKey) { - this.i18nKey = i18nKey; - } - - @Override - public String getI18nKey() { - return i18nKey; - } - - public static VoteCountingType valueOf(int ordinal) { - VoteCountingType result = null; - for (VoteCountingType curr : VoteCountingType.values()) { - if (curr.ordinal() == ordinal) { - result = curr; - break; - } - } - return result; - } -} Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/CondorcetMethod.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/CondorcetMethod.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/CondorcetMethod.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -163,8 +163,7 @@ * autres votes du votant et mise à jour du nombre de victoires pour ce * vote. * - * @see getVictories(String id, Choice choice, Map<String, Map<Choice, - * Double>> votes) + * @see #getVictories(String, Choice , Map) * @param choices Les choix utilisés pour le dépouillement. * @param votes Les votes de chaque votant. * @param byGroup Calcul sur des groupes. Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/StandardMethod.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/StandardMethod.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/business/StandardMethod.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -68,13 +68,13 @@ // Calcul avec prise en compte des groupes public void calculateChoicesByGroup(List<Choice> choices) { - Map<String, List<String>> mapGroupsChoosenChoices = this - .getChoosenChoicesByGroup(choices); + Map<String, List<String>> mapGroupsChoosenChoices = + getChoosenChoicesByGroup(choices); for (Choice choice : choices) { double totalChoice = 0.; for (String idGroup : mapGroupsChoosenChoices.keySet()) { - totalChoice += this.getValueForChoiceByGroup(choice, idGroup, + totalChoice += getValueForChoiceByGroup(choice, idGroup, mapGroupsChoosenChoices.get(idGroup)); } choice.setValue(totalChoice); Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollDTO.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/PollDTO.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -22,14 +22,13 @@ */ package org.chorem.pollen.votecounting.dto; +import org.chorem.pollen.common.ChoiceType; +import org.chorem.pollen.common.PollType; + import java.util.ArrayList; import java.util.Date; import java.util.List; -import org.chorem.pollen.common.ChoiceType; -import org.chorem.pollen.common.PollType; -import org.chorem.pollen.common.VoteCountingType; - /** * Classe DTO représentant un sondage. * @@ -65,7 +64,7 @@ private PollType pollType = null; - private VoteCountingType voteCounting = null; + private int voteCounting; private ChoiceType choiceType = null; @@ -199,11 +198,11 @@ this.pollType = pollType; } - public VoteCountingType getVoteCounting() { + public int getVoteCounting() { return voteCounting; } - public void setVoteCounting(VoteCountingType voteCounting) { + public void setVoteCounting(int voteCounting) { this.voteCounting = voteCounting; } Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteCountingResultDTO.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteCountingResultDTO.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/dto/VoteCountingResultDTO.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -24,8 +24,6 @@ import java.util.List; -import org.chorem.pollen.common.VoteCountingType; - /** * Classe DTO représentant un résultat de sondage. * @@ -39,7 +37,7 @@ private String idPoll; - private VoteCountingType typeVoteCounting; + private int typeVoteCounting; private boolean byGroup; @@ -73,11 +71,11 @@ this.idPoll = idPoll; } - public VoteCountingType getTypeVoteCounting() { + public int getTypeVoteCounting() { return typeVoteCounting; } - public void setTypeVoteCounting(VoteCountingType typeVoteCounting) { + public void setTypeVoteCounting(int typeVoteCounting) { this.typeVoteCounting = typeVoteCounting; } Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ImportExportService.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ImportExportService.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ImportExportService.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -27,7 +27,6 @@ import org.apache.commons.logging.LogFactory; import org.chorem.pollen.common.ChoiceType; import org.chorem.pollen.common.PollType; -import org.chorem.pollen.common.VoteCountingType; import org.chorem.pollen.votecounting.business.NumberMethod; import org.chorem.pollen.votecounting.dto.ChoiceDTO; import org.chorem.pollen.votecounting.dto.CommentDTO; @@ -207,7 +206,7 @@ PollType.valueOf(pollElm.getAttributeValue(POLL_TYPE))); poll.setChoiceType(ChoiceType.valueOf( pollElm.getAttributeValue(CHOICE_TYPE))); - poll.setVoteCounting(VoteCountingType.valueOf( + poll.setVoteCounting(Integer.valueOf( pollElm.getAttributeValue(VOTE_COUNTING))); poll.setClosed(Boolean.valueOf(pollElm.getAttributeValue(CLOSED))); poll.setChoiceAddAllowed(Boolean.valueOf( @@ -408,7 +407,7 @@ pollElm.setAttribute(POLL_ID, poll.getPollId()); pollElm.setAttribute(POLL_TYPE, poll.getPollType().name()); pollElm.setAttribute(CHOICE_TYPE, poll.getChoiceType().name()); - pollElm.setAttribute(VOTE_COUNTING, poll.getVoteCounting().name()); + pollElm.setAttribute(VOTE_COUNTING, String.valueOf(poll.getVoteCounting())); pollElm.setAttribute(CLOSED, poll.isClosed() ? VALUE_TRUE : VALUE_FALSE); pollElm.setAttribute(CHOICE_ADD_ALLOWED, poll.isChoiceAddAllowed() ? VALUE_TRUE : VALUE_FALSE); Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExportImpl.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExportImpl.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceExportImpl.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -26,7 +26,6 @@ import org.apache.commons.logging.LogFactory; import org.chorem.pollen.common.ChoiceType; import org.chorem.pollen.common.PollType; -import org.chorem.pollen.common.VoteCountingType; import org.chorem.pollen.votecounting.business.NumberMethod; import org.chorem.pollen.votecounting.dto.ChoiceDTO; import org.chorem.pollen.votecounting.dto.CommentDTO; @@ -129,7 +128,7 @@ pollElm.setAttribute("pollId", poll.getPollId()); pollElm.setAttribute("pollType", poll.getPollType().name()); pollElm.setAttribute("choiceType", poll.getChoiceType().name()); - pollElm.setAttribute("voteCounting", poll.getVoteCounting().name()); + pollElm.setAttribute("voteCounting", String.valueOf(poll.getVoteCounting())); pollElm.setAttribute("closed", poll.isClosed() ? "true" : "false"); pollElm.setAttribute("choiceAddAllowed", poll.isChoiceAddAllowed() ? "true" : "false"); @@ -377,7 +376,7 @@ .valueOf(pollElm.getAttributeValue("pollType"))); poll.setChoiceType(ChoiceType.valueOf(pollElm .getAttributeValue("choiceType"))); - poll.setVoteCounting(VoteCountingType.valueOf(pollElm + poll.setVoteCounting(Integer.valueOf(pollElm .getAttributeValue("voteCounting"))); poll.setClosed(Boolean.valueOf(pollElm.getAttributeValue("closed"))); poll.setChoiceAddAllowed(Boolean.valueOf(pollElm Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/ServiceVoteCountingImpl.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -26,7 +26,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.chorem.pollen.common.VoteCountingType; import org.chorem.pollen.votecounting.business.Choice; import org.chorem.pollen.votecounting.business.CondorcetMethod; import org.chorem.pollen.votecounting.business.Context; @@ -137,19 +136,19 @@ * * @param type : type de dépouillement */ - private void createContext(VoteCountingType type) { + private void createContext(int type) { Method method = null; switch (type) { - case NORMAL: + case 0: method = new StandardMethod(); break; - case PERCENTAGE: + case 1: method = new PercentageMethod(); break; - case CONDORCET: + case 2: method = new CondorcetMethod(); break; - case NUMBER: + case 3: method = new NumberMethod(); break; default: Modified: trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/VoteCountingService.java =================================================================== --- trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/VoteCountingService.java 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pollen-votecounting/src/main/java/org/chorem/pollen/votecounting/services/VoteCountingService.java 2012-06-25 17:56:45 UTC (rev 3556) @@ -113,16 +113,16 @@ Method method; switch (poll.getVoteCounting()) { - case NORMAL: + case 0: method = new StandardMethod(); break; - case PERCENTAGE: + case 1: method = new PercentageMethod(); break; - case CONDORCET: + case 2: method = new CondorcetMethod(); break; - case NUMBER: + case 3: method = new NumberMethod(); break; default: Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-25 17:53:21 UTC (rev 3555) +++ trunk/pom.xml 2012-06-25 17:56:45 UTC (rev 3556) @@ -18,6 +18,11 @@ <version>1.5-SNAPSHOT</version> <modules> + <module>pollen-votecounting-api</module> + <module>pollen-votecounting-strategy-condorcet</module> + <module>pollen-votecounting-strategy-normal</module> + <module>pollen-votecounting-strategy-number</module> + <module>pollen-votecounting-strategy-percentage</module> <module>pollen-votecounting</module> <module>pollen-persistence</module> <module>pollen-services</module>

1 0

r3555 - trunk/pollen-votecounting/src/test/java
by tchemit＠users.chorem.org 25 Jun '12

25 Jun '12

Author: tchemit Date: 2012-06-25 19:53:21 +0200 (Mon, 25 Jun 2012) New Revision: 3555 Url: http://chorem.org/repositories/revision/pollen/3555 Log: remove dummy tests (it tests nothing\!) Removed: trunk/pollen-votecounting/src/test/java/org/

1 0

r3554 - trunk/pollen-persistence/src/main/java/org/chorem/pollen
by tchemit＠users.chorem.org 25 Jun '12

25 Jun '12

Author: tchemit Date: 2012-06-25 19:49:06 +0200 (Mon, 25 Jun 2012) New Revision: 3554 Url: http://chorem.org/repositories/revision/pollen/3554 Log: refs #642 : add helper code Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java Modified: trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java =================================================================== --- trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java 2012-06-25 17:43:36 UTC (rev 3553) +++ trunk/pollen-persistence/src/main/java/org/chorem/pollen/PollenIOUtil.java 2012-06-25 17:49:06 UTC (rev 3554) @@ -22,10 +22,17 @@ */ package org.chorem.pollen; +import com.google.common.base.Preconditions; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.topia.TopiaContext; +import org.nuiton.topia.TopiaException; +import org.nuiton.topia.persistence.TopiaFilterPagerUtil; +import org.nuiton.util.PagerUtil; import java.io.File; +import java.util.List; /** * Some utils IO methods. @@ -62,4 +69,32 @@ File databaseFile = new File(tempDirFile, dataBasePath); return databaseFile; } + + public static <E> List<E> findByPager(TopiaContext tx, + String hql, + TopiaFilterPagerUtil.FilterPagerBean pager, + Object... params) throws TopiaException { + Preconditions.checkNotNull(pager); + + if (StringUtils.isNotBlank(pager.getSortColumn())) { + hql += " ORDER BY " + pager.getSortColumn(); + if (!pager.isSortAscendant()) { + hql += " DESC"; + } + } + List<E> result = tx.find(hql, + pager.getRecordStartIndex(), + pager.getRecordEndIndex() - 1, params); + return result; + } + + public static void computeAndAddRecordsToPager( + TopiaContext tx, + String countHql, + TopiaFilterPagerUtil.FilterPagerBean pager, + Object... params) throws TopiaException { + long records = (Long) tx.findUnique(countHql, params); + pager.setRecords((int) records); + PagerUtil.computeRecordIndexesAndPagesNumber(pager); + } }

1 0

r3553 - in trunk/pollen-persistence/src/test: java/org/chorem/pollen/business/persistence resources
by tchemit＠users.chorem.org 25 Jun '12

25 Jun '12

Author: tchemit Date: 2012-06-25 19:43:36 +0200 (Mon, 25 Jun 2012) New Revision: 3553 Url: http://chorem.org/repositories/revision/pollen/3553 Log: refs #642: add dao tests Modified: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/CommentDAOImplTest.java trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonListDAOImplTest.java trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonToListDAOImplTest.java trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollDAOImplTest.java trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/UserAccountDAOImplTest.java trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java trunk/pollen-persistence/src/test/resources/db.properties Modified: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/CommentDAOImplTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/CommentDAOImplTest.java 2012-06-25 17:42:18 UTC (rev 3552) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/CommentDAOImplTest.java 2012-06-25 17:43:36 UTC (rev 3553) @@ -1,3 +1,25 @@ +/* + * #%L + * Pollen :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package org.chorem.pollen.business.persistence; import org.chorem.pollen.entities.PollenDAOHelper; Property changes on: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/CommentDAOImplTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonListDAOImplTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonListDAOImplTest.java 2012-06-25 17:42:18 UTC (rev 3552) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonListDAOImplTest.java 2012-06-25 17:43:36 UTC (rev 3553) @@ -1,3 +1,25 @@ +/* + * #%L + * Pollen :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package org.chorem.pollen.business.persistence; import org.chorem.pollen.entities.PollenDAOHelper; Property changes on: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonListDAOImplTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonToListDAOImplTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonToListDAOImplTest.java 2012-06-25 17:42:18 UTC (rev 3552) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonToListDAOImplTest.java 2012-06-25 17:43:36 UTC (rev 3553) @@ -1,3 +1,25 @@ +/* + * #%L + * Pollen :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package org.chorem.pollen.business.persistence; import org.chorem.pollen.entities.PollenDAOHelper; Property changes on: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PersonToListDAOImplTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollDAOImplTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollDAOImplTest.java 2012-06-25 17:42:18 UTC (rev 3552) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollDAOImplTest.java 2012-06-25 17:43:36 UTC (rev 3553) @@ -1,3 +1,25 @@ +/* + * #%L + * Pollen :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package org.chorem.pollen.business.persistence; import org.apache.commons.lang3.tuple.Pair; Property changes on: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/PollDAOImplTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/UserAccountDAOImplTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/UserAccountDAOImplTest.java 2012-06-25 17:42:18 UTC (rev 3552) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/UserAccountDAOImplTest.java 2012-06-25 17:43:36 UTC (rev 3553) @@ -1,3 +1,25 @@ +/* + * #%L + * Pollen :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package org.chorem.pollen.business.persistence; import org.chorem.pollen.entities.PollenDAOHelper; Property changes on: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/UserAccountDAOImplTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java =================================================================== --- trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java 2012-06-25 17:42:18 UTC (rev 3552) +++ trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java 2012-06-25 17:43:36 UTC (rev 3553) @@ -1,3 +1,25 @@ +/* + * #%L + * Pollen :: Persistence + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ package org.chorem.pollen.business.persistence; import org.chorem.pollen.entities.PollenDAOHelper; Property changes on: trunk/pollen-persistence/src/test/java/org/chorem/pollen/business/persistence/VoteDAOImplTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/pollen-persistence/src/test/resources/db.properties =================================================================== --- trunk/pollen-persistence/src/test/resources/db.properties 2012-06-25 17:42:18 UTC (rev 3552) +++ trunk/pollen-persistence/src/test/resources/db.properties 2012-06-25 17:43:36 UTC (rev 3553) @@ -1,3 +1,25 @@ +### +# #%L +# Pollen :: Persistence +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### hibernate.show_sql=false hibernate.hbm2ddl.auto=update hibernate.dialect=org.hibernate.dialect.H2Dialect Property changes on: trunk/pollen-persistence/src/test/resources/db.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

25 Jun '12

Author: tchemit Date: 2012-06-25 19:42:18 +0200 (Mon, 25 Jun 2012) New Revision: 3552 Url: http://chorem.org/repositories/revision/pollen/3552 Log: refs #590: implements condorcet strategy (but still need to review vote counting algorithm) Added: trunk/pollen-votecounting-strategy-condorcet/ trunk/pollen-votecounting-strategy-condorcet/LICENSE.txt trunk/pollen-votecounting-strategy-condorcet/README.txt trunk/pollen-votecounting-strategy-condorcet/changelog.txt trunk/pollen-votecounting-strategy-condorcet/pom.xml trunk/pollen-votecounting-strategy-condorcet/src/ trunk/pollen-votecounting-strategy-condorcet/src/main/ trunk/pollen-votecounting-strategy-condorcet/src/main/java/ trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/ trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/ trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/ trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/votecounting/ trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetStrategy.java trunk/pollen-votecounting-strategy-condorcet/src/main/resources/ trunk/pollen-votecounting-strategy-condorcet/src/main/resources/META-INF/ trunk/pollen-votecounting-strategy-condorcet/src/main/resources/META-INF/services/ trunk/pollen-votecounting-strategy-condorcet/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy trunk/pollen-votecounting-strategy-condorcet/src/main/resources/i18n/ trunk/pollen-votecounting-strategy-condorcet/src/main/resources/i18n/pollen-votecounting-strategy-condorcet_en_GB.properties trunk/pollen-votecounting-strategy-condorcet/src/main/resources/i18n/pollen-votecounting-strategy-condorcet_fr_FR.properties trunk/pollen-votecounting-strategy-condorcet/src/src/ trunk/pollen-votecounting-strategy-condorcet/src/src/site/ trunk/pollen-votecounting-strategy-condorcet/src/src/site/site_en.xml trunk/pollen-votecounting-strategy-condorcet/src/src/site/site_fr.xml trunk/pollen-votecounting-strategy-condorcet/src/test/ trunk/pollen-votecounting-strategy-condorcet/src/test/java/ trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/ trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/ trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/ trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/ trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetStrategyTest.java trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java trunk/pollen-votecounting-strategy-condorcet/src/test/resources/ trunk/pollen-votecounting-strategy-condorcet/src/test/resources/log4j.properties Property changes on: trunk/pollen-votecounting-strategy-condorcet ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml .idea .classpath .project .settings Added: trunk/pollen-votecounting-strategy-condorcet/LICENSE.txt =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/LICENSE.txt (rev 0) +++ trunk/pollen-votecounting-strategy-condorcet/LICENSE.txt 2012-06-25 17:42:18 UTC (rev 3552) @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file Property changes on: trunk/pollen-votecounting-strategy-condorcet/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-votecounting-strategy-condorcet/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-votecounting-strategy-condorcet/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-condorcet/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/pom.xml (rev 0) +++ trunk/pollen-votecounting-strategy-condorcet/pom.xml 2012-06-25 17:42:18 UTC (rev 3552) @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.chorem</groupId> + <artifactId>pollen</artifactId> + <version>1.5-SNAPSHOT</version> + </parent> + + <groupId>org.chorem.pollen</groupId> + <artifactId>pollen-votecounting-strategy-condorcet</artifactId> + + <name>Pollen :: VoteCounting strategy :: Condorcet</name> + <description>Implements the condorcet vote counting strategy</description> + + <dependencies> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-votecounting-api</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> + + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <build> + <plugins> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <reportPlugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <reports> + <report>index</report> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + </reports> + </plugin> + </reportPlugins> + </configuration> + </plugin> + </plugins> + </build> + + </profile> + + </profiles> + +</project> Property changes on: trunk/pollen-votecounting-strategy-condorcet/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetStrategy.java =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetStrategy.java (rev 0) +++ trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetStrategy.java 2012-06-25 17:42:18 UTC (rev 3552) @@ -0,0 +1,171 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Condorcet + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting; + +import com.google.common.base.Preconditions; +import org.chorem.pollen.votecounting.model.ChoiceScore; +import org.chorem.pollen.votecounting.model.VoteCountingResult; +import org.chorem.pollen.votecounting.model.VoteForChoice; +import org.chorem.pollen.votecounting.model.Voter; + +import java.util.Map; +import java.util.Set; + +import static org.nuiton.i18n.I18n.n_; + +/** + * Condorcet. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class CondorcetStrategy extends AbstractVoteCountingStrategy { + + public static final int ID = 2; + + @Override + public int getId() { + return ID; + } + + @Override + public String getI18nName() { + return n_("pollen.voteCountingType.condorcet"); + } + + @Override + public String getI18nHelp() { + return n_("pollen.voteCountingType.condorcet.help"); + } + + @Override + public VoteCountingResult votecount(Set<Voter> voters) { + + // get empty result by choice + Map<String, ChoiceScore> resultByChoice = votersToResult(voters); + + for (Voter voter : voters) { + // add this voter votes to result + addVoterChoices(voter, resultByChoice); + } + // transform map of result to list of them (and sort them) + VoteCountingResult result = resultToList(null, resultByChoice); + return result; + } + + @Override + public String getDisplayVoteValue(Integer voteValue) { + return voteValue == null ? "" : String.valueOf(voteValue); + } + + @Override + public boolean isChoiceInVote(Integer voteValue) { + return voteValue != null && voteValue > 0 && voteValue < 100; + } + + @Override + public boolean isVoteValueNull(Integer voteValue) { + return voteValue == null; + } + + @Override + public ChoiceToVoteRenderType getRenderType() { + return ChoiceToVoteRenderType.TEXTFIELD; + } + + @Override + public boolean isDisplayResultsByChoice() { + return false; + } + + @Override + public boolean isVoteValueValid(Integer voteValue) { + return voteValue != null && voteValue > 0; + } + + @Override + public boolean isTotalVoteValueValid(int totalValues) { + // no validation on total value + return true; + } + + @Override + public String getTotalVoteValueNotValidMessage() { + // no validation on total value, so no message + return null; + } + + @Override + public String getVoteValueNotValidMessage() { + return n_("pollen.error.vote.invalidCondorcetVoteValue"); + } + + public void addVoterChoices(Voter voter, + Map<String, ChoiceScore> resultByChoice) { + + double voterWeight = voter.getWeight(); + + Set<VoteForChoice> voteForChoices = voter.getVoteForChoices(); + + for (VoteForChoice voteForChoice : voteForChoices) { + + Double voteValue = voteForChoice.getVoteValue(); + + if (voteValue != null) { + + // get nb victories for this choice among voter choices + int victories = getVictories(voteForChoice, voteForChoices); + + // get score for choice + String choiceId = voteForChoice.getChoiceId(); + ChoiceScore choiceScore = resultByChoice.get(choiceId); + + // compute score to add + double scoreToAdd = (double) victories * voterWeight; + + // add to score this weighted vote + choiceScore.addScoreValue(scoreToAdd); + } + } + } + + public int getVictories(VoteForChoice voteForChoice, + Set<VoteForChoice> voteForChoices) { + int result = 0; + Preconditions.checkNotNull(voteForChoice); + Double refValue = voteForChoice.getVoteValue(); + Preconditions.checkNotNull(refValue); + String currentCHoiceId = voteForChoice.getChoiceId(); + for (VoteForChoice forChoice : voteForChoices) { + if (!currentCHoiceId.equals(forChoice.getChoiceId())) { + Double voteValue = forChoice.getVoteValue(); + if (voteValue == null || refValue < voteValue) { + + // ref choice wins against current choice + result++; + } + } + } + return result; + } +} Property changes on: trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/votecounting/CondorcetStrategy.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-condorcet/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy (rev 0) +++ trunk/pollen-votecounting-strategy-condorcet/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy 2012-06-25 17:42:18 UTC (rev 3552) @@ -0,0 +1 @@ +org.chorem.pollen.votecounting.CondorcetStrategy Property changes on: trunk/pollen-votecounting-strategy-condorcet/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-condorcet/src/main/resources/i18n/pollen-votecounting-strategy-condorcet_en_GB.properties =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/src/main/resources/i18n/pollen-votecounting-strategy-condorcet_en_GB.properties (rev 0) +++ trunk/pollen-votecounting-strategy-condorcet/src/main/resources/i18n/pollen-votecounting-strategy-condorcet_en_GB.properties 2012-06-25 17:42:18 UTC (rev 3552) @@ -0,0 +1,3 @@ +pollen.error.vote.invalidCondorcetVoteValue= +pollen.voteCountingType.condorcet=Condorcet +pollen.voteCountingType.condorcet.help=Rank choices by preference order from 1 to N (1\=favorite). Only the rank is taken into account, not the values. Two choices can have the same value. Property changes on: trunk/pollen-votecounting-strategy-condorcet/src/main/resources/i18n/pollen-votecounting-strategy-condorcet_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-condorcet/src/main/resources/i18n/pollen-votecounting-strategy-condorcet_fr_FR.properties =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/src/main/resources/i18n/pollen-votecounting-strategy-condorcet_fr_FR.properties (rev 0) +++ trunk/pollen-votecounting-strategy-condorcet/src/main/resources/i18n/pollen-votecounting-strategy-condorcet_fr_FR.properties 2012-06-25 17:42:18 UTC (rev 3552) @@ -0,0 +1,3 @@ +pollen.error.vote.invalidCondorcetVoteValue= +pollen.voteCountingType.condorcet=Condorcet +pollen.voteCountingType.condorcet.help=Classer les choix par ordre de préférence de 1 à N (1\=préféré). Seul l'ordre des choix compte, peu importe les valeurs. Deux choix peuvent avoir la même valeur. Property changes on: trunk/pollen-votecounting-strategy-condorcet/src/main/resources/i18n/pollen-votecounting-strategy-condorcet_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-condorcet/src/src/site/site_en.xml =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/src/src/site/site_en.xml (rev 0) +++ trunk/pollen-votecounting-strategy-condorcet/src/src/site/site_en.xml 2012-06-25 17:42:18 UTC (rev 3552) @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<project name="${project.name}"> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="User"> + <item name="About" href="./index.html"/> + </menu> + + <menu name="Language"> + <item name="Français" href="index.html"/> + <item name="English" href="../index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> +</project> + Property changes on: trunk/pollen-votecounting-strategy-condorcet/src/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-condorcet/src/src/site/site_fr.xml =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/src/src/site/site_fr.xml (rev 0) +++ trunk/pollen-votecounting-strategy-condorcet/src/src/site/site_fr.xml 2012-06-25 17:42:18 UTC (rev 3552) @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<project name="${project.name}"> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="A propos" href="./index.html"/> + </menu> + + <menu name="Language"> + <item name="Français" href="index.html"/> + <item name="English" href="../index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> + +</project> + Property changes on: trunk/pollen-votecounting-strategy-condorcet/src/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetStrategyTest.java =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetStrategyTest.java (rev 0) +++ trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetStrategyTest.java 2012-06-25 17:42:18 UTC (rev 3552) @@ -0,0 +1,285 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Condorcet + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting; + +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import org.chorem.pollen.votecounting.model.ChoiceIdAble; +import org.chorem.pollen.votecounting.model.ChoiceScore; +import org.chorem.pollen.votecounting.model.VoteCountingResult; +import org.chorem.pollen.votecounting.model.Voter; +import org.chorem.pollen.votecounting.model.VoterBuilder; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Tests the {@link CondorcetStrategy}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class CondorcetStrategyTest { + + public static final String CHOICE_A = "a"; + + public static final String CHOICE_B = "b"; + + public static final String CHOICE_C = "c"; + + protected static VoteCountingStrategyProvider provider; + + protected VoteCountingStrategy strategy; + + @BeforeClass + public static void beforeClass() throws Exception { + provider = new VoteCountingStrategyProvider(); + } + + @Before + public void setUp() throws Exception { + strategy = provider.getStrategy(CondorcetStrategy.ID); + } + + @Test + public void simpleVotecount() throws Exception { + + // Simple poll (all weight to 1) + // 1 (a=1 b=2 c=null) + // 2 (a=3 b=2 c=1) + // 3 (a=1 b=null c=2) + // Result (a=4 b=2 c=3) + + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 2.). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, 3.). + addVoteForChoice(CHOICE_B, 2.). + addVoteForChoice(CHOICE_C, 1.). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, 2.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + Assert.assertNull(result.getVoter()); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScore(scores.get(0), CHOICE_A, BigDecimal.valueOf(4.)); + assertChoiceScore(scores.get(1), CHOICE_C, BigDecimal.valueOf(3.)); + assertChoiceScore(scores.get(2), CHOICE_B, BigDecimal.valueOf(2.)); + } + + @Test + public void simpleVotecount2() throws Exception { + + // Simple poll (all weight to 1) + // 1 (a=1 b=2 c=null) + // 2 (a=1 b=2 c=1) + // 3 (a=null b=null c=2) + // Result (a=3 b=1 c=3) + + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 2.). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 2.). + addVoteForChoice(CHOICE_C, 1.). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, 2.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + Assert.assertNull(result.getVoter()); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScoreEquals(BigDecimal.valueOf(3.), + Sets.newHashSet(scores.get(0), + scores.get(1)), + CHOICE_A, CHOICE_C); + assertChoiceScore(scores.get(2), CHOICE_B, BigDecimal.valueOf(1.)); + } + + @Test + public void simpleVotecount3() throws Exception { + + // Simple poll (all weight to 1) + // 1 (a=1 b=null c=null) + // 2 (a=null b=1 c=null) + // 3 (a=null b=null c=1) + // Result (a=2 b=2 c=2) + + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 1.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, 1.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + Assert.assertNull(result.getVoter()); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScoreEquals(BigDecimal.valueOf(2.), + Sets.newHashSet(scores.get(0), + scores.get(1), + scores.get(2) + ), + CHOICE_A, CHOICE_B, CHOICE_C); + } + + @Test + public void weightedVotecount1() throws Exception { + + // poll with weighted vote + // 1 (x2) (a=1 b=null c=null) + // 2 (x1) (a=null b=1 c=null) + // 3 (x1) (a=null b=1 c=2) + // Result (a=2 b=2 c=1) + + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 2.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, 2.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + Assert.assertNull(result.getVoter()); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScoreEquals(BigDecimal.valueOf(4.), + Sets.newHashSet(scores.get(0), + scores.get(1)), + CHOICE_A, CHOICE_B); + assertChoiceScore(scores.get(2), CHOICE_C, BigDecimal.valueOf(1.)); + } + + @Test + public void weightedVotecount2() throws Exception { + + // poll with weighted vote + // 1 (x2) (a=1 b=null c=null) + // 2 (x1) (a=null b=1 c=null) + // 3 (x3) (a=null b=2 c=1) + // Result (a=2 b=4 c=3) + + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 2.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 3.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 2.). + addVoteForChoice(CHOICE_C, 1.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + Assert.assertNull(result.getVoter()); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScore(scores.get(0), CHOICE_C, BigDecimal.valueOf(6.)); + assertChoiceScore(scores.get(1), CHOICE_B, BigDecimal.valueOf(5.)); + assertChoiceScore(scores.get(2), CHOICE_A, BigDecimal.valueOf(4.)); + } + + public static void assertChoiceScore(ChoiceScore choiceScore, + String choiceId, + BigDecimal choiceResult) { + Assert.assertNotNull(choiceScore); + Assert.assertEquals(choiceId, choiceScore.getChoiceId()); + Assert.assertEquals(choiceResult, choiceScore.getScoreValue()); + } + + public static void assertChoiceScoreEquals(BigDecimal choiceResult, + Set<ChoiceScore> choiceScores, + String... choiceIds) { + + Assert.assertNotNull(choiceScores); + Map<String, ChoiceScore> choicesById = Maps.uniqueIndex( + choiceScores, new ChoiceIdAble.ChoiceIdAbleById()); + for (String choiceId : choiceIds) { + + ChoiceScore choiceScore = choicesById.get(choiceId); + Assert.assertNotNull(choiceScore); + assertChoiceScore(choiceScore, choiceId, choiceResult); + } + } + +} Property changes on: trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/CondorcetStrategyTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java (rev 0) +++ trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java 2012-06-25 17:42:18 UTC (rev 3552) @@ -0,0 +1,49 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Condorcet + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting; + +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * Tests the {@link VoteCountingStrategyProvider}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class VoteCountingStrategyProviderTest { + + protected static VoteCountingStrategyProvider provider; + + @BeforeClass + public static void beforeClass() throws Exception { + provider = new VoteCountingStrategyProvider(); + } + + @Test + public void getStrategy() throws Exception { + + Assert.assertNotNull(provider.getStrategy(CondorcetStrategy.ID)); + } +} Property changes on: trunk/pollen-votecounting-strategy-condorcet/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-condorcet/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/src/test/resources/log4j.properties (rev 0) +++ trunk/pollen-votecounting-strategy-condorcet/src/test/resources/log4j.properties 2012-06-25 17:42:18 UTC (rev 3552) @@ -0,0 +1,30 @@ +### +# #%L +# Pollen :: VoteCounting strategy :: Condorcet +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### +# Global logging configuration +log4j.rootLogger=WARN, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n +# package level +log4j.logger.org.chorem.pollen=INFO Property changes on: trunk/pollen-votecounting-strategy-condorcet/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

25 Jun '12

Author: tchemit Date: 2012-06-25 19:41:37 +0200 (Mon, 25 Jun 2012) New Revision: 3551 Url: http://chorem.org/repositories/revision/pollen/3551 Log: refs #590: implements percentage strategy Added: trunk/pollen-votecounting-strategy-percentage/ trunk/pollen-votecounting-strategy-percentage/LICENSE.txt trunk/pollen-votecounting-strategy-percentage/README.txt trunk/pollen-votecounting-strategy-percentage/changelog.txt trunk/pollen-votecounting-strategy-percentage/pom.xml trunk/pollen-votecounting-strategy-percentage/src/ trunk/pollen-votecounting-strategy-percentage/src/main/ trunk/pollen-votecounting-strategy-percentage/src/main/java/ trunk/pollen-votecounting-strategy-percentage/src/main/java/org/ trunk/pollen-votecounting-strategy-percentage/src/main/java/org/chorem/ trunk/pollen-votecounting-strategy-percentage/src/main/java/org/chorem/pollen/ trunk/pollen-votecounting-strategy-percentage/src/main/java/org/chorem/pollen/votecounting/ trunk/pollen-votecounting-strategy-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageStrategy.java trunk/pollen-votecounting-strategy-percentage/src/main/resources/ trunk/pollen-votecounting-strategy-percentage/src/main/resources/META-INF/ trunk/pollen-votecounting-strategy-percentage/src/main/resources/META-INF/services/ trunk/pollen-votecounting-strategy-percentage/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy trunk/pollen-votecounting-strategy-percentage/src/main/resources/i18n/ trunk/pollen-votecounting-strategy-percentage/src/main/resources/i18n/pollen-votecounting-strategy-percentage_en_GB.properties trunk/pollen-votecounting-strategy-percentage/src/main/resources/i18n/pollen-votecounting-strategy-percentage_fr_FR.properties trunk/pollen-votecounting-strategy-percentage/src/site/ trunk/pollen-votecounting-strategy-percentage/src/site/site_en.xml trunk/pollen-votecounting-strategy-percentage/src/site/site_fr.xml trunk/pollen-votecounting-strategy-percentage/src/test/ trunk/pollen-votecounting-strategy-percentage/src/test/java/ trunk/pollen-votecounting-strategy-percentage/src/test/java/org/ trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/ trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/ trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/ trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageStrategyTest.java trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java trunk/pollen-votecounting-strategy-percentage/src/test/resources/ trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties Property changes on: trunk/pollen-votecounting-strategy-percentage ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml .idea .classpath .project .settings Added: trunk/pollen-votecounting-strategy-percentage/LICENSE.txt =================================================================== --- trunk/pollen-votecounting-strategy-percentage/LICENSE.txt (rev 0) +++ trunk/pollen-votecounting-strategy-percentage/LICENSE.txt 2012-06-25 17:41:37 UTC (rev 3551) @@ -0,0 +1,661 @@ + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/> + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU Affero General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU Affero General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + <one line to give the program's name and a brief idea of what it does.> + Copyright (C) <year> <name of author> + + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +<http://www.gnu.org/licenses/>. \ No newline at end of file Property changes on: trunk/pollen-votecounting-strategy-percentage/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-votecounting-strategy-percentage/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-votecounting-strategy-percentage/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-percentage/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-percentage/pom.xml (rev 0) +++ trunk/pollen-votecounting-strategy-percentage/pom.xml 2012-06-25 17:41:37 UTC (rev 3551) @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> + + <modelVersion>4.0.0</modelVersion> + + <parent> + <groupId>org.chorem</groupId> + <artifactId>pollen</artifactId> + <version>1.5-SNAPSHOT</version> + </parent> + + <groupId>org.chorem.pollen</groupId> + <artifactId>pollen-votecounting-strategy-percentage</artifactId> + + <name>Pollen :: VoteCounting strategy :: Percentage</name> + <description>Implements the percentage vote counting strategy</description> + + <dependencies> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-votecounting-api</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-log4j12</artifactId> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>maven-i18n-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + + <profiles> + + <profile> + <id>reporting</id> + <activation> + <property> + <name>performRelease</name> + <value>true</value> + </property> + </activation> + + <build> + <plugins> + <plugin> + <artifactId>maven-site-plugin</artifactId> + <configuration> + <reportPlugins> + <plugin> + <artifactId>maven-project-info-reports-plugin</artifactId> + <reports> + <report>index</report> + <report>project-team</report> + <report>mailing-list</report> + <report>cim</report> + <report>issue-tracking</report> + <report>license</report> + <report>scm</report> + <report>dependency-convergence</report> + <report>dependency-management</report> + </reports> + </plugin> + </reportPlugins> + </configuration> + </plugin> + </plugins> + </build> + + </profile> + + </profiles> + +</project> Property changes on: trunk/pollen-votecounting-strategy-percentage/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageStrategy.java =================================================================== --- trunk/pollen-votecounting-strategy-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageStrategy.java (rev 0) +++ trunk/pollen-votecounting-strategy-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageStrategy.java 2012-06-25 17:41:37 UTC (rev 3551) @@ -0,0 +1,143 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Percentage + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting; + +import org.chorem.pollen.votecounting.model.ChoiceScore; +import org.chorem.pollen.votecounting.model.VoteCountingResult; +import org.chorem.pollen.votecounting.model.VoteForChoice; +import org.chorem.pollen.votecounting.model.Voter; + +import java.util.Map; +import java.util.Set; + +import static org.nuiton.i18n.I18n.n_; + +/** + * Percentage strategy. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class PercentageStrategy extends AbstractVoteCountingStrategy { + + public static final int ID = 1; + + @Override + public int getId() { + return ID; + } + + @Override + public String getI18nName() { + return n_("pollen.voteCountingType.percentage"); + } + + @Override + public String getI18nHelp() { + return n_("pollen.voteCountingType.percentage.help"); + } + + @Override + public VoteCountingResult votecount(Set<Voter> voters) { + // get empty result by choice + Map<String, ChoiceScore> resultByChoice = votersToResult(voters); + + for (Voter voter : voters) { + // add this voter votes to result + addVoterChoices(voter, resultByChoice); + } + // transform map of result to list of them (and sort them) + VoteCountingResult result = resultToList(null, resultByChoice); + return result; + } + + @Override + public String getDisplayVoteValue(Integer voteValue) { + return voteValue == null ? "" : String.valueOf(voteValue); + } + + @Override + public boolean isChoiceInVote(Integer voteValue) { + return voteValue != null && voteValue >= 0 && voteValue <= 100; + } + + + @Override + public boolean isVoteValueNull(Integer value) { + return value == null || value == 0; + } + + @Override + public ChoiceToVoteRenderType getRenderType() { + return ChoiceToVoteRenderType.TEXTFIELD; + } + + @Override + public boolean isDisplayResultsByChoice() { + return false; + } + + @Override + public boolean isVoteValueValid(Integer voteValue) { + // no validation on not null vote value + return true; + } + + @Override + public boolean isTotalVoteValueValid(int totalValues) { + return totalValues == 100; + } + + @Override + public String getVoteValueNotValidMessage() { + // no validation on not null vote value, so no message + return null; + } + + @Override + public String getTotalVoteValueNotValidMessage() { + return n_("pollen.error.vote.percentage"); + } + + public void addVoterChoices(Voter voter, + Map<String, ChoiceScore> resultByChoice) { + + double voterWeight = voter.getWeight(); + + for (VoteForChoice voteForChoice : voter.getVoteForChoices()) { + Double voteValue = voteForChoice.getVoteValue(); + if (voteValue != null) { + + // get score for choice + String choiceId = voteForChoice.getChoiceId(); + ChoiceScore choiceScore = resultByChoice.get(choiceId); + + // compute score to add + double scoreToAdd = voteValue * voterWeight; + + // add to score this weighted vote + choiceScore.addScoreValue(scoreToAdd); + } + } + } +} Property changes on: trunk/pollen-votecounting-strategy-percentage/src/main/java/org/chorem/pollen/votecounting/PercentageStrategy.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-percentage/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy =================================================================== --- trunk/pollen-votecounting-strategy-percentage/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy (rev 0) +++ trunk/pollen-votecounting-strategy-percentage/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy 2012-06-25 17:41:37 UTC (rev 3551) @@ -0,0 +1 @@ +org.chorem.pollen.votecounting.PercentageStrategy Property changes on: trunk/pollen-votecounting-strategy-percentage/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCountingStrategy ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-percentage/src/main/resources/i18n/pollen-votecounting-strategy-percentage_en_GB.properties =================================================================== --- trunk/pollen-votecounting-strategy-percentage/src/main/resources/i18n/pollen-votecounting-strategy-percentage_en_GB.properties (rev 0) +++ trunk/pollen-votecounting-strategy-percentage/src/main/resources/i18n/pollen-votecounting-strategy-percentage_en_GB.properties 2012-06-25 17:41:37 UTC (rev 3551) @@ -0,0 +1,3 @@ +pollen.error.vote.percentage= +pollen.voteCountingType.percentage=Percentage +pollen.voteCountingType.percentage.help=Allocate choices to get a 100%% total. Property changes on: trunk/pollen-votecounting-strategy-percentage/src/main/resources/i18n/pollen-votecounting-strategy-percentage_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-percentage/src/main/resources/i18n/pollen-votecounting-strategy-percentage_fr_FR.properties =================================================================== --- trunk/pollen-votecounting-strategy-percentage/src/main/resources/i18n/pollen-votecounting-strategy-percentage_fr_FR.properties (rev 0) +++ trunk/pollen-votecounting-strategy-percentage/src/main/resources/i18n/pollen-votecounting-strategy-percentage_fr_FR.properties 2012-06-25 17:41:37 UTC (rev 3551) @@ -0,0 +1,3 @@ +pollen.error.vote.percentage= +pollen.voteCountingType.percentage=Pourcentage +pollen.voteCountingType.percentage.help=Répartir les choix de manière à obtenir 100%% au total. Property changes on: trunk/pollen-votecounting-strategy-percentage/src/main/resources/i18n/pollen-votecounting-strategy-percentage_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-percentage/src/site/site_en.xml =================================================================== --- trunk/pollen-votecounting-strategy-percentage/src/site/site_en.xml (rev 0) +++ trunk/pollen-votecounting-strategy-percentage/src/site/site_en.xml 2012-06-25 17:41:37 UTC (rev 3551) @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<project name="${project.name}"> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="User"> + <item name="About" href="./index.html"/> + </menu> + + <menu name="Language"> + <item name="Français" href="index.html"/> + <item name="English" href="../index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> +</project> + Property changes on: trunk/pollen-votecounting-strategy-percentage/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-percentage/src/site/site_fr.xml =================================================================== --- trunk/pollen-votecounting-strategy-percentage/src/site/site_fr.xml (rev 0) +++ trunk/pollen-votecounting-strategy-percentage/src/site/site_fr.xml 2012-06-25 17:41:37 UTC (rev 3551) @@ -0,0 +1,69 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<project name="${project.name}"> + + <body> + + <breadcrumbs> + <item name="${project.name}" href="${project.url}/index.html"/> + </breadcrumbs> + + <menu ref="parent"/> + + <menu name="Utilisateur"> + <item name="A propos" href="./index.html"/> + </menu> + + <menu name="Language"> + <item name="Français" href="index.html"/> + <item name="English" href="../index.html"/> + </menu> + + <menu ref="reports"/> + + <footer> + + <script type="text/javascript" + src="http://maven-site.chorem.org/public/js/maven-site-chorem.org.js"> + </script> + + <div id='projectMetas' + projectversion='${project.version}' + platform='${project.platform}' + projectid='${project.projectId}' + scm='${project.scm.connection}' + scmwebeditorenabled='${project.scmwebeditorEnabled}' + scmwebeditorurl='${project.scmwebeditorUrl}' + siteSourcesType='${project.siteSourcesType}' + piwikEnabled='${project.piwikEnabled}' + piwikId='${project.piwikId}'> + </div> + </footer> + + </body> + +</project> + Property changes on: trunk/pollen-votecounting-strategy-percentage/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageStrategyTest.java =================================================================== --- trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageStrategyTest.java (rev 0) +++ trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageStrategyTest.java 2012-06-25 17:41:37 UTC (rev 3551) @@ -0,0 +1,278 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Percentage + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting; + +import com.google.common.collect.Maps; +import com.google.common.collect.Sets; +import org.chorem.pollen.votecounting.model.ChoiceIdAble; +import org.chorem.pollen.votecounting.model.ChoiceScore; +import org.chorem.pollen.votecounting.model.VoteCountingResult; +import org.chorem.pollen.votecounting.model.Voter; +import org.chorem.pollen.votecounting.model.VoterBuilder; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Tests the {@link PercentageStrategy}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class PercentageStrategyTest { + + public static final String CHOICE_A = "a"; + + public static final String CHOICE_B = "b"; + + public static final String CHOICE_C = "c"; + + protected static VoteCountingStrategyProvider provider; + + protected VoteCountingStrategy strategy; + + @BeforeClass + public static void beforeClass() throws Exception { + provider = new VoteCountingStrategyProvider(); + } + + @Before + public void setUp() throws Exception { + strategy = provider.getStrategy(PercentageStrategy.ID); + } + + @Test + public void simpleVotecount() throws Exception { + + // Simple poll (all weight to 1) + // 1 (a=100 b=null c=null) + // 2 (a=null b=100 c=null) + // 3 (a=50 b=50 c=null) + // Result (a=100 b=150 c=null) + + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 1.). + addVoteForChoice(CHOICE_A, 100.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 100.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, 50.). + addVoteForChoice(CHOICE_B, 50.). + addVoteForChoice(CHOICE_C, null). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + Assert.assertNull(result.getVoter()); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScoreEquals(BigDecimal.valueOf(150.), + Sets.newHashSet(scores.get(0), + scores.get(1)), + CHOICE_A, CHOICE_B); + + assertChoiceScore(scores.get(2), CHOICE_C, null); + } + + @Test + public void simpleVotecount2() throws Exception { + + // Simple poll (all weight to 1) + // 1 (a=20 b=30 c=50) + // 2 (a=50 b=20 c=30) + // 3 (a=10 b=50 c=40) + // Result (a=80 b=100 c=120) + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 1.). + addVoteForChoice(CHOICE_A, 20.). + addVoteForChoice(CHOICE_B, 30.). + addVoteForChoice(CHOICE_C, 50.). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, 50.). + addVoteForChoice(CHOICE_B, 20.). + addVoteForChoice(CHOICE_C, 30.). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, 10.). + addVoteForChoice(CHOICE_B, 50.). + addVoteForChoice(CHOICE_C, 40.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + Assert.assertNull(result.getVoter()); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScore(scores.get(0), CHOICE_C, BigDecimal.valueOf(120.)); + assertChoiceScore(scores.get(1), CHOICE_B, BigDecimal.valueOf(100.)); + assertChoiceScore(scores.get(2), CHOICE_A, BigDecimal.valueOf(80.)); + } + + @Test + public void simpleVotecount3() throws Exception { + + // Simple poll (all weight to 1) + // 1 (a=50 b=50 c=null) + // 2 (a=50 b=50 c=null) + // 3 (a=50 b=50 c=null) + // Result (a=150 b=150 c=null) + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 1.). + addVoteForChoice(CHOICE_A, 50.). + addVoteForChoice(CHOICE_B, 50.). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, 50.). + addVoteForChoice(CHOICE_B, 50.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, 50.). + addVoteForChoice(CHOICE_B, 50.). + addVoteForChoice(CHOICE_C, null). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + Assert.assertNull(result.getVoter()); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScoreEquals(BigDecimal.valueOf(150.), + Sets.newHashSet(scores.get(0), + scores.get(1)), + CHOICE_A, CHOICE_B); + assertChoiceScore(scores.get(2), CHOICE_C, null); + } + + @Test + public void weightedVotecount1() throws Exception { + + // poll with weighted vote + // 1 (x2) (a=100 b=null c=null) + // 2 (x1) (a=null b=100 c=null) + // 3 (x1) (a=null b=50 c=50) + // Result (a=200 b=150 c=50) + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 2.). + addVoteForChoice(CHOICE_A, 100.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 100.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 50.). + addVoteForChoice(CHOICE_C, 50.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + Assert.assertNull(result.getVoter()); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + assertChoiceScore(scores.get(0), CHOICE_A, BigDecimal.valueOf(200.)); + assertChoiceScore(scores.get(1), CHOICE_B, BigDecimal.valueOf(150.)); + assertChoiceScore(scores.get(2), CHOICE_C, BigDecimal.valueOf(50.)); + } + + @Test + public void weightedVotecount2() throws Exception { + + // poll with weighted vote + // 1 (x2) (a=100 b=null c=null) + // 2 (x1) (a=null b=100 c=null) + // 3 (x3) (a=null b=50 c=50) + // Result (a=200 b=250 c=150) + Set<Voter> voters = new VoterBuilder(). + newVoter("1", 2.). + addVoteForChoice(CHOICE_A, 100.). + addVoteForChoice(CHOICE_B, null). + addVoteForChoice(CHOICE_C, null). + newVoter("2", 1.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 100.). + addVoteForChoice(CHOICE_C, null). + newVoter("3", 3.). + addVoteForChoice(CHOICE_A, null). + addVoteForChoice(CHOICE_B, 50.). + addVoteForChoice(CHOICE_C, 50.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + Assert.assertNull(result.getVoter()); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(3, scores.size()); + + assertChoiceScore(scores.get(0), CHOICE_B, BigDecimal.valueOf(250.)); + assertChoiceScore(scores.get(1), CHOICE_A, BigDecimal.valueOf(200.)); + assertChoiceScore(scores.get(2), CHOICE_C, BigDecimal.valueOf(150.)); + } + + public static void assertChoiceScore(ChoiceScore choiceScore, + String choiceId, + BigDecimal choiceResult) { + Assert.assertNotNull(choiceScore); + Assert.assertEquals(choiceId, choiceScore.getChoiceId()); + Assert.assertEquals(choiceResult, choiceScore.getScoreValue()); + } + + public static void assertChoiceScoreEquals(BigDecimal choiceResult, + Set<ChoiceScore> choiceScores, + String... choiceIds) { + + Assert.assertNotNull(choiceScores); + Map<String, ChoiceScore> choicesById = Maps.uniqueIndex( + choiceScores, new ChoiceIdAble.ChoiceIdAbleById()); + for (String choiceId : choiceIds) { + + ChoiceScore choiceScore = choicesById.get(choiceId); + Assert.assertNotNull(choiceScore); + assertChoiceScore(choiceScore, choiceId, choiceResult); + } + } + +} Property changes on: trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/PercentageStrategyTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java =================================================================== --- trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java (rev 0) +++ trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java 2012-06-25 17:41:37 UTC (rev 3551) @@ -0,0 +1,49 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Percentage + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2012 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * #L% + */ +package org.chorem.pollen.votecounting; + +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; + +/** + * Tests the {@link VoteCountingStrategyProvider}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class VoteCountingStrategyProviderTest { + + protected static VoteCountingStrategyProvider provider; + + @BeforeClass + public static void beforeClass() throws Exception { + provider = new VoteCountingStrategyProvider(); + } + + @Test + public void getStrategy() throws Exception { + + Assert.assertNotNull(provider.getStrategy(PercentageStrategy.ID)); + } +} Property changes on: trunk/pollen-votecounting-strategy-percentage/src/test/java/org/chorem/pollen/votecounting/VoteCountingStrategyProviderTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties (rev 0) +++ trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties 2012-06-25 17:41:37 UTC (rev 3551) @@ -0,0 +1,30 @@ +### +# #%L +# Pollen :: VoteCounting strategy :: Percentage +# $Id$ +# $HeadURL$ +# %% +# Copyright (C) 2009 - 2012 CodeLutin +# %% +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# #L% +### +# Global logging configuration +log4j.rootLogger=WARN, stdout +# Console output... +log4j.appender.stdout=org.apache.log4j.ConsoleAppender +log4j.appender.stdout.layout=org.apache.log4j.PatternLayout +log4j.appender.stdout.layout.ConversionPattern=%d %5p [%t] (%F:%L) %M - %m%n +# package level +log4j.logger.org.chorem.pollen=INFO Property changes on: trunk/pollen-votecounting-strategy-percentage/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0