sapor 0.1b1 → 0.2a1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (324) hide show
  1. checksums.yaml +5 -5
  2. data/Example-Catalonia.md +361 -0
  3. data/Example-Flanders.md +486 -0
  4. data/Example-Greece.md +25 -0
  5. data/Example-Oslo.md +678 -0
  6. data/Example-UnitedKingdom-Referendum.md +132 -0
  7. data/Examples.md +9 -355
  8. data/README.md +41 -8
  9. data/bin/create_installation_package.sh +2 -2
  10. data/bin/install.sh +1 -1
  11. data/bin/sapor.rb +4 -2
  12. data/bin/sapor.sh +10 -9
  13. data/data/hu/hungary-2014.txt +1680 -0
  14. data/data/hu/hungary_2014_screen_scraper.rb +48 -0
  15. data/data/hu/hungary_2014_to_psv.rb +80 -0
  16. data/data/hu/index-2014.txt +106 -0
  17. data/data/pl/2015-gl-lis-okr.csv +42 -0
  18. data/data/pl/poland_2015_to_psv.rb +79 -0
  19. data/data/pl/poland_2015_to_psv_with_ko_and_rsw.rb +94 -0
  20. data/data/pl/poland_2015_to_psv_with_ko_konf_kp_l_and_zp.rb +100 -0
  21. data/data/pl/poland_2015_to_psv_with_ko_sld_and_wi.rb +92 -0
  22. data/data/pl/poland_2015_to_psv_with_sld.rb +84 -0
  23. data/data/pl/poland_2015_to_psv_with_sld_and_wi.rb +85 -0
  24. data/data/uk/inject_ukip_2015_as_brexit_2019_in_2017.rb +54 -0
  25. data/data/uk/united_kingdom_2015.txt +651 -0
  26. data/data/uk/united_kingdom_2015_to_psv.rb +104 -0
  27. data/data/uk/united_kingdom_2017.txt +651 -0
  28. data/data/uk/united_kingdom_2017_to_psv.rb +104 -0
  29. data/data/uk/united_kingdom_2017_to_psv_with_brexit_and_chuk.rb +113 -0
  30. data/data/uk/united_kingdom_2017_to_psv_with_tig.rb +111 -0
  31. data/lib/sapor/binomials_cache.rb +1 -1
  32. data/lib/sapor/combinations_distribution.rb +43 -1
  33. data/lib/sapor/denominators.rb +67 -0
  34. data/lib/sapor/dichotomies.rb +41 -1
  35. data/lib/sapor/dichotomy.rb +31 -5
  36. data/lib/sapor/first_past_the_post.rb +6 -2
  37. data/lib/sapor/largest_remainder.rb +118 -0
  38. data/lib/sapor/log4r_logger.rb +1 -1
  39. data/lib/sapor/log_facade.rb +1 -1
  40. data/lib/sapor/{leveled_proportional.rb → multi_district_leveled_proportional.rb} +7 -7
  41. data/lib/sapor/{proportional.rb → multi_district_proportional.rb} +27 -32
  42. data/lib/sapor/multi_district_variable_threshold_proportional.rb +128 -0
  43. data/lib/sapor/number_formatter.rb +1 -1
  44. data/lib/sapor/options.rb +73 -0
  45. data/lib/sapor/poll.rb +178 -29
  46. data/lib/sapor/polychotomy.rb +100 -259
  47. data/lib/sapor/pseudorandom_multirange_enumerator.rb +1 -1
  48. data/lib/sapor/referendum_polychotomy.rb +165 -0
  49. data/lib/sapor/regional_data/area.rb +4 -2
  50. data/lib/sapor/regional_data/austria.rb +84 -0
  51. data/lib/sapor/regional_data/belgium-brussels-2014.psv +46 -0
  52. data/lib/sapor/regional_data/belgium-brussels-20190526.psv +33 -0
  53. data/lib/sapor/regional_data/belgium-flanders-2014.psv +80 -0
  54. data/lib/sapor/regional_data/belgium-flanders-20190526.psv +74 -0
  55. data/lib/sapor/regional_data/belgium-wallonia-2014.psv +114 -0
  56. data/lib/sapor/regional_data/belgium-wallonia-20190526.psv +93 -0
  57. data/lib/sapor/regional_data/belgium.rb +97 -0
  58. data/lib/sapor/regional_data/belgium_brussels.rb +62 -0
  59. data/lib/sapor/regional_data/belgium_flanders.rb +64 -0
  60. data/lib/sapor/regional_data/belgium_wallonia.rb +63 -0
  61. data/lib/sapor/regional_data/catalonia-2012-2015.psv +1 -1
  62. data/lib/sapor/regional_data/catalonia-2012.psv +1 -1
  63. data/lib/sapor/regional_data/catalonia-2015-jxcat.psv +68 -0
  64. data/lib/sapor/regional_data/catalonia-2015-no-jxsi.psv +68 -0
  65. data/lib/sapor/regional_data/catalonia-2015.psv +63 -0
  66. data/lib/sapor/regional_data/catalonia-jxcat.rb +109 -0
  67. data/lib/sapor/regional_data/catalonia-no-jxsi.rb +96 -0
  68. data/lib/sapor/regional_data/catalonia.rb +27 -21
  69. data/lib/sapor/regional_data/denmark-20150618-with-e-and-p.psv +164 -0
  70. data/lib/sapor/regional_data/denmark-20150618-with-e.psv +153 -0
  71. data/lib/sapor/regional_data/denmark-20150618-with-p.psv +153 -0
  72. data/lib/sapor/regional_data/denmark-20150618.psv +142 -0
  73. data/lib/sapor/regional_data/denmark.rb +128 -0
  74. data/lib/sapor/regional_data/denmark_with_e.rb +128 -0
  75. data/lib/sapor/regional_data/denmark_with_e_and_p.rb +128 -0
  76. data/lib/sapor/regional_data/denmark_with_p.rb +128 -0
  77. data/lib/sapor/regional_data/estonia.rb +88 -0
  78. data/lib/sapor/regional_data/european-union-great-britain-20140522-brexit-chuk.psv +172 -0
  79. data/lib/sapor/regional_data/european-union-great-britain-20140522.psv +146 -0
  80. data/lib/sapor/regional_data/european-union-great-britain-20190523.psv +141 -0
  81. data/lib/sapor/regional_data/european-union-ireland-2014-ia-ri-sd.psv +64 -0
  82. data/lib/sapor/regional_data/european-union-ireland-2014-ia-sd.psv +60 -0
  83. data/lib/sapor/regional_data/european-union-ireland-2014-ia.psv +56 -0
  84. data/lib/sapor/regional_data/european-union-ireland-2014-sd.psv +56 -0
  85. data/lib/sapor/regional_data/european-union-ireland-2014.psv +50 -0
  86. data/lib/sapor/regional_data/european-union-ireland-20190524-ia.psv +58 -0
  87. data/lib/sapor/regional_data/european-union-ireland-20190524.psv +52 -0
  88. data/lib/sapor/regional_data/european_union_27_austria.rb +76 -0
  89. data/lib/sapor/regional_data/european_union_27_croatia.rb +81 -0
  90. data/lib/sapor/regional_data/european_union_27_denmark.rb +77 -0
  91. data/lib/sapor/regional_data/european_union_27_estonia.rb +74 -0
  92. data/lib/sapor/regional_data/european_union_27_finland.rb +74 -0
  93. data/lib/sapor/regional_data/european_union_27_ireland.rb +96 -0
  94. data/lib/sapor/regional_data/european_union_27_ireland_with_ia.rb +97 -0
  95. data/lib/sapor/regional_data/european_union_27_italy.rb +83 -0
  96. data/lib/sapor/regional_data/european_union_27_netherlands.rb +81 -0
  97. data/lib/sapor/regional_data/european_union_27_poland.rb +79 -0
  98. data/lib/sapor/regional_data/european_union_27_romania.rb +78 -0
  99. data/lib/sapor/regional_data/european_union_27_slovakia.rb +80 -0
  100. data/lib/sapor/regional_data/european_union_27_spain.rb +82 -0
  101. data/lib/sapor/regional_data/european_union_27_sweden.rb +76 -0
  102. data/lib/sapor/regional_data/european_union_austria.rb +76 -0
  103. data/lib/sapor/regional_data/european_union_bulgaria.rb +81 -0
  104. data/lib/sapor/regional_data/european_union_croatia.rb +81 -0
  105. data/lib/sapor/regional_data/european_union_cyprus.rb +72 -0
  106. data/lib/sapor/regional_data/european_union_czech_republic.rb +82 -0
  107. data/lib/sapor/regional_data/european_union_denmark.rb +77 -0
  108. data/lib/sapor/regional_data/european_union_estonia.rb +74 -0
  109. data/lib/sapor/regional_data/european_union_finland.rb +74 -0
  110. data/lib/sapor/regional_data/european_union_flanders.rb +74 -0
  111. data/lib/sapor/regional_data/european_union_france.rb +84 -0
  112. data/lib/sapor/regional_data/european_union_france_2019.rb +84 -0
  113. data/lib/sapor/regional_data/european_union_french_community_of_belgium.rb +73 -0
  114. data/lib/sapor/regional_data/european_union_germany.rb +86 -0
  115. data/lib/sapor/regional_data/european_union_great_britain.rb +98 -0
  116. data/lib/sapor/regional_data/european_union_greece.rb +77 -0
  117. data/lib/sapor/regional_data/european_union_hungary.rb +76 -0
  118. data/lib/sapor/regional_data/european_union_ireland.rb +96 -0
  119. data/lib/sapor/regional_data/european_union_ireland_with_ia.rb +97 -0
  120. data/lib/sapor/regional_data/european_union_italy.rb +83 -0
  121. data/lib/sapor/regional_data/european_union_latvia.rb +81 -0
  122. data/lib/sapor/regional_data/european_union_lithuania.rb +80 -0
  123. data/lib/sapor/regional_data/european_union_luxembourg.rb +75 -0
  124. data/lib/sapor/regional_data/european_union_malta.rb +71 -0
  125. data/lib/sapor/regional_data/european_union_netherlands.rb +81 -0
  126. data/lib/sapor/regional_data/european_union_northern_ireland.rb +75 -0
  127. data/lib/sapor/regional_data/european_union_poland.rb +79 -0
  128. data/lib/sapor/regional_data/european_union_portugal.rb +75 -0
  129. data/lib/sapor/regional_data/european_union_romania.rb +78 -0
  130. data/lib/sapor/regional_data/european_union_slovakia.rb +81 -0
  131. data/lib/sapor/regional_data/european_union_slovenia.rb +85 -0
  132. data/lib/sapor/regional_data/european_union_spain.rb +82 -0
  133. data/lib/sapor/regional_data/european_union_sweden.rb +76 -0
  134. data/lib/sapor/regional_data/finland-20150419-with-sin.psv +224 -0
  135. data/lib/sapor/regional_data/finland-20150419.psv +212 -0
  136. data/lib/sapor/regional_data/finland.rb +107 -0
  137. data/lib/sapor/regional_data/finland_with_sin.rb +107 -0
  138. data/lib/sapor/regional_data/flanders-2014.psv +96 -0
  139. data/lib/sapor/regional_data/flanders-20190526.psv +87 -0
  140. data/lib/sapor/regional_data/flanders.rb +115 -0
  141. data/lib/sapor/regional_data/france.rb +38 -0
  142. data/lib/sapor/regional_data/greece.rb +92 -0
  143. data/lib/sapor/regional_data/hungary-2014.psv +2104 -0
  144. data/lib/sapor/regional_data/hungary.rb +116 -0
  145. data/lib/sapor/regional_data/iceland-20161029-midflokkurinn.psv +94 -0
  146. data/lib/sapor/regional_data/iceland-20161029.psv +88 -0
  147. data/lib/sapor/regional_data/iceland-20171028.psv +85 -0
  148. data/lib/sapor/regional_data/iceland.rb +133 -0
  149. data/lib/sapor/regional_data/latvia-20141004-kpv-p-par.psv +109 -0
  150. data/lib/sapor/regional_data/latvia-20141004-kpv-par.psv +103 -0
  151. data/lib/sapor/regional_data/latvia-20141004-kpv.psv +97 -0
  152. data/lib/sapor/regional_data/latvia-20141004.psv +89 -0
  153. data/lib/sapor/regional_data/latvia.rb +112 -0
  154. data/lib/sapor/regional_data/latvia_kpv.rb +112 -0
  155. data/lib/sapor/regional_data/latvia_kpv_p_par.rb +112 -0
  156. data/lib/sapor/regional_data/latvia_kpv_par.rb +112 -0
  157. data/lib/sapor/regional_data/luxembourg-20131020.psv +76 -0
  158. data/lib/sapor/regional_data/luxembourg.rb +82 -0
  159. data/lib/sapor/regional_data/netherlands.rb +108 -0
  160. data/lib/sapor/regional_data/norway.rb +85 -68
  161. data/lib/sapor/regional_data/norwegian_municipality.rb +68 -0
  162. data/lib/sapor/regional_data/poland-20151025-with-ko-and-l-without-n-po-r-and-zl.psv +321 -0
  163. data/lib/sapor/regional_data/poland-20151025-with-ko-konf-kp-l-and-zp-without-k-k15-n-pis-po-psl-r-and-zl.psv +280 -0
  164. data/lib/sapor/regional_data/poland-20151025-with-ko-sld-and-wi-without-n-po-and-zl.psv +403 -0
  165. data/lib/sapor/regional_data/poland-20151025-with-sld-and-wi-without-zl.psv +444 -0
  166. data/lib/sapor/regional_data/poland-20151025-with-sld-without-zl.psv +403 -0
  167. data/lib/sapor/regional_data/poland-20151025.psv +403 -0
  168. data/lib/sapor/regional_data/poland.rb +125 -0
  169. data/lib/sapor/regional_data/poland_with_ko_and_l_without_n_po_r_and_zl.rb +122 -0
  170. data/lib/sapor/regional_data/poland_with_ko_konf_kp_l_and_zp_without_k_k15_n_pis_po_psl_r_and_zl.rb +123 -0
  171. data/lib/sapor/regional_data/poland_with_ko_sld_and_wi_without_n_po_and_zl.rb +125 -0
  172. data/lib/sapor/regional_data/poland_with_sld_and_wi_without_zl.rb +126 -0
  173. data/lib/sapor/regional_data/poland_with_sld_without_zl.rb +126 -0
  174. data/lib/sapor/regional_data/portugal-20151004-with-a-and-ch-without-paf.psv +438 -0
  175. data/lib/sapor/regional_data/portugal-20151004-with-a-and-il-without-paf.psv +438 -0
  176. data/lib/sapor/regional_data/portugal-20151004-with-a-ch-and-il-without-paf.psv +461 -0
  177. data/lib/sapor/regional_data/portugal-20151004-with-a-without-paf.psv +415 -0
  178. data/lib/sapor/regional_data/portugal-20151004-with-ch-and-il-without-paf.psv +438 -0
  179. data/lib/sapor/regional_data/portugal-20151004-without-paf.psv +392 -0
  180. data/lib/sapor/regional_data/portugal-20151004.psv +370 -0
  181. data/lib/sapor/regional_data/portugal.rb +101 -0
  182. data/lib/sapor/regional_data/portugal_with_a_and_ch_without_paf.rb +92 -0
  183. data/lib/sapor/regional_data/portugal_with_a_and_il_without_paf.rb +92 -0
  184. data/lib/sapor/regional_data/portugal_with_a_ch_and_il_without_paf.rb +92 -0
  185. data/lib/sapor/regional_data/portugal_with_a_without_paf.rb +92 -0
  186. data/lib/sapor/regional_data/portugal_with_ch_and_il_without_paf.rb +92 -0
  187. data/lib/sapor/regional_data/portugal_without_paf.rb +92 -0
  188. data/lib/sapor/regional_data/slovakia.rb +81 -0
  189. data/lib/sapor/regional_data/slovenia.rb +114 -0
  190. data/lib/sapor/regional_data/spain-20160626.psv +619 -0
  191. data/lib/sapor/regional_data/spain.rb +136 -0
  192. data/lib/sapor/regional_data/sweden.rb +92 -0
  193. data/lib/sapor/regional_data/sweden_20140914.rb +89 -0
  194. data/lib/sapor/regional_data/united_kingdom-2015.psv +4358 -0
  195. data/lib/sapor/regional_data/united_kingdom-20170608-brexit-chuk.psv +5154 -0
  196. data/lib/sapor/regional_data/united_kingdom-20170608-brexit.psv +4521 -0
  197. data/lib/sapor/regional_data/united_kingdom-20170608-tig.psv +4529 -0
  198. data/lib/sapor/regional_data/united_kingdom-20170608.psv +3894 -0
  199. data/lib/sapor/regional_data/united_kingdom.rb +57 -1038
  200. data/lib/sapor/regional_data/united_kingdom_with_brexit.rb +110 -0
  201. data/lib/sapor/regional_data/united_kingdom_with_brexit_and_chuk.rb +111 -0
  202. data/lib/sapor/regional_data/united_kingdom_with_tig.rb +111 -0
  203. data/lib/sapor/regional_data/utopia.rb +2 -2
  204. data/lib/sapor/regional_data/wallonia-2014.psv +101 -0
  205. data/lib/sapor/regional_data/wallonia.rb +97 -0
  206. data/lib/sapor/representatives_polychotomy.rb +338 -0
  207. data/lib/sapor/single_district_proportional.rb +75 -0
  208. data/lib/sapor.rb +112 -6
  209. data/sapor.gemspec +2 -2
  210. data/spec/integration/area_spec.rb +2 -2
  211. data/spec/integration/poll_spec.rb +6 -1
  212. data/spec/integration/sample.poll +2 -1
  213. data/spec/spec_helper.rb +2 -2
  214. data/spec/unit/area_spec.rb +12 -12
  215. data/spec/unit/austria_spec.rb +76 -0
  216. data/spec/unit/belgium_brussels_spec.rb +58 -0
  217. data/spec/unit/belgium_flanders_spec.rb +62 -0
  218. data/spec/unit/belgium_spec.rb +26 -0
  219. data/spec/unit/belgium_wallonia_spec.rb +65 -0
  220. data/spec/unit/binomials_cache_spec.rb +1 -1
  221. data/spec/unit/catalonia_spec.rb +21 -29
  222. data/spec/unit/combinations_distribution_spec.rb +1 -1
  223. data/spec/unit/denmark_spec.rb +56 -0
  224. data/spec/unit/denmark_with_e_and_p_spec.rb +58 -0
  225. data/spec/unit/denmark_with_e_spec.rb +57 -0
  226. data/spec/unit/denmark_with_p_spec.rb +57 -0
  227. data/spec/unit/denominators_spec.rb +8 -2
  228. data/spec/unit/dichotomies_spec.rb +1 -1
  229. data/spec/unit/dichotomy_spec.rb +1 -1
  230. data/spec/unit/estonia_spec.rb +65 -0
  231. data/spec/unit/european_union_27_austria_spec.rb +61 -0
  232. data/spec/unit/european_union_27_croatia_spec.rb +60 -0
  233. data/spec/unit/european_union_27_denmark_spec.rb +62 -0
  234. data/spec/unit/european_union_27_estonia_spec.rb +94 -0
  235. data/spec/unit/european_union_27_finland_spec.rb +75 -0
  236. data/spec/unit/european_union_27_ireland_spec.rb +72 -0
  237. data/spec/unit/european_union_27_ireland_with_ia_spec.rb +74 -0
  238. data/spec/unit/european_union_27_italy_spec.rb +69 -0
  239. data/spec/unit/european_union_27_netherlands_spec.rb +81 -0
  240. data/spec/unit/european_union_27_poland_spec.rb +69 -0
  241. data/spec/unit/european_union_27_romania_spec.rb +67 -0
  242. data/spec/unit/european_union_27_slovakia_spec.rb +111 -0
  243. data/spec/unit/european_union_27_spain_spec.rb +130 -0
  244. data/spec/unit/european_union_27_sweden_spec.rb +89 -0
  245. data/spec/unit/european_union_austria_spec.rb +61 -0
  246. data/spec/unit/european_union_bulgaria_spec.rb +97 -0
  247. data/spec/unit/european_union_croatia_spec.rb +59 -0
  248. data/spec/unit/european_union_cyprus_spec.rb +65 -0
  249. data/spec/unit/european_union_czech_republic_spec.rb +125 -0
  250. data/spec/unit/european_union_denmark_spec.rb +61 -0
  251. data/spec/unit/european_union_estonia_spec.rb +93 -0
  252. data/spec/unit/european_union_finland_spec.rb +75 -0
  253. data/spec/unit/european_union_flanders_spec.rb +56 -0
  254. data/spec/unit/european_union_france_2019_spec.rb +73 -0
  255. data/spec/unit/european_union_france_spec.rb +73 -0
  256. data/spec/unit/european_union_french_community_of_belgium_spec.rb +61 -0
  257. data/spec/unit/european_union_germany_spec.rb +90 -0
  258. data/spec/unit/european_union_great_britain_spec.rb +87 -0
  259. data/spec/unit/european_union_greece_spec.rb +148 -0
  260. data/spec/unit/european_union_hungary_spec.rb +57 -0
  261. data/spec/unit/european_union_ireland_spec.rb +72 -0
  262. data/spec/unit/european_union_ireland_with_ia_spec.rb +74 -0
  263. data/spec/unit/european_union_italy_spec.rb +69 -0
  264. data/spec/unit/european_union_latvia_spec.rb +76 -0
  265. data/spec/unit/european_union_lithuania_spec.rb +68 -0
  266. data/spec/unit/european_union_luxembourg_spec.rb +63 -0
  267. data/spec/unit/european_union_malta_spec.rb +60 -0
  268. data/spec/unit/european_union_netherlands_spec.rb +81 -0
  269. data/spec/unit/european_union_northern_ireland_spec.rb +66 -0
  270. data/spec/unit/european_union_poland_spec.rb +69 -0
  271. data/spec/unit/european_union_portugal_spec.rb +77 -0
  272. data/spec/unit/european_union_romania_spec.rb +67 -0
  273. data/spec/unit/european_union_slovakia_spec.rb +111 -0
  274. data/spec/unit/european_union_slovenia_spec.rb +77 -0
  275. data/spec/unit/european_union_spain_spec.rb +129 -0
  276. data/spec/unit/european_union_sweden_spec.rb +89 -0
  277. data/spec/unit/finland_spec.rb +65 -0
  278. data/spec/unit/finland_with_sin_spec.rb +67 -0
  279. data/spec/unit/first_past_the_post_spec.rb +6 -5
  280. data/spec/unit/flanders_spec.rb +70 -0
  281. data/spec/unit/france_spec.rb +32 -0
  282. data/spec/unit/greece_spec.rb +118 -0
  283. data/spec/unit/hungary_spec.rb +132 -0
  284. data/spec/unit/iceland_spec.rb +57 -0
  285. data/spec/unit/largest_remainder_spec.rb +79 -0
  286. data/spec/unit/latvia_kpv_p_par_spec.rb +38 -0
  287. data/spec/unit/latvia_kpv_par_spec.rb +38 -0
  288. data/spec/unit/latvia_kpv_spec.rb +38 -0
  289. data/spec/unit/latvia_spec.rb +60 -0
  290. data/spec/unit/luxembourg_spec.rb +54 -0
  291. data/spec/unit/{leveled_proportional_spec.rb → multi_district_leveled_proportional_spec.rb} +12 -14
  292. data/spec/unit/{proportional_spec.rb → multi_district_proportional_spec.rb} +11 -16
  293. data/spec/unit/netherlands_spec.rb +107 -0
  294. data/spec/unit/norway_spec.rb +23 -6
  295. data/spec/unit/norwegian_municipality_spec.rb +89 -0
  296. data/spec/unit/number_formatter_spec.rb +1 -1
  297. data/spec/unit/poland_spec.rb +62 -0
  298. data/spec/unit/poland_with_ko_and_l_without_n_po_r_and_zl_spec.rb +60 -0
  299. data/spec/unit/poland_with_ko_konf_kp_l_and_zp_without_k_k15_n_pis_po_psl_r_and_zl_spec.rb +59 -0
  300. data/spec/unit/poland_with_ko_sld_and_wi_without_n_po_and_zl_spec.rb +62 -0
  301. data/spec/unit/poland_with_sld_and_wi_without_zl_spec.rb +63 -0
  302. data/spec/unit/poland_with_sld_without_zl_spec.rb +62 -0
  303. data/spec/unit/poll_spec.rb +8 -3
  304. data/spec/unit/portugal_spec.rb +66 -0
  305. data/spec/unit/portugal_with_a_and_ch_without_paf_spec.rb +68 -0
  306. data/spec/unit/portugal_with_a_and_il_without_paf_spec.rb +68 -0
  307. data/spec/unit/portugal_with_a_ch_and_il_without_paf_spec.rb +69 -0
  308. data/spec/unit/portugal_with_a_without_paf_spec.rb +67 -0
  309. data/spec/unit/portugal_with_ch_and_il_without_paf_spec.rb +68 -0
  310. data/spec/unit/portugal_without_paf_spec.rb +66 -0
  311. data/spec/unit/pseudorandom_multirange_enumerator_spec.rb +1 -1
  312. data/spec/unit/referendum_polychotomy_spec.rb +289 -0
  313. data/spec/unit/{polychotomy_spec.rb → representatives_polychotomy_spec.rb} +26 -26
  314. data/spec/unit/slovakia_spec.rb +99 -0
  315. data/spec/unit/slovenia_spec.rb +80 -0
  316. data/spec/unit/spain_spec.rb +101 -0
  317. data/spec/unit/sweden_20140914_spec.rb +112 -0
  318. data/spec/unit/sweden_spec.rb +113 -0
  319. data/spec/unit/united_kingdom_spec.rb +65 -0
  320. data/spec/unit/united_kingdom_with_brexit_and_chuk_spec.rb +67 -0
  321. data/spec/unit/united_kingdom_with_brexit_spec.rb +66 -0
  322. data/spec/unit/united_kingdom_with_tig_spec.rb +66 -0
  323. data/spec/unit/wallonia_spec.rb +130 -0
  324. metadata +381 -11
@@ -1,7 +1,7 @@
1
1
  # encoding: utf-8
2
2
  #
3
3
  # Statistical Analysis of Polling Results (SAPoR)
4
- # Copyright (C) 2014 Filip van Laenen <f.a.vanlaenen@ieee.org>
4
+ # Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
5
5
  #
6
6
  # This file is part of SAPoR.
7
7
  #
@@ -17,37 +17,32 @@
17
17
  # You can find a copy of the GNU General Public License in /doc/gpl.txt
18
18
  #
19
19
 
20
- require 'prime'
21
-
22
20
  module Sapor
23
21
  #
24
- # Represents a polychotomy.
22
+ # Superclass for polychotomies.
25
23
  #
26
24
  class Polychotomy
27
- include NumberFormatter
28
-
29
25
  attr_reader :error_estimate, :no_of_data_points, :no_of_simulations
30
26
 
31
27
  def initialize(results, area, dichotomies, max_error)
32
- @results = results
33
- @area = area
34
- @choices = results.keys
35
- @coalitions = area.coalitions
36
- @ranges = extract_ranges_from_dichotomies(dichotomies, max_error)
37
- range_sizes = @ranges.values.map(&:size)
38
- @enum = PseudoRandomMultiRangeEnumerator.new(range_sizes).each
39
- @no_of_simulations = 0
40
- @no_of_data_points = 0
41
- @distributions = create_new_votes_distributions # TODO: Rename to @votes
42
- @seats = create_new_seats_distributions
43
- @comparisons = {}
44
- @choices.each do |a|
45
- @choices.each do |b|
46
- @comparisons[a + '>' + b] = 0.to_lf
47
- end
28
+ initialize_static_information(results, area, dichotomies, max_error)
29
+ initialize_calculation_information
30
+ end
31
+
32
+ def most_probable_fraction(key)
33
+ if @no_of_simulations == 0
34
+ nil
35
+ else
36
+ calculate_most_probable_fraction(key, @votes)
37
+ end
38
+ end
39
+
40
+ def most_probable_value(key)
41
+ if @no_of_simulations == 0
42
+ nil
43
+ else
44
+ @votes[key].most_probable_value
48
45
  end
49
- @combinations_sum = 0.to_lf
50
- @error_estimate = 1.0
51
46
  end
52
47
 
53
48
  def range(choice)
@@ -58,95 +53,55 @@ module Sapor
58
53
  @enum.size
59
54
  end
60
55
 
61
- def most_probable_value(key)
62
- if @no_of_simulations == 0
63
- nil
64
- else
65
- @distributions[key].most_probable_value
56
+ def encode_with(coder)
57
+ (instance_variables - [:@area, :@enum, :@logger]).each do |var|
58
+ var = var.to_s
59
+ coder[var.gsub('@', '')] = eval(var)
66
60
  end
67
61
  end
68
-
69
- def calculate_most_probable_fraction(key, distributions)
70
- distributions[key].most_probable_value.to_f / @area.population_size
62
+
63
+ def revive_volatile_fields(logger = nil)
64
+ @area = Poll.lookup_area(@area_code)
65
+ @enum = create_enumerator(@ranges)
66
+ @logger = logger
67
+ 1.upto(@no_of_data_points).each { |i| @enum.next() }
71
68
  end
69
+
70
+ private
72
71
 
73
- def most_probable_fraction(key)
74
- if @no_of_simulations == 0
75
- nil
76
- else
77
- calculate_most_probable_fraction(key, @distributions)
78
- end
72
+ def calculate_most_probable_fraction(key, votes)
73
+ votes[key].most_probable_value.to_f / @area.population_size
79
74
  end
80
75
 
81
- def refine
82
- no_of_new_simulations = 0
83
- new_votes = create_new_votes_distributions
84
- new_seats = create_new_seats_distributions
85
- while @no_of_data_points == 0 || no_of_new_simulations == 0 ||
86
- no_of_new_simulations < @no_of_simulations
87
- no_of_new_simulations += try_next_data_point(new_votes, new_seats)
88
- end
89
- unless @no_of_simulations == 0
90
- @error_estimate = calculate_error_estimate(new_votes)
91
- end
92
- @distributions = merge_distributions(@distributions, new_votes)
93
- @seats = merge_distributions(@seats, new_seats)
94
- @no_of_simulations += no_of_new_simulations
76
+ def calculate_most_probable_rounded_fraction(key, votes)
77
+ votes[key].most_probable_rounded_fraction(@area.population_size)
95
78
  end
96
79
 
97
- def try_next_data_point(new_votes, new_seats)
98
- data_point = next_data_point
99
- if data_point[OTHER] >= 0
100
- simulate(new_votes, new_seats, data_point)
101
- new_simulation = 1
102
- else
103
- new_simulation = 0
80
+ def create_comparisons(choices)
81
+ comparisons = {}
82
+ choices.each do |a|
83
+ choices.each do |b|
84
+ comparisons[a + '>' + b] = 0.to_lf
85
+ end
104
86
  end
105
- @no_of_data_points += 1
106
- new_simulation
87
+ comparisons
107
88
  end
108
89
 
109
- def report
110
- choice_lengths = @choices.map(&:length)
111
- choice_lengths << 6
112
- max_choice_width = choice_lengths.max
113
- max_seats_width = @area.no_of_seats.to_s.size
114
- sorted_choices = sort_choices_by_result
115
- choice_lines = sorted_choices.map.with_index do |choice, i|
116
- next_choice = sorted_choices[i + 1]
117
- create_choice_report_line(choice, next_choice, max_choice_width, max_seats_width)
118
- end
119
- coalition_lengths = @coalitions.map { |coalition| coalition_label(coalition).length }
120
- coalition_lengths << 6
121
- max_coalition_width = coalition_lengths.max
122
- sorted_coalitions = sort_coalitions_by_result
123
- coalition_lines = sorted_coalitions.map do |coalition|
124
- create_coalition_report_line(coalition, max_coalition_width, max_seats_width)
125
- end
126
- 'Most probable rounded fractions, fractions and 95% confidence' \
127
- " intervals:\n" + 'Choice'.ljust(max_choice_width) +
128
- " Result MPRF MPF CI(95%) P(>↓) Seats\n" +
129
- choice_lines.join("\n") + "\n" +
130
- 'Coalition'.ljust(max_coalition_width) + " Result MPRF MPF" +
131
- " CI(95%) P(>50%) Seats P(>50%)\n" +
132
- coalition_lines.join("\n")
90
+ def create_enumerator(ranges)
91
+ range_sizes = ranges.values.map(&:size)
92
+ PseudoRandomMultiRangeEnumerator.new(range_sizes).each
133
93
  end
134
94
 
135
- def progress_report
136
- space_size_ratio = space_size / @no_of_data_points
137
- if space_size_ratio > 10
138
- space_size_ratio = with_thousands_separator(space_size_ratio.round)
139
- else
140
- space_size_ratio = space_size_ratio.round(1)
95
+ def create_rankings(choices)
96
+ rankings = {}
97
+ choices.each do |choice|
98
+ 1.upto(choices.size).each do |i|
99
+ rankings[choice + '@' + (i - 1).to_s] = 0.to_lf
100
+ end
141
101
  end
142
- "#{with_thousands_separator(@no_of_simulations)} simulations out of " \
143
- "#{with_thousands_separator(@no_of_data_points)} data" \
144
- " points, 1 / #{space_size_ratio} of search space size" \
145
- " (#{with_thousands_separator(space_size)})."
102
+ rankings
146
103
  end
147
104
 
148
- private
149
-
150
105
  def extract_ranges_from_dichotomies(dichotomies, max_error)
151
106
  ranges = {}
152
107
  level = 1 - (max_error**2)
@@ -159,37 +114,36 @@ module Sapor
159
114
  ranges
160
115
  end
161
116
 
162
- def create_new_seats_distributions
163
- distributions = {}
164
- @choices.each do |choice|
165
- distributions[choice] = CombinationsDistribution.new
166
- Range.new(0, @area.no_of_seats).each do |value|
167
- distributions[choice][value] = 0.to_lf
168
- end
169
- end
170
- @coalitions.each do |coalition|
171
- distributions[coalition] = CombinationsDistribution.new
172
- Range.new(0, @area.no_of_seats).each do |value|
173
- distributions[coalition][value] = 0.to_lf
174
- end
175
- end
176
- distributions
117
+ def initialize_calculation_information
118
+ @enum = create_enumerator(@ranges)
119
+ @no_of_simulations = 0
120
+ @no_of_data_points = 0
121
+ @combinations_sum = 0.to_lf
122
+ @error_estimate = 1.0
123
+ @votes = create_new_votes_distributions
177
124
  end
178
125
 
179
- def create_new_votes_distributions
180
- distributions = {}
181
- @choices.each do |choice|
182
- unless choice == OTHER
183
- distributions[choice] = CombinationsDistribution.new
184
- @ranges[choice].each do |value|
185
- distributions[choice][value] = 0.to_lf
186
- end
187
- end
188
- end
189
- @coalitions.each do |coalition|
190
- distributions[coalition] = CombinationsDistribution.new
126
+ def initialize_static_information(results, area, dichotomies, max_error)
127
+ @results = results
128
+ @area = area
129
+ @area_code = area.area_code
130
+ @choices = results.keys
131
+ @comparisons = create_comparisons(@choices)
132
+ @rankings = create_rankings(@choices)
133
+ @ranges = extract_ranges_from_dichotomies(dichotomies, max_error)
134
+ end
135
+
136
+ def larger_than(a, b)
137
+ probability = @comparisons[a + '>' + b] / @combinations_sum
138
+ probability.mantissa * (10**probability.exponent)
139
+ end
140
+
141
+ def most_probable_rounded_fraction(key)
142
+ if @no_of_simulations == 0
143
+ nil
144
+ else
145
+ calculate_most_probable_rounded_fraction(key, @votes)
191
146
  end
192
- distributions
193
147
  end
194
148
 
195
149
  def next_data_point
@@ -202,74 +156,13 @@ module Sapor
202
156
  data_point
203
157
  end
204
158
 
205
- def simulate(votes, seats, data_point)
206
- combinations = 1.to_lf
207
- data_point.each do |choice, value|
208
- combinations *= BinomialsCache.binomial(value, @results[choice])
209
- end
210
- @combinations_sum += combinations
211
- data_point.each do |choice, value|
212
- votes[choice][value] += combinations unless choice == OTHER
213
- end
214
- @choices.each do |a|
215
- @choices.each do |b|
216
- if data_point[a] > data_point[b]
217
- @comparisons[a + '>' + b] += combinations
218
- end
219
- end
220
- end
221
- @coalitions.each do |coalition|
222
- coalition_value = coalition.map { |choice| data_point.key?(choice) ? data_point[choice] : 0}.inject(:+)
223
- if votes[coalition][coalition_value].nil?
224
- votes[coalition][coalition_value] = combinations
225
- else
226
- votes[coalition][coalition_value] += combinations
227
- end
228
- end
229
- projection = @area.seats(data_point)
230
- @choices.each do |choice|
231
- if projection.key?(choice)
232
- seats[choice][projection[choice]] += combinations
233
- else
234
- seats[choice][0] += combinations
235
- end
236
- end
237
- @coalitions.each do |coalition|
238
- coalition_value = coalition.map { |choice| projection.key?(choice) ? projection[choice] : 0}.inject(:+)
239
- if seats[coalition][coalition_value].nil?
240
- seats[coalition][coalition_value] = combinations
241
- else
242
- seats[coalition][coalition_value] += combinations
243
- end
244
- end
245
- end
246
-
247
- def calculate_error_estimate(new_simulations)
248
- error_estimate = 0
249
- @choices.each do |choice|
250
- unless choice == OTHER
251
- mpv_new = calculate_most_probable_fraction(choice, new_simulations)
252
- mpv_old = calculate_most_probable_fraction(choice, @distributions)
253
- delta = (mpv_new - mpv_old).abs
254
- error_estimate = [error_estimate, delta].max
255
- end
256
- end
257
- error_estimate
159
+ def ranking(choice, i)
160
+ probability = @rankings[choice + '@' + i.to_s] / @combinations_sum
161
+ probability.mantissa * (10**probability.exponent)
258
162
  end
259
163
 
260
- def merge_distributions(distributions1, distributions2)
261
- merged_distributions = {}
262
- @choices.each do |choice|
263
- unless choice == OTHER
264
- merged_distributions[choice] = distributions1[choice] + \
265
- distributions2[choice]
266
- end
267
- end
268
- @coalitions.each do |coalition|
269
- merged_distributions[coalition] = distributions1[coalition] + \
270
- distributions2[coalition]
271
- end
272
- merged_distributions
164
+ def result(choice)
165
+ @results[choice].to_f / @results.values.inject(:+)
273
166
  end
274
167
 
275
168
  def sort_choices_by_result
@@ -283,77 +176,25 @@ module Sapor
283
176
  end
284
177
  end
285
178
  end
286
-
287
- def coalition_label(coalition)
288
- coalition.sort.join(' + ')
289
- end
290
-
291
- def sort_coalitions_by_result
292
- @coalitions.sort do |a, b|
293
- comparison = result(b) <=> result(a)
294
- if comparison == 0
295
- coalition_label(a) <=> coalition_label(b)
296
- else
297
- comparison
179
+
180
+ def write_rankings(filename)
181
+ ci_filename = filename.gsub('.poll', '-polychotomy-rankings.psv')
182
+ File.open(ci_filename, 'w') do |file|
183
+ file.puts('Choice | ' + 0.upto(@choices.size - 1).map {|i| i + 1}.join(' | '))
184
+ @choices.each do | choice |
185
+ file.puts(choice + ' | ' + 0.upto(@choices.size - 1).map {|i| ranking(choice, i)}.join(' | '))
298
186
  end
299
187
  end
300
188
  end
301
-
302
- def result(choice)
303
- @results[choice].to_f / @results.values.inject(:+)
304
- end
305
-
306
- def coalition_result(coalition)
307
- coalition.map { |choice| @results[choice].to_f }.inject(:+) / @results.values.inject(:+)
308
- end
309
-
310
- def larger_than(a, b)
311
- probability = @comparisons[a + '>' + b] / @combinations_sum
312
- probability.mantissa * (10**probability.exponent)
313
- end
314
-
315
- def create_choice_report_line(choice, next_choice, max_choice_width, max_seats_width)
316
- ci_values = @distributions[choice].confidence_interval(0.95)
317
- confidence_interval = ci_values.map { |x| x.to_f / @area.population_size }
318
- ci_seats = @seats[choice].confidence_interval(0.95)
319
- choice.ljust(max_choice_width) + ' ' + \
320
- six_char_percentage(result(choice)) + ' ' + \
321
- six_char_percentage(most_probable_rounded_fraction(choice)) + ' ' + \
322
- six_char_percentage(most_probable_fraction(choice)) + ' ' + \
323
- six_char_percentage(confidence_interval.first) + '–' + \
324
- six_char_percentage(confidence_interval.last) + ' ' + \
325
- (next_choice.nil? ? ' ' : six_char_percentage(larger_than(choice, next_choice))) + ' ' + \
326
- (max_seats_width == 1 ? ' ' : '') + \
327
- ci_seats.first.to_s.rjust(max_seats_width) + '–' + \
328
- ci_seats.last.to_s.rjust(max_seats_width)
329
- end
330
-
331
- def create_coalition_report_line(coalition, max_coalition_width, max_seats_width)
332
- ci_values = @distributions[coalition].confidence_interval(0.95)
333
- majority_votes_probability = @distributions[coalition].threshold_probability(0.5, @area.population_size)
334
- confidence_interval = ci_values.map { |x| x.to_f / @area.population_size }
335
- ci_seats = @seats[coalition].confidence_interval(0.95)
336
- seats_majority = 1 + @area.no_of_seats / 2
337
- majority_seats_probability = @seats[coalition].value_threshold_probability(seats_majority)
338
- coalition_label(coalition).ljust(max_coalition_width) + ' ' + \
339
- six_char_percentage(coalition_result(coalition)) + ' ' + \
340
- six_char_percentage(most_probable_rounded_fraction(coalition)) + ' ' + \
341
- six_char_percentage(most_probable_fraction(coalition)) + ' ' + \
342
- six_char_percentage(confidence_interval.first) + '–' + \
343
- six_char_percentage(confidence_interval.last) + ' ' + \
344
- six_char_percentage(majority_votes_probability) + ' ' + \
345
- (max_seats_width == 1 ? ' ' : '') + \
346
- ci_seats.first.to_s.rjust(max_seats_width) + '–' + \
347
- ci_seats.last.to_s.rjust(max_seats_width) + ' ' + \
348
- six_char_percentage(majority_seats_probability)
349
- end
350
-
351
- def most_probable_rounded_fraction(key)
352
- if @no_of_simulations == 0
353
- nil
354
- else
355
- @distributions[key].most_probable_rounded_fraction(@area.population_size)
189
+
190
+ def write_state_summary(filename)
191
+ state_summary_filename = filename.gsub('.poll', '_state_summary.txt')
192
+ File.open(state_summary_filename, 'w') do |file|
193
+ file.puts("ErrorEstimate=#{@error_estimate}")
194
+ file.puts("NumberOfSimulations=#{@no_of_simulations}")
195
+ file.puts("NumberOfDataPoints=#{@no_of_data_points}")
196
+ file.puts("SpaceSize=#{space_size}")
356
197
  end
357
- end
198
+ end
358
199
  end
359
200
  end
@@ -1,7 +1,7 @@
1
1
  # encoding: utf-8
2
2
  #
3
3
  # Statistical Analysis of Polling Results (SAPoR)
4
- # Copyright (C) 2014 Filip van Laenen <f.a.vanlaenen@ieee.org>
4
+ # Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
5
5
  #
6
6
  # This file is part of SAPoR.
7
7
  #
@@ -0,0 +1,165 @@
1
+ # encoding: utf-8
2
+ #
3
+ # Statistical Analysis of Polling Results (SAPoR)
4
+ # Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
5
+ #
6
+ # This file is part of SAPoR.
7
+ #
8
+ # SAPoR is free software: you can redistribute it and/or modify it under the
9
+ # terms of the GNU General Public License as published by the Free Software
10
+ # Foundation, either version 3 of the License, or (at your option) any later
11
+ # version.
12
+ #
13
+ # SAPoR is distributed in the hope that it will be useful, but WITHOUT ANY
14
+ # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
15
+ # A PARTICULAR PURPOSE. See the GNU General Public License for more details.
16
+ #
17
+ # You can find a copy of the GNU General Public License in /doc/gpl.txt
18
+ #
19
+
20
+ module Sapor
21
+ #
22
+ # Represents a polychotomy for a referendum.
23
+ #
24
+ class ReferendumPolychotomy < Polychotomy
25
+ include NumberFormatter
26
+
27
+ def initialize(results, area, dichotomies, max_error)
28
+ super(results, area, dichotomies, max_error)
29
+ end
30
+
31
+ def refine
32
+ no_of_new_simulations = 0
33
+ new_votes = create_new_votes_distributions
34
+ while @no_of_data_points == 0 || no_of_new_simulations == 0 ||
35
+ no_of_new_simulations < @no_of_simulations
36
+ no_of_new_simulations += try_next_data_point(new_votes)
37
+ end
38
+ unless @no_of_simulations == 0
39
+ @error_estimate = calculate_error_estimate(new_votes)
40
+ end
41
+ @votes = merge_distributions(@votes, new_votes)
42
+ @no_of_simulations += no_of_new_simulations
43
+ end
44
+
45
+ def try_next_data_point(new_votes)
46
+ data_point = next_data_point
47
+ if data_point[OTHER] >= 0
48
+ simulate(new_votes, data_point)
49
+ new_simulation = 1
50
+ else
51
+ new_simulation = 0
52
+ end
53
+ @no_of_data_points += 1
54
+ new_simulation
55
+ end
56
+
57
+ def report
58
+ choice_lengths = @choices.map(&:length)
59
+ choice_lengths << 6
60
+ max_choice_width = choice_lengths.max
61
+ sorted_choices = sort_choices_by_result
62
+ choice_lines = sorted_choices.map.with_index do |choice, i|
63
+ next_choice = sorted_choices[i + 1]
64
+ create_choice_report_line(choice, i, next_choice, max_choice_width)
65
+ end
66
+ 'Most probable rounded fractions, fractions and 95% confidence' \
67
+ " intervals:\n" + 'Choice'.ljust(max_choice_width) +
68
+ ' Result MPRF MPF CI(95%) P(>↓) P(R↑) P(R)' \
69
+ " P(R↓)\n" + choice_lines.join("\n")
70
+ end
71
+
72
+ def progress_report
73
+ space_size_ratio = space_size.to_f / @no_of_data_points
74
+ if space_size_ratio > 10
75
+ space_size_ratio = with_thousands_separator(space_size_ratio.round)
76
+ else
77
+ space_size_ratio = space_size_ratio.round(1)
78
+ end
79
+ "#{with_thousands_separator(@no_of_simulations)} simulations out of " \
80
+ "#{with_thousands_separator(@no_of_data_points)} data" \
81
+ " points, 1 / #{space_size_ratio} of search space size" \
82
+ " (#{with_thousands_separator(space_size)})."
83
+ end
84
+
85
+ def write_outputs(filename)
86
+ write_rankings(filename)
87
+ end
88
+
89
+ private
90
+
91
+ def create_new_votes_distributions
92
+ votes = {}
93
+ @choices.each do |choice|
94
+ next if choice == OTHER
95
+ votes[choice] = CombinationsDistribution.new
96
+ @ranges[choice].each do |value|
97
+ votes[choice][value] = 0.to_lf
98
+ end
99
+ end
100
+ votes
101
+ end
102
+
103
+ def simulate(votes, data_point)
104
+ combinations = 1.to_lf
105
+ data_point.each do |choice, value|
106
+ combinations *= BinomialsCache.binomial(value, @results[choice])
107
+ end
108
+ @combinations_sum += combinations
109
+ data_point.each do |choice, value|
110
+ votes[choice][value] += combinations unless choice == OTHER
111
+ end
112
+ @choices.each do |a|
113
+ @choices.each do |b|
114
+ if data_point[a] > data_point[b]
115
+ @comparisons[a + '>' + b] += combinations
116
+ end
117
+ end
118
+ end
119
+ @choices.sort { |a, b| data_point[b] <=> data_point[a] }.each_with_index do |choice, i|
120
+ @rankings[choice + '@' + i.to_s] += combinations
121
+ end
122
+ end
123
+
124
+ def calculate_error_estimate(new_simulations)
125
+ error_estimate = 0
126
+ @choices.each do |choice|
127
+ next if choice == OTHER
128
+ mpv_new = calculate_most_probable_fraction(choice, new_simulations)
129
+ mpv_old = calculate_most_probable_fraction(choice, @votes)
130
+ mpv_delta = (mpv_new - mpv_old).abs
131
+ mprf_new = calculate_most_probable_rounded_fraction(choice, new_simulations)
132
+ mprf_old = calculate_most_probable_rounded_fraction(choice, @votes)
133
+ mprf_delta = (mprf_new - mprf_old).abs
134
+ error_estimate = [error_estimate, mpv_delta, mprf_delta].max
135
+ end
136
+ error_estimate
137
+ end
138
+
139
+ def merge_distributions(distributions1, distributions2)
140
+ merged_distributions = {}
141
+ @choices.each do |choice|
142
+ unless choice == OTHER
143
+ merged_distributions[choice] = distributions1[choice] + \
144
+ distributions2[choice]
145
+ end
146
+ end
147
+ merged_distributions
148
+ end
149
+
150
+ def create_choice_report_line(choice, i, next_choice, max_choice_width)
151
+ ci_values = @votes[choice].confidence_interval(0.95)
152
+ confidence_interval = ci_values.map { |x| x.to_f / @area.population_size }
153
+ choice.ljust(max_choice_width) + ' ' + \
154
+ six_char_percentage(result(choice)) + ' ' + \
155
+ six_char_percentage(most_probable_rounded_fraction(choice)) + ' ' + \
156
+ six_char_percentage(most_probable_fraction(choice)) + ' ' + \
157
+ six_char_percentage(confidence_interval.first) + '–' + \
158
+ six_char_percentage(confidence_interval.last) + ' ' + \
159
+ (next_choice.nil? ? ' ' : six_char_percentage(larger_than(choice, next_choice))) + ' ' + \
160
+ (i == 0 ? ' ' : six_char_percentage(ranking(choice, i - 1))) + ' ' + \
161
+ six_char_percentage(ranking(choice, i)) + \
162
+ (next_choice.nil? ? '' : ' ' + six_char_percentage(ranking(choice, i + 1)))
163
+ end
164
+ end
165
+ end
@@ -1,7 +1,7 @@
1
1
  # encoding: utf-8
2
2
  #
3
3
  # Statistical Analysis of Polling Results (SAPoR)
4
- # Copyright (C) 2014 Filip van Laenen <f.a.vanlaenen@ieee.org>
4
+ # Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
5
5
  #
6
6
  # This file is part of SAPoR.
7
7
  #
@@ -23,7 +23,9 @@ module Sapor
23
23
  # polls can be registered.
24
24
  #
25
25
  class Area
26
- include Singleton
26
+ def threshold
27
+ nil
28
+ end
27
29
 
28
30
  def lines_to_election_results(lines)
29
31
  results = {}