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

Gh pages #12

Open
wants to merge 137 commits into
base: gh-pages
Choose a base branch
from
Open

Gh pages #12

wants to merge 137 commits into from

Conversation

jamesonquinn
Copy link

Added 2 voting methods: star and 3-2-1. See http://electology.github.io/vse-sim/VSE/ for why this is worth it.

jamesonquinn and others added 30 commits May 30, 2017 10:53
@jamesonquinn
make voters give at least 1 each of max and min rating. Add STAR and …
78090b8 
…begin to add 321. Broken.
@jamesonquinn
fix sandbox
4df983e
@jamesonquinn
fix mindist
a781d17
@jamesonquinn
OK, star and 321 both work now.
1479362
@jamesonquinn
"system"->"method"; and Trudeau backed off.
eb619f7 
“Voting system” is ambiguous; could refer to machines. “Method” is
clearer.
@jamesonquinn
draft rewriting
6c5eac0
@jamesonquinn
describe what I'm imagining
889881d
@jamesonquinn
more blurbs
ceab5d9
@paretoman
wrote 2 more strategies. Maybe could do another. used 1 as lowest sco…
284d6eb 
…re for testing. need to change that back to 0.
@paretoman
connected config to strategy.
456fb72
@paretoman
spaces to tabs.
dfe04e5
@paretoman
different strategies for different voter groups.
e52ce7d
@paretoman
added strategies that rely on who the frontrunner is.
2281a56
@paretoman
Merge branch 'gh-pages' of https://github.com/electology/ballot into …
6bcc06c 
…gh-pages
@jamesonquinn
Merge pull request #1 from paretoman/gh-pages
ed2a6a3 
strategic voting
@paretoman
added strategy per ballot. added buttons for adjusting the number of …
191eb82 
…strategic voters.
@paretoman
Merge branch 'gh-pages' of https://github.com/electology/ballot into …
92c001d 
…gh-pages
@paretoman
put strategy into a function, to get ready to use it 3 times. also fi…
ea50301 
…xed bug with percent voter strategy.
@paretoman
done making strategy into function.
80f523b
@paretoman
strategy for approval and 321. example for chicken dilemma
64e05b3
@paretoman
added star stragegy leaving room for 1st "starnormfrontrunners". gui …
0d251f6 
…improvement for 3 scores.
@paretoman
small bug
12cb84b
@jamesonquinn
Merge pull request #2 from paretoman/gh-pages
5afa83f 
strategy stuff
@paretoman
select percent strategy in UI.
b36d66a
@paretoman
preload images. fixes bug where candidates wouldn't show up.
9913cd2
@paretoman
fix slices display for score voter.
3cc3bb2
@paretoman
add strategy UI
22cc56d
@paretoman
switch to first set of voters for percentage control.
679ee5e
@paretoman
UI choose frontrunner
249deee
@paretoman
UI for unstrategic voters' strategy.
c4d8735
paretoman and others added 26 commits August 13, 2017 23:18
@paretoman
cleaned up strategy (rewrote) in voters.js
9b9f1a5
@paretoman
small edits
adac139
@paretoman
started with some iframe stuff
85b7c03
@paretoman
load functionality works
6a60ade
@paretoman
proof of concept but needs some layout work
39a00c0
@paretoman
not really working
a18d3e5
@paretoman
kinda works, not good.
3eadc8e
@paretoman
sticky sidebar
5925f41
@paretoman
small fixes
93dca5d
@paretoman
added ability to keep config from last time. When the user makes some…
4938d2b 
… adjustments and then scrolls down the page, when he scrolls back up, he'll see the example the way he left it, instead of seeing it reset to initial settings.
@paretoman
merged gh-pages into divnav, which was a separate branch but might al…
a88d97d 
…most be ready to replace gh-pages
@paretoman
ballot default positions
967f8ba
@paretoman
small fix - don't open external page when clicking nav links
72afaee
@paretoman
works, but work in progress on getting the nav buttons to point direc…
39af82a 
…tly at their examples.
@jamesonquinn
Merge pull request #11 from paretoman/divnav
ac867aa 
divnav - a work in progress
@paretoman
small fix - updates window size for nav anchors. added feature to all…
031dd09 
…ow the nav to put the words at a specified height on the page (in %).
@paretoman
layout: small fix
8bac598
@paretoman
layout. small fixes
27de751
@paretoman
layout. centered vertically. nav inside iframe.
4daad38
@paretoman
small fixes
0fa9c93
@jamesonquinn
Merge pull request #12 from paretoman/layout3
67c6c50 
Layout3
@jamesonquinn
Use mod, not random, for percentStrategy
31b36f6
@jamesonquinn
off-by-one error fix
a2bf1bc
@jamesonquinn
yet another version of the page
cf9cbf0
@jamesonquinn
check in my work
097e6be
@jamesonquinn
Merge branch 'ncase/gh-pages' into gh-pages
609fb40 
# Conflicts:
#	index.html
@fsargent
Copy link

Now http://electionscience.github.io/vse-sim/VSE/

@endolith
Copy link
Contributor

endolith commented Jul 22, 2019 •
edited
Loading

@fsargent I've submitted changes to that page in https://github.com/electionscience/vse-sim/pulls. Will someone look at them and pull them?

Also there are a lot of links to http://electology.github.io/vse-sim/VSE/ that will no longer work. Can it be a redirect?

endolith added a commit to endolith/Equal.Vote that referenced this pull request Jul 23, 2019
@endolith
Update link to VSE
5a3cc48 
ncase/ballot#12 (comment)
@endolith endolith mentioned this pull request Jul 23, 2019
Open
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.
4 participants
@jamesonquinn @fsargent @endolith @paretoman