Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fs/jquinn #41

Open
wants to merge 162 commits into
base: main
Choose a base branch
from
Open

Fs/jquinn #41

wants to merge 162 commits into from

Conversation

fsargent
Copy link
Contributor

No description provided.

homunq and others added 30 commits July 19, 2021 10:45
@homunq
formatting stuff
b1d016d
@homunq
Some doctrings for voterModels.py
e226b6c
@ragconsumer
Low info strats
c4028df 
Added low information strategies and Minimax
@homunq
Srv->STAR
49b7b96
@homunq
Merge branch 'master' of https://github.com/jamesonquinn/vse-sim
7af685c
@ragconsumer
threeRoundResults started
06f4b66 
Wrote some of threeRoundResults, added a basic but non-rigorous pollsToProbs function, refactored low-information strats, and added a better zero-information approval voting strategy.
@ragconsumer
Update .gitignore
305266f
@ragconsumer
Merge branch 'master' of https://github.com/jamesonquinn/vse-sim
26ba370
@ragconsumer
New architecture
6c6b8b5 
Switched to using threeRoundResult. Removed @rememberBallot decorators. Switched from static methods to class methods for strategy functions and results.
@ragconsumer
Update methods.py
981d0fd 
Bug fix
@ragconsumer
Brought old strategy function into the new architecture
f9c8298
@ragconsumer
Improved reporting in threeRoundResults
376b13b
@homunq
principledPollsToProbs
012e8d6
@homunq
Merge branch 'master' of https://github.com/jamesonquinn/vse-sim
383f89d
@ragconsumer
Changed makeResults to return a dict
5406f05
@homunq
numpy as np
ecdde57
@homunq
imports
d261024
@ragconsumer
partial refactoring
c0a629d
@ragconsumer
Merge branch 'master' of https://github.com/jamesonquinn/vse-sim
e7b4c6e
@ragconsumer
threeRoundResults now functional
cb239b6
@ragconsumer
Binary search for min foreground
bf9c3bb 
Implemented the binary search for determining the minimum foreground to elect the winner under strategy and ensured that all results are returned.
@ragconsumer
Added foreground and target selection functions
e461e6b
@homunq
csv output (appendResults)
4f697f0
@ragconsumer
Added compromise and diehard strategies
0a88b59 
Added comp and diehard strategies for plurality, approval, score, and IRV. (Not yet added for STAR or Condorcet.)
@ragconsumer
Added top-2 variants
31d22ed
@ragconsumer
STAR and Condorcet strats
9220787 
Added diehard and compromise strategies for STAR and Condorcet. Improved the low info strategies for top2 methods. Increased the default polling uncertainty.
@ragconsumer
bug fix
f7778bf
@ragconsumer
Added tieFor2Probs()
653d5ba 
It's slow.
@ragconsumer
Improved ties for 2nd
5d27ccc 
created tieFor2Estimate
@ragconsumer
Created vse2
0538425
homunq and others added 21 commits December 17, 2022 12:03
@homunq
Merge branch 'master' of https://github.com/jamesonquinn/vse-sim
f0f1dab
@homunq
more notebooks
ceecbac
@ragconsumer
Bug fix
26517d2
@ragconsumer
Fixed bug in tieFor2Estimate
ef45cd4
@homunq
notebooks and conversion
3b079e3
@homunq
Instructions for reproducing paper.
e2c0174
@homunq
instructions to reproduce paper
43fa675
@homunq
Update convert_pngs_for_paper.sh
f81c56f
@homunq
notebooks
3e5f2e6
@homunq
debugging... let's see
b8a22c6
@homunq
Update run sims for paper.ipynb
e267de2
@ragconsumer
Update run sims for paper.ipynb
5f17ecb
@ragconsumer
fixed tieFor2Estimate with numerical stability
319c1cb
@homunq
log first (still need to replace nas)
ca88198
@ragconsumer
tieFor2Estimate now handles 0 inputs
cea92a0
@homunq
fix dataclasses my way
bed98c3
@homunq
Merge branch 'master' of https://github.com/jamesonquinn/vse-sim
3209cbc
@homunq
Update README.md
f40850a
@homunq
testing urls
f1df1ef
@homunq
move dummy markdown to real
5ab8ec7
@fsargent
Docs updates into jquinn changes.
bcb40a1
@review-notebook-app
Copy link

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.

Powered by ReviewNB

@sourcery-ai sourcery-ai bot mentioned this pull request Dec 31, 2022
Closed
@electionscience electionscience deleted a comment from sourcery-ai bot Dec 31, 2022
@fsargent fsargent marked this pull request as ready for review December 31, 2022 23:47
@fsargent
Copy link
Contributor Author

Quite a few exceptions, if you can work on these, @homunq and @ragconsumer.
Could import as is, but it's a bit rough with things like dim not being defined in functions. Would love all the import * moved to specific imports.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@fsargent @homunq @ragconsumer