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

r3576 - in trunk/pollen-services: . src/main/java/org/chorem/pollen/services src/main/java/org/chorem/pollen/services/exceptions src/main/java/org/chorem/pollen/services/impl src/main/resources/i18n src/test/java/org/chorem/pollen/services/impl
by tchemit＠users.chorem.org July 31, 2012

July 31, 2012

Author: tchemit Date: 2012-07-31 18:17:34 +0200 (Tue, 31 Jul 2012) New Revision: 3576 Url: http://chorem.org/repositories/revision/pollen/3576 Log: refs #715: Import voting users list doesn't work (review and fix csv import + remove 3 classes :) Removed: trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java Modified: trunk/pollen-services/pom.xml trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java Modified: trunk/pollen-services/pom.xml =================================================================== --- trunk/pollen-services/pom.xml 2012-07-31 14:19:29 UTC (rev 3575) +++ trunk/pollen-services/pom.xml 2012-07-31 16:17:34 UTC (rev 3576) @@ -84,10 +84,6 @@ <artifactId>nuiton-utils</artifactId> </dependency> <dependency> - <groupId>org.nuiton</groupId> - <artifactId>nuiton-csv</artifactId> - </dependency> - <dependency> <groupId>org.nuiton.i18n</groupId> <artifactId>nuiton-i18n</artifactId> </dependency> Deleted: trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java 2012-07-31 14:19:29 UTC (rev 3575) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/FavoriteListImport.java 2012-07-31 16:17:34 UTC (rev 3576) @@ -1,57 +0,0 @@ -/* - * #%L - * Pollen :: Services - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit - * %% - * 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; - -import org.chorem.pollen.business.persistence.PollAccount; -import org.chorem.pollen.services.exceptions.FavoriteListImportException; -import org.chorem.pollen.services.impl.FavoriteListImportCSV; -import org.chorem.pollen.services.impl.FavoriteListImportLDAP; - -import java.util.List; - -/** - * Used to import a favorite List or a List of {@link PollAccount} from a given - * source url (file, external service, ...) - * <p/> - * Created: 16/04/12 - * - * @author fdesbois <desbois(a)codelutin.com> - * @see FavoriteListImportLDAP - * @see FavoriteListImportCSV - * @since 1.3 - */ -public interface FavoriteListImport { - - /** - * Execute the import from given {@code url}. This will returned the - * successful list of {@link PollAccount} instanciated during import. No - * database save is done here, only the extraction from an input url to - * a list of entities to manage. - * - * @param url Url of the file or service that contains data to import - * @return the List of PollAccount imported - * @throws FavoriteListImportException for any import error - */ - public List<PollAccount> execute(String url) - throws FavoriteListImportException; -} Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java 2012-07-31 14:19:29 UTC (rev 3575) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/exceptions/FavoriteListImportException.java 2012-07-31 16:17:34 UTC (rev 3576) @@ -22,8 +22,6 @@ */ package org.chorem.pollen.services.exceptions; -import org.chorem.pollen.services.FavoriteListImport; - import java.util.Locale; import static org.nuiton.i18n.I18n._; @@ -31,7 +29,7 @@ import static org.nuiton.i18n.I18n.n_; /** - * Exception during {@link FavoriteListImport#execute(String)} error. There is + * Exception during favorite list import. There is * always a cause from librairies used for import. * * @author fdesbois <desbois(a)codelutin.com> Deleted: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java 2012-07-31 14:19:29 UTC (rev 3575) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportCSV.java 2012-07-31 16:17:34 UTC (rev 3576) @@ -1,184 +0,0 @@ -/* - * #%L - * Pollen :: Services - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit - * %% - * 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 com.google.common.collect.Iterables; -import com.google.common.collect.Lists; -import org.apache.commons.io.IOUtils; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.pollen.PollenTechnicalException; -import org.chorem.pollen.business.persistence.PollAccount; -import org.chorem.pollen.services.FavoriteListImport; -import org.chorem.pollen.services.PollenServicePredicates; -import org.chorem.pollen.services.PollenServiceSupport; -import org.chorem.pollen.services.exceptions.FavoriteListImportException; -import org.nuiton.util.StringUtil; -import org.nuiton.util.csv.Import; -import org.nuiton.util.csv.ImportModel; -import org.nuiton.util.csv.ImportRuntimeException; -import org.nuiton.util.csv.ImportableColumn; -import org.nuiton.util.csv.ModelBuilder; -import org.nuiton.util.csv.ValueParser; - -import java.io.File; -import java.io.FileNotFoundException; -import java.io.FileReader; -import java.io.Reader; -import java.text.ParseException; -import java.util.List; - -import static org.nuiton.i18n.I18n._; - -/** - * Implementation of {@link FavoriteListImport} as a service for CSV import. - * Nuiton-CSV is used to manage the {@link Import} using a specific {@link - * ImportModel} for pollen. Empty rows (no votingId or no email) are ignored. - * <p/> - * Created: 16/04/12 - * - * @author fdesbois <desbois(a)codelutin.com> - * @since 1.3 - */ -public class FavoriteListImportCSV extends PollenServiceSupport implements FavoriteListImport { - - private static final Log log = LogFactory.getLog(FavoriteListImportCSV.class); - - private static final ValueParser<String> EMAIL_PARSER = new ValueParser<String>() { - - @Override - public String parse(String value) throws ParseException { - if (value != null && !StringUtil.isEmail(value)) { - throw new ParseException(_("pollen.error.email.invalid"), 0); - } - return value; - } - }; - - protected class FavoriteListImportModel implements ImportModel<PollAccount> { - - @Override - public char getSeparator() { - return ','; - } - - @Override - public void pushCsvHeaderNames(List<String> headerNames) { - } - - @Override - public PollAccount newEmptyInstance() { - return newInstance(getDAO(PollAccount.class)); - } - - @Override - public Iterable<ImportableColumn<PollAccount, Object>> getColumnsForImport() { - ModelBuilder modelBuilder = new ModelBuilder(); - modelBuilder.newMandatoryColumn(PollAccount.PROPERTY_VOTING_ID, - PollAccount.PROPERTY_VOTING_ID); - modelBuilder.newMandatoryColumn(PollAccount.PROPERTY_EMAIL, - PollAccount.PROPERTY_EMAIL, - EMAIL_PARSER); - return modelBuilder.getColumnsForImport(); - } - } - - @Override - public List<PollAccount> execute(String url) throws FavoriteListImportException { - - List<PollAccount> results; - Reader reader = null; - try { - reader = new FileReader(new File(url)); - - Import<PollAccount> csvImport = Import.newImport(new FavoriteListImportModel(), reader); - - // Filter on empty account (without email or votingId) - results = Lists.newArrayList( - Iterables.filter(csvImport, - PollenServicePredicates.POLL_ACCOUNT_NOT_EMPTY) - ); - - if (log.isInfoEnabled()) { - log.info(results.size() + " comptes importés."); - } - - } catch (FileNotFoundException ex) { - throw new PollenTechnicalException(ex); - - } catch (ImportRuntimeException ex) { - if (log.isDebugEnabled()) { - log.debug("Error during CSV import", ex); - } - throw new FavoriteListImportException("CSV", ex); - - } finally { - IOUtils.closeQuietly(reader); - } - return results; - } - -// @Override -// public List<PollAccount> execute(String url) throws FavoriteListImportException { -// -// List<PollAccount> results; -// Reader reader = null; -// try { -// reader = new FileReader(new File(url)); -// -// // Définition de la stratégie de mapping -// ColumnPositionMappingStrategy<PollAccountImpl> strat = -// new ColumnPositionMappingStrategy<PollAccountImpl>(); -// -// String[] columns = new String[] { -// PollAccount.PROPERTY_VOTING_ID, -// PollAccount.PROPERTY_EMAIL -// }; -// -// strat.setType(PollAccountImpl.class); -// strat.setColumnMapping(columns); -// -// // Parsing du fichier CSV -// CsvToBean<PollAccountImpl> csv = new CsvToBean<PollAccountImpl>(); -// List<PollAccount> importedData = Lists.<PollAccount>newArrayList(csv.parse(strat, reader)); -// -// // Suppression des comptes null -// results = Lists.newArrayList( -// Iterables.filter(importedData, -// PollenServicePredicates.POLL_ACCOUNT_NOT_EMPTY) -// ); -// -// if (log.isInfoEnabled()) { -// log.info(results.size() + " comptes importés."); -// } -// -// } catch (Exception ex) { -// log.warn("Error during CSV import", ex); -// throw new FavoriteListImportException(ex); -// -// } finally { -// IOUtils.closeQuietly(reader); -// } -// return results; -// } -} Deleted: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java 2012-07-31 14:19:29 UTC (rev 3575) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteListImportLDAP.java 2012-07-31 16:17:34 UTC (rev 3576) @@ -1,121 +0,0 @@ -/* - * #%L - * Pollen :: Services - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2012 CodeLutin, Tony Chemit - * %% - * 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 com.google.common.collect.Lists; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.pollen.business.persistence.PollAccount; -import org.chorem.pollen.business.persistence.PollAccountDAO; -import org.chorem.pollen.services.FavoriteListImport; -import org.chorem.pollen.services.PollenServiceSupport; -import org.chorem.pollen.services.exceptions.FavoriteListImportException; - -import javax.naming.NamingEnumeration; -import javax.naming.NamingException; -import javax.naming.directory.Attribute; -import javax.naming.directory.DirContext; -import javax.naming.directory.InitialDirContext; -import javax.naming.directory.SearchControls; -import javax.naming.directory.SearchResult; -import java.util.List; -import java.util.Properties; - -/** - * LDAP Import of {@link PollAccount}. The behavior is the same than the one - * from pollen 1.2.x - * <p/> - * TODO-fdesbois-2012-04-17 : tests and documentation - * <p/> - * Created: 16/04/12 - * - * @author fdesbois <desbois(a)codelutin.com> - * @since 1.3 - */ -public class FavoriteListImportLDAP extends PollenServiceSupport implements FavoriteListImport { - - private static final Log log = LogFactory.getLog(FavoriteListImportLDAP.class); - - @Override - public List<PollAccount> execute(String url) throws FavoriteListImportException { - - long start = System.nanoTime(); - - List<PollAccount> results = Lists.newArrayList(); - try { - - // Initialisation du contexte - Properties env = new Properties(); -// if (server != null) { -// env.put(Context.INITIAL_CONTEXT_FACTORY, -// "com.sun.jndi.ldap.LdapCtxFactory"); -// env.put(Context.PROVIDER_URL, "ldap://" + server + "/"); -// } - DirContext ictx = new InitialDirContext(env); - - // Recherche en profondeur - SearchControls control = new SearchControls(); - control.setSearchScope(SearchControls.SUBTREE_SCOPE); - - // Création des comptes avec les résultats de la recherche - NamingEnumeration<SearchResult> e = ictx.search(url, null, - control); - while (e.hasMore()) { - SearchResult r = e.next(); - - if (log.isDebugEnabled()) { - log.debug("Result: " + r.getName() + "(object: " - + r.getClassName() + ")"); - } - - Attribute nameAttr = r.getAttributes().get("cn"); - Attribute emailAttr = r.getAttributes().get("mail"); - - if (nameAttr != null) { - PollAccountDAO dao = getDAO(PollAccount.class); - PollAccount account = newInstance(dao); - account.setVotingId(nameAttr.get().toString()); - account.setEmail(emailAttr.get().toString()); - results.add(account); - - if (log.isDebugEnabled()) { - log.debug("New account - name: " - + nameAttr.get().toString() + ", email: " - + emailAttr.get().toString()); - } - } - } - } catch (NamingException ex) { - log.error("Exception de nommage lors de l'import depuis LDAP", ex); - throw new FavoriteListImportException("LDAP", ex); - } - - long duration = (System.nanoTime() - start) / 1000000000; - if (log.isInfoEnabled()) { - log.info(results.size() + " comptes importés en " + duration - + " sec."); - } - - return results; - } -} 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-07-31 14:19:29 UTC (rev 3575) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/FavoriteService.java 2012-07-31 16:17:34 UTC (rev 3576) @@ -23,7 +23,11 @@ package org.chorem.pollen.services.impl; import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import org.apache.commons.io.IOUtils; import org.apache.commons.lang3.StringUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.chorem.pollen.PollenTechnicalException; import org.chorem.pollen.business.persistence.PersonList; import org.chorem.pollen.business.persistence.PersonListDAO; @@ -33,6 +37,7 @@ import org.chorem.pollen.business.persistence.UserAccountDAO; import org.chorem.pollen.services.PollenServiceSupport; import org.chorem.pollen.services.exceptions.FavoriteListAlreadyExistException; +import org.chorem.pollen.services.exceptions.FavoriteListImportException; import org.chorem.pollen.services.exceptions.FavoriteListNotFoundException; import org.chorem.pollen.services.exceptions.FavoriteListNotOwnedByUserException; import org.chorem.pollen.services.exceptions.ParticipantAlreadyFoundInListException; @@ -41,11 +46,31 @@ import org.chorem.pollen.services.exceptions.UserNotFoundException; import org.nuiton.topia.TopiaException; import org.nuiton.topia.persistence.TopiaFilterPagerUtil; +import org.nuiton.util.StringUtil; +import javax.naming.NamingEnumeration; +import javax.naming.NamingException; +import javax.naming.directory.Attribute; +import javax.naming.directory.DirContext; +import javax.naming.directory.InitialDirContext; +import javax.naming.directory.SearchControls; +import javax.naming.directory.SearchResult; +import java.io.BufferedReader; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.FileReader; +import java.io.IOException; import java.util.List; +import java.util.Locale; +import java.util.Properties; +import static org.nuiton.i18n.I18n.l_; + public class FavoriteService extends PollenServiceSupport { + /** Logger. */ + private static final Log log = LogFactory.getLog(FavoriteService.class); + public List<PersonList> getFavoriteLists(UserAccount user, TopiaFilterPagerUtil.FilterPagerBean pager) { @@ -338,6 +363,134 @@ } } + public List<PollAccount> importFromCsvfile(String filename, + File file) throws FavoriteListImportException { + + List<PollAccount> results = Lists.newArrayList(); + Locale locale = getLocale(); + PollAccountDAO dao = getDAO(PollAccount.class); + BufferedReader reader = null; + try { + reader = new BufferedReader(new FileReader(file)); + String line; + int lineNumber = 0; + while ((line = reader.readLine()) != null) { + line = line.trim(); + if (StringUtils.isBlank(line) || line.startsWith("#")) { + + // comment line + continue; + } + lineNumber++; + + int spaceIndex = line.indexOf(' '); + String email; + String votingId; + if (spaceIndex == -1) { + // only email + email = line; + votingId = line; + } else { + // email + votingId + email = line.substring(0, spaceIndex); + votingId = line.substring(spaceIndex); + } + email = email.trim(); + votingId = votingId.trim(); + + if (!StringUtil.isEmail(email)) { + + // email is not valid + String error = l_(locale, "pollen.error.import.invalid.email", lineNumber, email); + throw new FavoriteListImportException(filename, error, null); + } + + PollAccount account = newInstance(dao); + account.setEmail(email); + account.setVotingId(votingId); + results.add(account); + } + + if (log.isInfoEnabled()) { + log.info(results.size() + " comptes importés."); + } + reader.close(); + + } catch (FileNotFoundException ex) { + // should never happens ? + throw new PollenTechnicalException(ex); + } catch (IOException e) { + if (log.isErrorEnabled()) { + log.error("Could not close reader", e); + } + } finally { + IOUtils.closeQuietly(reader); + } + return results; + } + + public List<PollAccount> importFromLDAP(String url) throws FavoriteListImportException { + + long start = System.nanoTime(); + + List<PollAccount> results = Lists.newArrayList(); + try { + + // Initialisation du contexte + Properties env = new Properties(); +// if (server != null) { +// env.put(Context.INITIAL_CONTEXT_FACTORY, +// "com.sun.jndi.ldap.LdapCtxFactory"); +// env.put(Context.PROVIDER_URL, "ldap://" + server + "/"); +// } + DirContext ictx = new InitialDirContext(env); + + // Recherche en profondeur + SearchControls control = new SearchControls(); + control.setSearchScope(SearchControls.SUBTREE_SCOPE); + + // Création des comptes avec les résultats de la recherche + NamingEnumeration<SearchResult> e = ictx.search(url, null, + control); + while (e.hasMore()) { + SearchResult r = e.next(); + + if (log.isDebugEnabled()) { + log.debug("Result: " + r.getName() + "(object: " + + r.getClassName() + ")"); + } + + Attribute nameAttr = r.getAttributes().get("cn"); + Attribute emailAttr = r.getAttributes().get("mail"); + + if (nameAttr != null) { + PollAccountDAO dao = getDAO(PollAccount.class); + PollAccount account = newInstance(dao); + account.setVotingId(nameAttr.get().toString()); + account.setEmail(emailAttr.get().toString()); + results.add(account); + + if (log.isDebugEnabled()) { + log.debug("New account - name: " + + nameAttr.get().toString() + ", email: " + + emailAttr.get().toString()); + } + } + } + } catch (NamingException ex) { + log.error("Exception de nommage lors de l'import depuis LDAP", ex); + throw new FavoriteListImportException("LDAP", ex); + } + + long duration = (System.nanoTime() - start) / 1000000000; + if (log.isInfoEnabled()) { + log.info(results.size() + " comptes importés en " + duration + + " sec."); + } + + return results; + } + public PersonList newFavoriteList() { PersonListDAO dao = getDAO(PersonList.class); PersonList personList = newInstance(dao); Modified: trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties =================================================================== --- trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties 2012-07-31 14:19:29 UTC (rev 3575) +++ trunk/pollen-services/src/main/resources/i18n/pollen-services_en_GB.properties 2012-07-31 16:17:34 UTC (rev 3576) @@ -25,8 +25,8 @@ pollen.email.voteEmail.subject=[Pollen] Vote reporting (%s) pollen.email.votingEmail.content=A new poll has been created\: "%s".\nYou can participate with the identifier %s by following this link\: \n%s pollen.email.votingEmail.subject=[Pollen] Invitation to vote (%s) -pollen.error.email.invalid=The email doesn't have the good format pollen.error.import=Error during %1$s import \: %2$s +pollen.error.import.invalid.email=At line %s, Email format is not valid '%s' pollen.feed.addChoiceContent= pollen.feed.addChoiceTitle= pollen.feed.addCommentContent=%s @@ -47,5 +47,4 @@ pollen.security.error.poll.free.creatorId.can.not.vote=Using a creator Id does not allow you to vote. pollen.security.error.poll.not.closed.and.results.not.continuous=The poll is not closed and results are not continuous pollen.security.error.poll.not.free.and.access.not.granted=You can not access to this non free poll -pollen.security.error.poll.not.running.can.not.vote=You can not vote (poll is finished or not began). pollen.security.error.poll.result.private.and.access.not.granted=Results of the poll are private and you do not have credentials to see them Modified: trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties =================================================================== --- trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties 2012-07-31 14:19:29 UTC (rev 3575) +++ trunk/pollen-services/src/main/resources/i18n/pollen-services_fr_FR.properties 2012-07-31 16:17:34 UTC (rev 3576) @@ -25,8 +25,8 @@ pollen.email.voteEmail.subject=[Pollen] Notification de vote (%s) pollen.email.votingEmail.content=Un nouveau sondage a été créé \: "%s".\nVous pouvez y participer avec l'identifiant %s à l'adresse suivante \: \n%s pollen.email.votingEmail.subject=[Pollen] Invitation au vote (%s) -pollen.error.email.invalid=Email non valide pollen.error.import=Erreur pendant l'import %1$s \: %2$s +pollen.error.import.invalid.email=A la ligne %s, le courriel n'est pas valide '%s' pollen.feed.addChoiceContent= pollen.feed.addChoiceTitle= pollen.feed.addCommentContent=%s @@ -47,5 +47,4 @@ pollen.security.error.poll.free.creatorId.can.not.vote=L'utlisation du creatorId ne permet de voter. pollen.security.error.poll.not.closed.and.results.not.continuous=Vous n'avez pas accès aux résultats de ce sondage (résultats non continus et sondage non fermé) pollen.security.error.poll.not.free.and.access.not.granted=Vous n'avez pas accès à ce sondage restreint -pollen.security.error.poll.not.running.can.not.vote=Vous n'êtes pas autorisé à voter (sondage terminé ou pas encore commencé). pollen.security.error.poll.result.private.and.access.not.granted=Vous n'avez pas accès aux résultats privés de ce sondage Modified: trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java =================================================================== --- trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java 2012-07-31 14:19:29 UTC (rev 3575) +++ trunk/pollen-services/src/test/java/org/chorem/pollen/services/impl/FavoriteServiceTest.java 2012-07-31 16:17:34 UTC (rev 3576) @@ -22,13 +22,19 @@ */ package org.chorem.pollen.services.impl; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import org.apache.commons.io.FileUtils; +import org.chorem.pollen.PollenTechnicalException; +import org.chorem.pollen.business.persistence.PollAccount; import org.chorem.pollen.services.AbstractPollenServiceTest; +import org.chorem.pollen.services.exceptions.FavoriteListImportException; +import org.junit.Assert; import org.junit.Before; import org.junit.Ignore; import org.junit.Test; +import java.io.File; +import java.util.List; + /** * Tests the {@link FavoriteService}. * @@ -38,8 +44,6 @@ @Ignore public class FavoriteServiceTest extends AbstractPollenServiceTest { - /** Logger. */ - private static final Log log = LogFactory.getLog(FavoriteServiceTest.class); @Override @Before @@ -105,4 +109,77 @@ } + @Test(expected = PollenTechnicalException.class) + public void executeImportCsvFileNotFound() throws Exception { + + File importFile = getCsvImportFile(); + + FavoriteService service = newService(FavoriteService.class); + + service.importFromCsvfile(importFile.getName(), importFile); + } + + @Test(expected = FavoriteListImportException.class) + public void executeImportCsvInvalidEmail() throws Exception { + + FavoriteService service = newService(FavoriteService.class); + + File importFile = getCsvImportFile(); + + String importContent = "badEmail@ voterId"; + + FileUtils.write(importFile, importContent); + + service.importFromCsvfile(importFile.getName(), importFile); + } + + @Test + public void executeImportCsvEmptyContent() throws Exception { + + FavoriteService service = newService(FavoriteService.class); + + File importFile = getCsvImportFile(); + + String importContent = ""; + FileUtils.write(importFile, importContent); + + List<PollAccount> importedAccount = service.importFromCsvfile(importFile.getName(), importFile); + + Assert.assertNotNull(importedAccount); + Assert.assertTrue(importedAccount.isEmpty()); + } + + @Test + public void executeImportCsv() throws Exception { + + FavoriteService service = newService(FavoriteService.class); + + File importFile = getCsvImportFile(); + + String importContent = "myemail(a)mydomain.uk voterId \n\t\t myemail2(a)mydomain.uk\r\r\n#Comment\n\n "; + FileUtils.write(importFile, importContent); + + List<PollAccount> importedAccount = service.importFromCsvfile(importFile.getName(), importFile); + + Assert.assertNotNull(importedAccount); + Assert.assertEquals(2, importedAccount.size()); + assertPollAccount(importedAccount.get(0), "myemail(a)mydomain.uk", "voterId"); + assertPollAccount(importedAccount.get(1), "myemail2(a)mydomain.uk", "myemail2(a)mydomain.uk"); + } + + protected void assertPollAccount(PollAccount pollAccount, + String expectedEmail, + String expectedVotingId) { + Assert.assertNotNull(pollAccount); + Assert.assertEquals(expectedEmail, pollAccount.getEmail()); + Assert.assertEquals(expectedVotingId, pollAccount.getVotingId()); + + } + + protected File getCsvImportFile() { + File temporaryDirectory = fakeContext.getConfiguration().getTemporaryDirectory(); + File importFile = new File(temporaryDirectory, "import.csv"); + return importFile; + } + }

1 0

r3575 - trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin
by tchemit＠users.chorem.org July 31, 2012

July 31, 2012

Author: tchemit Date: 2012-07-31 16:19:29 +0200 (Tue, 31 Jul 2012) New Revision: 3575 Url: http://chorem.org/repositories/revision/pollen/3575 Log: fixes #722: Can not delete a user Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp Modified: trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp =================================================================== --- trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp 2012-07-31 12:52:15 UTC (rev 3574) +++ trunk/pollen-ui-struts2/src/main/webapp/WEB-INF/jsp/admin/confirmDeleteUser.jsp 2012-07-31 14:19:29 UTC (rev 3575) @@ -30,7 +30,7 @@ <fieldset class="ui-widget-content ui-corner-all"> <s:hidden key="redirectUrl" label=''/> - <s:hidden key="userId" value='%{#user.topiaId}' label=''/> + <s:hidden key="userId" value='%{user.topiaId}' label=''/> <s:text name="pollen.information.confirmDeleteUser"/> <div align="center" style="padding-top: 1em;">

1 0

r3574 - trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl
by tchemit＠users.chorem.org July 31, 2012

July 31, 2012

Author: tchemit Date: 2012-07-31 14:52:15 +0200 (Tue, 31 Jul 2012) New Revision: 3574 Url: http://chorem.org/repositories/revision/pollen/3574 Log: fixes #721: Can't change my account profile Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java Modified: trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java =================================================================== --- trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-07-31 10:54:49 UTC (rev 3573) +++ trunk/pollen-services/src/main/java/org/chorem/pollen/services/impl/UserService.java 2012-07-31 12:52:15 UTC (rev 3574) @@ -23,6 +23,7 @@ package org.chorem.pollen.services.impl; import com.google.common.base.Preconditions; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.RandomStringUtils; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; @@ -177,7 +178,8 @@ // In case of email change, check if an other user has not already // the new email // existing user found - if (dao.isUserExist(user)) { + if (ObjectUtils.notEqual(user.getEmail(), userToUpdate.getEmail()) + && dao.isUserExist(user)) { throw new UserEmailAlreadyUsedException(); }

1 0

r3573 - in trunk: pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/strategy pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/strategy pollen-votecounting-strategy-borda/src/main/java/org/chorem/pollen/votecounting/strategy pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/votecounting/strateg
by tchemit＠users.chorem.org July 31, 2012

July 31, 2012

Author: tchemit Date: 2012-07-31 12:54:49 +0200 (Tue, 31 Jul 2012) New Revision: 3573 Url: http://chorem.org/repositories/revision/pollen/3573 Log: refs #590: Refactor votecounting module (javadoc + some improvments) 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/VoteForPoll.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceIdAble.java trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceScore.java 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/SimpleVoter.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/strategy/VoteCountingStrategy.java trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java trunk/pollen-votecounting-strategy-borda/src/main/java/org/chorem/pollen/votecounting/strategy/BordaStrategy.java trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/votecounting/strategy/CondorcetStrategy.java trunk/pollen-votecounting-strategy-coombs/src/main/java/org/chorem/pollen/votecounting/strategy/CoombsStrategy.java trunk/pollen-votecounting-strategy-instant-runoff/src/main/java/org/chorem/pollen/votecounting/strategy/InstantRunoffStrategy.java trunk/pollen-votecounting-strategy-normal/src/main/java/org/chorem/pollen/votecounting/strategy/NormalStrategy.java trunk/pollen-votecounting-strategy-number/src/main/java/org/chorem/pollen/votecounting/strategy/NumberStrategy.java trunk/pollen-votecounting-strategy-percentage/src/main/java/org/chorem/pollen/votecounting/strategy/PercentageStrategy.java 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-07-31 07:16:34 UTC (rev 3572) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/AbstractVoteAction.java 2012-07-31 10:54:49 UTC (rev 3573) @@ -439,7 +439,7 @@ public String getChoiceFragment() { VoteCountingStrategy strategy = getVoteCountingStrategy(poll); String result = - "displayVote_" + strategy.getRenderType().name() + ".jsp"; + "displayVote_" + strategy.getVoteValueEditorType().name() + ".jsp"; return result; } 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-07-31 07:16:34 UTC (rev 3572) +++ trunk/pollen-ui-struts2/src/main/java/org/chorem/pollen/ui/actions/poll/VoteForPoll.java 2012-07-31 10:54:49 UTC (rev 3573) @@ -102,7 +102,7 @@ int nbVotes = 0; int totalValues = 0; - VoteCountingStrategy voteCountingStrategy = + VoteCountingStrategy strategy = getVoteCountingStrategy(getPoll()); boolean voteValid = true; @@ -111,7 +111,7 @@ Integer value = voteToChoice.getVoteValue(); // check if vote is null ? - boolean voteNull = voteCountingStrategy.isVoteValueNull(value); + boolean voteNull = strategy.isVoteValueNull(value); if (voteNull) { // null vote, can skip his validation @@ -119,7 +119,7 @@ } // check if vote value is valid ? - boolean valid = voteCountingStrategy.isVoteValueValid(value); + boolean valid = strategy.isVoteValueValid(value); if (valid) { @@ -130,31 +130,11 @@ // not a valid vote value, mark it and skip other fields validation String validMessage = - voteCountingStrategy.getVoteValueNotValidMessage(); - addFieldError("vote.choices", _(validMessage)); + strategy.getVoteValueNotValidMessage(getLocale()); + addFieldError("vote.choices", validMessage); voteValid = false; break; } - -// // 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) { @@ -166,20 +146,15 @@ } // check that total vote value is ok - if (!voteCountingStrategy.isTotalVoteValueValid(totalValues)) { + if (!strategy.isTotalVoteValueValid(totalValues)) { // not valid - String errorMessage = voteCountingStrategy.getTotalVoteValueNotValidMessage(); - addFieldError("vote.choices", _(errorMessage)); + String errorMessage = strategy.getTotalVoteValueNotValidMessage(getLocale()); + 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) @Override public String execute() throws Exception { Modified: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceIdAble.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceIdAble.java 2012-07-31 07:16:34 UTC (rev 3572) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceIdAble.java 2012-07-31 10:54:49 UTC (rev 3573) @@ -25,7 +25,7 @@ import com.google.common.base.Function; /** - * To mark any object with identify a choice via the {@link #getChoiceId()} + * To mark any object that identify a choice via the {@link #getChoiceId()} * method. * * @author tchemit <chemit(a)codelutin.com> Modified: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceScore.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceScore.java 2012-07-31 07:16:34 UTC (rev 3572) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/ChoiceScore.java 2012-07-31 10:54:49 UTC (rev 3573) @@ -59,13 +59,14 @@ } public void addScoreValue(double scoreToAdd) { + BigDecimal newScoreValue; if (scoreValue == null) { - setScoreValue(BigDecimal.valueOf(scoreToAdd)); + newScoreValue = BigDecimal.valueOf(scoreToAdd); } else { - setScoreValue(scoreValue.add(BigDecimal.valueOf(scoreToAdd))); + newScoreValue = scoreValue.add(BigDecimal.valueOf(scoreToAdd)); } - + setScoreValue(newScoreValue); } public void setScoreValue(BigDecimal scoreValue) { @@ -74,15 +75,18 @@ @Override public int compareTo(ChoiceScore o) { - BigDecimal v1 = scoreValue; - BigDecimal v2 = o.scoreValue; - if (v1 == null) { - v1 = new BigDecimal(-1); - } - if (v2 == null) { - v2 = new BigDecimal(-1); - } - int i = v1.subtract(v2).intValue(); - return i; + int i1 = scoreValue == null ? -1 : scoreValue.intValue(); + int i2 = o.scoreValue == null ? -1 : o.scoreValue.intValue(); + return i1 - i2; +// BigDecimal v1 = scoreValue; +// BigDecimal v2 = o.scoreValue; +// if (v1 == null) { +// v1 = new BigDecimal(-1); +// } +// if (v2 == null) { +// v2 = new BigDecimal(-1); +// } +// int i = v1.subtract(v2).intValue(); +// return i; } } Modified: 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 2012-07-31 07:16:34 UTC (rev 3572) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/GroupOfVoter.java 2012-07-31 10:54:49 UTC (rev 3573) @@ -56,7 +56,11 @@ GroupOfVoter result = new GroupOfVoter(); result.setVoterId(voterId); result.setWeight(weight); - result.setVoteForChoices(voteForChoices); + if (voters != null) { + for (VoteForChoice voteForChoice : voteForChoices) { + result.addVoteForChoice(voteForChoice); + } + } result.setVoters(voters); return result; } @@ -102,11 +106,6 @@ getVoteForChoices().add(voteForChoice); } - @Override - 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/SimpleVoter.java =================================================================== --- trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/SimpleVoter.java 2012-07-31 07:16:34 UTC (rev 3572) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/SimpleVoter.java 2012-07-31 10:54:49 UTC (rev 3573) @@ -49,7 +49,11 @@ SimpleVoter result = new SimpleVoter(); result.setVoterId(voterId); result.setWeight(weight); - result.setVoteForChoices(voteForChoices); + if (voteForChoices != null) { + for (VoteForChoice voteForChoice : voteForChoices) { + result.addVoteForChoice(voteForChoice); + } + } return result; } @@ -86,9 +90,4 @@ this.weight = weight; } - @Override - public void setVoteForChoices(Set<VoteForChoice> voteForChoices) { - this.voteForChoices = voteForChoices; - } - } 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-07-31 07:16:34 UTC (rev 3572) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/model/Voter.java 2012-07-31 10:54:49 UTC (rev 3573) @@ -25,25 +25,52 @@ import java.util.Set; /** - * A voter (says a physical person which votes on a poll). + * A voter (can be a physical voter or a group of voters). * * @author tchemit <chemit(a)codelutin.com> * @since 1.5 */ public interface Voter { + /** + * Gets the voter unique id. + * + * @return the unique id of the voter. + */ String getVoterId(); + /** + * Gets the weight of the voter. + * + * @return the weight to apply for this voter. + */ double getWeight(); + /** + * Gets all the vote for choices registred for this voter. + * + * @return all the vote values registred for this voter + */ + Set<VoteForChoice> getVoteForChoices(); + + /** + * Register a new vote value for this voter. + * + * @param voteForChoice new vote value to register for this voter + */ void addVoteForChoice(VoteForChoice voteForChoice); - Set<VoteForChoice> getVoteForChoices(); - + /** + * Sets the voter id. + * + * @param voterId the new voter id to set + */ void setVoterId(String voterId); + /** + * Sets the voter weight. + * + * @param weight the new weight to set + */ void setWeight(double weight); - - void setVoteForChoices(Set<VoteForChoice> voteForChoices); - } Modified: 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/VoteCountingStrategy.java 2012-07-31 07:16:34 UTC (rev 3572) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategy.java 2012-07-31 10:54:49 UTC (rev 3573) @@ -66,25 +66,94 @@ */ VoteCountingResult votecount(Set<Voter> voter); + /** + * Get the value to display for a given vote value in the vote page. + * + * @param voteValue the vote value to display + * @return the string representation of a vote value + */ String getDisplayVoteValue(Integer voteValue); + /** + * Test if the given value is a vote value (says users has filled it). + * + * @param voteValue the vote value to test + * @return {@code true} if the given value is persisted. + */ boolean isChoiceInVote(Integer voteValue); + /** + * Get the vote counting strategy name to display in UI. + * + * @param locale the locale used to render the strategy name + * @return the localized vote counting strategy name + */ String getStrategyName(Locale locale); + /** + * Get the vote counting strategy help to display in UI. + * + * @param locale the locale used to render the strategy name + * @return the localized vote counting strategy help + */ String getStrategyHelp(Locale locale); + /** + * Tests if the given vote value is valid. + * + * @param voteValue the vote value to test + * @return {@code true} if the given vote value is valid, {@code false} + * otherwise. + */ boolean isVoteValueValid(Integer voteValue); - String getVoteValueNotValidMessage(); + /** + * If a vote value is not valid, gets the localized message of the error. + * + * @param locale the locale used to render the error message + * @return the localized validation message + */ + String getVoteValueNotValidMessage(Locale locale); + /** + * Tests if the total values of a vote is valid. + * + * @param totalValues the given total values + * @return {@code true} if the total values of a vote is valid, + * {@code false} otherwhise. + */ boolean isTotalVoteValueValid(int totalValues); - String getTotalVoteValueNotValidMessage(); + /** + * If the total values of a vote is not valid, gets the localized error + * message. + * + * @param locale the locale used to render the error message + * @return the localized validation message + */ + String getTotalVoteValueNotValidMessage(Locale locale); + /** + * Tests if a given vote value is null or not. + * + * @param value the vote value to test + * @return {@code true} if the given vote value is null (or considered as + * null), {@code false} otherwise. + */ boolean isVoteValueNull(Integer value); - ChoiceToVoteRenderType getRenderType(); + /** + * Gets the type of editor used to render a vote value. + * + * @return the type of editor used to render a vote value. + * @see ChoiceToVoteRenderType + */ + ChoiceToVoteRenderType getVoteValueEditorType(); + /** + * @return {@code true} if display results by choice. + * @deprecated since 1.5 (result will be offered by the strategy it-self). + */ + @Deprecated boolean isDisplayResultsByChoice(); } Modified: trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java =================================================================== --- trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java 2012-07-31 07:16:34 UTC (rev 3572) +++ trunk/pollen-votecounting-api/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java 2012-07-31 10:54:49 UTC (rev 3573) @@ -36,7 +36,6 @@ protected static VoteCountingStrategyProvider provider; - @BeforeClass public static void beforeClass() throws Exception { provider = new VoteCountingStrategyProvider(); Modified: trunk/pollen-votecounting-strategy-borda/src/main/java/org/chorem/pollen/votecounting/strategy/BordaStrategy.java =================================================================== --- trunk/pollen-votecounting-strategy-borda/src/main/java/org/chorem/pollen/votecounting/strategy/BordaStrategy.java 2012-07-31 07:16:34 UTC (rev 3572) +++ trunk/pollen-votecounting-strategy-borda/src/main/java/org/chorem/pollen/votecounting/strategy/BordaStrategy.java 2012-07-31 10:54:49 UTC (rev 3573) @@ -30,9 +30,11 @@ import org.chorem.pollen.votecounting.model.Voter; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Set; +import static org.nuiton.i18n.I18n.l_; import static org.nuiton.i18n.I18n.n_; /** @@ -64,14 +66,14 @@ } @Override - public String getTotalVoteValueNotValidMessage() { + public String getTotalVoteValueNotValidMessage(Locale locale) { // no validation on total value, so no message return null; } @Override - public String getVoteValueNotValidMessage() { - return n_("pollen.error.vote.invalidBordaVoteValue"); + public String getVoteValueNotValidMessage(Locale locale) { + return l_(locale, "pollen.error.vote.invalidBordaVoteValue"); } @Override @@ -80,7 +82,7 @@ } @Override - public ChoiceToVoteRenderType getRenderType() { + public ChoiceToVoteRenderType getVoteValueEditorType() { return ChoiceToVoteRenderType.TEXTFIELD; } Modified: trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/votecounting/strategy/CondorcetStrategy.java =================================================================== --- trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/votecounting/strategy/CondorcetStrategy.java 2012-07-31 07:16:34 UTC (rev 3572) +++ trunk/pollen-votecounting-strategy-condorcet/src/main/java/org/chorem/pollen/votecounting/strategy/CondorcetStrategy.java 2012-07-31 10:54:49 UTC (rev 3573) @@ -37,9 +37,11 @@ import java.math.BigDecimal; import java.util.Arrays; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Set; +import static org.nuiton.i18n.I18n.l_; import static org.nuiton.i18n.I18n.n_; /** @@ -71,14 +73,14 @@ } @Override - public String getTotalVoteValueNotValidMessage() { + public String getTotalVoteValueNotValidMessage(Locale locale) { // no validation on total value, so no message return null; } @Override - public String getVoteValueNotValidMessage() { - return n_("pollen.error.vote.invalidCondorcetVoteValue"); + public String getVoteValueNotValidMessage(Locale locale) { + return l_(locale, "pollen.error.vote.invalidCondorcetVoteValue"); } @Override @@ -87,7 +89,7 @@ } @Override - public ChoiceToVoteRenderType getRenderType() { + public ChoiceToVoteRenderType getVoteValueEditorType() { return ChoiceToVoteRenderType.TEXTFIELD; } Modified: trunk/pollen-votecounting-strategy-coombs/src/main/java/org/chorem/pollen/votecounting/strategy/CoombsStrategy.java =================================================================== --- trunk/pollen-votecounting-strategy-coombs/src/main/java/org/chorem/pollen/votecounting/strategy/CoombsStrategy.java 2012-07-31 07:16:34 UTC (rev 3572) +++ trunk/pollen-votecounting-strategy-coombs/src/main/java/org/chorem/pollen/votecounting/strategy/CoombsStrategy.java 2012-07-31 10:54:49 UTC (rev 3573) @@ -36,10 +36,12 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.SortedMap; +import static org.nuiton.i18n.I18n.l_; import static org.nuiton.i18n.I18n.n_; /** @@ -71,14 +73,14 @@ } @Override - public String getTotalVoteValueNotValidMessage() { + public String getTotalVoteValueNotValidMessage(Locale locale) { // no validation on total value, so no message return null; } @Override - public String getVoteValueNotValidMessage() { - return n_("pollen.error.vote.invalidCoombsVoteValue"); + public String getVoteValueNotValidMessage(Locale locale) { + return l_(locale, "pollen.error.vote.invalidCoombsVoteValue"); } @Override @@ -87,7 +89,7 @@ } @Override - public ChoiceToVoteRenderType getRenderType() { + public ChoiceToVoteRenderType getVoteValueEditorType() { return ChoiceToVoteRenderType.TEXTFIELD; } Modified: trunk/pollen-votecounting-strategy-instant-runoff/src/main/java/org/chorem/pollen/votecounting/strategy/InstantRunoffStrategy.java =================================================================== --- trunk/pollen-votecounting-strategy-instant-runoff/src/main/java/org/chorem/pollen/votecounting/strategy/InstantRunoffStrategy.java 2012-07-31 07:16:34 UTC (rev 3572) +++ trunk/pollen-votecounting-strategy-instant-runoff/src/main/java/org/chorem/pollen/votecounting/strategy/InstantRunoffStrategy.java 2012-07-31 10:54:49 UTC (rev 3573) @@ -35,10 +35,12 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; +import java.util.Locale; import java.util.Map; import java.util.Set; import java.util.SortedMap; +import static org.nuiton.i18n.I18n.l_; import static org.nuiton.i18n.I18n.n_; /** @@ -72,14 +74,14 @@ } @Override - public String getTotalVoteValueNotValidMessage() { + public String getTotalVoteValueNotValidMessage(Locale locale) { // no validation on total value, so no message return null; } @Override - public String getVoteValueNotValidMessage() { - return n_("pollen.error.vote.invalidInstantRunoffVoteValue"); + public String getVoteValueNotValidMessage(Locale locale) { + return l_(locale, "pollen.error.vote.invalidInstantRunoffVoteValue"); } @Override @@ -88,7 +90,7 @@ } @Override - public ChoiceToVoteRenderType getRenderType() { + public ChoiceToVoteRenderType getVoteValueEditorType() { return ChoiceToVoteRenderType.TEXTFIELD; } Modified: trunk/pollen-votecounting-strategy-normal/src/main/java/org/chorem/pollen/votecounting/strategy/NormalStrategy.java =================================================================== --- trunk/pollen-votecounting-strategy-normal/src/main/java/org/chorem/pollen/votecounting/strategy/NormalStrategy.java 2012-07-31 07:16:34 UTC (rev 3572) +++ trunk/pollen-votecounting-strategy-normal/src/main/java/org/chorem/pollen/votecounting/strategy/NormalStrategy.java 2012-07-31 10:54:49 UTC (rev 3573) @@ -28,6 +28,7 @@ import org.chorem.pollen.votecounting.model.VoteForChoice; import org.chorem.pollen.votecounting.model.Voter; +import java.util.Locale; import java.util.Map; import java.util.Set; @@ -89,7 +90,7 @@ } @Override - public ChoiceToVoteRenderType getRenderType() { + public ChoiceToVoteRenderType getVoteValueEditorType() { return ChoiceToVoteRenderType.CHECKBOX; } @@ -111,13 +112,13 @@ } @Override - public String getVoteValueNotValidMessage() { + public String getVoteValueNotValidMessage(Locale locale) { // no validation on not null vote value, so no message return null; } @Override - public String getTotalVoteValueNotValidMessage() { + public String getTotalVoteValueNotValidMessage(Locale locale) { // no validation on total values, so no message return null; } Modified: trunk/pollen-votecounting-strategy-number/src/main/java/org/chorem/pollen/votecounting/strategy/NumberStrategy.java =================================================================== --- trunk/pollen-votecounting-strategy-number/src/main/java/org/chorem/pollen/votecounting/strategy/NumberStrategy.java 2012-07-31 07:16:34 UTC (rev 3572) +++ trunk/pollen-votecounting-strategy-number/src/main/java/org/chorem/pollen/votecounting/strategy/NumberStrategy.java 2012-07-31 10:54:49 UTC (rev 3573) @@ -28,6 +28,7 @@ import org.chorem.pollen.votecounting.model.VoteForChoice; import org.chorem.pollen.votecounting.model.Voter; +import java.util.Locale; import java.util.Map; import java.util.Set; @@ -89,7 +90,7 @@ } @Override - public ChoiceToVoteRenderType getRenderType() { + public ChoiceToVoteRenderType getVoteValueEditorType() { return ChoiceToVoteRenderType.TEXTFIELD; } @@ -111,13 +112,13 @@ } @Override - public String getTotalVoteValueNotValidMessage() { + public String getTotalVoteValueNotValidMessage(Locale locale) { // no validation on total values, so no message return null; } @Override - public String getVoteValueNotValidMessage() { + public String getVoteValueNotValidMessage(Locale locale) { // no validation on not null vote value, so no message return null; } Modified: trunk/pollen-votecounting-strategy-percentage/src/main/java/org/chorem/pollen/votecounting/strategy/PercentageStrategy.java =================================================================== --- trunk/pollen-votecounting-strategy-percentage/src/main/java/org/chorem/pollen/votecounting/strategy/PercentageStrategy.java 2012-07-31 07:16:34 UTC (rev 3572) +++ trunk/pollen-votecounting-strategy-percentage/src/main/java/org/chorem/pollen/votecounting/strategy/PercentageStrategy.java 2012-07-31 10:54:49 UTC (rev 3573) @@ -28,9 +28,11 @@ import org.chorem.pollen.votecounting.model.VoteForChoice; import org.chorem.pollen.votecounting.model.Voter; +import java.util.Locale; import java.util.Map; import java.util.Set; +import static org.nuiton.i18n.I18n.l_; import static org.nuiton.i18n.I18n.n_; /** @@ -89,7 +91,7 @@ } @Override - public ChoiceToVoteRenderType getRenderType() { + public ChoiceToVoteRenderType getVoteValueEditorType() { return ChoiceToVoteRenderType.TEXTFIELD; } @@ -110,14 +112,14 @@ } @Override - public String getVoteValueNotValidMessage() { + public String getVoteValueNotValidMessage(Locale locale) { // no validation on not null vote value, so no message return null; } @Override - public String getTotalVoteValueNotValidMessage() { - return n_("pollen.error.vote.percentage"); + public String getTotalVoteValueNotValidMessage(Locale locale) { + return l_(locale, "pollen.error.vote.percentage"); } public void addVoterChoices(Voter voter,

1 0

r3572 - trunk
by tchemit＠users.chorem.org July 31, 2012

July 31, 2012

Author: tchemit Date: 2012-07-31 09:16:34 +0200 (Tue, 31 Jul 2012) New Revision: 3572 Url: http://chorem.org/repositories/revision/pollen/3572 Log: fixes #720: Updates to nuiton-utils 2.5.2 + fix developer and contributors time zone in pom Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-07 19:41:27 UTC (rev 3571) +++ trunk/pom.xml 2012-07-31 07:16:34 UTC (rev 3572) @@ -46,7 +46,7 @@ <email>chatellier at codelutin.com</email> <organization>CodeLutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+1</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> </roles> @@ -57,7 +57,7 @@ <email>chemit at codelutin.com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+1</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>lead</role> <role>developer</role> @@ -69,7 +69,7 @@ <email>couteau at codelutin.com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+1</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> <role>technical writer</role> @@ -81,7 +81,7 @@ <email>desbois at codelutin.com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+1</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> </roles> @@ -92,7 +92,7 @@ <email>morin at codelutin.com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+1</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>developer</role> </roles> @@ -105,7 +105,7 @@ <email>nemawan(a)hotmail.com</email> <organization>ALMA - Code Lutin</organization> <organizationUrl>http:/alma.univ-nantes.fr</organizationUrl> - <timezone>+1</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Chef de Projet</role> <role>Analyste</role> @@ -117,7 +117,7 @@ <email>tpoulit(a)gmail.com</email> <organization>ALMA - Code Lutin</organization> <organizationUrl>http:/alma.univ-nantes.fr</organizationUrl> - <timezone>+1</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Analyste</role> <role>Développeur</role> @@ -128,7 +128,7 @@ <email>benouna66(a)gmail.com</email> <organization>ALMA - Code Lutin</organization> <organizationUrl>http:/alma.univ-nantes.fr</organizationUrl> - <timezone>+1</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Analyste</role> <role>Développeur</role> @@ -139,7 +139,7 @@ <email>zhykos(a)gmail.com</email> <organization>ALMA - Code Lutin</organization> <organizationUrl>http:/alma.univ-nantes.fr</organizationUrl> - <timezone>+1</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Architecte</role> <role>Développeur</role> @@ -150,7 +150,7 @@ <email>eddahbi(a)gmail.com</email> <organization>ALMA - Code Lutin</organization> <organizationUrl>http:/alma.univ-nantes.fr</organizationUrl> - <timezone>+1</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Architecte</role> <role>Développeur</role> @@ -161,7 +161,7 @@ <email>rannou at codelutin.com</email> <organization>Code Lutin</organization> <organizationUrl>http://www.codelutin.com/</organizationUrl> - <timezone>+1</timezone> + <timezone>Europe/Paris</timezone> <roles> <role>Concepteur</role> <role>Développeur</role> @@ -183,7 +183,7 @@ <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <nuitonWebVersion>1.11</nuitonWebVersion> - <nuitonUtilsVersion>2.5</nuitonUtilsVersion> + <nuitonUtilsVersion>2.5.2</nuitonUtilsVersion> <h2Version>1.3.167</h2Version> <postgresqlVersion>9.1-901-1.jdbc4</postgresqlVersion> <struts2Version>2.3.4</struts2Version>

1 0

r3571 - trunk
by tchemit＠users.chorem.org July 7, 2012

July 7, 2012

Author: tchemit Date: 2012-07-07 21:41:27 +0200 (Sat, 07 Jul 2012) New Revision: 3571 Url: http://chorem.org/repositories/revision/pollen/3571 Log: updates to mavenpom 3.3.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-26 07:36:22 UTC (rev 3570) +++ trunk/pom.xml 2012-07-07 19:41:27 UTC (rev 3571) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.4-SNAPSHOT</version> + <version>3.3.4</version> </parent> <groupId>org.chorem</groupId>

1 0

r3570 - trunk/pollen-ui-struts2
by tchemit＠users.chorem.org June 26, 2012

June 26, 2012

Author: tchemit Date: 2012-06-26 09:36:22 +0200 (Tue, 26 Jun 2012) New Revision: 3570 Url: http://chorem.org/repositories/revision/pollen/3570 Log: refs #590: Refactor votecounting module (fix pom) Modified: trunk/pollen-ui-struts2/pom.xml Modified: trunk/pollen-ui-struts2/pom.xml =================================================================== --- trunk/pollen-ui-struts2/pom.xml 2012-06-26 06:56:12 UTC (rev 3569) +++ trunk/pollen-ui-struts2/pom.xml 2012-06-26 07:36:22 UTC (rev 3570) @@ -26,7 +26,7 @@ </dependency> <dependency> <groupId>${project.groupId}</groupId> - <artifactId>pollen-votecounting-strategy-all</artifactId> + <artifactId>pollen-votecounting-strategy</artifactId> <version>${project.version}</version> <type>pom</type> <scope>runtime</scope>

1 0

r3569 - trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/strategy
by tchemit＠users.chorem.org June 26, 2012

June 26, 2012

Author: tchemit Date: 2012-06-26 08:56:12 +0200 (Tue, 26 Jun 2012) New Revision: 3569 Url: http://chorem.org/repositories/revision/pollen/3569 Log: move constant Modified: trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/strategy/AbstractVoteCountingStrategy.java Modified: 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/AbstractVoteCountingStrategy.java 2012-06-26 06:55:58 UTC (rev 3568) +++ trunk/pollen-votecounting-api/src/main/java/org/chorem/pollen/votecounting/strategy/AbstractVoteCountingStrategy.java 2012-06-26 06:56:12 UTC (rev 3569) @@ -33,6 +33,7 @@ import org.chorem.pollen.votecounting.model.Voter; import java.io.Serializable; +import java.math.BigDecimal; import java.util.Collection; import java.util.Collections; import java.util.Comparator; @@ -52,6 +53,8 @@ */ public abstract class AbstractVoteCountingStrategy implements VoteCountingStrategy { + public static final BigDecimal ZERO_D = BigDecimal.valueOf(0.); + @Override public String getStrategyName(Locale locale) { String result = l_(locale, getI18nName());

1 0

June 26, 2012

Author: tchemit Date: 2012-06-26 08:55:58 +0200 (Tue, 26 Jun 2012) New Revision: 3568 Url: http://chorem.org/repositories/revision/pollen/3568 Log: refs #543 Implements Coomb's method Added: trunk/pollen-votecounting-strategy-coombs/ trunk/pollen-votecounting-strategy-coombs/LICENSE.txt trunk/pollen-votecounting-strategy-coombs/README.txt trunk/pollen-votecounting-strategy-coombs/changelog.txt trunk/pollen-votecounting-strategy-coombs/pom.xml trunk/pollen-votecounting-strategy-coombs/src/ trunk/pollen-votecounting-strategy-coombs/src/main/ trunk/pollen-votecounting-strategy-coombs/src/main/java/ trunk/pollen-votecounting-strategy-coombs/src/main/java/org/ trunk/pollen-votecounting-strategy-coombs/src/main/java/org/chorem/ trunk/pollen-votecounting-strategy-coombs/src/main/java/org/chorem/pollen/ trunk/pollen-votecounting-strategy-coombs/src/main/java/org/chorem/pollen/votecounting/ trunk/pollen-votecounting-strategy-coombs/src/main/java/org/chorem/pollen/votecounting/strategy/ trunk/pollen-votecounting-strategy-coombs/src/main/java/org/chorem/pollen/votecounting/strategy/CoombsStrategy.java trunk/pollen-votecounting-strategy-coombs/src/main/resources/ trunk/pollen-votecounting-strategy-coombs/src/main/resources/META-INF/ trunk/pollen-votecounting-strategy-coombs/src/main/resources/META-INF/services/ trunk/pollen-votecounting-strategy-coombs/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.strategy.VoteCountingStrategy trunk/pollen-votecounting-strategy-coombs/src/main/resources/i18n/ trunk/pollen-votecounting-strategy-coombs/src/main/resources/i18n/pollen-votecounting-strategy-coombs_en_GB.properties trunk/pollen-votecounting-strategy-coombs/src/main/resources/i18n/pollen-votecounting-strategy-coombs_fr_FR.properties trunk/pollen-votecounting-strategy-coombs/src/site/ trunk/pollen-votecounting-strategy-coombs/src/site/site_en.xml trunk/pollen-votecounting-strategy-coombs/src/site/site_fr.xml trunk/pollen-votecounting-strategy-coombs/src/test/ trunk/pollen-votecounting-strategy-coombs/src/test/java/ trunk/pollen-votecounting-strategy-coombs/src/test/java/org/ trunk/pollen-votecounting-strategy-coombs/src/test/java/org/chorem/ trunk/pollen-votecounting-strategy-coombs/src/test/java/org/chorem/pollen/ trunk/pollen-votecounting-strategy-coombs/src/test/java/org/chorem/pollen/votecounting/ trunk/pollen-votecounting-strategy-coombs/src/test/java/org/chorem/pollen/votecounting/strategy/ trunk/pollen-votecounting-strategy-coombs/src/test/java/org/chorem/pollen/votecounting/strategy/CoombsStrategyTest.java trunk/pollen-votecounting-strategy-coombs/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java trunk/pollen-votecounting-strategy-coombs/src/test/resources/ trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties Property changes on: trunk/pollen-votecounting-strategy-coombs ___________________________________________________________________ Added: svn:ignore + target *.ipr *.iws *.iml .project .classpath .settings Added: trunk/pollen-votecounting-strategy-coombs/LICENSE.txt =================================================================== --- trunk/pollen-votecounting-strategy-coombs/LICENSE.txt (rev 0) +++ trunk/pollen-votecounting-strategy-coombs/LICENSE.txt 2012-06-26 06:55:58 UTC (rev 3568) @@ -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-coombs/LICENSE.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-votecounting-strategy-coombs/README.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Property changes on: trunk/pollen-votecounting-strategy-coombs/changelog.txt ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-coombs/pom.xml =================================================================== --- trunk/pollen-votecounting-strategy-coombs/pom.xml (rev 0) +++ trunk/pollen-votecounting-strategy-coombs/pom.xml 2012-06-26 06:55:58 UTC (rev 3568) @@ -0,0 +1,114 @@ +<?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-coombs</artifactId> + + <name>Pollen :: VoteCounting strategy :: Coombs</name> + <description>Implements the coombs 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.nuiton</groupId> + <artifactId>nuiton-utils</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-coombs/pom.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-coombs/src/main/java/org/chorem/pollen/votecounting/strategy/CoombsStrategy.java =================================================================== --- trunk/pollen-votecounting-strategy-coombs/src/main/java/org/chorem/pollen/votecounting/strategy/CoombsStrategy.java (rev 0) +++ trunk/pollen-votecounting-strategy-coombs/src/main/java/org/chorem/pollen/votecounting/strategy/CoombsStrategy.java 2012-06-26 06:55:58 UTC (rev 3568) @@ -0,0 +1,314 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Coombs + * $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.collections.CollectionUtils; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +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.Voter; + +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.SortedMap; + +import static org.nuiton.i18n.I18n.n_; + +/** + * Coombs. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +public class CoombsStrategy extends AbstractVoteCountingStrategy { + + public static final int ID = 6; + + /** Logger. */ + private static final Log log = LogFactory.getLog(CoombsStrategy.class); + + @Override + public int getId() { + return ID; + } + + @Override + public String getI18nName() { + return n_("pollen.voteCountingType.coombs"); + } + + @Override + public String getI18nHelp() { + return n_("pollen.voteCountingType.coombs.help"); + } + + @Override + public String getTotalVoteValueNotValidMessage() { + // no validation on total value, so no message + return null; + } + + @Override + public String getVoteValueNotValidMessage() { + return n_("pollen.error.vote.invalidCoombsVoteValue"); + } + + @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 + SortedMap<String, ChoiceScore> resultByChoice = votersToResult(voters); + + // calcul du score minimum pour atteindre la majorité absolue + double totalWeight = 0.; + for (Voter voter : voters) { + totalWeight += voter.getWeight(); + } + totalWeight /= 2; + + // calcul pour chaque votant de ses choix préférés + Map<Voter, List<Set<String>>> topRankChoices = + buildVoterSortedChoices(voters); + + Set<String> choiceIdsToExclude = Sets.newHashSet(); + Set<String> choiceIdsToKeep = Sets.newHashSet(resultByChoice.keySet()); + + round(topRankChoices, + choiceIdsToExclude, + choiceIdsToKeep, + resultByChoice, + totalWeight); + + + // transform map of result to list of them (and sort them) + VoteCountingResult result = resultToList(resultByChoice); + return result; + } + + public void round(Map<Voter, List<Set<String>>> topRankChoices, + Set<String> idsToExclude, + Set<String> idsToInclude, + SortedMap<String, ChoiceScore> resultByChoice, + double totalWeight) { + + List<ChoiceScore> results = applyScores(topRankChoices, + idsToExclude, + idsToInclude, + resultByChoice); + + if (!results.isEmpty()) { + + // get best score + double max = + results.get(results.size() - 1).getScoreValue().doubleValue(); + + if (max < totalWeight) { + + // pas de majorité absolue, il faut éliminer le(s) choix les plus mauvais + + guessChoiceIdsToRemove(idsToInclude, idsToExclude, topRankChoices); + + // on ne veux plus utiliser ces choix dans le tour suivant + idsToInclude.removeAll(idsToExclude); + + // nouveau tour + round(topRankChoices, + idsToExclude, + idsToInclude, + resultByChoice, + totalWeight); + + } else { + + // majorité absolue trouvée plus rien à faire en fait :) + } + } + } + + public List<ChoiceScore> applyScores(Map<Voter, List<Set<String>>> topRankChoices, + Set<String> idsToExclude, + Set<String> idsToInclude, + SortedMap<String, ChoiceScore> resultByChoice) { + + if (CollectionUtils.isNotEmpty(idsToExclude)) { + + // on supprime des classements les ids données + + for (List<Set<String>> choicesByLevel : topRankChoices.values()) { + Iterator<Set<String>> itr = choicesByLevel.iterator(); + while (itr.hasNext()) { + Set<String> choiceIds = itr.next(); + choiceIds.removeAll(idsToExclude); + if (choiceIds.isEmpty()) { + + // remove this level + itr.remove(); + } + } + } + } + + // on remet à zero les scores pour les ids a conserver + for (String id : idsToInclude) { + resultByChoice.get(id).setScoreValue(null); + } + + // on calcule les scores à partir des classements + + for (Map.Entry<Voter, List<Set<String>>> entry : topRankChoices.entrySet()) { + List<Set<String>> idsByLevel = entry.getValue(); + if (!idsByLevel.isEmpty()) { + + Set<String> winnerIds = idsByLevel.get(0); + Voter voter = entry.getKey(); + double voterWeight = voter.getWeight(); + for (String id : winnerIds) { + if (idsToInclude.contains(id)) { + ChoiceScore choiceScore = resultByChoice.get(id); + choiceScore.addScoreValue(voterWeight); + } + } + } + } + + // recopy choices to run rounds on it and eliminates choices until + // there is a choice > 50 + List<ChoiceScore> results = Lists.newArrayList(); + + for (String id : idsToInclude) { + results.add(resultByChoice.get(id)); + } + + Collections.sort(results); + + // on supprime tout score à 0 + Iterator<ChoiceScore> itr = results.iterator(); + while (itr.hasNext()) { + ChoiceScore choiceScore = itr.next(); + if (choiceScore.getScoreValue() == null || + ZERO_D.equals(choiceScore.getScoreValue())) { + itr.remove(); + } else { + // score > 0 on peut s'arreter + break; + } + } + return results; + } + + public void guessChoiceIdsToRemove(Set<String> idsToInclude, + Set<String> idsToExclude, + Map<Voter, List<Set<String>>> results) { + + // pour chaque choix restant on calcule son score lorsqu'il est le dernier + + Map<String, ChoiceScore> badScores = Maps.newTreeMap(); + for (String id : idsToInclude) { + badScores.put(id, ChoiceScore.newScore(id, null)); + } + + for (Map.Entry<Voter, List<Set<String>>> entry : results.entrySet()) { + Voter voter = entry.getKey(); + List<Set<String>> idsChoices = entry.getValue(); + if (!idsChoices.isEmpty()) { + + Set<String> lastIds = idsChoices.get(idsChoices.size() - 1); + + double voterWeight = voter.getWeight(); + + for (String lastId : lastIds) { + badScores.get(lastId).addScoreValue(voterWeight); + } + } + } + + // on construit alors la liste des scores + List<ChoiceScore> scores = Lists.newArrayList(badScores.values()); + + // que l'on trie + Collections.sort(scores); + + // puis revers (pour avoir les meilleurs scores au début) + Collections.reverse(scores); + + double maxScore = scores.get(0).getScoreValue().doubleValue(); + + idsToExclude.clear(); + + for (ChoiceScore choiceScore : scores) { + + if (maxScore == choiceScore.getScoreValue().doubleValue()) { + + idsToExclude.add(choiceScore.getChoiceId()); + } else { + // value < max, on peut s'arreter là + break; + } + } + } +} Property changes on: trunk/pollen-votecounting-strategy-coombs/src/main/java/org/chorem/pollen/votecounting/strategy/CoombsStrategy.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-coombs/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.strategy.VoteCountingStrategy =================================================================== --- trunk/pollen-votecounting-strategy-coombs/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.strategy.VoteCountingStrategy (rev 0) +++ trunk/pollen-votecounting-strategy-coombs/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.strategy.VoteCountingStrategy 2012-06-26 06:55:58 UTC (rev 3568) @@ -0,0 +1 @@ +org.chorem.pollen.votecounting.strategy.CoombsStrategy Property changes on: trunk/pollen-votecounting-strategy-coombs/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 Added: trunk/pollen-votecounting-strategy-coombs/src/main/resources/i18n/pollen-votecounting-strategy-coombs_en_GB.properties =================================================================== --- trunk/pollen-votecounting-strategy-coombs/src/main/resources/i18n/pollen-votecounting-strategy-coombs_en_GB.properties (rev 0) +++ trunk/pollen-votecounting-strategy-coombs/src/main/resources/i18n/pollen-votecounting-strategy-coombs_en_GB.properties 2012-06-26 06:55:58 UTC (rev 3568) @@ -0,0 +1,3 @@ +pollen.error.vote.invalidCoombsVoteValue= +pollen.voteCountingType.coombs=Coombs +pollen.voteCountingType.coombs.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-coombs/src/main/resources/i18n/pollen-votecounting-strategy-coombs_en_GB.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-coombs/src/main/resources/i18n/pollen-votecounting-strategy-coombs_fr_FR.properties =================================================================== --- trunk/pollen-votecounting-strategy-coombs/src/main/resources/i18n/pollen-votecounting-strategy-coombs_fr_FR.properties (rev 0) +++ trunk/pollen-votecounting-strategy-coombs/src/main/resources/i18n/pollen-votecounting-strategy-coombs_fr_FR.properties 2012-06-26 06:55:58 UTC (rev 3568) @@ -0,0 +1,3 @@ +pollen.error.vote.invalidCoombsVoteValue= +pollen.voteCountingType.coombs=Coombs +pollen.voteCountingType.coombs.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-coombs/src/main/resources/i18n/pollen-votecounting-strategy-coombs_fr_FR.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-coombs/src/site/site_en.xml =================================================================== --- trunk/pollen-votecounting-strategy-coombs/src/site/site_en.xml (rev 0) +++ trunk/pollen-votecounting-strategy-coombs/src/site/site_en.xml 2012-06-26 06:55:58 UTC (rev 3568) @@ -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="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-coombs/src/site/site_en.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-coombs/src/site/site_fr.xml =================================================================== --- trunk/pollen-votecounting-strategy-coombs/src/site/site_fr.xml (rev 0) +++ trunk/pollen-votecounting-strategy-coombs/src/site/site_fr.xml 2012-06-26 06:55:58 UTC (rev 3568) @@ -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-coombs/src/site/site_fr.xml ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-coombs/src/test/java/org/chorem/pollen/votecounting/strategy/CoombsStrategyTest.java =================================================================== --- trunk/pollen-votecounting-strategy-coombs/src/test/java/org/chorem/pollen/votecounting/strategy/CoombsStrategyTest.java (rev 0) +++ trunk/pollen-votecounting-strategy-coombs/src/test/java/org/chorem/pollen/votecounting/strategy/CoombsStrategyTest.java 2012-06-26 06:55:58 UTC (rev 3568) @@ -0,0 +1,326 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Coombs + * $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.Ignore; +import org.junit.Test; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Map; +import java.util.Set; + +/** + * Tests the {@link CoombsStrategy}. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.5 + */ +@Ignore +public class CoombsStrategyTest { + + public static final String CHOICE_A = "Ville A"; + + public static final String CHOICE_B = "Ville B"; + + public static final String CHOICE_C = "Ville C"; + + public static final String CHOICE_D = "Ville D"; + + 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(CoombsStrategy.ID); + } + + @Test + public void simpleVotecount() throws Exception { + + // see http://fr.wikipedia.org/wiki/M%C3%A9thode_de_Coombs + + // Ville 1re 2e 3e 4e R1 R2 + // A 42 0 0 58 42 - + // B 26 42 32 0 26 26+42 + // C 15 43 42 0 15 15 + // D 17 15 26 42 17 17 + + Set<Voter> voters = new VoterBuilder(). + newVoter("Ville A", 42.). + addVoteForChoice(CHOICE_A, 1.). + addVoteForChoice(CHOICE_B, 2.). + addVoteForChoice(CHOICE_C, 3.). + addVoteForChoice(CHOICE_D, 4.). + newVoter("Ville B", 26.). + addVoteForChoice(CHOICE_B, 1.). + addVoteForChoice(CHOICE_C, 2.). + addVoteForChoice(CHOICE_D, 3.). + addVoteForChoice(CHOICE_A, 4.). + newVoter("Ville C", 15.). + addVoteForChoice(CHOICE_C, 1.). + addVoteForChoice(CHOICE_D, 2.). + addVoteForChoice(CHOICE_B, 3.). + addVoteForChoice(CHOICE_A, 4.). + newVoter("Ville D", 17.). + addVoteForChoice(CHOICE_D, 1.). + addVoteForChoice(CHOICE_C, 2.). + addVoteForChoice(CHOICE_B, 3.). + addVoteForChoice(CHOICE_A, 4.). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + Assert.assertNotNull(result); + List<ChoiceScore> scores = result.getScores(); + Assert.assertNotNull(scores); + Assert.assertEquals(4, scores.size()); + + assertChoiceScore(scores.get(0), CHOICE_B, BigDecimal.valueOf(68.)); + assertChoiceScore(scores.get(1), CHOICE_A, BigDecimal.valueOf(42.)); + assertChoiceScore(scores.get(2), CHOICE_D, BigDecimal.valueOf(17.)); + assertChoiceScore(scores.get(3), CHOICE_C, BigDecimal.valueOf(15.)); + } + + @Test + public void simpleVotecount0() throws Exception { + + // Simple poll (all weight to 1) R1 + // 1 (a=1 b=2 c=null) a 2 + // 2 (a=3 b=2 c=1) b 1 + // 3 (a=1 b=null c=2) c - + + 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(2.)); + assertChoiceScore(scores.get(1), CHOICE_C, BigDecimal.valueOf(1.)); + assertChoiceScore(scores.get(2), CHOICE_B, null); + } + + @Test + public void simpleVotecount2() throws Exception { + + // Simple poll (all weight to 1) R1 + // 1 (a=1 b=2 c=null) a 2 + // 2 (a=1 b=2 c=1) b - + // 3 (a=null b=null c=2) 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, 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(2.), + Sets.newHashSet(scores.get(0), + scores.get(1)), + CHOICE_A, CHOICE_C); + assertChoiceScore(scores.get(2), CHOICE_B, null); + } + + @Test + public void simpleVotecount3() throws Exception { + + // Simple poll (all weight to 1) R1 + // 1 (a=1 b=null c=null) a 1 + // 2 (a=null b=1 c=null) b 1 + // 3 (a=null b=null c=1) 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, 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(1.), + 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 R1 + // 1 (x2) (a=1 b=null c=null) a 2 + // 2 (x1) (a=null b=1 c=null) b 2 + // 3 (x1) (a=null b=1 c=2) c - + + 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(2.), + Sets.newHashSet(scores.get(0), + scores.get(1)), + CHOICE_A, CHOICE_B); + assertChoiceScore(scores.get(2), CHOICE_C, null); + } + + @Test + public void weightedVotecount2() throws Exception { + + // poll with weighted vote R1 + // 1 (x2) (a=1 b=null c=null) a 2 + // 2 (x1) (a=null b=1 c=null) b 1 + // 3 (x3) (a=null b=2 c=1) 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(3.)); + assertChoiceScore(scores.get(1), CHOICE_A, BigDecimal.valueOf(2.)); + assertChoiceScore(scores.get(2), CHOICE_B, BigDecimal.valueOf(1.)); + } + + 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-coombs/src/test/java/org/chorem/pollen/votecounting/strategy/CoombsStrategyTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-coombs/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java =================================================================== --- trunk/pollen-votecounting-strategy-coombs/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java (rev 0) +++ trunk/pollen-votecounting-strategy-coombs/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java 2012-06-26 06:55:58 UTC (rev 3568) @@ -0,0 +1,49 @@ +/* + * #%L + * Pollen :: VoteCounting strategy :: Coombs + * $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(CoombsStrategy.ID)); + } +} Property changes on: trunk/pollen-votecounting-strategy-coombs/src/test/java/org/chorem/pollen/votecounting/strategy/VoteCountingStrategyProviderTest.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Added: trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties =================================================================== --- trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties (rev 0) +++ trunk/pollen-votecounting-strategy-coombs/src/test/resources/log4j.properties 2012-06-26 06:55:58 UTC (rev 3568) @@ -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-coombs/src/test/resources/log4j.properties ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native

1 0

r3567 - trunk/pollen-votecounting-strategy-borda/src/main/java/org/chorem/pollen/votecounting/strategy
by tchemit＠users.chorem.org June 26, 2012

June 26, 2012

Author: tchemit Date: 2012-06-26 08:55:25 +0200 (Tue, 26 Jun 2012) New Revision: 3567 Url: http://chorem.org/repositories/revision/pollen/3567 Log: refs #542 Fix strategy id Modified: trunk/pollen-votecounting-strategy-borda/src/main/java/org/chorem/pollen/votecounting/strategy/BordaStrategy.java Modified: trunk/pollen-votecounting-strategy-borda/src/main/java/org/chorem/pollen/votecounting/strategy/BordaStrategy.java =================================================================== --- trunk/pollen-votecounting-strategy-borda/src/main/java/org/chorem/pollen/votecounting/strategy/BordaStrategy.java 2012-06-26 06:54:58 UTC (rev 3566) +++ trunk/pollen-votecounting-strategy-borda/src/main/java/org/chorem/pollen/votecounting/strategy/BordaStrategy.java 2012-06-26 06:55:25 UTC (rev 3567) @@ -43,7 +43,7 @@ */ public class BordaStrategy extends AbstractVoteCountingStrategy { - public static final int ID = 5; + public static final int ID = 4; /** Logger. */ private static final Log log = LogFactory.getLog(BordaStrategy.class);

1 0