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.

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

Import Jameson Quinn's VSE Sim fork #39

Open
wants to merge 163 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
163 commits
Select commit Hold shift + click to select a range
b1d016d
formatting stuff
homunq Jul 19, 2021
e226b6c
Some doctrings for voterModels.py
homunq Jul 20, 2021
c4028df
Low info strats
ragconsumer Jul 22, 2021
49b7b96
Srv->STAR
homunq Jul 23, 2021
7af685c
Merge branch 'master' of https://github.com/jamesonquinn/vse-sim
homunq Jul 23, 2021
06f4b66
threeRoundResults started
ragconsumer Jul 23, 2021
305266f
Update .gitignore
ragconsumer Jul 23, 2021
26ba370
Merge branch 'master' of https://github.com/jamesonquinn/vse-sim
ragconsumer Jul 23, 2021
6c6b8b5
New architecture
ragconsumer Jul 24, 2021
981d0fd
Update methods.py
ragconsumer Jul 24, 2021
f9c8298
Brought old strategy function into the new architecture
ragconsumer Jul 24, 2021
376b13b
Improved reporting in threeRoundResults
ragconsumer Jul 24, 2021
012e8d6
principledPollsToProbs
homunq Jul 24, 2021
383f89d
Merge branch 'master' of https://github.com/jamesonquinn/vse-sim
homunq Jul 24, 2021
5406f05
Changed makeResults to return a dict
ragconsumer Jul 24, 2021
ecdde57
numpy as np
homunq Jul 24, 2021
d261024
imports
homunq Jul 24, 2021
c0a629d
partial refactoring
ragconsumer Jul 24, 2021
e7b4c6e
Merge branch 'master' of https://github.com/jamesonquinn/vse-sim
ragconsumer Jul 24, 2021
cb239b6
threeRoundResults now functional
ragconsumer Jul 24, 2021
bf9c3bb
Binary search for min foreground
ragconsumer Jul 25, 2021
e461e6b
Added foreground and target selection functions
ragconsumer Jul 26, 2021
4f697f0
csv output (appendResults)
homunq Jul 26, 2021
0a88b59
Added compromise and diehard strategies
ragconsumer Jul 26, 2021
31d22ed
Added top-2 variants
ragconsumer Jul 27, 2021
9220787
STAR and Condorcet strats
ragconsumer Jul 27, 2021
f7778bf
bug fix
ragconsumer Jul 27, 2021
653d5ba
Added tieFor2Probs()
ragconsumer Jul 28, 2021
5d27ccc
Improved ties for 2nd
ragconsumer Jul 28, 2021
0538425
Created vse2
ragconsumer Jul 29, 2021
44defb5
fixed pollToProbs for 0 inputs
ragconsumer Jul 29, 2021
d8fe7d7
bug fixes and performance improvements
ragconsumer Jul 29, 2021
f5c6d69
imports
homunq Jul 29, 2021
71fb147
Merge branch 'master' of https://github.com/jamesonquinn/vse-sim
homunq Jul 29, 2021
4ab1603
multiprocessing
homunq Jul 29, 2021
ceb1cef
Create vse15.py
homunq Jul 29, 2021
e9c998e
rename 15 to 1_5
homunq Jul 29, 2021
c783719
Fixes for multithreading
ragconsumer Jul 29, 2021
cd89fce
Merge branch 'master' of https://github.com/jamesonquinn/vse-sim
ragconsumer Jul 29, 2021
5102a23
Added bullet voting strat
ragconsumer Jul 29, 2021
9cabd3a
formatting, call STAR "STAR".
homunq Jul 30, 2021
41c7095
Merge branch 'master' of https://github.com/jamesonquinn/vse-sim
homunq Jul 30, 2021
0801f92
spelling
homunq Jul 30, 2021
c5e411f
Inputs >= 1 no longer break pollsToProbs
ragconsumer Jul 30, 2021
6aaf5b6
Irv.lowInfoBallot never uses IRV polls
ragconsumer Jul 30, 2021
525eecb
Update Testing Notebook.ipynb
ragconsumer Jul 30, 2021
8a2e67a
Merge branch 'master' of https://github.com/jamesonquinn/vse-sim
homunq Jul 30, 2021
f0bf6e7
Added deciderUtilDiffs to results
ragconsumer Jul 30, 2021
544a16e
Normalized Borda results
ragconsumer Jul 30, 2021
9a8b02b
add cols
homunq Jul 31, 2021
0312473
Merge branch 'master' of https://github.com/jamesonquinn/vse-sim
homunq Jul 31, 2021
95f3552
pass in pickiness
homunq Jul 31, 2021
eb2eea6
fix bug
homunq Jul 31, 2021
3505b0c
bug fix
homunq Jul 31, 2021
154cd79
Update vse2.py
ragconsumer Jul 31, 2021
53a90e6
Merge branch 'master' of https://github.com/jamesonquinn/vse-sim
ragconsumer Jul 31, 2021
7f48145
Improved reporting and added default polling uncertainty
ragconsumer Jul 31, 2021
1858285
fixed minimax
ragconsumer Jul 31, 2021
984e4fb
better analysis
homunq Jul 31, 2021
e34ca6e
Merge branch 'master' of https://github.com/jamesonquinn/vse-sim
homunq Jul 31, 2021
50943c4
Added random target selection
ragconsumer Jul 31, 2021
9acc493
Merge branch 'master' of https://github.com/jamesonquinn/vse-sim
ragconsumer Jul 31, 2021
0b8c5a5
added totalStratUtilDiff
homunq Aug 1, 2021
782331e
Create SatPMOutputs.txt
homunq Aug 1, 2021
75be025
Update SatPMOutputs.txt
homunq Aug 1, 2021
a34567e
record pickiness & pollingError values
homunq Aug 1, 2021
78eaad7
select012 impemented
homunq Aug 1, 2021
3bba7d5
Allowed file overwriting
ragconsumer Aug 1, 2021
b28bca9
Created resultgeneration notebook
ragconsumer Aug 1, 2021
5017c38
Update resultgeneration.ipynb
ragconsumer Aug 1, 2021
d8cbba7
calculate ASR
homunq Aug 1, 2021
f4f759a
Merge branch 'master' of https://github.com/jamesonquinn/vse-sim
homunq Aug 1, 2021
522a767
Added bullet voting as diehard 4
ragconsumer Aug 1, 2021
8900b14
Merge branch 'master' of https://github.com/jamesonquinn/vse-sim
ragconsumer Aug 1, 2021
00a7e19
Added CsvBatches
ragconsumer Aug 5, 2021
b0cee2e
Removed Choosers and SideTallies
ragconsumer Aug 6, 2021
2984fa1
Moved threeRoundResults
ragconsumer Aug 6, 2021
d95e163
Added doctests
ragconsumer Aug 7, 2021
8ae222d
vse2 -> vse
ragconsumer Aug 7, 2021
5b71740
Improved IRV results
ragconsumer Aug 8, 2021
f02eee9
pngs
homunq Aug 9, 2021
521734d
Merge branch 'master' of https://github.com/jamesonquinn/vse-sim
homunq Aug 9, 2021
6a5d988
Update methods.py
ragconsumer Aug 9, 2021
6979a7d
Added info on decider util diffs
ragconsumer Aug 9, 2021
7535129
Incorporated polling error
ragconsumer Aug 10, 2021
1bd6fdb
Cleaned up Minimax and improved Minimax results
ragconsumer Aug 11, 2021
96c93ce
Added default foregrounds and backgrounds
ragconsumer Aug 11, 2021
4f7cd5a
Added scenario types
ragconsumer Aug 13, 2021
87857b2
Added hybrid strategies
ragconsumer Aug 13, 2021
bf49120
lowInfo-> va
ragconsumer Aug 13, 2021
f4c9070
Bullet voting in notebook
ragconsumer Aug 14, 2021
ed92c3c
lowInfo -> va; partial work on MAV
ragconsumer Sep 3, 2021
7772415
Added Raynaud
ragconsumer Sep 17, 2021
cb2397a
Added Smith-IRV
ragconsumer Sep 17, 2021
1004132
Added additional STAR strategies
ragconsumer Oct 5, 2021
0384da8
Added bullet voting for all methods
ragconsumer Oct 6, 2021
f3af04c
Added additional voting methods
ragconsumer Dec 23, 2021
4cf72a8
Added CID and multi-winner methods
ragconsumer Apr 4, 2022
f4d4be4
Added STV
ragconsumer Apr 5, 2022
b326ec3
Added ballotEval and improved the display of CID results
ragconsumer Apr 16, 2022
54df5b0
Added a zero information score/STAR strategy
ragconsumer Apr 18, 2022
5f3e3cf
Created charts
ragconsumer Apr 27, 2022
e23fe31
Added realistic bullet voting
ragconsumer Apr 27, 2022
a474323
Fixed STAR.vaBallot
ragconsumer Apr 28, 2022
181bd54
Tuned default parameters for STAR's vaBallot
ragconsumer Apr 28, 2022
ae350ec
Overdue commit; added new modules and mw voting methods
ragconsumer Jul 21, 2022
69b929f
Added minimaxSTV + bug fixes for top 2 runoffs
ragconsumer Jul 21, 2022
139a904
Improve stratEval and fixed a bug in Approval.honBallot
ragconsumer Jul 26, 2022
1eeccc8
Allocated Score bug fix
ragconsumer Aug 20, 2022
d0a1e35
Allowed StratTest to evaluated multiple voting methods at once and ad…
ragconsumer Sep 2, 2022
085415e
Added S5HtoSTV
ragconsumer Sep 17, 2022
d1f70df
Updated honest Approval strategy and the display of CID charts
ragconsumer Sep 21, 2022
c0ed635
fixed numeric instability in dataClasses — but still getting NaNs
homunq Dec 10, 2022
99b49de
turn back into float (in case of np weirdness)
homunq Dec 11, 2022
50c4217
Update dataClasses.py
homunq Dec 12, 2022
b52382b
CID updates and new strats for IRV
ragconsumer Dec 12, 2022
98316fc
Made fewer strategies get tested by default
ragconsumer Dec 12, 2022
727ac2f
graphs work — some cleanup remains.
homunq Dec 13, 2022
1212adf
Added the Borda strat as the Condorcet va strat
ragconsumer Dec 14, 2022
2c61143
Added untargeted bullet voting and Minimax VA
ragconsumer Dec 14, 2022
dccc1f4
Added targeted bullet voting
ragconsumer Dec 15, 2022
44745de
Made targeted bullet voting honest
ragconsumer Dec 15, 2022
30a465f
Bullet voting update
ragconsumer Dec 16, 2022
46b89f7
Update redo_graphs.R
homunq Dec 16, 2022
1763ba0
checking in
homunq Dec 17, 2022
0ddf55c
Added favorite betrayal to Approval
ragconsumer Dec 17, 2022
78c4fc0
Added burial for IRV
ragconsumer Dec 17, 2022
6e22af4
Added STAR diehard and comp strategies to minimax for intensities of …
ragconsumer Dec 17, 2022
38b53c4
Switched to pivotalUtilDiff and normalized it
ragconsumer Dec 17, 2022
d412d91
Bug fix
ragconsumer Dec 17, 2022
cfecb7c
Added factionFraction
ragconsumer Dec 17, 2022
b8a94a4
Added binary results for strategy success
ragconsumer Dec 17, 2022
0e0b97d
Updated hurtCandElected to R1
ragconsumer Dec 17, 2022
f3302c1
Update redo_graphs.R
homunq Dec 17, 2022
ba0d12b
Added lightweight simulations to resultgeneration
ragconsumer Dec 17, 2022
79932f3
Merge branch 'master' of https://github.com/jamesonquinn/vse-sim
ragconsumer Dec 17, 2022
61e1f69
near finalizing notebooks
homunq Dec 17, 2022
f0f1dab
Merge branch 'master' of https://github.com/jamesonquinn/vse-sim
homunq Dec 17, 2022
ceecbac
more notebooks
homunq Dec 17, 2022
26517d2
Bug fix
ragconsumer Dec 19, 2022
ef45cd4
Fixed bug in tieFor2Estimate
ragconsumer Dec 19, 2022
3b079e3
notebooks and conversion
homunq Dec 19, 2022
e2c0174
Instructions for reproducing paper.
homunq Dec 19, 2022
43fa675
instructions to reproduce paper
homunq Dec 19, 2022
f81c56f
Update convert_pngs_for_paper.sh
homunq Dec 19, 2022
3e5f2e6
notebooks
homunq Dec 20, 2022
b8a22c6
debugging... let's see
homunq Dec 20, 2022
e267de2
Update run sims for paper.ipynb
homunq Dec 20, 2022
5f17ecb
Update run sims for paper.ipynb
ragconsumer Dec 20, 2022
319c1cb
fixed tieFor2Estimate with numerical stability
ragconsumer Dec 20, 2022
ca88198
log first (still need to replace nas)
homunq Dec 20, 2022
cea92a0
tieFor2Estimate now handles 0 inputs
ragconsumer Dec 20, 2022
bed98c3
fix dataclasses my way
homunq Dec 23, 2022
3209cbc
Merge branch 'master' of https://github.com/jamesonquinn/vse-sim
homunq Dec 23, 2022
f40850a
Update README.md
homunq Dec 23, 2022
f1df1ef
testing urls
homunq Dec 23, 2022
5ab8ec7
move dummy markdown to real
homunq Dec 31, 2022
7625c46
Improved the honest strategy for STAR
ragconsumer Jan 19, 2023
edf1735
Merge branch 'master'
ragconsumer Jan 19, 2023
55d0c05
Update cid.py
ragconsumer Jan 19, 2023
aa581d2
Added script for candidate number comparison
ragconsumer Jan 19, 2023
50ee437
Added "trivial" scenario type
ragconsumer Jan 19, 2023
66fd23c
Fixed unit tests
ragconsumer Jan 27, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,8 @@ __pycache__
.Rhistory
ez_setup.py
get-pip.py
*.swp
*.png
.RData
*.svg

394 changes: 394 additions & 0 deletions .ipynb_checkpoints/CIDresultsgen-checkpoint.ipynb

Large diffs are not rendered by default.

13,910 changes: 13,910 additions & 0 deletions .ipynb_checkpoints/Testing Notebook JQ-checkpoint.ipynb

Large diffs are not rendered by default.

Loading