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

sapor 0.3.4 → 0.3.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (26) hide show

checksums.yaml +4 -4
data/lib/sapor/poll.rb +3 -5
data/lib/sapor/regional_data/{european_union_france_2019.rb → european_union_27_france.rb} +10 -10
data/lib/sapor/regional_data/european_union_france.rb +8 -8
data/lib/sapor/regional_data/european_union_latvia.rb +5 -5
data/lib/sapor/regional_data/european_union_luxembourg.rb +1 -1
data/lib/sapor/regional_data/greece.rb +5 -5
data/lib/sapor/regional_data/latvia-20181006.psv +104 -0
data/lib/sapor/regional_data/latvia.rb +43 -44
data/lib/sapor/regional_data/luxembourg-20131020.psv +0 -16
data/lib/sapor/regional_data/luxembourg-20181014.psv +59 -0
data/lib/sapor/regional_data/luxembourg.rb +26 -20
data/lib/sapor.rb +1 -4
data/sapor.gemspec +1 -1
data/spec/unit/{european_union_france_2019_spec.rb → european_union_27_france_spec.rb} +11 -11
data/spec/unit/european_union_france_spec.rb +2 -2
data/spec/unit/greece_spec.rb +2 -2
data/spec/unit/latvia_spec.rb +19 -17
data/spec/unit/luxembourg_spec.rb +13 -12
metadata +7 -14
data/lib/sapor/regional_data/latvia_kpv.rb +0 -112
data/lib/sapor/regional_data/latvia_kpv_p_par.rb +0 -112
data/lib/sapor/regional_data/latvia_kpv_par.rb +0 -112
data/spec/unit/latvia_kpv_p_par_spec.rb +0 -38
data/spec/unit/latvia_kpv_par_spec.rb +0 -38
data/spec/unit/latvia_kpv_spec.rb +0 -38

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c82aca07c944b7856177371f689664504ad1db67bff9151627938bee6e2c4525
-  data.tar.gz: bc0b6f05813bad8c204a5058a309416e3b59f08395b88327ac2f15caf90a27ca
+  metadata.gz: f25fefeb34310d1cabbfa39e487ca17da86a423fb0c717f4e2171aeaa2efcf57
+  data.tar.gz: 668f74a5b33fb288533e5ffca9d0b6eb5e8b743bfa22311070c8b439cb830359
 SHA512:
-  metadata.gz: 840b5c70a2f624858ff02f96b83309b3513de3767909228fdc98abf39ee7487d69343a97356b9529d08acbada9ba3362d4ebe6ef4e409165b0ca810e23680808
-  data.tar.gz: 35e5e6a577ca5c87c82c66fe53f8bbde8a56a39718adc01a1657ace534f0472577257e3f249c4aa3098246fb36446cde9f19c3dd1604b591fd577b1f67f8be82
+  metadata.gz: f821ce4a0511660b8547873da615b74d7ccd90648cef7f623b9aa9fb44c3f0c56030574748bd5e9db30e55c03cca70dca63de6c29ae52ac12026bbbf743e1c3e
+  data.tar.gz: 11dc904bc2e19ff3d79342e795f04f6858d2ae2a7e30e5eef3a44fa61f32d1f89991c3b1fc47938379d5adffbea9e3d1fa2aaf2550c41ecd30efd5e4c13f9443

data/lib/sapor/poll.rb CHANGED Viewed

@@ -43,6 +43,7 @@ module Sapor
                             EuropeanUnion27Denmark.instance,
                             EuropeanUnion27Estonia.instance,
                             EuropeanUnion27Finland.instance,
+                            EuropeanUnion27France.instance,
                             EuropeanUnion27Ireland.instance,
                             EuropeanUnion27IrelandWithIa.instance,
                             EuropeanUnion27Italy.instance,
@@ -62,7 +63,6 @@ module Sapor
                             EuropeanUnionFinland.instance,
                             EuropeanUnionFlanders.instance,
                             EuropeanUnionFrance.instance,
-                            EuropeanUnionFrance2019.instance,
                             EuropeanUnionFrenchCommunityOfBelgium.instance,
                             EuropeanUnionGermany.instance,
                             EuropeanUnionGreatBritain.instance,
@@ -84,8 +84,6 @@ module Sapor
                             EuropeanUnionSlovenia.instance,
                             EuropeanUnionSpain.instance,
                             EuropeanUnionSweden.instance].freeze
-    LATVIAN_AREAS = [Latvia.instance, LatviaKpv.instance, \
-                     LatviaKpvPar.instance, LatviaKpvPPar.instance].freeze
     NORWEGIAN_AREAS = [Norway.instance, NorwegianMunicipality::BERGEN,
                        NorwegianMunicipality::OSLO,
                        NorwegianMunicipality::TRONDHEIM].freeze
@@ -104,10 +102,10 @@ module Sapor
                         PortugalWithoutPaf.instance].freeze
     AREAS_MAP = {}
     (BELGIAN_AREAS + CATALONIAN_AREAS + DANISH_AREAS + EUROPEAN_UNION_AREAS + \
-     LATVIAN_AREAS + NORWEGIAN_AREAS + POLISH_AREAS + PORTUGUESE_AREAS + \
+     NORWEGIAN_AREAS + POLISH_AREAS + PORTUGUESE_AREAS + \
      [Austria.instance, Estonia.instance, Finland.instance,
       FinlandWithSin.instance, France.instance, Greece.instance,
-      Hungary.instance, Iceland.instance, Luxembourg.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,

data/lib/sapor/regional_data/{european_union_france_2019.rb → european_union_27_france.rb} RENAMED Viewed

@@ -21,11 +21,11 @@ module Sapor
   #
   # The regional data for the European Union: France.
   #
-  class EuropeanUnionFrance2019 < Area
+  class EuropeanUnion27France < Area
     include Singleton
     def area_code
-      'EU[FR]@2019'
+      'EU27[FR]'
     end
     def coalitions
@@ -57,18 +57,18 @@ module Sapor
                   ['La France insoumise (GUE/NGL)',
                    'Nouveau Parti anticapitaliste (GUE/NGL)',
                    'Parti communiste français (GUE/NGL)'],
-                  ['Les Patriotes (EFDD)'],
                   ['Les Républicains (EPP)'],
-                  ['Lutte Ouvrière (*)', 'Mouvement des gilets jaunes (*)',
-                   'Résistons! (*)', 'Union populaire républicaine (*)']].freeze
+                  ['Les Patriotes (*)', 'Lutte Ouvrière (*)',
+                   'Mouvement des gilets jaunes (*)', 'Résistons! (*)',
+                   'Union populaire républicaine (*)']].freeze
     NO_OF_SEATS = 79
-    # Voter turnout on 25 May 2014
-    # Source: Web page with the official results of the elections of 25 May
-    # 2014, downloaded on 8 February 2018,
-    # https://en.wikipedia.org/wiki/European_Parliament_election,_2014_(France)
-    POPULATION_SIZE = 18_955_636
+    # Voter turnout on 26 May 2019
+    # Source: Web page with the official results of the elections of 25-26 May
+    # 2019, downloaded on 30 December 2019,
+    # https://en.wikipedia.org/wiki/2019_European_Parliament_election_in_France
+    POPULATION_SIZE = 22_655_174
     THRESHOLD = 0.05

data/lib/sapor/regional_data/european_union_france.rb CHANGED Viewed

@@ -57,18 +57,18 @@ module Sapor
                   ['La France insoumise (GUE/NGL)',
                    'Nouveau Parti anticapitaliste (GUE/NGL)',
                    'Parti communiste français (GUE/NGL)'],
-                  ['Les Patriotes (EFDD)'],
                   ['Les Républicains (EPP)'],
-                  ['Lutte Ouvrière (*)', 'Mouvement des gilets jaunes (*)',
-                   'Résistons! (*)', 'Union populaire républicaine (*)']].freeze
+                  ['Les Patriotes (*)', 'Lutte Ouvrière (*)',
+                   'Mouvement des gilets jaunes (*)', 'Résistons! (*)',
+                   'Union populaire républicaine (*)']].freeze
     NO_OF_SEATS = 74
-    # Voter turnout on 25 May 2014
-    # Source: Web page with the official results of the elections of 25 May
-    # 2014, downloaded on 8 February 2018,
-    # https://en.wikipedia.org/wiki/European_Parliament_election,_2014_(France)
-    POPULATION_SIZE = 18_955_636
+    # Voter turnout on 26 May 2019
+    # Source: Web page with the official results of the elections of 25-26 May
+    # 2019, downloaded on 30 December 2019,
+    # https://en.wikipedia.org/wiki/2019_European_Parliament_election_in_France
+    POPULATION_SIZE = 22_655_174
     THRESHOLD = 0.05

data/lib/sapor/regional_data/european_union_latvia.rb CHANGED Viewed

@@ -48,16 +48,16 @@ module Sapor
     COALITIONS = [['Attīstībai/Par! (RE)'],
                   ['Jaunā Saskaņa (GUE/NGL)'],
-                  ['Jaunā Vienotība (EPP)', 'Jaunā konservatīvā partija (EPP)',
-                   'KPV LV (EPP)',
+                  ['Jaunā VIENOTĪBA (EPP)', 'Jaunā konservatīvā partija (EPP)',
+                   'Politiskā partija „KPV LV” (EPP)',
                    'Zaļo un Zemnieku savienība (EPP)'],
                   ['Latvijas Krievu savienība (Greens/EFA)'],
-                  ['Latvijas Reģionu apvienība (ECR)',
+                  ['Latvijas Reģionu Apvienība (ECR)',
                    'Nacionālā apvienība „Visu Latvijai!”–„Tēvzemei un ' \
                      'Brīvībai/LNNK” (ECR)'],
                   ['No sirds Latvijai (*)', 'Vienoti Latvijai (*)'],
-                  ['Progresīvie (S&D)',
-                   'Sociāldemokrātiskā Partija “Saskaņa” (S&D)']].freeze
+                  ['PROGRESĪVIE (S&D)',
+                   'Sociāldemokrātiskā partija “Saskaņa” (S&D)']].freeze
     NO_OF_SEATS = 8

data/lib/sapor/regional_data/european_union_luxembourg.rb CHANGED Viewed

@@ -50,7 +50,7 @@ module Sapor
                   ['Chrëschtlech-Sozial Vollekspartei (EPP)'],
                   ['déi gréng (Greens/EFA)',
                    'Piratepartei Lëtzebuerg (Greens/EFA)'],
-                  ['Déi Lénk (GUE/NGL)'],
+                  ['déi Lénk (GUE/NGL)'],
                   ['Demokratesch Partei (RE)'],
                   ['Kommunistesch Partei Lëtzebuerg (*)',
                    'Partei fir Integral Demokratie (*)'],

data/lib/sapor/regional_data/greece.rb CHANGED Viewed

@@ -72,11 +72,11 @@ module Sapor
     NO_OF_BONUS_SEATS = 50
-    # Number of registered voters on 20 September 2015
-    # Source: Greek legislative election, September 2015, retrieved on 20
-    # January 2019.
-    # URL: https://en.wikipedia.org/wiki/Greek_legislative_election,_September_2015
-    POPULATION_SIZE = 5_567_930
+    # Number of registered voters on 7 July 2019
+    # Source: Greek legislative election, 7 July 2019, retrieved on 27
+    # December 2019.
+    # URL: https://en.wikipedia.org/wiki/2019_Greek_legislative_election
+    POPULATION_SIZE = 5_769_542
     THRESHOLD = 0.03

data/lib/sapor/regional_data/latvia-20181006.psv ADDED Viewed

@@ -0,0 +1,104 @@
+# 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: "13. Saeimas vēlēšanas". Retrieved on 28 December 2019.
+# URL: https://sv2018.cvk.lv/pub/ElectionResults
+Kurzeme | Politiskā partija „KPV LV”                                       | 21,220
+Kurzeme | Jaunā konservatīvā partija                                       | 15,751
+Kurzeme | Zaļo un Zemnieku savienība                                       | 14,925
+Kurzeme | Nacionālā apvienība „Visu Latvijai!”–„Tēvzemei un Brīvībai/LNNK” | 13,292
+Kurzeme | Attīstībai/Par!                                                  | 11,830
+Kurzeme | Sociāldemokrātiskā partija “Saskaņa”                             |  8,960
+Kurzeme | Jaunā VIENOTĪBA                                                  |  5,839
+Kurzeme | Latvijas Reģionu Apvienība                                       |  5,661
+Kurzeme | PROGRESĪVIE                                                      |  2,695
+Kurzeme | No sirds Latvijai                                                |  1,241
+Kurzeme | Latvijas Krievu savienība                                        |    912
+Kurzeme | Latviešu Nacionālisti                                            |    616
+Kurzeme | Apvienība SKG                                                    |    330
+Kurzeme | Par Alternatīvu                                                  |    207
+Kurzeme | Latvijas centriskā partija                                       |    150
+Kurzeme | Rīcības partija                                                  |    106
+Latgale | Sociāldemokrātiskā partija “Saskaņa”                             | 32,159
+Latgale | Zaļo un Zemnieku savienība                                       | 12,539
+Latgale | Latvijas Krievu savienība                                        |  9,561
+Latgale | Jaunā konservatīvā partija                                       |  7,900
+Latgale | Politiskā partija „KPV LV”                                       |  6,874
+Latgale | Jaunā VIENOTĪBA                                                  |  5,067
+Latgale | Nacionālā apvienība „Visu Latvijai!”–„Tēvzemei un Brīvībai/LNNK” |  4,465
+Latgale | Attīstībai/Par!                                                  |  4,181
+Latgale | Latvijas Reģionu Apvienība                                       |  3,849
+Latgale | No sirds Latvijai                                                |    865
+Latgale | PROGRESĪVIE                                                      |    840
+Latgale | Apvienība SKG                                                    |    242
+Latgale | Latviešu Nacionālisti                                            |    209
+Latgale | Rīcības partija                                                  |    204
+Latgale | Par Alternatīvu                                                  |    168
+Latgale | Latvijas centriskā partija                                       |    154
+Rīga | Sociāldemokrātiskā partija “Saskaņa”                             | 88,260
+Rīga | Attīstībai/Par!                                                  | 39,209
+Rīga | Politiskā partija „KPV LV”                                       | 35,895
+Rīga | Jaunā konservatīvā partija                                       | 35,696
+Rīga | Nacionālā apvienība „Visu Latvijai!”–„Tēvzemei un Brīvībai/LNNK” | 26,995
+Rīga | Jaunā VIENOTĪBA                                                  | 19,536
+Rīga | Zaļo un Zemnieku savienība                                       | 14,103
+Rīga | Latvijas Krievu savienība                                        | 11,207
+Rīga | PROGRESĪVIE                                                      |  9,936
+Rīga | Latvijas Reģionu Apvienība                                       |  6,066
+Rīga | No sirds Latvijai                                                |  2,003
+Rīga | Par Alternatīvu                                                  |  1,265
+Rīga | Latviešu Nacionālisti                                            |  1,153
+Rīga | Apvienība SKG                                                    |    396
+Rīga | Rīcības partija                                                  |    282
+Rīga | Latvijas centriskā partija                                       |    226
+Vidzeme | Jaunā konservatīvā partija                                       | 38,893
+Vidzeme | Politiskā partija „KPV LV”                                       | 34,341
+Vidzeme | Attīstībai/Par!                                                  | 33,651
+Vidzeme | Nacionālā apvienība „Visu Latvijai!”–„Tēvzemei un Brīvībai/LNNK” | 31,466
+Vidzeme | Zaļo un Zemnieku savienība                                       | 27,448
+Vidzeme | Sociāldemokrātiskā partija “Saskaņa”                             | 26,146
+Vidzeme | Jaunā VIENOTĪBA                                                  | 16,940
+Vidzeme | Latvijas Reģionu Apvienība                                       | 14,458
+Vidzeme | PROGRESĪVIE                                                      |  6,239
+Vidzeme | Latvijas Krievu savienība                                        |  3,061
+Vidzeme | No sirds Latvijai                                                |  1,844
+Vidzeme | Latviešu Nacionālisti                                            |  1,387
+Vidzeme | Par Alternatīvu                                                  |    787
+Vidzeme | Apvienība SKG                                                    |    506
+Vidzeme | Rīcības partija                                                  |    297
+Vidzeme | Latvijas centriskā partija                                       |    211
+Zemgale | Politiskā partija „KPV LV”                                       | 21,934
+Zemgale | Nacionālā apvienība „Visu Latvijai!”–„Tēvzemei un Brīvībai/LNNK” | 16,745
+Zemgale | Jaunā konservatīvā partija                                       | 16,454
+Zemgale | Zaļo un Zemnieku savienība                                       | 14,660
+Zemgale | Attīstībai/Par!                                                  | 12,814
+Zemgale | Sociāldemokrātiskā partija “Saskaņa”                             | 11,592
+Zemgale | Jaunā VIENOTĪBA                                                  |  9,160
+Zemgale | Latvijas Reģionu Apvienība                                       |  4,984
+Zemgale | PROGRESĪVIE                                                      |  2,368
+Zemgale | Latvijas Krievu savienība                                        |  2,273
+Zemgale | No sirds Latvijai                                                |  1,161
+Zemgale | Latviešu Nacionālisti                                            |    880
+Zemgale | Par Alternatīvu                                                  |    473
+Zemgale | Apvienība SKG                                                    |    261
+Zemgale | Rīcības partija                                                  |    170
+Zemgale | Latvijas centriskā partija                                       |    156

data/lib/sapor/regional_data/latvia.rb CHANGED Viewed

@@ -27,52 +27,24 @@ module Sapor
     end
     def coalitions
-      [['KPV LV', 'Sociāldemokrātiskā Partija “Saskaņa”'],
-       ['KPV LV', 'Sociāldemokrātiskā Partija “Saskaņa”',
-        'Zaļo un Zemnieku savienība'],
-       ['Kustība Par!',
-        'Nacionālā apvienība „Visu Latvijai!”–„Tēvzemei un Brīvībai/LNNK”',
-        'Vienotība', 'Zaļo un Zemnieku savienība'],
-       ['Kustība Par!',
-        'Nacionālā apvienība „Visu Latvijai!”–„Tēvzemei un Brīvībai/LNNK”',
-        'Zaļo un Zemnieku savienība'],
-       ['Kustība Par!', 'Jaunā konservatīvā partija',
-        'Nacionālā apvienība „Visu Latvijai!”–„Tēvzemei un Brīvībai/LNNK”',
-        'Vienotība'],
-       ['Kustība Par!', 'Jaunā konservatīvā partija',
-        'Nacionālā apvienība „Visu Latvijai!”–„Tēvzemei un Brīvībai/LNNK”',
-        'Vienotība', 'Zaļo un Zemnieku savienība'],
-       ['Kustība Par!', 'Jaunā konservatīvā partija',
-        'Nacionālā apvienība „Visu Latvijai!”–„Tēvzemei un Brīvībai/LNNK”',
-        'Zaļo un Zemnieku savienība'],
-       ['Kustība Par!', 'Jaunā konservatīvā partija',
-        'Sociāldemokrātiskā Partija “Saskaņa”'],
-       ['Kustība Par!', 'Sociāldemokrātiskā Partija “Saskaņa”'],
-       ['Jaunā konservatīvā partija',
-        'Nacionālā apvienība „Visu Latvijai!”–„Tēvzemei un Brīvībai/LNNK”',
-        'Vienotība', 'Zaļo un Zemnieku savienība'],
-       ['Jaunā konservatīvā partija',
-        'Nacionālā apvienība „Visu Latvijai!”–„Tēvzemei un Brīvībai/LNNK”',
-        'Zaļo un Zemnieku savienība'],
-       ['Nacionālā apvienība „Visu Latvijai!”–„Tēvzemei un Brīvībai/LNNK”',
-        'Vienotība', 'Zaļo un Zemnieku savienība']]
+      COALITIONS
     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_2018
+      if @overall_election_results_of_2018.nil?
+        @overall_election_results_of_2018 = \
+          summarize_election_results(election_results_of_2018)
       end
-      @overall_election_results_of_2014
+      @overall_election_results_of_2018
     end
     def population_size
-      # Voter turnout on 4 October 2014
-      913_491
+      # Voter turnout on 6 October 2018
+      839_000
     end
     def seats(simulation)
@@ -85,24 +57,51 @@ module Sapor
     private
-    SEAT_DISTRIBUTION = { 'Kurzeme' => 13, 'Latgale' => 15, 'Rīga' => 32,
-                          'Vidzeme' => 26, 'Zemgale' => 14 }.freeze
+    AP_PARTY = 'Attīstībai/Par!'.freeze
+    JKP_PARTY = 'Jaunā konservatīvā partija'.freeze
+    JV_PARTY = 'Jaunā VIENOTĪBA'.freeze
+    KPVLV_PARTY = 'Politiskā partija „KPV LV”'.freeze
+    NA_PARTY = 'Nacionālā apvienība „Visu Latvijai!”–„Tēvzemei un ' \
+               'Brīvībai/LNNK”'.freeze
+    SDPS_PARTY = 'Sociāldemokrātiskā partija “Saskaņa”'.freeze
+    ZZS_PARTY = 'Zaļo un Zemnieku savienība'.freeze
+    COALITIONS = [[AP_PARTY, JKP_PARTY, JV_PARTY, KPVLV_PARTY],
+                  [AP_PARTY, JKP_PARTY, JV_PARTY, KPVLV_PARTY, NA_PARTY],
+                  [AP_PARTY, JKP_PARTY, JV_PARTY, NA_PARTY],
+                  [AP_PARTY, JKP_PARTY, JV_PARTY, NA_PARTY, ZZS_PARTY],
+                  [AP_PARTY, JKP_PARTY, KPVLV_PARTY, NA_PARTY],
+                  [AP_PARTY, JKP_PARTY, NA_PARTY, ZZS_PARTY],
+                  [AP_PARTY, JKP_PARTY, SDPS_PARTY],
+                  [AP_PARTY, JV_PARTY, KPVLV_PARTY, NA_PARTY],
+                  [AP_PARTY, JV_PARTY, NA_PARTY, ZZS_PARTY],
+                  [AP_PARTY, NA_PARTY, ZZS_PARTY],
+                  [AP_PARTY, SDPS_PARTY],
+                  [JKP_PARTY, JV_PARTY, KPVLV_PARTY, NA_PARTY],
+                  [JKP_PARTY, JV_PARTY, NA_PARTY, ZZS_PARTY],
+                  [JKP_PARTY, NA_PARTY, ZZS_PARTY],
+                  [KPVLV_PARTY, SDPS_PARTY],
+                  [KPVLV_PARTY, SDPS_PARTY, ZZS_PARTY],
+                  [NA_PARTY, JV_PARTY, ZZS_PARTY]].freeze
+    SEAT_DISTRIBUTION = { 'Kurzeme' => 12, 'Latgale' => 14, 'Rīga' => 35,
+                          'Vidzeme' => 25, 'Zemgale' => 14 }.freeze
     THRESHOLD = 0.05
-    def election_results_of_2014
-      if @election_results_of_2014.nil?
-        @election_results_of_2014 = load_election_results(
-          'latvia-20141004.psv'
+    def election_results_of_2018
+      if @election_results_of_2018.nil?
+        @election_results_of_2018 = load_election_results(
+          'latvia-20181006.psv'
         )
       end
-      @election_results_of_2014
+      @election_results_of_2018
     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_2018, election_results_of_2018,
           SEAT_DISTRIBUTION, SainteLagueDenominators, 0, THRESHOLD
         )
       end

data/lib/sapor/regional_data/luxembourg-20131020.psv CHANGED Viewed

@@ -58,19 +58,3 @@ Sud | Déi Lénk                                    |  95,829
 Sud | Piratepartei Lëtzebuerg                     |  50,678
 Sud | Kommunistesch Partei Lëtzebuerg             |  40,132
 Sud | Partei fir Integral Demokratie              |  22,570

data/lib/sapor/regional_data/luxembourg-20181014.psv ADDED Viewed

@@ -0,0 +1,59 @@
+# 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: "Résultats officieux — Site officiel des élections // Grand-Duché de
+#          Luxembourg". Retrieved on 20 September 2018.
+# URL: https://elections.public.lu/fr/elections-legislatives/2013/resultats.html
+Centre | Chrëschtlech-Sozial Vollekspartei           | 337,687
+Centre | Demokratesch Partei                         | 280,144
+Centre | déi gréng                                   | 187,790
+Centre | Lëtzebuerger Sozialistesch Aarbechterpartei | 135,968
+Centre | Alternativ Demokratesch Reformpartei        |  79,159
+Centre | déi Lénk                                    |  66,253
+Centre | Piratepartei Lëtzebuerg                     |  59,537
+Centre | Kommunistesch Partei Lëtzebuerg             |   8,448
+Centre | Demokratie                                  |   3,949
+Est | Chrëschtlech-Sozial Vollekspartei           | 62,156
+Est | Demokratesch Partei                         | 43,681
+Est | déi gréng                                   | 34,930
+Est | Lëtzebuerger Sozialistesch Aarbechterpartei | 27,222
+Est | Alternativ Demokratesch Reformpartei        | 20,255
+Est | Piratepartei Lëtzebuerg                     | 14,762
+Est | déi Lénk                                    |  6,984
+Est | Kommunistesch Partei Lëtzebuerg             |  1,396
+Nord | Chrëschtlech-Sozial Vollekspartei           | 111,067
+Nord | Demokratesch Partei                         |  59,039
+Nord | Lëtzebuerger Sozialistesch Aarbechterpartei |  54,682
+Nord | déi gréng                                   |  44,728
+Nord | Alternativ Demokratesch Reformpartei        |  33,751
+Nord | Piratepartei Lëtzebuerg                     |  26,421
+Nord | déi Lénk                                    |  12,164
+Nord | Kommunistesch Partei Lëtzebuerg             |   2,734
+Sud | Chrëschtlech-Sozial Vollekspartei           | 488,471
+Sud | Lëtzebuerger Sozialistesch Aarbechterpartei | 403,460
+Sud | Demokratesch Partei                         | 214,216
+Sud | déi gréng                                   | 266,445
+Sud | Alternativ Demokratesch Reformpartei        | 159,223
+Sud | déi Lénk                                    | 108,193
+Sud | Piratepartei Lëtzebuerg                     | 126,829
+Sud | Kommunistesch Partei Lëtzebuerg             |  32,338
+Sud | Demokratie                                  |   6,371
+Sud | déi Konservativ                             |   9,516

data/lib/sapor/regional_data/luxembourg.rb CHANGED Viewed

@@ -27,29 +27,24 @@ module Sapor
     end
     def coalitions
-      [['Chrëschtlech-Sozial Vollekspartei'],
-       ['Chrëschtlech-Sozial Vollekspartei',
-        'Lëtzebuerger Sozialistesch Aarbechterpartei'],
-       ['Chrëschtlech-Sozial Vollekspartei', 'Demokratesch Partei'],
-       ['déi gréng', 'Demokratesch Partei',
-        'Lëtzebuerger Sozialistesch Aarbechterpartei']]
+      COALITIONS
     end
     def no_of_seats
       SEAT_DISTRIBUTION.values.inject(:+)
     end
-    def overall_election_results_of_2013
-      if @overall_election_results_of_2013.nil?
-        @overall_election_results_of_2013 = \
-          summarize_election_results(election_results_of_2013)
+    def overall_election_results_of_2018
+      if @overall_election_results_of_2018.nil?
+        @overall_election_results_of_2018 = \
+          summarize_election_results(election_results_of_2018)
       end
-      @overall_election_results_of_2013
+      @overall_election_results_of_2018
     end
     def population_size
-      # Voter turnout on 20 October 2013 (note: multiple votes per voter)
-      3_276_692
+      # Voter turnout on 14 October 2018 (note: multiple votes per voter)
+      3_529_969
     end
     def seats(simulation)
@@ -58,21 +53,32 @@ module Sapor
     private
-    SEAT_DISTRIBUTION = { 'Centre' => 21, 'Est' => 7, 'Nord' => 9, 'Sud' => 23 }.freeze
+    CSV_PARTY = 'Chrëschtlech-Sozial Vollekspartei'.freeze
+    DG_PARTY = 'déi gréng'.freeze
+    DP_PARTY = 'Demokratesch Partei'.freeze
+    LSAP_PARTY = 'Lëtzebuerger Sozialistesch Aarbechterpartei'.freeze
-    def election_results_of_2013
-      if @election_results_of_2013.nil?
-        @election_results_of_2013 = load_election_results(
-          'luxembourg-20131020.psv'
+    COALITIONS = [[CSV_PARTY],
+                  [CSV_PARTY, LSAP_PARTY],
+                  [CSV_PARTY, DP_PARTY],
+                  [DG_PARTY, DP_PARTY, LSAP_PARTY]].freeze
+    SEAT_DISTRIBUTION = { 'Centre' => 21, 'Est' => 7, 'Nord' => 9,
+                          'Sud' => 23 }.freeze
+    def election_results_of_2018
+      if @election_results_of_2018.nil?
+        @election_results_of_2018 = load_election_results(
+          'luxembourg-20181014.psv'
         )
       end
-      @election_results_of_2013
+      @election_results_of_2018
     end
     def electoral_system
       if @electoral_system.nil?
         @electoral_system = MultiDistrictProportional.new( \
-          overall_election_results_of_2013, election_results_of_2013,
+          overall_election_results_of_2018, election_results_of_2018,
           SEAT_DISTRIBUTION, DhondtDenominators
         )
       end

data/lib/sapor.rb CHANGED Viewed

@@ -67,6 +67,7 @@ require 'sapor/regional_data/european_union_27_croatia'
 require 'sapor/regional_data/european_union_27_denmark'
 require 'sapor/regional_data/european_union_27_estonia'
 require 'sapor/regional_data/european_union_27_finland'
+require 'sapor/regional_data/european_union_27_france'
 require 'sapor/regional_data/european_union_27_ireland'
 require 'sapor/regional_data/european_union_27_ireland_with_ia'
 require 'sapor/regional_data/european_union_27_italy'
@@ -86,7 +87,6 @@ require 'sapor/regional_data/european_union_estonia'
 require 'sapor/regional_data/european_union_finland'
 require 'sapor/regional_data/european_union_flanders'
 require 'sapor/regional_data/european_union_france'
-require 'sapor/regional_data/european_union_france_2019'
 require 'sapor/regional_data/european_union_french_community_of_belgium'
 require 'sapor/regional_data/european_union_germany'
 require 'sapor/regional_data/european_union_great_britain'
@@ -116,9 +116,6 @@ require 'sapor/regional_data/greece'
 require 'sapor/regional_data/hungary'
 require 'sapor/regional_data/iceland'
 require 'sapor/regional_data/latvia'
-require 'sapor/regional_data/latvia_kpv'
-require 'sapor/regional_data/latvia_kpv_p_par'
-require 'sapor/regional_data/latvia_kpv_par'
 require 'sapor/regional_data/luxembourg'
 require 'sapor/regional_data/netherlands'
 require 'sapor/regional_data/norway'

data/sapor.gemspec CHANGED Viewed

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

data/spec/unit/{european_union_france_2019_spec.rb → european_union_27_france_spec.rb} RENAMED Viewed

@@ -19,26 +19,26 @@
 require 'spec_helper'
-describe Sapor::EuropeanUnionFrance2019, '#area_code' do
-  it 'returns EU[FR]@2019 as the area code' do
-    expect(Sapor::EuropeanUnionFrance2019.instance.area_code).to eq('EU[FR]@2019')
+describe Sapor::EuropeanUnion27France, '#area_code' do
+  it 'returns EU27[FR] as the area code' do
+    expect(Sapor::EuropeanUnion27France.instance.area_code).to eq('EU27[FR]')
   end
 end
-describe Sapor::EuropeanUnionFrance2019, '#no_of_seats' do
+describe Sapor::EuropeanUnion27France, '#no_of_seats' do
   it 'returns 79 as the number of seats' do
-    expect(Sapor::EuropeanUnionFrance2019.instance.no_of_seats).to eq(79)
+    expect(Sapor::EuropeanUnion27France.instance.no_of_seats).to eq(79)
   end
 end
-describe Sapor::EuropeanUnionFrance2019, '#population_size' do
-  it 'returns a population size of 18,955,636' do
-    expect(Sapor::EuropeanUnionFrance2019.instance.population_size).to \
-      eq(18_955_636)
+describe Sapor::EuropeanUnion27France, '#population_size' do
+  it 'returns a population size of 22,655,174' do
+    expect(Sapor::EuropeanUnion27France.instance.population_size).to \
+      eq(22_655_174)
   end
 end
-describe Sapor::EuropeanUnionFrance2019, '#seats' do
+describe Sapor::EuropeanUnion27France, '#seats' do
   it 'calculates the number of seats using the votes of the 2014 election' do
     results = { 'Front national–Rassemblement bleu Marine  (ENF)' => 4_712_461,
                 'Union pour un mouvement populaire (EPP)' => 3_943_819,
@@ -53,7 +53,7 @@ describe Sapor::EuropeanUnionFrance2019, '#seats' do
                 'Alliance écologiste indépendante (—)' => 211_759,
                 'Force vie' => 138_708, 'Europe citoyenne (—)' => 127_849,
                 'Parti du vote blanc (—)' => 110_090 }
-    seats = Sapor::EuropeanUnionFrance2019.instance.seats(results)
+    seats = Sapor::EuropeanUnion27France.instance.seats(results)
     expect(seats['Front national–Rassemblement bleu Marine  (ENF)']).to eq(22 + 1)
     expect(seats['Union pour un mouvement populaire (EPP)']).to eq(18 + 2)
     expect(seats['Parti socialiste–Parti radical de gauche (S&D)']).to eq(12 + 1)