Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
137 commits
Select commit Hold shift + click to select a range
78090b8
make voters give at least 1 each of max and min rating. Add STAR and …
jamesonquinn May 30, 2017
4df983e
fix sandbox
jamesonquinn May 31, 2017
a781d17
fix mindist
jamesonquinn May 31, 2017
1479362
OK, star and 321 both work now.
jamesonquinn May 31, 2017
eb619f7
"system"->"method"; and Trudeau backed off.
jamesonquinn May 31, 2017
6c5eac0
draft rewriting
jamesonquinn Jul 3, 2017
889881d
describe what I'm imagining
jamesonquinn Jul 30, 2017
ceab5d9
more blurbs
jamesonquinn Jul 30, 2017
284d6eb
wrote 2 more strategies. Maybe could do another. used 1 as lowest s…
paretoman Jul 31, 2017
456fb72
connected config to strategy.
paretoman Jul 31, 2017
dfe04e5
spaces to tabs.
paretoman Jul 31, 2017
e52ce7d
different strategies for different voter groups.
paretoman Jul 31, 2017
2281a56
added strategies that rely on who the frontrunner is.
paretoman Aug 1, 2017
6bcc06c
Merge branch 'gh-pages' of https://github.com/electology/ballot into …
paretoman Aug 1, 2017
ed2a6a3
Merge pull request #1 from paretoman/gh-pages
jamesonquinn Aug 1, 2017
191eb82
added strategy per ballot. added buttons for adjusting the number of …
paretoman Aug 1, 2017
92c001d
Merge branch 'gh-pages' of https://github.com/electology/ballot into …
paretoman Aug 1, 2017
ea50301
put strategy into a function, to get ready to use it 3 times. also fi…
paretoman Aug 1, 2017
80f523b
done making strategy into function.
paretoman Aug 1, 2017
64e05b3
strategy for approval and 321. example for chicken dilemma
paretoman Aug 1, 2017
0d251f6
added star stragegy leaving room for 1st "starnormfrontrunners". gui…
paretoman Aug 1, 2017
12cb84b
small bug
paretoman Aug 1, 2017
5afa83f
Merge pull request #2 from paretoman/gh-pages
jamesonquinn Aug 2, 2017
b36d66a
select percent strategy in UI.
paretoman Aug 2, 2017
9913cd2
preload images. fixes bug where candidates wouldn't show up.
paretoman Aug 2, 2017
3cc3bb2
fix slices display for score voter.
paretoman Aug 2, 2017
22cc56d
add strategy UI
paretoman Aug 2, 2017
679ee5e
switch to first set of voters for percentage control.
paretoman Aug 3, 2017
249deee
UI choose frontrunner
paretoman Aug 3, 2017
c4d8735
UI for unstrategic voters' strategy.
paretoman Aug 3, 2017
b33b58d
Merge pull request #3 from paretoman/gh-pages
jamesonquinn Aug 3, 2017
5b41f57
UI for unstrategic voters' strategy.
paretoman Aug 3, 2017
25b08db
small fixes.
paretoman Aug 3, 2017
1a26383
UI allow multiple frontrunners. (checkboxes).
paretoman Aug 3, 2017
733a12d
added strategy MTF. more TF. more threshold frontrunners. Approve of…
paretoman Aug 3, 2017
58cb422
slider for strategy
paretoman Aug 3, 2017
33d32fa
small fixes.
paretoman Aug 3, 2017
45448b9
for a single ballot, let the user choose the strategy.
paretoman Aug 3, 2017
919956d
add reset button to single ballots
paretoman Aug 3, 2017
4e4e9cd
smaller buttons, moving buttons.
paretoman Aug 3, 2017
bdb45ea
merging
paretoman Aug 4, 2017
4149960
UI add shapes to buttons.
paretoman Aug 4, 2017
bfec26a
small stuff.
paretoman Aug 4, 2017
2a7a4d7
added a "poll" button to select the winner as the frontrunner. (mayb…
paretoman Aug 4, 2017
60d84d5
added "how strategic is each group of voters?". detail: config will k…
paretoman Aug 4, 2017
30fd48a
added circles to show strategies.
paretoman Aug 4, 2017
17d99f2
Merge pull request #4 from paretoman/gh-pages
jamesonquinn Aug 4, 2017
477ec7c
added circles to show strategies.
paretoman Aug 4, 2017
ee5c8d0
Merge remote-tracking branch 'upstream/gh-pages' into gh-pages
paretoman Aug 4, 2017
a00f35d
Merge pull request #5 from paretoman/gh-pages
jamesonquinn Aug 4, 2017
572604b
added function jsave. run jsave(1) in the console when viewing a fil…
paretoman Aug 5, 2017
3d685c3
added back the ability to save. works using whatever base url you're…
paretoman Aug 5, 2017
8cae168
small fix.
paretoman Aug 5, 2017
fbb6fd1
fixed saving. some things werent being updated before being saved: f…
paretoman Aug 5, 2017
9a599d5
Merge pull request #6 from paretoman/gh-pages
jamesonquinn Aug 5, 2017
608cbb4
added save button to all the election examples.
paretoman Aug 5, 2017
a5bc96f
added tooltip for buttons
paretoman Aug 5, 2017
1a393f4
added snowman. (first attempt at 3 voter sizes). todo: fine tuning
paretoman Aug 5, 2017
0d03389
refined snowman. put 3 voters in a line.
paretoman Aug 5, 2017
89e2066
UI button and slider sizes. to make look nice.
paretoman Aug 5, 2017
58cc07a
UI, rearranged sliders
paretoman Aug 5, 2017
61066a8
added yee diagrams!
paretoman Aug 6, 2017
b549fa7
striped ties. a yee diagram shows ties as two colors striped. merge…
paretoman Aug 6, 2017
2413eaf
small fixes. config for yee object.
paretoman Aug 6, 2017
cbd1bce
fix some things. yee loading on start if configured. fixed axis bug.
paretoman Aug 6, 2017
7cbb36d
make pretty yee diagram.
paretoman Aug 6, 2017
6904125
Merge pull request #7 from paretoman/gh-pages
jamesonquinn Aug 6, 2017
10ce320
faster. halfway there...
paretoman Aug 6, 2017
cad4874
yee: not much faster. but different. made custom scoring function tha…
paretoman Aug 6, 2017
8dee139
tried another speed improvement... disabled right now while testing
paretoman Aug 7, 2017
5f50e03
added ability to choose whether to include each side menu (feature).
paretoman Aug 7, 2017
113ec96
added config button to change menus (and ability to save menu configu…
paretoman Aug 7, 2017
e62fd03
put UI config on top of menu. Unicode snowman. sizing windows. begi…
paretoman Aug 7, 2017
4605f42
added html for "best frontrunner" and "not the worst frontrunner" str…
paretoman Aug 7, 2017
5fe2de1
changed strategy names. also reduced number from 8 to 5.
paretoman Aug 7, 2017
873f922
config reset fix. button sizes. star individual UI. need star strate…
paretoman Aug 7, 2017
ab5332c
cleaned up examples. horizontal voter groups.
paretoman Aug 7, 2017
1b8f5d3
nice looking. better saving. you get the file name when you press sa…
paretoman Aug 7, 2017
719f883
moving from 1:5 to 0:5 scale and 1:3 to 0:2 scale.
paretoman Aug 8, 2017
6732518
changed strategy names to single letters.
paretoman Aug 8, 2017
7dc55a6
Merge pull request #8 from paretoman/gh-pages
jamesonquinn Aug 8, 2017
a6d0b44
top2 polling completed
paretoman Aug 9, 2017
067b583
beginnings of "complete.html"
jamesonquinn Aug 10, 2017
5344b0a
added presets (phase 1)
paretoman Aug 10, 2017
ae1b52d
trying to figure out how to reload all the
paretoman Aug 11, 2017
fa57b3d
works
paretoman Aug 11, 2017
154b8c1
cleanup
paretoman Aug 11, 2017
4eb2797
moved all election configuration to one big file so that they can all…
paretoman Aug 11, 2017
6f3f088
small fix
paretoman Aug 11, 2017
5ada429
kinda slow, but it's at least connected. it isn't using the combineK…
paretoman Aug 11, 2017
21c9f50
adjusted the way pixels are drawn to make them align with the edge of…
paretoman Aug 11, 2017
2470276
kinda works. but gets the math wrong. also, works differently on dif…
paretoman Aug 11, 2017
886621c
works! cool. there was a math bug %. and there was a switch in argum…
paretoman Aug 12, 2017
a07e99a
UI: added compute method. also fixed some bugs unrelated to the comp…
paretoman Aug 12, 2017
3b41524
added ties. added frontrunners. (to array methods using cpu and gpu)
paretoman Aug 12, 2017
dba913d
small fix. variable name.
paretoman Aug 12, 2017
b6f045b
adding SingleVoter to sandbox. Halfway there. Just need the ballot …
paretoman Aug 12, 2017
b0af7a9
added ballot papers display. almost there. it still doesn't work if…
paretoman Aug 12, 2017
052c302
single voter works. added images for 5 candidates (rather than just …
paretoman Aug 13, 2017
601cc9f
better images, alignment of ballot inside sandbox
paretoman Aug 13, 2017
0eca94d
added ability to access ballot presets from sandbox.
paretoman Aug 13, 2017
751fafb
Merge pull request #9 from paretoman/gh-pages
jamesonquinn Aug 13, 2017
e78fbad
iframe communication: first success in sandbox, very rough.
paretoman Aug 13, 2017
8890131
cleaned up iframe communication
paretoman Aug 13, 2017
52c1c3d
functional. scrolling triggers a change in the sidebar's election ex…
paretoman Aug 13, 2017
6f55d86
fixed side bar works but needs sizing css.
paretoman Aug 13, 2017
ad38472
sidebar cleaned up a little with css.
paretoman Aug 13, 2017
8fca75a
added FPTP strategy when there are 2 or more frontrunners. (same str…
paretoman Aug 13, 2017
df0498b
replaced frontrunnerSet with preFrontrunnerIds, to be more descriptive.
paretoman Aug 13, 2017
35642ed
fix bug. organized voters.js so that there is less confusion about wh…
paretoman Aug 13, 2017
0be02e0
took out "threshold" strategy.. basically this was bestwinner except …
paretoman Aug 13, 2017
9b9f1a5
cleaned up strategy (rewrote) in voters.js
paretoman Aug 14, 2017
adac139
small edits
paretoman Aug 14, 2017
85b7c03
started with some iframe stuff
paretoman Aug 14, 2017
6a60ade
load functionality works
paretoman Aug 14, 2017
39a00c0
proof of concept but needs some layout work
paretoman Aug 14, 2017
a18d3e5
not really working
paretoman Aug 14, 2017
3eadc8e
kinda works, not good.
paretoman Aug 15, 2017
5925f41
sticky sidebar
paretoman Aug 24, 2017
93dca5d
small fixes
paretoman Aug 24, 2017
4938d2b
added ability to keep config from last time. When the user makes som…
paretoman Aug 25, 2017
a88d97d
merged gh-pages into divnav, which was a separate branch but might al…
paretoman Aug 25, 2017
967f8ba
ballot default positions
paretoman Aug 25, 2017
72afaee
small fix - don't open external page when clicking nav links
paretoman Aug 25, 2017
39af82a
works, but work in progress on getting the nav buttons to point direc…
paretoman Aug 25, 2017
ac867aa
Merge pull request #11 from paretoman/divnav
jamesonquinn Aug 25, 2017
031dd09
small fix - updates window size for nav anchors. added feature to al…
paretoman Aug 25, 2017
8bac598
layout: small fix
paretoman Aug 28, 2017
27de751
layout. small fixes
paretoman Aug 28, 2017
4daad38
layout. centered vertically. nav inside iframe.
paretoman Aug 28, 2017
0fa9c93
small fixes
paretoman Aug 28, 2017
67c6c50
Merge pull request #12 from paretoman/layout3
jamesonquinn Aug 28, 2017
31b36f6
Use mod, not random, for percentStrategy
jamesonquinn Sep 8, 2017
a2bf1bc
off-by-one error fix
jamesonquinn Sep 8, 2017
cf9cbf0
yet another version of the page
jamesonquinn Sep 8, 2017
097e6be
check in my work
jamesonquinn Feb 4, 2018
609fb40
Merge branch 'ncase/gh-pages' into gh-pages
jamesonquinn Feb 5, 2018
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
1,201 changes: 1,201 additions & 0 deletions complete.html

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions css/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ a{ color: hsl(240,80%,70%); }
a:hover{ color: hsl(240,80%,80%); }
#content{}
.words{
width: 670px;
max-width: 670px;
margin: 0 auto;
}
#content p{
Expand Down Expand Up @@ -60,7 +60,7 @@ li{
margin-top: 0;
font-size: 0.8em;
text-align: center;
width: 260px;
max-width: 260px;
line-height: 1.2em;
}
#content p.caption-test{
Expand All @@ -72,14 +72,14 @@ li{
margin: 0 auto;
}
.sim-intro{
width: 600px;
max-width: 600px;
}
.sim-ballot{
width: 670px;
max-width: 670px;
margin: 35px auto 50px auto;
}
.sim-test{
width: 800px;
max-width: 800px;
margin: 50px auto 40px auto;
}
#content p.quote{
Expand Down
66 changes: 66 additions & 0 deletions css/slides.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
/*todo: fix horizontal scrolling
*/

div.target {
margin: 0;
padding: 0;
}

#main {
margin-left: 500px;
position:relative;
right: 20px;
}

#main div.target {
background: #ccc;
}

#main div.target:nth-child(even) {
background: #eee;
}

#nav {
font-size: 10px;
top: 0%;

/* just for start*/
position: absolute;
top: 200%;
height: 100%;
left: 20px;
}

#nav a {
border-bottom: 1px solid #666;
color: #333;
display: block;
padding: 1px;
text-align: center;
text-decoration: none;
}

#nav a:hover, #nav a.active {
background: #666;
color: #fff;
}

#nav nav {
left: 0;
width: 100px;
height: 20%;
position: absolute;
}

#fixedbox {
width: 458px;
height: 100%;
}

.anchor {
display: block;
position: relative;
height: 400px;
margin-top: -400px;
visibility: hidden;
}
Binary file modified img/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
106 changes: 53 additions & 53 deletions index.html

Large diffs are not rendered by default.

Loading