sapor 0.3.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 022baea2f19fd416f2364d714b550b3405e9abe1c5771c0ae53bdb40f400d7d6
-  data.tar.gz: 98b0325a4009471fcb4fa5359bbb3416967aec9eb20bebb2293380419193c39f
+  metadata.gz: f37ce8d35c3bf87a4504f0eb4f000f288e691009fe91bb2ed4886de92fcdac8e
+  data.tar.gz: d8f11473d8554ca16948079f5c902bee7b61206f6fd51b83ecdca1354863329b
 SHA512:
-  metadata.gz: 283636d4ee9819c25a3ec1d644b8f0166c39647f7da20d1c6a18fbe9c93cd2c6e16e52c57fdc956f0c71bc2711159f872f1973a49afb50729a5d2c53c9ec0c32
-  data.tar.gz: 04fcb296d85fc8a0be4edafb8742f5244da8bdd702f9046ab5c06ec13007bb623ef25a886f1c851472db9b06d08ed424783c9018c8a4d84b55064d7b8e8bc5a4
+  metadata.gz: 80c164dc69d557c13159444e7cbd0f435618020fb4a987a634beec653290e812c753ab0d849c78a86f506dcd37092f0dd80df2d99a73772901688efe349c278b
+  data.tar.gz: 5126c1dc5158a0c1a30c1b4d1196ebc3e10afe90bc61abcec1a46fb6f404a1e4050b96066a1dede4dd346fc58a0acf2cce1bed3d6cacde25dde248b0b94d44dc

data/lib/sapor/regional_data/european_union_27_italy.rb

@@ -49,7 +49,9 @@ module Sapor
 
     private
 
-    COALITIONS = [['Cambiamo! (*)', 'Insieme (*)'],
+    COALITIONS = [['Azione (S&D)', 'Liberi e Uguali (S&D)',
+                   'Partito Democratico (S&D)'],
+                  ['Cambiamo! (*)', 'Insieme (*)'],
                   ['CasaPound Italia (NI)', 'Movimento 5 Stelle (NI)'],
                   ['Civica Popolare (RE)', 'Italia Viva (RE)',
                    'Più Europa (RE)'],
@@ -57,7 +59,6 @@ module Sapor
                   ['Forza Italia (EPP)', 'Südtiroler Volkspartei (EPP)'],
                   ['Fratelli d’Italia (ECR)', 'Noi con l’Italia (ECR)'],
                   ['Lega Nord (ID)'],
-                  ['Liberi e Uguali (S&D)', 'Partito Democratico (S&D)'],
                   ['Potere al Popolo (GUE/NGL)']].freeze
 
     NO_OF_SEATS = 76

data/lib/sapor/regional_data/european_union_italy.rb

@@ -49,7 +49,9 @@ module Sapor
 
     private
 
-    COALITIONS = [['Cambiamo! (*)', 'Insieme (*)'],
+    COALITIONS = [['Azione (S&D)', 'Liberi e Uguali (S&D)',
+                   'Partito Democratico (S&D)'],
+                  ['Cambiamo! (*)', 'Insieme (*)'],
                   ['CasaPound Italia (NI)', 'Movimento 5 Stelle (NI)'],
                   ['Civica Popolare (RE)', 'Italia Viva (RE)',
                    'Più Europa (RE)'],
@@ -57,7 +59,6 @@ module Sapor
                   ['Forza Italia (EPP)', 'Südtiroler Volkspartei (EPP)'],
                   ['Fratelli d’Italia (ECR)', 'Noi con l’Italia (ECR)'],
                   ['Lega Nord (ID)'],
-                  ['Liberi e Uguali (S&D)', 'Partito Democratico (S&D)'],
                   ['Potere al Popolo (GUE/NGL)']].freeze
 
     NO_OF_SEATS = 73

data/lib/sapor/regional_data/european_union_luxembourg.rb

@@ -58,11 +58,11 @@ module Sapor
 
     NO_OF_SEATS = 6
 
-    # Voter turnout on 25 May 2014
-    # Source: Web page with the official results of the elections of 25 May
-    # 2014, downloaded on 11 May 2018,
-    # https://en.wikipedia.org/wiki/European_Parliament_election,_2014_(Luxembourg)
-    POPULATION_SIZE = 1_172_614
+    # Voter turnout on 26 May 2019
+    # Source: Web page with the official results of the elections of 26 May
+    # 2019, downloaded on 18 December 2019,
+    # https://lb.wikipedia.org/wiki/Wale_fir_d%27Europ%C3%A4escht_Parlament_2019_(L%C3%ABtzebuerg)
+    POPULATION_SIZE = 1_254_363
 
     def electoral_system
       if @electoral_system.nil?

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

@@ -0,0 +1,88 @@
+# 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
+#
+
+# Source: Web page with the official results of the elections of 26 May 2019,
+#         downloaded on 23 November 2019,
+# URL: https://verkiezingen2019.belgium.be/nl/verkiezingen?el=WL
+
+Brabant wallon | Mouvement Réformateur        | 81,684
+Brabant wallon | Ecolo                        | 47,410
+Brabant wallon | Parti Socialiste             | 35,803
+Brabant wallon | Centre démocrate humaniste   | 20,216
+Brabant wallon | Parti du Travail de Belgique | 18,074
+Brabant wallon | DéFI                         | 15,196
+Brabant wallon | Parti Populaire              |  6,547
+Brabant wallon | Listes Destexhe              |  6,031
+Brabant wallon | DierAnimal                   |  3,675
+Brabant wallon | Collectif Citoyen            |  2,818
+Brabant wallon | Wallonie Insoumise           |  1,892
+Brabant wallon | Turquoise                    |    590
+
+Hainaut | Parti Socialiste             | 239,616
+Hainaut | Mouvement Réformateur        | 122,336
+Hainaut | Parti du Travail de Belgique | 115,073
+Hainaut | Ecolo                        |  83,938
+Hainaut | Centre démocrate humaniste   |  63,296
+Hainaut | DéFI                         |  26,907
+Hainaut | Parti Populaire              |  27,361
+Hainaut | Collectif Citoyen            |  10,545
+Hainaut | Listes Destexhe              |   8,900
+Hainaut | DierAnimal                   |   6,347
+Hainaut | AGIR                         |   5,967
+Hainaut | NATION                       |   4,759
+Hainaut | La Droite                    |   3,407
+Hainaut | Demain                       |   1,659
+Hainaut | Parti Communiste de Belgique |     944
+
+Liège | Parti Socialiste             | 154,893
+Liège | Mouvement Réformateur        | 124,103
+Liège | Ecolo                        |  93,921
+Liège | Parti du Travail de Belgique |  93,293
+Liège | Centre démocrate humaniste   |  56,816
+Liège | Parti Populaire              |  26,047
+Liège | DéFI                         |  23,144
+Liège | Listes Destexhe              |   9,955
+Liège | Collectif Citoyen            |   8,786
+Liège | Wallonie Insoumise           |   6,263
+Liège | DierAnimal                   |   5,393
+Liège | Demain                       |   2,784
+Liège | NATION                       |   2,070
+Liège | REFERENDUM                   |     621
+
+Luxembourg | Mouvement Réformateur        | 41,705
+Luxembourg | Centre démocrate humaniste   | 37,151
+Luxembourg | Parti Socialiste             | 32,317
+Luxembourg | Ecolo                        | 24,323
+Luxembourg | Parti du Travail de Belgique | 14,933
+Luxembourg | Parti Populaire              |  5,044
+Luxembourg | DéFI                         |  4,786
+Luxembourg | Collectif Citoyen            |  2,070
+Luxembourg | Listes Destexhe              |  1,549
+Luxembourg | NATION                       |  1,170
+
+Namur | Parti Socialiste             | 69,793
+Namur | Mouvement Réformateur        | 66,050
+Namur | Centre démocrate humaniste   | 46,296
+Namur | Ecolo                        | 45,039
+Namur | Parti du Travail de Belgique | 36,970
+Namur | DéFI                         | 14,186
+Namur | Parti Populaire              |  9,623
+Namur | Listes Destexhe              |  4,443
+Namur | DierAnimal                   |  3,002
+Namur | Collectif Citoyen            |  2,454
+Namur | NATION                       |  1,650
+Namur | AGIR                         |  1,179

data/lib/sapor/regional_data/wallonia.rb

@@ -27,29 +27,44 @@ module Sapor
       'BE-WAL'
     end
 
+    CDH_PARTY = 'Centre démocrate humaniste'.freeze
+    ECOLO_PARTY = 'Ecolo'.freeze
+    MR_PARTY = 'Mouvement Réformateur'.freeze
+    PS_PARTY = 'Parti Socialiste'.freeze
+    PTB_PARTY = 'Parti du Travail de Belgique'.freeze
+
     def coalitions
-      [%w(cdH Ecolo MR), %w(cdH Ecolo PS), %w(cdH MR), %w(cdH PS),
-       %w(cdH PS PTB), %w(Ecolo MR), %w(Ecolo MR PS), %w(Ecolo PS),
-       %w(Ecolo PS PTB), %w(Ecolo PTB), %w(MR PS), %w(PS PTB)]
+      [[CDH_PARTY, ECOLO_PARTY, MR_PARTY],
+       [CDH_PARTY, ECOLO_PARTY, PS_PARTY],
+       [CDH_PARTY, MR_PARTY],
+       [CDH_PARTY, PS_PARTY],
+       [CDH_PARTY, PS_PARTY, PTB_PARTY],
+       [ECOLO_PARTY, MR_PARTY],
+       [ECOLO_PARTY, MR_PARTY, PS_PARTY],
+       [ECOLO_PARTY, PS_PARTY],
+       [ECOLO_PARTY, PS_PARTY, PTB_PARTY],
+       [ECOLO_PARTY, PTB_PARTY],
+       [MR_PARTY, PS_PARTY],
+       [PS_PARTY, PTB_PARTY]]
     end
 
     def no_of_seats
       SEAT_DISTRIBUTION.values.inject(:+)
     end
 
-    def overall_election_results_of_2014
-      if @overall_election_results_of_2014.nil?
-        @overall_election_results_of_2014 = \
-          summarize_election_results(election_results_of_2014)
+    def overall_election_results_of_2019
+      if @overall_election_results_of_2019.nil?
+        @overall_election_results_of_2019 = \
+          summarize_election_results(election_results_of_2019)
       end
-      @overall_election_results_of_2014
+      @overall_election_results_of_2019
     end
 
     def population_size
-      # Voter turnout on 25 May 2014
-      # Source: http://elections2014.belgium.be/fr/wal/results/results_tab_WLR00000.html
-      # Retrieved on 21 July 2017
-      2_047_387
+      # Voter turnout on 26 May 2019
+      # Source: https://verkiezingen2019.belgium.be/nl/verkiezingen?el=WL
+      # Retrieved on 7 December 2019
+      2_034_813
     end
 
     def seats(simulation)
@@ -64,28 +79,28 @@ module Sapor
 
     # Source: https://nl.wikipedia.org/wiki/Waals_Parlement
     # Retrieved on 21 July 2017
-    SEAT_DISTRIBUTION = { 'Brabant Wallon' => 8,
-                          'Hainaut' => 28,
+    SEAT_DISTRIBUTION = { 'Brabant wallon' => 8,
+                          'Hainaut' => 27,
                           'Liège' => 23,
-                          'Luxembourg' => 5,
+                          'Luxembourg' => 6,
                           'Namur' => 11 }.freeze
 
     THRESHOLD = 0.05
 
-    def election_results_of_2014
-      if @election_results_of_2014.nil?
-        @election_results_of_2014 = load_election_results( \
-          'wallonia-2014.psv'
+    def election_results_of_2019
+      if @election_results_of_2019.nil?
+        @election_results_of_2019 = load_election_results( \
+          'wallonia-20190526.psv'
         )
       end
-      @election_results_of_2014
+      @election_results_of_2019
     end
 
     def electoral_system
       if @electoral_system.nil?
         @electoral_system = MultiDistrictProportional.new( \
-          overall_election_results_of_2014,
-          election_results_of_2014,
+          overall_election_results_of_2019,
+          election_results_of_2019,
           SEAT_DISTRIBUTION,
           DhondtDenominators,
           THRESHOLD

data/sapor.gemspec

@@ -19,7 +19,7 @@
 
 Gem::Specification.new do |gem|
   gem.name = 'sapor'
-  gem.version = '0.3.0'
+  gem.version = '0.3.3'
   gem.authors = ['Filip van Laenen']
   gem.email = ['f.a.vanlaenen@ieee.org']
 

data/spec/unit/european_union_luxembourg_spec.rb

@@ -32,9 +32,9 @@ describe Sapor::EuropeanUnionLuxembourg, '#no_of_seats' do
 end
 
 describe Sapor::EuropeanUnionLuxembourg, '#population_size' do
-  it 'returns a population size of 1,172,614' do
+  it 'returns a population size of 1,254,363' do
     expect(Sapor::EuropeanUnionLuxembourg.instance.population_size).to \
-      eq(1_172_614)
+      eq(1_254_363)
   end
 end
 

data/spec/unit/wallonia_spec.rb

@@ -25,52 +25,6 @@ describe Sapor::Wallonia, '#area_code' do
   end
 end
 
-describe Sapor::Wallonia, '#coalitions' do
-  def walloon_coalitions
-    Sapor::Wallonia.instance.coalitions
-  end
-
-  it 'returns MR + cdH + Ecolo as a coalition to track' do
-    expect(walloon_coalitions).to include(['cdH', 'Ecolo', 'MR'])
-  end
-
-  it 'returns PS + cdH + Ecolo as a coalition to track' do
-    expect(walloon_coalitions).to include(['cdH', 'Ecolo', 'PS'])
-  end
-
-  it 'returns MR + cdH as a coalition to track' do
-    expect(walloon_coalitions).to include(['cdH', 'MR'])
-  end
-
-  it 'returns PS + cdH as a coalition to track' do
-    expect(walloon_coalitions).to include(['cdH', 'PS'])
-  end
-
-  it 'returns PS + cdH + PTB as a coalition to track' do
-    expect(walloon_coalitions).to include(['cdH', 'PS', 'PTB'])
-  end
-
-  it 'returns MR + Ecolo as a coalition to track' do
-    expect(walloon_coalitions).to include(['Ecolo', 'MR'])
-  end
-
-  it 'returns PS + MR + Ecolo as a coalition to track' do
-    expect(walloon_coalitions).to include(['Ecolo', 'MR', 'PS'])
-  end
-
-  it 'returns PS + Ecolo + PTB as a coalition to track' do
-    expect(walloon_coalitions).to include(['Ecolo', 'PS', 'PTB'])
-  end
-
-  it 'returns PS + MR as a coalition to track' do
-    expect(walloon_coalitions).to include(['MR', 'PS'])
-  end
-
-  it 'returns PS + PTB as a coalition to track' do
-    expect(walloon_coalitions).to include(['PS', 'PTB'])
-  end
-end
-
 describe Sapor::Wallonia, '#no_of_seats' do
   it 'returns 75 as the number of seats' do
     expect(Sapor::Wallonia.instance.no_of_seats).to eq(75)
@@ -78,48 +32,34 @@ describe Sapor::Wallonia, '#no_of_seats' do
 end
 
 describe Sapor::Wallonia, '#population_size' do
-  it 'returns a population size of 2,047,387' do
-    expect(Sapor::Wallonia.instance.population_size).to eq(2_047_387)
+  it 'returns a population size of 2,034,813' do
+    expect(Sapor::Wallonia.instance.population_size).to eq(2_034_813)
   end
 end
 
 describe Sapor::Wallonia, '#seats' do
-  it 'calculates the number of seats for the election of 2014' do
+  it 'calculates the number of seats for the election of 2019' do
     Wallonia = Sapor::Wallonia.instance
-    results = Wallonia.overall_election_results_of_2014
+    results = Wallonia.overall_election_results_of_2019
     seats = Wallonia.seats(results)
-    # expect(seats['PS']).to eq(30)
-    expect(seats['PS']).to eq(28) # Correction for Hainaut?
-    # expect(seats['MR']).to eq(25)
-    expect(seats['MR']).to eq(24) # Correction for Hainaut?
-    # expect(seats['cdH']).to eq(13)
-    expect(seats['cdH']).to eq(12) # Correction for Hainaut?
-    # expect(seats['Ecolo']).to eq(4)
-    expect(seats['Ecolo']).to eq(6) # Correction for Hainaut?
-    # expect(seats['PTB']).to eq(2)
-    expect(seats['PTB']).to eq(4) # Correction for Hainaut?
-    expect(seats['Parti Populaire']).to eq(1)
+    expect(seats['Parti Socialiste']).to eq(23)
+    expect(seats['Mouvement Réformateur']).to eq(20)
+    expect(seats['Ecolo']).to eq(12)
+    expect(seats['Centre démocrate humaniste']).to eq(10)
+    expect(seats['Parti du Travail de Belgique']).to eq(10)
+    expect(seats['AGIR']).to eq(0)
+    expect(seats['Collectif Citoyen']).to eq(0)
     expect(seats['DéFI']).to eq(0)
-    expect(seats['MG']).to eq(0)
-    expect(seats['VEGA']).to eq(0)
+    expect(seats['Demain']).to eq(0)
+    expect(seats['DierAnimal']).to eq(0)
     expect(seats['La Droite']).to eq(0)
-    expect(seats['Debout les Belges']).to eq(0)
-    expect(seats['Atomique']).to eq(0)
-    expect(seats['FW']).to eq(0)
-    expect(seats['ISLAM']).to eq(0)
+    expect(seats['Listes Destexhe']).to eq(0)
     expect(seats['NATION']).to eq(0)
-    expect(seats['NWA']).to eq(0)
-    expect(seats['P+']).to eq(0)
-    expect(seats['PIRATE']).to eq(0)
-    expect(seats['PP PARTIPENSIONNES']).to eq(0)
-    expect(seats['R']).to eq(0)
-    expect(seats['Rassemblement R']).to eq(0)
-    expect(seats['Rassemblement Wallon']).to eq(0)
-    expect(seats['R.W.F.']).to eq(0)
-    expect(seats['UdL']).to eq(0)
-    expect(seats['Union des Liberaux']).to eq(0)
-    expect(seats['VLC']).to eq(0)
-    expect(seats["Wallonie d’Abord"]).to eq(0)
+    expect(seats['Parti Communiste de Belgique']).to eq(0)
+    expect(seats['Parti Populaire']).to eq(0)
+    expect(seats['REFERENDUM']).to eq(0)
+    expect(seats['Turquoise']).to eq(0)
+    expect(seats['Wallonie Insoumise']).to eq(0)
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sapor
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.3
 platform: ruby
 authors:
 - Filip van Laenen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-30 00:00:00.000000000 Z
+date: 2019-12-19 00:00:00.000000000 Z
 dependencies: []
 description: SAPoR
 email:
@@ -230,6 +230,7 @@ files:
 - lib/sapor/regional_data/united_kingdom_with_tig.rb
 - lib/sapor/regional_data/utopia.rb
 - lib/sapor/regional_data/wallonia-2014.psv
+- lib/sapor/regional_data/wallonia-20190526.psv
 - lib/sapor/regional_data/wallonia.rb
 - lib/sapor/representatives_polychotomy.rb
 - lib/sapor/single_district_proportional.rb