Code

Gh pages#12

Code

Open

jamesonquinn wants to merge 137 commits intoncase:gh-pagesncase/ballot:gh-pagesfrom electionscience:gh-pageselectionscience/ballot:gh-pagesCopy head branch name to clipboard

+28,400-481

Commits

Commits on May 30, 2017

• make voters give at least 1 each of max and min rating. Add STAR and begin to add 321. Broken.

  jamesonquinn

  committed
  78090b8

Commits on May 31, 2017

• fix sandbox

  jamesonquinn

  committed
  4df983e

• fix mindist

  jamesonquinn

  committed
  a781d17

• OK, star and 321 both work now.

  jamesonquinn

  committed
  1479362

• "system"->"method"; and Trudeau backed off.

  Show description for eb619f7
  jamesonquinn

  committed
  eb619f7

Commits on Jul 3, 2017

• draft rewriting

  jamesonquinn

  committed
  6c5eac0

Commits on Jul 30, 2017

• describe what I'm imagining

  jamesonquinn

  committed
  889881d

• more blurbs

  jamesonquinn

  committed
  ceab5d9

Commits on Jul 31, 2017

• wrote 2 more strategies. Maybe could do another. used 1 as lowest score for testing. need to change that back to 0.

  paretoman

  committed
  284d6eb

• connected config to strategy.

  paretoman

  committed
  456fb72

• spaces to tabs.

  paretoman

  committed
  dfe04e5

• different strategies for different voter groups.

  paretoman

  committed
  e52ce7d

Commits on Aug 1, 2017

• added strategies that rely on who the frontrunner is.

  paretoman

  committed
  2281a56

• Merge branch 'gh-pages' of https://github.com/electology/ballot into gh-pages

  paretoman

  committed
  6bcc06c

• Merge pull request #1 from paretoman/gh-pages

  Show description for ed2a6a3
  jamesonquinn

  authored
  ed2a6a3

• added strategy per ballot. added buttons for adjusting the number of strategic voters.

  paretoman

  committed
  191eb82

• Merge branch 'gh-pages' of https://github.com/electology/ballot into gh-pages

  paretoman

  committed
  92c001d

• put strategy into a function, to get ready to use it 3 times. also fixed bug with percent voter strategy.

  paretoman

  committed
  ea50301

• done making strategy into function.

  paretoman

  committed
  80f523b

• strategy for approval and 321. example for chicken dilemma

  paretoman

  committed
  64e05b3

• added star stragegy leaving room for 1st "starnormfrontrunners". gui improvement for 3 scores.

  paretoman

  committed
  0d251f6

• small bug

  paretoman

  committed
  12cb84b

Commits on Aug 2, 2017

• Merge pull request #2 from paretoman/gh-pages

  Show description for 5afa83f
  jamesonquinn

  authored
  5afa83f

• select percent strategy in UI.

  paretoman

  committed
  b36d66a

• preload images. fixes bug where candidates wouldn't show up.

  paretoman

  committed
  9913cd2

• fix slices display for score voter.

  paretoman

  committed
  3cc3bb2

• add strategy UI

  paretoman

  committed
  22cc56d

Commits on Aug 3, 2017

• switch to first set of voters for percentage control.

  paretoman

  committed
  679ee5e

• UI choose frontrunner

  paretoman

  committed
  249deee

• UI for unstrategic voters' strategy.

  paretoman

  committed
  c4d8735

• Merge pull request #3 from paretoman/gh-pages

  Show description for b33b58d
  jamesonquinn

  authored
  b33b58d

• UI for unstrategic voters' strategy.

  paretoman

  committed
  5b41f57

• small fixes.

  paretoman

  committed
  25b08db

• UI allow multiple frontrunners. (checkboxes).

  paretoman

  committed
  1a26383

• added strategy MTF. more TF. more threshold frontrunners. Approve of everyone better than the worst frontrunner.

  paretoman

  committed
  733a12d

• slider for strategy

  paretoman

  committed
  58cb422

• small fixes.

  paretoman

  committed
  33d32fa

• for a single ballot, let the user choose the strategy.

  paretoman

  committed
  45448b9

• add reset button to single ballots

  paretoman

  committed
  919956d

• smaller buttons, moving buttons.

  paretoman

  committed
  4e4e9cd

Commits on Aug 4, 2017

• merging

  paretoman

  committed
  bdb45ea

• UI add shapes to buttons.

  paretoman

  committed
  4149960

• small stuff.

  paretoman

  committed
  bfec26a

• added a "poll" button to select the winner as the frontrunner. (maybe will add more frontrunners later... how to define). also bug fix with shapes.

  paretoman

  committed
  2a7a4d7

• added "how strategic is each group of voters?". detail: config will keep track of all 3 voter groups.

  paretoman

  committed
  60d84d5

• added circles to show strategies.

  paretoman

  committed
  30fd48a

• Merge pull request #4 from paretoman/gh-pages

  Show description for 17d99f2
  jamesonquinn

  authored
  17d99f2

• added circles to show strategies.

  paretoman

  committed
  477ec7c

• Merge remote-tracking branch 'upstream/gh-pages' into gh-pages

  Show description for ee5c8d0
  paretoman

  committed
  ee5c8d0

• Merge pull request #5 from paretoman/gh-pages

  Show description for a00f35d
  jamesonquinn

  authored
  a00f35d

Commits on Aug 5, 2017

• added function jsave. run jsave(1) in the console when viewing a file like election11.html to automatically generate the json to copy and paste into a new version of election11.html

  paretoman

  committed
  572604b

• added back the ability to save. works using whatever base url you're currently at. saves the whole configurations

  paretoman

  committed
  3d685c3

• small fix.

  paretoman

  committed
  8cae168

• fixed saving. some things werent being updated before being saved: frontrunners and description.

  paretoman

  committed
  fbb6fd1

• Merge pull request #6 from paretoman/gh-pages

  Show description for 9a599d5
  jamesonquinn

  authored
  9a599d5

• added save button to all the election examples.

  paretoman

  committed
  608cbb4

• added tooltip for buttons

  paretoman

  committed
  a5bc96f

• added snowman. (first attempt at 3 voter sizes). todo: fine tuning

  paretoman

  committed
  1a393f4

• refined snowman. put 3 voters in a line.

  paretoman

  committed
  0d03389

• UI button and slider sizes. to make look nice.

  paretoman

  committed
  89e2066

• UI, rearranged sliders

  paretoman

  committed
  58cc07a

Commits on Aug 6, 2017

• added yee diagrams!

  paretoman

  committed
  61066a8

• striped ties. a yee diagram shows ties as two colors striped. merged in tie functionality from halfout's fork.

  paretoman

  committed
  b549fa7

• small fixes. config for yee object.

  paretoman

  committed
  2413eaf

• fix some things. yee loading on start if configured. fixed axis bug.

  paretoman

  committed
  cbd1bce

• make pretty yee diagram.

  paretoman

  committed
  7cbb36d

• Merge pull request #7 from paretoman/gh-pages

  Show description for 6904125
  jamesonquinn

  authored
  6904125

• faster. halfway there...

  paretoman

  committed
  10ce320

• yee: not much faster. but different. made custom scoring function that doesn't require as many square roots. just 2 instead of 5.

  paretoman

  committed
  cad4874

Commits on Aug 7, 2017

• tried another speed improvement... disabled right now while testing

  paretoman

  committed
  8dee139

• added ability to choose whether to include each side menu (feature).

  paretoman

  committed
  5f50e03

• added config button to change menus (and ability to save menu configuration)

  paretoman

  committed
  113ec96

• put UI config on top of menu. Unicode snowman. sizing windows. beginning top 2. so far just score. UI sliders for percent strategy only appear when there are enough voter groups.

  paretoman

  committed
  e62fd03

• added html for "best frontrunner" and "not the worst frontrunner" strategies.

  paretoman

  committed
  4605f42

• changed strategy names. also reduced number from 8 to 5.

  paretoman

  committed
  5fe2de1

• config reset fix. button sizes. star individual UI. need star strategies.

  paretoman

  committed
  873f922

• cleaned up examples. horizontal voter groups.

  paretoman

  committed
  ab5332c

• nice looking. better saving. you get the file name when you press save, it's in the console, along with the text to paste. also, took out the animated "oh no" to lighten the load. UI improvement: b…

  Show description for 1b8f5d3
  paretoman

  committed
  1b8f5d3

Commits on Aug 8, 2017

• moving from 1:5 to 0:5 scale and 1:3 to 0:2 scale.

  paretoman

  committed
  719f883

• changed strategy names to single letters.

  Show description for 6732518
  paretoman

  committed
  6732518

• Merge pull request #8 from paretoman/gh-pages

  Show description for 7dc55a6
  jamesonquinn

  authored
  7dc55a6

Commits on Aug 9, 2017

• top2 polling completed

  paretoman

  committed
  a6d0b44

Commits on Aug 10, 2017

• beginnings of "complete.html"

  jamesonquinn

  committed
  067b583

• added presets (phase 1)

  paretoman

  committed
  5344b0a

Commits on Aug 11, 2017

• trying to figure out how to reload all the

  paretoman

  committed
  ae1b52d

• works

  paretoman

  committed
  fa57b3d

• cleanup

  paretoman

  committed
  154b8c1

• moved all election configuration to one big file so that they can all get to one another through the menu rather than reloading the whole iframe.

  paretoman

  committed
  4eb2797

• small fix

  paretoman

  committed
  6f3f088

• kinda slow, but it's at least connected. it isn't using the combineKernels, which it should.

  paretoman

  committed
  5ada429

• adjusted the way pixels are drawn to make them align with the edge of the map. changed "density" to "pixelsize". new election15 just to show yee diagrams

  paretoman

  committed
  21c9f50

• kinda works. but gets the math wrong. also, works differently on different browsers. mobile chrome v mobile firefox

  paretoman

  committed
  2470276

Commits on Aug 12, 2017

• works! cool. there was a math bug %. and there was a switch in arguments with min and max. Also, there was a factor of 2 that might indicate something weird. Basically, writing the code in just jav…

  Show description for 886621c
  paretoman

  committed
  886621c

• UI: added compute method. also fixed some bugs unrelated to the compute method.

  paretoman

  committed
  a07e99a

• added ties. added frontrunners. (to array methods using cpu and gpu)

  paretoman

  committed
  3b41524

• small fix. variable name.

  paretoman

  committed
  dba913d

• adding SingleVoter to sandbox. Halfway there. Just need the ballot sheets.. The main arena is ready and the config menu is ready.

  paretoman

  committed
  b6f045b

• added ballot papers display. almost there. it still doesn't work if there are more than 3 candidates.

  paretoman

  committed
  b0af7a9

Commits on Aug 13, 2017

• single voter works. added images for 5 candidates (rather than just 3). also fixed the "voter number" button highlighting.

  paretoman

  committed
  052c302

• better images, alignment of ballot inside sandbox

  paretoman

  committed
  601cc9f

• added ability to access ballot presets from sandbox.

  paretoman

  committed
  0eca94d

• Merge pull request #9 from paretoman/gh-pages

  Show description for 751fafb
  jamesonquinn

  authored
  751fafb

• iframe communication: first success in sandbox, very rough.

  paretoman

  committed
  e78fbad

• cleaned up iframe communication

  paretoman

  committed
  8890131

• functional. scrolling triggers a change in the sidebar's election example.

  paretoman

  committed
  52c1c3d

• fixed side bar works but needs sizing css.

  paretoman

  committed
  6f55d86

• sidebar cleaned up a little with css.

  paretoman

  committed
  ad38472

• added FPTP strategy when there are 2 or more frontrunners. (same strategy for all choices of strategy except zero strategy) just pick the best frontrunner

  paretoman

  committed
  8fca75a

• replaced frontrunnerSet with preFrontrunnerIds, to be more descriptive.

  paretoman

  committed
  df0498b

• fix bug. organized voters.js so that there is less confusion about where to get info. not from config, but from model.

  paretoman

  committed
  35642ed

• took out "threshold" strategy.. basically this was bestwinner except with only one frontrunner, in which case you don't vote for the frontrunner, just those better.

  paretoman

  committed
  0be02e0

Commits on Aug 14, 2017

• cleaned up strategy (rewrote) in voters.js

  paretoman

  committed
  9b9f1a5

• small edits

  paretoman

  committed
  adac139

• started with some iframe stuff

  paretoman

  committed
  85b7c03

• load functionality works

  paretoman

  committed
  6a60ade

• proof of concept but needs some layout work

  paretoman

  committed
  39a00c0

• not really working

  paretoman

  committed
  a18d3e5

Commits on Aug 15, 2017

• kinda works, not good.

  paretoman

  committed
  3eadc8e

Commits on Aug 24, 2017

• sticky sidebar

  paretoman

  committed
  5925f41

• small fixes

  paretoman

  committed
  93dca5d

Commits on Aug 25, 2017

• added ability to keep config from last time. When the user makes some adjustments and then scrolls down the page, when he scrolls back up, he'll see the example the way he left it, instead of seein…

  Show description for 4938d2b
  paretoman

  committed
  4938d2b

• merged gh-pages into divnav, which was a separate branch but might almost be ready to replace gh-pages

  paretoman

  committed
  a88d97d

• ballot default positions

  paretoman

  committed
  967f8ba

• small fix - don't open external page when clicking nav links

  paretoman

  committed
  72afaee

• works, but work in progress on getting the nav buttons to point directly at their examples.

  paretoman

  committed
  39af82a

• Merge pull request #11 from paretoman/divnav

  Show description for ac867aa
  jamesonquinn

  authored
  ac867aa

• small fix - updates window size for nav anchors. added feature to allow the nav to put the words at a specified height on the page (in %).

  paretoman

  committed
  031dd09

Commits on Aug 28, 2017

• layout: small fix

  paretoman

  committed
  8bac598

• layout. small fixes

  paretoman

  committed
  27de751

• layout. centered vertically. nav inside iframe.

  paretoman

  committed
  4daad38

• small fixes

  paretoman

  committed
  0fa9c93

• Merge pull request #12 from paretoman/layout3

  Show description for 67c6c50
  jamesonquinn

  authored
  67c6c50

Commits on Sep 8, 2017

• Use mod, not random, for percentStrategy

  jamesonquinn

  committed
  31b36f6

• off-by-one error fix

  jamesonquinn

  committed
  a2bf1bc

• yet another version of the page

  jamesonquinn

  committed
  cf9cbf0

Commits on Feb 4, 2018

• check in my work

  jamesonquinn

  committed
  097e6be

Commits on Feb 5, 2018

• Merge branch 'ncase/gh-pages' into gh-pages

  Show description for 609fb40
  jamesonquinn

  committed
  609fb40