sapor 0.3.5 → 0.3.6

data/spec/unit/wallonia_spec.rb

@@ -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.
 #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sapor
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors:
 - Filip van Laenen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-30 00:00:00.000000000 Z
+date: 2020-01-27 00:00:00.000000000 Z
 dependencies: []
 description: SAPoR
 email:
@@ -41,6 +41,10 @@ files:
 - data/hu/hungary_2014_screen_scraper.rb
 - data/hu/hungary_2014_to_psv.rb
 - data/hu/index-2014.txt
+- data/ie/2016-04-28_general-election-2016-candidate-details-csv_en.csv
+- data/ie/ireland_2016_to_psv.rb
+- data/no/2020-01-01_partifordeling_1_st_2017.csv
+- data/no/norway_2017_to_psv.rb
 - data/pl/2015-gl-lis-okr.csv
 - data/pl/poland_2015_to_psv.rb
 - data/pl/poland_2015_to_psv_with_ko_and_rsw.rb
@@ -65,6 +69,7 @@ files:
 - lib/sapor/largest_remainder.rb
 - lib/sapor/log4r_logger.rb
 - lib/sapor/log_facade.rb
+- lib/sapor/many_past_the_post.rb
 - lib/sapor/multi_district_leveled_proportional.rb
 - lib/sapor/multi_district_proportional.rb
 - lib/sapor/multi_district_variable_threshold_proportional.rb
@@ -91,8 +96,8 @@ files:
 - lib/sapor/regional_data/catalonia-2015-jxcat.psv
 - lib/sapor/regional_data/catalonia-2015-no-jxsi.psv
 - lib/sapor/regional_data/catalonia-2015.psv
-- lib/sapor/regional_data/catalonia-jxcat.rb
-- lib/sapor/regional_data/catalonia-no-jxsi.rb
+- lib/sapor/regional_data/catalonia-20171221-with-vox.psv
+- lib/sapor/regional_data/catalonia-20171221.psv
 - lib/sapor/regional_data/catalonia.rb
 - lib/sapor/regional_data/denmark-20150618-with-e-and-p.psv
 - lib/sapor/regional_data/denmark-20150618-with-e.psv
@@ -172,8 +177,13 @@ files:
 - lib/sapor/regional_data/hungary.rb
 - lib/sapor/regional_data/iceland-20161029-midflokkurinn.psv
 - lib/sapor/regional_data/iceland-20161029.psv
+- lib/sapor/regional_data/iceland-20171028-with-j.psv
 - lib/sapor/regional_data/iceland-20171028.psv
 - lib/sapor/regional_data/iceland.rb
+- lib/sapor/regional_data/ireland-20160226-2020-candidates.psv
+- lib/sapor/regional_data/ireland-20160226-2020.psv
+- lib/sapor/regional_data/ireland-20160226.psv
+- lib/sapor/regional_data/ireland.rb
 - lib/sapor/regional_data/latvia-20141004-kpv-p-par.psv
 - lib/sapor/regional_data/latvia-20141004-kpv-par.psv
 - lib/sapor/regional_data/latvia-20141004-kpv.psv
@@ -184,6 +194,7 @@ files:
 - lib/sapor/regional_data/luxembourg-20181014.psv
 - lib/sapor/regional_data/luxembourg.rb
 - lib/sapor/regional_data/netherlands.rb
+- lib/sapor/regional_data/norway-20170911.psv
 - lib/sapor/regional_data/norway.rb
 - lib/sapor/regional_data/norwegian_municipality.rb
 - lib/sapor/regional_data/poland-20151025-with-ko-and-l-without-n-po-r-and-zl.psv
@@ -246,6 +257,7 @@ files:
 - spec/unit/belgium_wallonia_spec.rb
 - spec/unit/binomials_cache_spec.rb
 - spec/unit/catalonia_spec.rb
+- spec/unit/catalonia_with_vox_spec.rb
 - spec/unit/combinations_distribution_spec.rb
 - spec/unit/denmark_spec.rb
 - spec/unit/denmark_with_e_and_p_spec.rb
@@ -309,6 +321,9 @@ files:
 - spec/unit/greece_spec.rb
 - spec/unit/hungary_spec.rb
 - spec/unit/iceland_spec.rb
+- spec/unit/iceland_with_j_spec.rb
+- spec/unit/ireland_2016_spec.rb
+- spec/unit/ireland_spec.rb
 - spec/unit/largest_remainder_spec.rb
 - spec/unit/latvia_spec.rb
 - spec/unit/luxembourg_spec.rb
@@ -382,6 +397,7 @@ test_files:
 - spec/unit/belgium_wallonia_spec.rb
 - spec/unit/binomials_cache_spec.rb
 - spec/unit/catalonia_spec.rb
+- spec/unit/catalonia_with_vox_spec.rb
 - spec/unit/combinations_distribution_spec.rb
 - spec/unit/denmark_spec.rb
 - spec/unit/denmark_with_e_and_p_spec.rb
@@ -445,6 +461,9 @@ test_files:
 - spec/unit/greece_spec.rb
 - spec/unit/hungary_spec.rb
 - spec/unit/iceland_spec.rb
+- spec/unit/iceland_with_j_spec.rb
+- spec/unit/ireland_2016_spec.rb
+- spec/unit/ireland_spec.rb
 - spec/unit/largest_remainder_spec.rb
 - spec/unit/latvia_spec.rb
 - spec/unit/luxembourg_spec.rb

data/lib/sapor/regional_data/catalonia-jxcat.rb

@@ -1,109 +0,0 @@
-# encoding: utf-8
-#
-# Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 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
-#
-
-module Sapor
-  #
-  # The regional data for Catalonia.
-  #
-  class CataloniaWithJuntsPerCatalunya < Area
-    include Singleton
-    def area_code
-      'ES-CT∪{ERC,JuntsxCat}\\{JxSí}'
-    end
-
-    def coalitions
-      COALITIONS
-    end
-
-    def no_of_seats
-      SEAT_DISTRIBUTION.values.inject(:+)
-    end
-
-    def overall_election_results_of_2015
-      if @overall_election_results_of_2015.nil?
-        @overall_election_results_of_2015 = \
-          summarize_election_results(election_results_of_2015)
-      end
-      @overall_election_results_of_2015
-    end
-
-    def population_size
-      # Voter turnout in 2015
-      # Source: "Election Results. Parliament of Catalonia Election 2015".
-      #         Generalitat of Catalonia. Retrieved 21 October 2017.
-      # URL: http://governacio.gencat.cat/ca/pgov_ambits_d_actuacio/pgov_eleccions/pgov_dades_electorals/resultats-2?id_eleccions=A20151&id_territori=CA09
-      5_510_853
-    end
-
-    def seats(simulation)
-      electoral_system.project(simulation)
-    end
-
-    def threshold
-      THRESHOLD
-    end
-
-    private
-
-    SEAT_DISTRIBUTION = { 'Barcelona' => 85, 'Girona' => 17, 'Lleida' => 15,
-                          'Tarragona' => 18 }.freeze
-
-    THRESHOLD = 0.03
-
-    COALITIONS = [['Candidatura d’Unitat Popular',
-                   'Esquerra Republicana de Catalunya–Catalunya Sí',
-                   'Junts per Catalunya'],
-                  ['Catalunya en Comú', 'Ciutadans–Partido de la Ciudadanía',
-                   'Partit dels Socialistes de Catalunya (PSC-PSOE)',
-                   'Partit Popular'],
-                  ['Catalunya en Comú',
-                   'Esquerra Republicana de Catalunya–Catalunya Sí',
-                   'Junts per Catalunya'],
-                  ['Catalunya en Comú',
-                   'Esquerra Republicana de Catalunya–Catalunya Sí',
-                   'Partit dels Socialistes de Catalunya (PSC-PSOE)'],
-                  ['Ciutadans–Partido de la Ciudadanía',
-                   'Partit dels Socialistes de Catalunya (PSC-PSOE)',
-                   'Partit Popular'],
-                  ['Esquerra Republicana de Catalunya–Catalunya Sí',
-                   'Junts per Catalunya']].freeze
-
-    def election_results_of_2015
-      if @election_results_of_2015.nil?
-        @election_results_of_2015 = load_election_results( \
-          'catalonia-2015-jxcat.psv'
-        )
-      end
-      @election_results_of_2015
-    end
-
-    def electoral_system
-      if @electoral_system.nil?
-        @electoral_system = MultiDistrictProportional.new( \
-          overall_election_results_of_2015,
-          election_results_of_2015,
-          SEAT_DISTRIBUTION,
-          DhondtDenominators,
-          THRESHOLD
-        )
-      end
-      @electoral_system
-    end
-  end
-end

data/lib/sapor/regional_data/catalonia-no-jxsi.rb

@@ -1,96 +0,0 @@
-# encoding: utf-8
-#
-# Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2016 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
-#
-
-module Sapor
-  #
-  # The regional data for Catalonia.
-  #
-  class CataloniaWithoutJuntsPelSi < Area
-    include Singleton
-    def area_code
-      'ES-CT∪{ERC,PDeCAT}\\{JxSí}'
-    end
-
-    def coalitions
-      [['Partit Demòcrata Europeu Català', 'Esquerra Republicana de Catalunya–Catalunya Sí'],
-       ['Partit Demòcrata Europeu Català', 'Esquerra Republicana de Catalunya–Catalunya Sí', 'Candidatura d’Unitat Popular'],
-       ['Partit Demòcrata Europeu Català', 'Esquerra Republicana de Catalunya–Catalunya Sí', 'Catalunya en Comú'],
-       ['Ciutadans–Partido de la Ciudadanía',
-        'Partit dels Socialistes de Catalunya (PSC-PSOE)',
-        'Catalunya en Comú', 'Partit Popular'],
-       ['Ciutadans–Partido de la Ciudadanía',
-        'Partit dels Socialistes de Catalunya (PSC-PSOE)', 'Partit Popular']]
-    end
-
-    def no_of_seats
-      SEAT_DISTRIBUTION.values.inject(:+)
-    end
-
-    def overall_election_results_of_2015
-      if @overall_election_results_of_2015.nil?
-        @overall_election_results_of_2015 = \
-          summarize_election_results(election_results_of_2015)
-      end
-      @overall_election_results_of_2015
-    end
-
-    def population_size
-      # Voter turnout in 2015
-      # Source: "Election Results. Parliament of Catalonia Election 2015".
-      #         Generalitat of Catalonia. Retrieved 21 October 2017.
-      # URL: http://governacio.gencat.cat/ca/pgov_ambits_d_actuacio/pgov_eleccions/pgov_dades_electorals/resultats-2?id_eleccions=A20151&id_territori=CA09
-      5_510_853
-    end
-
-    def seats(simulation)
-      electoral_system.project(simulation)
-    end
-
-    def threshold
-      THRESHOLD
-    end
-
-    private
-
-    SEAT_DISTRIBUTION = { 'Barcelona' => 85, 'Girona' => 17, 'Lleida' => 15,
-                          'Tarragona' => 18 }
-
-    THRESHOLD = 0.03
-
-    def election_results_of_2015
-      if @election_results_of_2015.nil?
-        @election_results_of_2015 = load_election_results( \
-          'catalonia-2015-no-jxsi.psv')
-      end
-      @election_results_of_2015
-    end
-
-    def electoral_system
-      if @electoral_system.nil?
-        @electoral_system = MultiDistrictProportional.new( \
-          overall_election_results_of_2015,
-          election_results_of_2015,
-          SEAT_DISTRIBUTION,
-          DhondtDenominators,
-          THRESHOLD)
-      end
-      @electoral_system
-    end
-  end
-end