RubyGems - sapor - Versions diffs - 0.3.5 → 0.3.6 - Mend

sapor 0.3.5 → 0.3.6

Files changed (326) hide show

data/lib/sapor/multi_district_leveled_proportional.rb CHANGED

@@ -1,7 +1,7 @@
 # encoding: utf-8
 #
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #

data/lib/sapor/multi_district_proportional.rb CHANGED

@@ -1,6 +1,6 @@
 #
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #

data/lib/sapor/multi_district_variable_threshold_proportional.rb CHANGED

@@ -1,6 +1,6 @@
 #
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #

data/lib/sapor/number_formatter.rb CHANGED

@@ -1,7 +1,7 @@
 # encoding: utf-8
 #
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #

data/lib/sapor/options.rb CHANGED

@@ -1,7 +1,7 @@
 # encoding: utf-8
 #
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #

data/lib/sapor/poll.rb CHANGED

@@ -1,6 +1,6 @@
 #
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #
@@ -33,9 +33,6 @@ module Sapor
     BELGIAN_AREAS = [BelgiumBrussels.instance, BelgiumFlanders.instance,
                      BelgiumWallonia.instance, Flanders.instance,
                      Wallonia.instance].freeze
-    CATALONIAN_AREAS = [Catalonia.instance,
-                        CataloniaWithJuntsPerCatalunya.instance,
-                        CataloniaWithoutJuntsPelSi.instance].freeze
     DANISH_AREAS = [Denmark.instance, DenmarkWithE.instance,
                     DenmarkWithEAndP.instance, DenmarkWithP.instance].freeze
     EUROPEAN_UNION_AREAS = [EuropeanUnion27Austria.instance,
@@ -101,16 +98,17 @@ module Sapor
                         PortugalWithChAndIlWithoutPaf.instance,
                         PortugalWithoutPaf.instance].freeze
     AREAS_MAP = {}
-    (BELGIAN_AREAS + CATALONIAN_AREAS + DANISH_AREAS + EUROPEAN_UNION_AREAS + \
-     NORWEGIAN_AREAS + POLISH_AREAS + PORTUGUESE_AREAS + \
-     [Austria.instance, Estonia.instance, Finland.instance,
-      FinlandWithSin.instance, France.instance, Greece.instance,
-      Hungary.instance, Iceland.instance, Latvia.instance, Luxembourg.instance,
-      Netherlands.instance, Slovakia.instance, Slovenia.instance,
-      Spain.instance, Sweden.instance, Sweden20140914.instance,
-      UnitedKingdom.instance, UnitedKingdomWithBrexit.instance,
-      UnitedKingdomWithBrexitAndChuk.instance, UnitedKingdomWithTig.instance,
-      Utopia.instance]).map do |area|
+    (BELGIAN_AREAS + DANISH_AREAS + EUROPEAN_UNION_AREAS + NORWEGIAN_AREAS + \
+     POLISH_AREAS + PORTUGUESE_AREAS + \
+     [Austria.instance, Catalonia.instance, CataloniaWithVox.instance,
+      Estonia.instance, Finland.instance, FinlandWithSin.instance,
+      France.instance, Greece.instance, Hungary.instance, Iceland.instance,
+      IcelandWithJ.instance, Ireland.instance, Latvia.instance,
+      Luxembourg.instance, Netherlands.instance, Slovakia.instance,
+      Slovenia.instance, Spain.instance, Sweden.instance,
+      Sweden20140914.instance, UnitedKingdom.instance,
+      UnitedKingdomWithBrexit.instance, UnitedKingdomWithBrexitAndChuk.instance,
+      UnitedKingdomWithTig.instance, Utopia.instance]).map do |area|
       AREAS_MAP[area.area_code] = area
     end

data/lib/sapor/polychotomy.rb CHANGED

@@ -1,7 +1,7 @@
 # encoding: utf-8
 #
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #

data/lib/sapor/pseudorandom_multirange_enumerator.rb CHANGED

@@ -1,7 +1,7 @@
 # encoding: utf-8
 #
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #

data/lib/sapor/referendum_polychotomy.rb CHANGED

@@ -1,7 +1,7 @@
 # encoding: utf-8
 #
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #

data/lib/sapor/regional_data/area.rb CHANGED

@@ -1,7 +1,7 @@
 # encoding: utf-8
 #
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #
@@ -27,17 +27,28 @@ module Sapor
       nil
     end
-    def lines_to_election_results(lines)
+    def lines_to_election_results(lines, capped = false)
       results = {}
-      lines.each_line { |line| add_line_to_election_results(results, line) }
-      results
+      candidates = {}
+      lines.each_line do |line|
+        add_line_to_election_results(results, candidates, line, capped)
+      end
+      [results, candidates]
+    end
+    def load_capped_election_results(filename)
+      load_full_election_results(filename, true)
     end
     def load_election_results(filename)
+      load_full_election_results(filename, false).first
+    end
+    def load_full_election_results(filename, capped)
       dirname = File.dirname(File.expand_path(__FILE__))
       full_filename = File.expand_path(filename, dirname)
       lines = File.read(full_filename)
-      lines_to_election_results(lines)
+      lines_to_election_results(lines, capped)
     end
     def summarize_election_results(election_results)
@@ -50,16 +61,19 @@ module Sapor
     private
-    def add_line_to_election_results(results, line)
+    def add_line_to_election_results(results, candidates, line, capped)
       return if line.strip.empty? || line.strip.start_with?('#')
       values = line.split('|')
-      fail(ArgumentError, "Broken line: #{line}.") unless values.size.equal?(3)
-      add_line_values_to_election_results(results, values)
+      fail(ArgumentError, "Broken line: #{line}.") unless values.size.equal?(capped ? 4 : 3)
+      add_line_values_to_election_results(results, candidates, values, capped)
     end
-    def add_line_values_to_election_results(results, values)
+    def add_line_values_to_election_results(results, candidates, values, capped)
       constituency = values[0].strip
-      results[constituency] = {} unless results.key?(constituency)
+      unless results.key?(constituency)
+        results[constituency] = {}
+        candidates[constituency] = {}
+      end
       choice = values[1].strip
       votes = values[2].gsub(',', '').to_i
       if results[constituency].key?(choice)
@@ -67,6 +81,10 @@ module Sapor
                             "constituency #{constituency}.")
       end
       results[constituency][choice] = votes
+      if capped
+        cap = values[3].gsub(',', '').to_i
+        candidates[constituency][choice] = cap
+      end
     end
     def add_local_results_to_summary(summary, local_results)

data/lib/sapor/regional_data/austria.rb CHANGED

@@ -1,6 +1,6 @@
 #
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #

data/lib/sapor/regional_data/belgium-brussels-2014.psv CHANGED

@@ -1,5 +1,5 @@
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #

data/lib/sapor/regional_data/belgium-brussels-20190526.psv CHANGED

@@ -1,5 +1,5 @@
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #

data/lib/sapor/regional_data/belgium-flanders-2014.psv CHANGED

@@ -1,5 +1,5 @@
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #

data/lib/sapor/regional_data/belgium-flanders-20190526.psv CHANGED

@@ -1,5 +1,5 @@
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #

data/lib/sapor/regional_data/belgium-wallonia-2014.psv CHANGED

@@ -1,5 +1,5 @@
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #

data/lib/sapor/regional_data/belgium-wallonia-20190526.psv CHANGED

@@ -1,5 +1,5 @@
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #

data/lib/sapor/regional_data/belgium.rb CHANGED

@@ -1,7 +1,7 @@
 # encoding: utf-8
 #
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #

data/lib/sapor/regional_data/belgium_brussels.rb CHANGED

@@ -1,7 +1,7 @@
 # encoding: utf-8
 #
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #

data/lib/sapor/regional_data/belgium_flanders.rb CHANGED

@@ -1,7 +1,7 @@
 # encoding: utf-8
 #
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #

data/lib/sapor/regional_data/belgium_wallonia.rb CHANGED

@@ -1,7 +1,7 @@
 # encoding: utf-8
 #
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #

data/lib/sapor/regional_data/catalonia-2012-2015.psv CHANGED

@@ -1,5 +1,5 @@
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #

data/lib/sapor/regional_data/catalonia-2012.psv CHANGED

@@ -1,5 +1,5 @@
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #

data/lib/sapor/regional_data/catalonia-2015-jxcat.psv CHANGED

@@ -1,5 +1,5 @@
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #

data/lib/sapor/regional_data/catalonia-2015-no-jxsi.psv CHANGED

@@ -1,5 +1,5 @@
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #

data/lib/sapor/regional_data/catalonia-2015.psv CHANGED

@@ -1,5 +1,5 @@
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #

data/lib/sapor/regional_data/catalonia-20171221-with-vox.psv ADDED

@@ -0,0 +1,67 @@
+# Statistical Analysis of Polling Results (SAPoR)
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
+#
+# This file is part of SAPoR.
+#
+# SAPoR is free software: you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+#
+# SAPoR is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You can find a copy of the GNU General Public License in /doc/gpl.txt
+#
+# Source: "Disposición 426 del BOE núm. 11 de 2018" Retrieved on 3 January 2020.
+# URL: http://www.juntaelectoralcentral.es/cs/jec/documentos/CATALU%C3%91A_2017_Resultados.pdf
+# Added Vox with the same distribution as Partit Popular.
+Barcelona | Ciutadans–Partido de la Ciudadanía               | 868,032
+Barcelona | Junts pel Catalunya                              | 624,261
+Barcelona | Esquerra Republicana–Catalunya Sí                | 678,030
+Barcelona | Partit dels Socialistes de Catalunya (PSC-PSOE)  | 497,650
+Barcelona | Catalunya en Comú–Podem                          | 276,810
+Barcelona | Candidatura d’Unitat Popular                     | 143,711
+Barcelona | Partit Popular                                   | 142,934
+Barcelona | Vox                                              | 142,934
+Barcelona | Partit Animalista contra el Maltractament Animal |  31,330
+Barcelona | Recortes Cero–Grupo Verde                        |   8,621
+Girona | Ciutadans–Partido de la Ciudadanía               |  79,634
+Girona | Junts pel Catalunya                              | 149,638
+Girona | Esquerra Republicana–Catalunya Sí                |  88,582
+Girona | Partit dels Socialistes de Catalunya (PSC-PSOE)  |  35,197
+Girona | Catalunya en Comú–Podem                          |  16,482
+Girona | Candidatura d’Unitat Popular                     |  21,708
+Girona | Partit Popular                                   |  11,646
+Girona | Vox                                              |  11,646
+Girona | Partit Animalista contra el Maltractament Animal |   2,582
+Girona | Recortes Cero–Grupo Verde                        |     560
+Girona | Per un Món Més Just                              |     241
+Lleida | Ciutadans–Partido de la Ciudadanía               | 40,908
+Lleida | Junts pel Catalunya                              | 78,303
+Lleida | Esquerra Republicana–Catalunya Sí                | 64,417
+Lleida | Partit dels Socialistes de Catalunya (PSC-PSOE)  | 21,795
+Lleida | Catalunya en Comú–Podem                          |  9,415
+Lleida | Candidatura d’Unitat Popular                     | 12,140
+Lleida | Partit Popular                                   | 10,902
+Lleida | Vox                                              | 10,902
+Lleida | Partit Animalista contra el Maltractament Animal |  1,186
+Lleida | Recortes Cero–Grupo Verde                        |    312
+Lleida | Per un Món Més Just                              |    336
+Tarragona | Ciutadans–Partido de la Ciudadanía               | 120,825
+Tarragona | Junts pel Catalunya                              |  96,031
+Tarragona | Esquerra Republicana–Catalunya Sí                | 104,832
+Tarragona | Partit dels Socialistes de Catalunya (PSC-PSOE)  |  52,017
+Tarragona | Catalunya en Comú–Podem                          |  23,653
+Tarragona | Candidatura d’Unitat Popular                     |  17,687
+Tarragona | Partit Popular                                   |  20,188
+Tarragona | Vox                                              |  20,188
+Tarragona | Partit Animalista contra el Maltractament Animal |   3,645
+Tarragona | Recortes Cero–Grupo Verde                        |     794

data/lib/sapor/regional_data/catalonia-20171221.psv ADDED

@@ -0,0 +1,61 @@
+# Statistical Analysis of Polling Results (SAPoR)
+# Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
+#
+# This file is part of SAPoR.
+#
+# SAPoR is free software: you can redistribute it and/or modify it under the
+# terms of the GNU General Public License as published by the Free Software
+# Foundation, either version 3 of the License, or (at your option) any later
+# version.
+#
+# SAPoR is distributed in the hope that it will be useful, but WITHOUT ANY
+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
+# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+#
+# You can find a copy of the GNU General Public License in /doc/gpl.txt
+#
+# Source: "Disposición 426 del BOE núm. 11 de 2018" Retrieved on 3 January 2020.
+# URL: http://www.juntaelectoralcentral.es/cs/jec/documentos/CATALU%C3%91A_2017_Resultados.pdf
+Barcelona | Ciutadans–Partido de la Ciudadanía               | 868,032
+Barcelona | Junts pel Catalunya                              | 624,261
+Barcelona | Esquerra Republicana–Catalunya Sí                | 678,030
+Barcelona | Partit dels Socialistes de Catalunya (PSC-PSOE)  | 497,650
+Barcelona | Catalunya en Comú–Podem                          | 276,810
+Barcelona | Candidatura d’Unitat Popular                     | 143,711
+Barcelona | Partit Popular                                   | 142,934
+Barcelona | Partit Animalista contra el Maltractament Animal |  31,330
+Barcelona | Recortes Cero–Grupo Verde                        |   8,621
+Girona | Ciutadans–Partido de la Ciudadanía               |  79,634
+Girona | Junts pel Catalunya                              | 149,638
+Girona | Esquerra Republicana–Catalunya Sí                |  88,582
+Girona | Partit dels Socialistes de Catalunya (PSC-PSOE)  |  35,197
+Girona | Catalunya en Comú–Podem                          |  16,482
+Girona | Candidatura d’Unitat Popular                     |  21,708
+Girona | Partit Popular                                   |  11,646
+Girona | Partit Animalista contra el Maltractament Animal |   2,582
+Girona | Recortes Cero–Grupo Verde                        |     560
+Girona | Per un Món Més Just                              |     241
+Lleida | Ciutadans–Partido de la Ciudadanía               | 40,908
+Lleida | Junts pel Catalunya                              | 78,303
+Lleida | Esquerra Republicana–Catalunya Sí                | 64,417
+Lleida | Partit dels Socialistes de Catalunya (PSC-PSOE)  | 21,795
+Lleida | Catalunya en Comú–Podem                          |  9,415
+Lleida | Candidatura d’Unitat Popular                     | 12,140
+Lleida | Partit Popular                                   | 10,902
+Lleida | Partit Animalista contra el Maltractament Animal |  1,186
+Lleida | Recortes Cero–Grupo Verde                        |    312
+Lleida | Per un Món Més Just                              |    336
+Tarragona | Ciutadans–Partido de la Ciudadanía               | 120,825
+Tarragona | Junts pel Catalunya                              |  96,031
+Tarragona | Esquerra Republicana–Catalunya Sí                | 104,832
+Tarragona | Partit dels Socialistes de Catalunya (PSC-PSOE)  |  52,017
+Tarragona | Catalunya en Comú–Podem                          |  23,653
+Tarragona | Candidatura d’Unitat Popular                     |  17,687
+Tarragona | Partit Popular                                   |  20,188
+Tarragona | Partit Animalista contra el Maltractament Animal |   3,645
+Tarragona | Recortes Cero–Grupo Verde                        |     794