This is an automated email from the git hooks/post-receive script. New commit to branch feature/149-jugement-majoritaire in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit df14354ab89eeb5cf1b267dd37b1143359cff729 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Oct 6 12:17:40 2017 +0200 implentation du jugement majoritaire (algo de dépouillement) ref #149 --- pollen-votecounting-aggregator/pom.xml | 6 + pollen-votecounting-majority-judgment/LICENSE.txt | 661 +++++++++++++++++++++ pollen-votecounting-majority-judgment/README.md | 0 pollen-votecounting-majority-judgment/pom.xml | 93 +++ .../votecounting/MajorityJudgmentChoiceResult.java | 43 ++ .../votecounting/MajorityJudgmentConfig.java | 21 + .../votecounting/MajorityJudgmentDetailResult.java | 65 ++ .../votecounting/MajorityJudgmentVoteCounting.java | 108 ++++ .../MajorityJudgmentVoteCountingStrategy.java | 263 ++++++++ .../org.chorem.pollen.votecounting.VoteCounting | 1 + ...votecounting-majority-judgment_en_GB.properties | 4 + ...votecounting-majority-judgment_fr_FR.properties | 4 + .../MajorityJudgmentVoteCountingStrategyTest.java | 341 +++++++++++ .../votecounting/VoteCountingFactoryTest.java | 38 ++ .../src/test/resources/log4j.properties | 28 + 15 files changed, 1676 insertions(+) diff --git a/pollen-votecounting-aggregator/pom.xml b/pollen-votecounting-aggregator/pom.xml index d5e69273..e00f6461 100644 --- a/pollen-votecounting-aggregator/pom.xml +++ b/pollen-votecounting-aggregator/pom.xml @@ -47,6 +47,7 @@ <module>../pollen-votecounting-borda</module> <module>../pollen-votecounting-instant-runoff</module> <module>../pollen-votecounting-coombs</module> + <module>../pollen-votecounting-majority-judgment</module> </modules> <dependencies> @@ -85,6 +86,11 @@ <artifactId>pollen-votecounting-coombs</artifactId> <version>${project.version}</version> </dependency> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-votecounting-majority-judgment</artifactId> + <version>${project.version}</version> + </dependency> </dependencies> </project> diff --git a/pollen-votecounting-majority-judgment/LICENSE.txt b/pollen-votecounting-majority-judgment/LICENSE.txt new file mode 100644 index 00000000..dba13ed2 --- /dev/null +++ b/pollen-votecounting-majority-judgment/LICENSE.txt @@ -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/>. diff --git a/pollen-votecounting-majority-judgment/README.md b/pollen-votecounting-majority-judgment/README.md new file mode 100644 index 00000000..e69de29b diff --git a/pollen-votecounting-majority-judgment/pom.xml b/pollen-votecounting-majority-judgment/pom.xml new file mode 100644 index 00000000..3b5d7a65 --- /dev/null +++ b/pollen-votecounting-majority-judgment/pom.xml @@ -0,0 +1,93 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + #%L + Pollen :: VoteCounting :: Normal + %% + Copyright (C) 2009 - 2017 Code Lutin, 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% + --> + +<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>3.1.0-SNAPSHOT</version> + </parent> + + <groupId>org.chorem.pollen</groupId> + <artifactId>pollen-votecounting-majority-judgment</artifactId> + + <name>Pollen :: VoteCounting :: Majority Judgment</name> + <description>Implements the Majority Judgment vote counting</description> + + <dependencies> + + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>pollen-votecounting-api</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> + <groupId>com.google.guava</groupId> + <artifactId>guava</artifactId> + </dependency> + + <dependency> + <groupId>org.nuiton.i18n</groupId> + <artifactId>nuiton-i18n</artifactId> + </dependency> + + <dependency> + <groupId>log4j</groupId> + <artifactId>log4j</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </dependency> + + <dependency> + <groupId>org.assertj</groupId> + <artifactId>assertj-core</artifactId> + </dependency> + + + </dependencies> + + <build> + <plugins> + <plugin> + <groupId>org.nuiton.i18n</groupId> + <artifactId>i18n-maven-plugin</artifactId> + <executions> + <execution> + <goals> + <goal>parserJava</goal> + <goal>gen</goal> + </goals> + </execution> + </executions> + </plugin> + </plugins> + </build> + +</project> diff --git a/pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentChoiceResult.java b/pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentChoiceResult.java new file mode 100644 index 00000000..deffbb1f --- /dev/null +++ b/pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentChoiceResult.java @@ -0,0 +1,43 @@ +package org.chorem.pollen.votecounting; + +import java.io.Serializable; +import java.math.BigDecimal; +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class MajorityJudgmentChoiceResult implements Serializable { + + private static final long serialVersionUID = -5443173721590730351L; + + protected String choiceId; + + protected List<BigDecimal> voteByGrad; + + protected int median; + + public String getChoiceId() { + return choiceId; + } + + public void setChoiceId(String choiceId) { + this.choiceId = choiceId; + } + + public List<BigDecimal> getVoteByGrad() { + return voteByGrad; + } + + public void setVoteByGrad(List<BigDecimal> voteByGrad) { + this.voteByGrad = voteByGrad; + } + + public int getMedian() { + return median; + } + + public void setMedian(int median) { + this.median = median; + } +} diff --git a/pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentConfig.java b/pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentConfig.java new file mode 100644 index 00000000..d00313f0 --- /dev/null +++ b/pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentConfig.java @@ -0,0 +1,21 @@ +package org.chorem.pollen.votecounting; + +import org.chorem.pollen.votecounting.model.VoteCountingConfig; + +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class MajorityJudgmentConfig implements VoteCountingConfig { + + protected List<String> grades; + + public List<String> getGrades() { + return grades; + } + + public void setGrades(List<String> grades) { + this.grades = grades; + } +} diff --git a/pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentDetailResult.java b/pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentDetailResult.java new file mode 100644 index 00000000..a78d3e90 --- /dev/null +++ b/pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentDetailResult.java @@ -0,0 +1,65 @@ +package org.chorem.pollen.votecounting; + +/*- + * #%L + * Pollen :: VoteCounting :: Instant Runoff + * %% + * Copyright (C) 2009 - 2017 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% + */ + +import org.chorem.pollen.votecounting.model.VoteCountingDetailResult; + +import java.math.BigDecimal; +import java.util.List; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class MajorityJudgmentDetailResult implements VoteCountingDetailResult { + + private static final long serialVersionUID = -6759337206955499369L; + + protected BigDecimal sumWeight; + + protected BigDecimal halfWeight; + + protected List<MajorityJudgmentChoiceResult> choiceResults; + + public BigDecimal getSumWeight() { + return sumWeight; + } + + public void setSumWeight(BigDecimal sumWeight) { + this.sumWeight = sumWeight; + } + + public BigDecimal getHalfWeight() { + return halfWeight; + } + + public void setHalfWeight(BigDecimal halfWeight) { + this.halfWeight = halfWeight; + } + + public List<MajorityJudgmentChoiceResult> getChoiceResults() { + return choiceResults; + } + + public void setChoiceResults(List<MajorityJudgmentChoiceResult> choiceResults) { + this.choiceResults = choiceResults; + } +} diff --git a/pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCounting.java b/pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCounting.java new file mode 100644 index 00000000..09dc8d4d --- /dev/null +++ b/pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCounting.java @@ -0,0 +1,108 @@ +package org.chorem.pollen.votecounting; + +/* + * #%L + * Pollen :: VoteCounting :: Instant Runoff + * %% + * Copyright (C) 2009 - 2017 Code Lutin, 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% + */ + +import org.chorem.pollen.votecounting.model.ChoiceToVoteRenderType; + +import java.util.Locale; + +import static org.nuiton.i18n.I18n.l; +import static org.nuiton.i18n.I18n.n; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class MajorityJudgmentVoteCounting extends AbstractVoteCounting<MajorityJudgmentVoteCountingStrategy, MajorityJudgmentConfig> { + + public static final int ID = 8; + + public MajorityJudgmentVoteCounting() { + super(ID, + MajorityJudgmentVoteCountingStrategy.class, + MajorityJudgmentConfig.class, + n("pollen.voteCountingType.majorityJudgment"), + n("pollen.voteCountingType.majorityJudgment.shortHelp"), + n("pollen.voteCountingType.majorityJudgment.help") + ); + } + + @Override + public String getTotalVoteValueNotValidMessage(Locale locale, MajorityJudgmentConfig config) { + // no validation on total value, so no message + return null; + } + + @Override + public String getVoteValueNotValidMessage(Locale locale, + String choiceName, + String voteValue) { + return l(locale, "pollen.error.vote.invalidMajorityJudgmentVoteValue", + choiceName, + voteValue); + } + + @Override + public String getDisplayVoteValue(Double voteValue) { + return voteValue == null ? "" : String.valueOf(voteValue); + } + + @Override + public ChoiceToVoteRenderType getVoteValueEditorType() { + return ChoiceToVoteRenderType.TEXTFIELD; + } + + @Override + public boolean canLimitNumberOfChoices() { + return false; + } + + @Override + public Double getMinimumValue() { + return 0d; + } + + @Override + public Double getMaximumValue() { + return null; + } + + @Override + public boolean isChoiceInVote(Double voteValue) { + return voteValue != null && voteValue > 0; + } + + @Override + public boolean isVoteValueNull(Double voteValue) { + return voteValue == null; + } + + @Override + public boolean isVoteValueValid(Double voteValue) { + return voteValue != null && voteValue > 0; + } + + @Override + public boolean isTotalVoteValueValid(Double totalValues, MajorityJudgmentConfig config) { + // no validation on total value + return true; + } +} diff --git a/pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCountingStrategy.java b/pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCountingStrategy.java new file mode 100644 index 00000000..698f8a8e --- /dev/null +++ b/pollen-votecounting-majority-judgment/src/main/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCountingStrategy.java @@ -0,0 +1,263 @@ +/* + * #%L + * Pollen :: VoteCounting :: Instant Runoff + * %% + * Copyright (C) 2009 - 2017 Code Lutin, 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.votecounting; + +import com.google.common.base.Preconditions; +import com.google.common.collect.Lists; +import com.google.common.collect.Sets; +import org.chorem.pollen.votecounting.model.ChoiceScore; +import org.chorem.pollen.votecounting.model.VoteCountingResult; +import org.chorem.pollen.votecounting.model.VoteForChoice; +import org.chorem.pollen.votecounting.model.Voter; + +import java.math.BigDecimal; +import java.math.MathContext; +import java.util.Comparator; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class MajorityJudgmentVoteCountingStrategy extends AbstractVoteCountingStrategy<MajorityJudgmentConfig> { + + @Override + public VoteCountingResult votecount(Set<Voter> voters) { + + MajorityJudgmentDetailResult detailResult = new MajorityJudgmentDetailResult(); + + List<MajorityJudgmentChoiceResult> choiceResults = getAllChoiceIds(voters) + .stream() + .map(this::newChoiceResult) + .collect(Collectors.toList()); + + detailResult.setChoiceResults(choiceResults); + detailResult.setSumWeight(BigDecimal.ZERO); + + voters.forEach(voter -> addVoter(detailResult, voter)); + + detailResult.setHalfWeight(detailResult.getSumWeight().divide(BigDecimal.valueOf(2), MathContext.DECIMAL32)); + + choiceResults.forEach(choiceResult -> computeMedian(choiceResult, detailResult.getHalfWeight())); + + choiceResults.sort(CHOICE_RESULT_COMPARATOR.reversed()); + + List<ChoiceScore> scores = computeScore(choiceResults); + + return VoteCountingResult.newResult(scores, detailResult); + } + + @Override + public Set<VoteForChoice> toVoteForChoices(VoteCountingResult voteCountingResult) { + Set<VoteForChoice> voteForChoices = Sets.newHashSet(); + + for (ChoiceScore choiceScore : voteCountingResult.getScores()) { + + double score = choiceScore.getScoreOrder(); + VoteForChoice voteForChoice = VoteForChoice.newVote( + choiceScore.getChoiceId(), + score); + voteForChoices.add(voteForChoice); + } + return voteForChoices; + } + + protected MajorityJudgmentChoiceResult newChoiceResult(String choiceId) { + MajorityJudgmentChoiceResult choiceResult = new MajorityJudgmentChoiceResult(); + choiceResult.setChoiceId(choiceId); + List<BigDecimal> voteByGrad = config.getGrades().stream() + .map(grad -> BigDecimal.ZERO) + .collect(Collectors.toList()); + choiceResult.setVoteByGrad(voteByGrad); + return choiceResult; + } + + protected void addVoter(MajorityJudgmentDetailResult detailResult, Voter voter) { + BigDecimal weight = BigDecimal.valueOf(voter.getWeight()); + detailResult.setSumWeight(detailResult.getSumWeight().add(weight)); + voter.getVoteForChoices() + .forEach(voteForChoice -> addVoteForChoice(detailResult, weight, voteForChoice)); + + } + + protected void addVoteForChoice(MajorityJudgmentDetailResult detailResult, BigDecimal weight, VoteForChoice voteForChoice) { + detailResult.getChoiceResults() + .stream() + .filter(choiceResult -> voteForChoice.getChoiceId().equals(choiceResult.getChoiceId())) + .findFirst() + .ifPresent(choiceResult -> addGrad(choiceResult, voteForChoice.getVoteValue().intValue(), weight)); + } + + protected void addGrad(MajorityJudgmentChoiceResult choiceResult, int grade, BigDecimal weight) { + List<BigDecimal> voteByGrad = choiceResult.getVoteByGrad(); + BigDecimal vote = voteByGrad.get(grade).add(weight); + voteByGrad.set(grade, vote); + } + + protected void computeMedian(MajorityJudgmentChoiceResult choiceResult, BigDecimal demiWeight) { + + BigDecimal temp = BigDecimal.ZERO; + + Integer median = null; + + int grad = 0; + for (BigDecimal voteByGrad : choiceResult.getVoteByGrad()) { + + temp = temp.add(voteByGrad); + + if (temp.compareTo(demiWeight) >= 0) { + + median = grad; + break; + + } + + grad++; + } + + Preconditions.checkNotNull(median); + choiceResult.setMedian(median); + + } + + protected List<ChoiceScore> computeScore(List<MajorityJudgmentChoiceResult> choiceResults) { + + List<ChoiceScore> scores = Lists.newArrayListWithCapacity(choiceResults.size()); + + int order = 0; + + for (MajorityJudgmentChoiceResult choiceResult : choiceResults) { + + ChoiceScore choiceScore = new ChoiceScore(); + + choiceScore.setChoiceId(choiceResult.choiceId); + choiceScore.setScoreValue(BigDecimal.valueOf(choiceResult.getMedian())); + choiceScore.setScoreOrder(order); + + scores.add(choiceScore); + order++; + } + + return scores; + } + + protected static Comparator<MajorityJudgmentChoiceResult> CHOICE_RESULT_COMPARATOR = + Comparator.comparingInt(MajorityJudgmentChoiceResult::getMedian) + .thenComparing(MajorityJudgmentVoteCountingStrategy::compareChoiceResultSameMedian); + + protected static int compareChoiceResultSameMedian(MajorityJudgmentChoiceResult a, MajorityJudgmentChoiceResult b) { + return compareChoiceResultSameMedian(a, b , 0); + } + + /** + * Comparaison de deux {@code MajorityJudgmentChoiceResult} ayant la même mediane + * et dont les bornes a une distance inférieur a {@code gradAroundMedian} mention sont identique + * + * @param a une valeur à comparer + * @param b l'autre valeur à comparer + * @param gradAroundMedian l a distance a la médiane où faire la comparaison + * @return -1, 0 ou 1 si {@code b} est préféré à {@code a}, équivalent ou si {@code a} est préféré à {@code b} + */ + protected static int compareChoiceResultSameMedian(MajorityJudgmentChoiceResult a, MajorityJudgmentChoiceResult b, int gradAroundMedian) { + + int median = a.getMedian(); + int indexUnder = median - gradAroundMedian; + int indexUpper = median + gradAroundMedian + 1; + + int nbGrades = a.getVoteByGrad().size(); + if (indexUnder <= 0 && indexUpper >= nbGrades) { + // si on est en dehors du tableau des votes par mention alors les deux choix sont équivalent + return 0; + } + + BigDecimal aUnder, aUpper, bUnder, bUpper; + + // pour les deux choix on calcul le nombre de votant avec une mention strictement inférieur à {median - gradAroundMedian} + if (indexUnder > 0) { + aUnder = a.getVoteByGrad().subList(0, indexUnder).stream().reduce(BigDecimal.ZERO, BigDecimal::add); + bUnder = b.getVoteByGrad().subList(0, indexUnder).stream().reduce(BigDecimal.ZERO, BigDecimal::add); + } else { + aUnder = BigDecimal.ZERO; + bUnder = BigDecimal.ZERO; + } + + // pour les deux choix on calcul le nombre de votant avec une mention strictement supérieur à {median + gradAroundMedian} + if (indexUpper < nbGrades) { + aUpper = a.getVoteByGrad().subList(indexUpper, nbGrades).stream().reduce(BigDecimal.ZERO, BigDecimal::add); + bUpper = b.getVoteByGrad().subList(indexUpper, nbGrades).stream().reduce(BigDecimal.ZERO, BigDecimal::add); + } else { + aUpper = BigDecimal.ZERO; + bUpper = BigDecimal.ZERO; + } + + // on fait toutes les comparaisons des borne deux à deux + int aUnderAUpper = aUnder.compareTo(aUpper); + int aUnderBUnder = aUnder.compareTo(bUnder); + int aUnderBUpper = aUnder.compareTo(bUpper); + int aUpperBUnder = aUpper.compareTo(bUnder); + int aUpperBUpper = aUpper.compareTo(bUpper); + int bUnderBUpper = bUnder.compareTo(bUpper); + + int result; + + if (aUnderBUnder < 0 && aUpperBUnder < 0 && bUnderBUpper > 0 // bUnder > aUnder, aUpper, bUpper + || aUnderAUpper < 0 && aUpperBUnder > 0 && aUpperBUpper > 0 // aUpper > aUnder, bUnder, bUpper + ) { + result = 1; + + } else if (aUnderAUpper > 0 && aUnderBUnder > 0 && aUnderBUpper > 0 // aUnder > aUpper, bUnder, bUpper + || aUnderBUpper < 0 && aUpperBUpper < 0 && bUnderBUpper < 0 // bUpper > aUpper, aUnder, bUnder + ){ + result = -1; + // ici on géré des cas rare : une egalité + } else if (aUnderAUpper == 0 && aUnderBUnder > 0 && aUnderBUpper > 0 && bUnderBUpper < 0 // aUnder = aUpper > bUpper > bUnder + || aUnderBUnder == 0 && aUnderAUpper > 0 && aUnderBUpper > 0 && aUpperBUpper < 0 // aUnder = bUnder > bUpper > aUpper + || aUpperBUnder == 0 && aUnderAUpper < 0 && aUpperBUpper > 0 // aUpper = bUnder > aUnder, bUpper + || aUpperBUpper == 0 && aUnderAUpper < 0 && aUpperBUnder > 0 && aUnderBUnder < 0 // aUpper = bUpper > bUnder > aUnder + || bUnderBUpper == 0 && aUnderBUnder < 0 && aUnderBUpper < 0 && aUnderAUpper > 0 // bUnder = bUpper > aUnder > aUpper + ){ + result = 1; + } else if (aUnderAUpper == 0 && aUnderBUnder > 0 && aUnderBUpper > 0 && bUnderBUpper > 0 // aUnder = aUpper > bUnder > bUpper + || aUnderBUnder == 0 && aUnderAUpper > 0 && aUnderBUpper > 0 && aUpperBUpper > 0 // aUnder = bUnder > aUpper > bUpper + || aUnderBUpper == 0 && aUnderAUpper > 0 && aUnderBUnder > 0 // aUnder = bUpper > bUnder, aUpper + || aUpperBUpper == 0 && aUnderAUpper < 0 && aUpperBUnder > 0 && aUnderBUnder > 0 // aUpper = bUpper > aUnder > bUnder + || bUnderBUpper == 0 && aUpperBUnder < 0 && aUnderBUpper < 0 && aUnderAUpper < 0 // bUnder = bUpper > aUpper > aUnder + ) { + result = -1; + // ici on géré des cas encore plus rare : deux egalités + } else if (aUnderAUpper == 0 && aUnderBUnder == 0 && aUnderBUpper > 0 // aUnder = aUpper = bUnder > bUpper + || aUpperBUnder == 0 && aUpperBUpper == 0 && aUnderAUpper < 0 // aUpper = bUnder = bUpper > aUnder + ){ + result = 1; + } else if (aUnderAUpper == 0 && aUnderBUpper == 0 && aUnderBUnder > 0 // aUnder = aUpper = bUpper > bUnder + || aUnderBUnder == 0 && aUnderBUpper == 0 && aUnderAUpper > 0 // aUnder = bUnder = bUpper > aUpper + ) { + result = -1; + } else { // strict egalité des bornes donc on fait la comparaison a une distance de plus + result = compareChoiceResultSameMedian(a, b, gradAroundMedian + 1); + } + + return result; + + } + +} diff --git a/pollen-votecounting-majority-judgment/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCounting b/pollen-votecounting-majority-judgment/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCounting new file mode 100644 index 00000000..f37818ed --- /dev/null +++ b/pollen-votecounting-majority-judgment/src/main/resources/META-INF/services/org.chorem.pollen.votecounting.VoteCounting @@ -0,0 +1 @@ +org.chorem.pollen.votecounting.MajorityJudgmentVoteCounting diff --git a/pollen-votecounting-majority-judgment/src/main/resources/i18n/pollen-votecounting-majority-judgment_en_GB.properties b/pollen-votecounting-majority-judgment/src/main/resources/i18n/pollen-votecounting-majority-judgment_en_GB.properties new file mode 100644 index 00000000..8159dff0 --- /dev/null +++ b/pollen-votecounting-majority-judgment/src/main/resources/i18n/pollen-votecounting-majority-judgment_en_GB.properties @@ -0,0 +1,4 @@ +pollen.error.vote.invalidMajorityJudgmentVoteValue=Grade is required +pollen.voteCountingType.majorityJudgment=Majority judgment +pollen.voteCountingType.majorityJudgment.help=Voters freely grade each candidate in one of several named ranks. The choice with the highest median grade is the winner.<br/>More about this method\: <a href\='http\://en.wikipedia.org/wiki/Majority_judgment' target\='\#doc'>http\://en.wikipedia.org/wiki/Majority_judgment</a> +pollen.voteCountingType.majorityJudgment.shortHelp=Voters freely grade each choice in one of several named ranks. diff --git a/pollen-votecounting-majority-judgment/src/main/resources/i18n/pollen-votecounting-majority-judgment_fr_FR.properties b/pollen-votecounting-majority-judgment/src/main/resources/i18n/pollen-votecounting-majority-judgment_fr_FR.properties new file mode 100644 index 00000000..d3558e76 --- /dev/null +++ b/pollen-votecounting-majority-judgment/src/main/resources/i18n/pollen-votecounting-majority-judgment_fr_FR.properties @@ -0,0 +1,4 @@ +pollen.error.vote.invalidMajorityJudgmentVoteValue=La mention est obligatoire. +pollen.voteCountingType.majorityJudgment=Jugement majoritaire +pollen.voteCountingType.majorityJudgment.help=Attribuer à chaque choix une mention parmi une échelle commune à tous.<br/>Deux choix peuvent avoir la même mention. Pour chaque choix, on détermine la mention médiane, qu'on appelle « mention majoritaire ».<br/>Le choix avec la meilleur mention majoritaire gagne.<br/>Pour en savoir plus \: <a href\='http\://fr.wikipedia.org/wiki/Jugement_majoritaire' target\='\#doc'>http\://fr.wikipedia.org/wiki/Jugement_majoritaire</a> +pollen.voteCountingType.majorityJudgment.shortHelp=Attribuer à chaque choix une mention parmi une échelle commune à tous. diff --git a/pollen-votecounting-majority-judgment/src/test/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCountingStrategyTest.java b/pollen-votecounting-majority-judgment/src/test/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCountingStrategyTest.java new file mode 100644 index 00000000..4a9117ac --- /dev/null +++ b/pollen-votecounting-majority-judgment/src/test/java/org/chorem/pollen/votecounting/MajorityJudgmentVoteCountingStrategyTest.java @@ -0,0 +1,341 @@ +/* + * #%L + * Pollen :: VoteCounting :: Instant Runoff + * %% + * Copyright (C) 2009 - 2017 Code Lutin, 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.votecounting; + +import com.google.common.base.CharMatcher; +import com.google.common.base.Preconditions; +import com.google.common.collect.ImmutableList; +import org.chorem.pollen.votecounting.model.ChoiceScore; +import org.chorem.pollen.votecounting.model.SimpleVoterBuilder; +import org.chorem.pollen.votecounting.model.VoteCountingResult; +import org.chorem.pollen.votecounting.model.Voter; +import org.junit.Assert; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.omg.CosNaming.NamingContextPackage.NotFound; + +import java.math.BigDecimal; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class MajorityJudgmentVoteCountingStrategyTest { + + public static final String CHOICE_A = "A"; + + public static final String CHOICE_B = "B"; + + public static final String CHOICE_C = "C"; + + public static final String CHOICE_D = "D"; + + public static final double POOR = 0; + + public static final double FAIR = 1; + + public static final double GOOD = 2; + + public static final BigDecimal POOR_BD = BigDecimal.valueOf(0); + + public static final BigDecimal FAIR_BD = BigDecimal.valueOf(1); + + public static final BigDecimal GOOD_BD = BigDecimal.valueOf(2); + + public static final ImmutableList<String> GRADES_3 = ImmutableList.of( + "Poor", "Fair", "Good"); + + public static final ImmutableList<Character> GRADES_5 = ImmutableList.of( + '0', '1', '2', '3', '4'); + + protected static MajorityJudgmentVoteCounting voteCounting; + + + protected MajorityJudgmentVoteCountingStrategy strategy; + + @BeforeClass + public static void beforeClass() throws Exception { + VoteCountingFactory factory = new VoteCountingFactory(); + voteCounting = MajorityJudgmentVoteCounting.class.cast(factory.getVoteCounting(MajorityJudgmentVoteCounting.ID)); + } + + @Before + public void setUp() throws Exception { + strategy = voteCounting.newStrategy(); + MajorityJudgmentConfig config = new MajorityJudgmentConfig(); + config.setGrades(GRADES_3); + strategy.setConfig(config); + } + + @Test + public void simpleVotecount1() throws Exception { + + // Ville A B C D + //----------------------- + // voter 1 G F G P + // voter 2 G P P G + // voter 3 P F P F + // voter 4 F P F G + // voter 5 G P G F + //------------------------ + // Poor 1 3 2 1 + // Fair 1 2 1 2 + // Good 3 0 2 2 + //------------------------ + // median G P F F + // order 0 3 2 1 + + + Set<Voter> voters = new SimpleVoterBuilder(). + newVoter("Voter 1", 1.). + addVoteForChoice(CHOICE_A, GOOD). + addVoteForChoice(CHOICE_B, FAIR). + addVoteForChoice(CHOICE_C, GOOD). + addVoteForChoice(CHOICE_D, POOR). + newVoter("Voter 2", 1.). + addVoteForChoice(CHOICE_A, GOOD). + addVoteForChoice(CHOICE_B, POOR). + addVoteForChoice(CHOICE_C, POOR). + addVoteForChoice(CHOICE_D, GOOD). + newVoter("Voter 3", 1.). + addVoteForChoice(CHOICE_A, POOR). + addVoteForChoice(CHOICE_B, FAIR). + addVoteForChoice(CHOICE_C, POOR). + addVoteForChoice(CHOICE_D, FAIR). + newVoter("Voter 4", 1.). + addVoteForChoice(CHOICE_A, FAIR). + addVoteForChoice(CHOICE_B, POOR). + addVoteForChoice(CHOICE_C, FAIR). + addVoteForChoice(CHOICE_D, GOOD). + newVoter("Voter 5", 1.). + addVoteForChoice(CHOICE_A, GOOD). + addVoteForChoice(CHOICE_B, POOR). + addVoteForChoice(CHOICE_C, GOOD). + addVoteForChoice(CHOICE_D, FAIR). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + assertThat(result).isNotNull(); + assertThat(result.getScores()) + .isNotNull() + .containsExactlyInAnyOrder( + ChoiceScore.newScore(CHOICE_A, GOOD_BD, 0), + ChoiceScore.newScore(CHOICE_B, POOR_BD, 3), + ChoiceScore.newScore(CHOICE_C, FAIR_BD, 2), + ChoiceScore.newScore(CHOICE_D, FAIR_BD, 1)) + .isSortedAccordingTo(ChoiceScore::compareTo); + } + + @Test + public void simpleVotecount2() throws Exception { + + // Ville A B C D + // voter 1 P F G F x 2 + // voter 2 P F P P x 3 + // voter 3 P G F P + // voter 4 F P F G + // voter 5 P P F P + //------------------------ + // Poor 7 2 3 5 + // Fair 1 5 3 2 + // Good 0 1 2 1 + //------------------------ + // median P F F P + // order 3 0 1 2 + + Set<Voter> voters = new SimpleVoterBuilder(). + newVoter("Voter 1", 2.). + addVoteForChoice(CHOICE_A, POOR). + addVoteForChoice(CHOICE_B, FAIR). + addVoteForChoice(CHOICE_C, GOOD). + addVoteForChoice(CHOICE_D, FAIR). + newVoter("Voter 2", 3.). + addVoteForChoice(CHOICE_A, POOR). + addVoteForChoice(CHOICE_B, FAIR). + addVoteForChoice(CHOICE_C, POOR). + addVoteForChoice(CHOICE_D, POOR). + newVoter("Voter 3", 1.). + addVoteForChoice(CHOICE_A, POOR). + addVoteForChoice(CHOICE_B, GOOD). + addVoteForChoice(CHOICE_C, FAIR). + addVoteForChoice(CHOICE_D, POOR). + newVoter("Voter 4", 1.). + addVoteForChoice(CHOICE_A, FAIR). + addVoteForChoice(CHOICE_B, POOR). + addVoteForChoice(CHOICE_C, FAIR). + addVoteForChoice(CHOICE_D, GOOD). + newVoter("Voter 5", 1.). + addVoteForChoice(CHOICE_A, POOR). + addVoteForChoice(CHOICE_B, POOR). + addVoteForChoice(CHOICE_C, FAIR). + addVoteForChoice(CHOICE_D, POOR). + getVoters(); + + VoteCountingResult result = strategy.votecount(voters); + + assertThat(result).isNotNull(); +// assertThat(result.getScores()) +// .isNotNull() +// .containsExactlyInAnyOrder( +// ChoiceScore.newScore(CHOICE_A, POOR_BD, 3), +// ChoiceScore.newScore(CHOICE_B, FAIR_BD, 0), +// ChoiceScore.newScore(CHOICE_C, FAIR_BD, 1), +// ChoiceScore.newScore(CHOICE_D, POOR_BD, 2)) +// .isSortedAccordingTo(ChoiceScore::compareTo); + + MajorityJudgmentDetailResult detailResult = MajorityJudgmentDetailResult.class.cast(result.getDetailResult()); + + MajorityJudgmentChoiceResult resultA = detailResult.getChoiceResults().stream() + .filter(c -> CHOICE_A.equals(c.getChoiceId())) + .findFirst() + .orElseThrow(NotFound::new); + + MajorityJudgmentChoiceResult resultD = detailResult.getChoiceResults().stream() + .filter(c -> CHOICE_D.equals(c.getChoiceId())) + .findFirst() + .orElseThrow(NotFound::new); + + int compareDtoA = MajorityJudgmentVoteCountingStrategy.CHOICE_RESULT_COMPARATOR.compare(resultD, resultA); + Assert.assertEquals(1, compareDtoA); + } + + + @Test + public void testCompareEqual() { + // egalité + testEqualChoice( + "00000111111122333344", + "00000111111122333344"); + } + + @Test + public void testCompareDiferentMedian() { + testGreaterChoice( + "00112233333333444444", + "00000111111122333344"); + } + + @Test + public void testCompareSameMedianWithoutSameBounds() { + + // médians identique sans egalité + testGreaterChoice( + "00011122222233333344", + "00011112222222333344"); + + testGreaterChoice( + "00111111222222333344", + "00011111122223333444"); + + testGreaterChoice( + "00111111222222333344", + "00011111122223333444"); + } + + @Test + public void testCompareSameMedianWithSameBounds2() { + + // test médians identique avec egalité + testGreaterChoice( + "00111111222222333344", + "00011111222223333444"); + + testGreaterChoice( + "00011112222333334444", + "00001111122233334444"); + + testGreaterChoice( + "00111122222233333444", + "00011112222233334444"); + } + + @Test + public void testCompareSameMedianWithSameBounds3() { + + // test médians identique avec egalité + testGreaterChoice( + "00111112222233334444", + "00111111222233334444"); + + testGreaterChoice( + "00001111222233334444", + "00001111222223334444"); + } + + @Test + public void testCompareSameMedianWithSameBounds4() { + + // test médians identique avec egalité + testGreaterChoice( + "00111112222233344444", + "00111112222233334444"); + + } + + protected void testGreaterChoice(String votesA, String votesB) { + testCompareChoice(votesA, votesB, 1); + testCompareChoice(votesB, votesA, -1); + } + + protected void testEqualChoice(String votesA, String votesB) { + testCompareChoice(votesA, votesB, 0); + } + + protected void testCompareChoice(String votesForA, String votesForB, int expected) { + Preconditions.checkArgument(votesForA.length() == votesForB.length()); + + BigDecimal half = BigDecimal.valueOf(votesForA.length() / 2.); + + MajorityJudgmentChoiceResult a = stringToMajorityJudgmentChoiceResult(CHOICE_A, votesForA); + + MajorityJudgmentChoiceResult b = stringToMajorityJudgmentChoiceResult(CHOICE_B, votesForB); + + strategy.computeMedian(a, half); + strategy.computeMedian(b, half); + + int compareAtoB = MajorityJudgmentVoteCountingStrategy.CHOICE_RESULT_COMPARATOR.compare(a, b); + + String message = "Votes for A is not " + (expected == 0 ? "equal" : (expected < 0 ? "lower" : "greater")) + " to votes for B " + + "\n Votes for A : " + votesForA + + "\n Votes for B : " + votesForB; + + Assert.assertEquals(message, expected, compareAtoB); + + } + + protected MajorityJudgmentChoiceResult stringToMajorityJudgmentChoiceResult(String choiceId, String votes) { + MajorityJudgmentChoiceResult choiceResult = new MajorityJudgmentChoiceResult(); + choiceResult.setChoiceId(choiceId); + List<BigDecimal> voteByGrad = GRADES_5.stream() + .map(grad -> CharMatcher.is(grad).countIn(votes)) + .map(BigDecimal::valueOf) + .collect(Collectors.toList()); + choiceResult.setVoteByGrad(voteByGrad); + return choiceResult; + } + +} diff --git a/pollen-votecounting-majority-judgment/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java b/pollen-votecounting-majority-judgment/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java new file mode 100644 index 00000000..5b8ff4b3 --- /dev/null +++ b/pollen-votecounting-majority-judgment/src/test/java/org/chorem/pollen/votecounting/VoteCountingFactoryTest.java @@ -0,0 +1,38 @@ +/* + * #%L + * Pollen :: VoteCounting :: Instant Runoff + * %% + * Copyright (C) 2009 - 2017 Code Lutin, 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.votecounting; + +import org.junit.Assert; +import org.junit.Test; + +/** + * @author Sylvain Bavencoff - bavencoff@codelutin.com + */ +public class VoteCountingFactoryTest { + + @Test + public void getVoteCounting() throws Exception { + VoteCountingFactory factory = new VoteCountingFactory(); + VoteCounting voteCounting = + factory.getVoteCounting(MajorityJudgmentVoteCounting.ID); + Assert.assertNotNull(voteCounting); + } +} diff --git a/pollen-votecounting-majority-judgment/src/test/resources/log4j.properties b/pollen-votecounting-majority-judgment/src/test/resources/log4j.properties new file mode 100644 index 00000000..7c9a6a00 --- /dev/null +++ b/pollen-votecounting-majority-judgment/src/test/resources/log4j.properties @@ -0,0 +1,28 @@ +### +# #%L +# Pollen :: VoteCounting :: Instant Runoff +# %% +# Copyright (C) 2009 - 2017 Code Lutin, 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% +### +# 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 -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.