sapor 0.1b1 → 0.2a1

data/lib/sapor/regional_data/belgium_flanders.rb

@@ -0,0 +1,64 @@
+# 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 Belgium: the Flemish part.
+  #
+  class BelgiumFlanders < Belgium
+    def area_code
+      'BE[VLG]'
+    end
+
+    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_2019
+    end
+
+    def population_size
+      # Voter turnout on 26 May 2019
+      # Source: Web page with the official results of the elections of 26 May
+      # 2019, downloaded on 6 August 2019,
+      # https://verkiezingen2019.belgium.be/nl/verkiezingen?el=CK
+      1_156_127 + 554_838 + 998_917 + 690_028 + 806_395 	
+    end
+
+    def seat_distribution
+      SEAT_DISTRIBUTION
+    end
+
+    private
+
+    SEAT_DISTRIBUTION = { 'Antwerpen' => 24, 'Limburg' => 12,
+                          'Oost-Vlaanderen' => 20, 'Vlaams-Brabant' => 15,
+                          'West-Vlaanderen' => 16 }.freeze
+
+    def election_results_of_2019
+      if @election_results_of_2019.nil?
+        @election_results_of_2019 = load_election_results(
+          'belgium-flanders-20190526.psv'
+        )
+      end
+      @election_results_of_2019
+    end
+  end
+end

data/lib/sapor/regional_data/belgium_wallonia.rb

@@ -0,0 +1,63 @@
+# 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 Belgium: the Walloon part.
+  #
+  class BelgiumWallonia < Belgium
+    def area_code
+      'BE[WAL]'
+    end
+
+    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_2019
+    end
+
+    # Voter turnout on 26 May 2019
+    # Source: Web page with the official results of the elections of 26 May
+    # 2019, downloaded on 7 August 2019,
+    # https://verkiezingen2019.belgium.be/nl/verkiezingen?el=CK
+    def population_size
+      730_662 + 619_185 + 170_823 + 304_877 + 247_227
+    end
+
+    def seat_distribution
+      SEAT_DISTRIBUTION
+    end
+
+    private
+
+    SEAT_DISTRIBUTION = { 'Brabant wallon' => 5, 'Hainaut' => 18, 'Liège' => 15,
+                          'Luxembourg' => 4, 'Namur' => 6 }.freeze
+
+    def election_results_of_2019
+      if @election_results_of_2019.nil?
+        @election_results_of_2019 = load_election_results(
+          'belgium-wallonia-20190526.psv'
+        )
+      end
+      @election_results_of_2019
+    end
+  end
+end

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

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

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

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

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

@@ -0,0 +1,68 @@
+# 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: "Parliament of Catalonia election results, 27 September 2015". Central
+#         Electoral Commission. 6 November 2015. Retrieved on 21 October 2017.
+# URL: http://www.juntaelectoralcentral.es/cs/jec/documentos/CATALU%C3%91A_2015_Resultados.pdf
+
+# Adjustments:
+# Catalunya Sí que es Pot + Recortes Cero–Els Verds → Catalunya en Comú
+# Junts pel Sí → Partit Demòcrata Europeu Català + Esquerra Republicana de Catalunya–Catalunya Sí
+
+Barcelona | Junts per Catalunya                              | 556,461
+Barcelona | Esquerra Republicana de Catalunya–Catalunya Sí   | 556,461
+Barcelona | Ciutadans–Partido de la Ciudadanía               | 581,032
+Barcelona | Partit dels Socialistes de Catalunya (PSC-PSOE)  | 421,487
+Barcelona | Catalunya en Comú                                | 324,856
+Barcelona | Partit Popular                                   | 272,804
+Barcelona | Candidatura d’Unitat Popular                     | 255,328
+Barcelona | Unió Democràtica de Catalunya                    |  75,700
+Barcelona | Partit Animalista contra el Maltractament Animal |  24,426
+
+Girona | Junts per Catalunya                              | 108,167
+Girona | Esquerra Republicana de Catalunya–Catalunya Sí   | 108,167
+Girona | Ciutadans–Partido de la Ciudadanía               |  48,346
+Girona | Partit dels Socialistes de Catalunya (PSC-PSOE)  |  33,416
+Girona | Candidatura d’Unitat Popular                     |  33,117
+Girona | Partit Popular                                   |  22,660
+Girona | Catalunya en Comú                                |  19,158
+Girona | Unió Democràtica de Catalunya                    |   8,295
+Girona | Partit Animalista contra el Maltractament Animal |   1,823
+Girona | Pirates de Catalunya–Per decidir-ho tot          |     327
+Girona | Guanyem Catalunya                                |     320
+
+Lleida | Junts per Catalunya                              | 63,461
+Lleida | Esquerra Republicana de Catalunya–Catalunya Sí   | 63,461
+Lleida | Ciutadans–Partido de la Ciudadanía               | 26,612
+Lleida | Partit dels Socialistes de Catalunya (PSC-PSOE)  | 19,364
+Lleida | Candidatura d’Unitat Popular                     | 18,736
+Lleida | Partit Popular                                   | 16,761
+Lleida | Catalunya en Comú                                | 10,290
+Lleida | Unió Democràtica de Catalunya                    |  8,178
+Lleida | Partit Animalista contra el Maltractament Animal |  1,046
+Lleida | Guanyem Catalunya                                |    221
+
+Tarragona | Junts per Catalunya                              | 86,269
+Tarragona | Esquerra Republicana de Catalunya–Catalunya Sí   | 86,269
+Tarragona | Ciutadans–Partido de la Ciudadanía               | 80,374
+Tarragona | Partit dels Socialistes de Catalunya (PSC-PSOE)  | 49,016
+Tarragona | Partit Popular                                   | 36,968
+Tarragona | Candidatura d’Unitat Popular                     | 30,613
+Tarragona | Catalunya en Comú                                | 27,773
+Tarragona | Unió Democràtica de Catalunya                    | 11,120
+Tarragona | Partit Animalista contra el Maltractament Animal |  2,862
+Tarragona | Guanyem Catalunya                                |    626

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

@@ -0,0 +1,68 @@
+# 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: "Parliament of Catalonia election results, 27 September 2015". Central
+#         Electoral Commission. 6 November 2015. Retrieved on 21 October 2017.
+# URL: http://www.juntaelectoralcentral.es/cs/jec/documentos/CATALU%C3%91A_2015_Resultados.pdf
+
+# Adjustments:
+# Catalunya Sí que es Pot + Recortes Cero–Els Verds → Catalunya en Comú
+# Junts pel Sí → Partit Demòcrata Europeu Català + Esquerra Republicana de Catalunya–Catalunya Sí
+
+Barcelona | Partit Demòcrata Europeu Català                  | 556,461
+Barcelona | Esquerra Republicana de Catalunya–Catalunya Sí   | 556,461
+Barcelona | Ciutadans–Partido de la Ciudadanía               | 581,032
+Barcelona | Partit dels Socialistes de Catalunya (PSC-PSOE)  | 421,487
+Barcelona | Catalunya en Comú                                | 324,856
+Barcelona | Partit Popular                                   | 272,804
+Barcelona | Candidatura d’Unitat Popular                     | 255,328
+Barcelona | Unió Democràtica de Catalunya                    |  75,700
+Barcelona | Partit Animalista contra el Maltractament Animal |  24,426
+
+Girona | Partit Demòcrata Europeu Català                  | 108,167
+Girona | Esquerra Republicana de Catalunya–Catalunya Sí   | 108,167
+Girona | Ciutadans–Partido de la Ciudadanía               |  48,346
+Girona | Partit dels Socialistes de Catalunya (PSC-PSOE)  |  33,416
+Girona | Candidatura d’Unitat Popular                     |  33,117
+Girona | Partit Popular                                   |  22,660
+Girona | Catalunya en Comú                                |  19,158
+Girona | Unió Democràtica de Catalunya                    |   8,295
+Girona | Partit Animalista contra el Maltractament Animal |   1,823
+Girona | Pirates de Catalunya–Per decidir-ho tot          |     327
+Girona | Guanyem Catalunya                                |     320
+
+Lleida | Partit Demòcrata Europeu Català                  | 63,461
+Lleida | Esquerra Republicana de Catalunya–Catalunya Sí   | 63,461
+Lleida | Ciutadans–Partido de la Ciudadanía               | 26,612
+Lleida | Partit dels Socialistes de Catalunya (PSC-PSOE)  | 19,364
+Lleida | Candidatura d’Unitat Popular                     | 18,736
+Lleida | Partit Popular                                   | 16,761
+Lleida | Catalunya en Comú                                | 10,290
+Lleida | Unió Democràtica de Catalunya                    |  8,178
+Lleida | Partit Animalista contra el Maltractament Animal |  1,046
+Lleida | Guanyem Catalunya                                |    221
+
+Tarragona | Partit Demòcrata Europeu Català                  | 86,269
+Tarragona | Esquerra Republicana de Catalunya–Catalunya Sí   | 86,269
+Tarragona | Ciutadans–Partido de la Ciudadanía               | 80,374
+Tarragona | Partit dels Socialistes de Catalunya (PSC-PSOE)  | 49,016
+Tarragona | Partit Popular                                   | 36,968
+Tarragona | Candidatura d’Unitat Popular                     | 30,613
+Tarragona | Catalunya en Comú                                | 27,773
+Tarragona | Unió Democràtica de Catalunya                    | 11,120
+Tarragona | Partit Animalista contra el Maltractament Animal |  2,862
+Tarragona | Guanyem Catalunya                                |    626

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

@@ -0,0 +1,63 @@
+# 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: "Parliament of Catalonia election results, 27 September 2015". Central
+#         Electoral Commission. 6 November 2015. Retrieved on 21 October 2017.
+# URL: http://www.juntaelectoralcentral.es/cs/jec/documentos/CATALU%C3%91A_2015_Resultados.pdf
+
+# Adjustments:
+# Catalunya Sí que es Pot + Recortes Cero–Els Verds → Catalunya en Comú
+
+Barcelona | Junts pel Sí                                     | 1,112,922
+Barcelona | Ciutadans–Partido de la Ciudadanía               |   581,032
+Barcelona | Partit dels Socialistes de Catalunya (PSC-PSOE)  |   421,487
+Barcelona | Catalunya en Comú                                |   324,856
+Barcelona | Partit Popular                                   |   272,804
+Barcelona | Candidatura d’Unitat Popular                     |   255,328
+Barcelona | Unió Democràtica de Catalunya                    |    75,700
+Barcelona | Partit Animalista contra el Maltractament Animal |    24,426
+
+Girona | Junts pel Sí                                     | 216,333
+Girona | Ciutadans–Partido de la Ciudadanía               |  48,346
+Girona | Partit dels Socialistes de Catalunya (PSC-PSOE)  |  33,416
+Girona | Candidatura d’Unitat Popular                     |  33,117
+Girona | Partit Popular                                   |  22,660
+Girona | Catalunya en Comú                                |  19,158
+Girona | Unió Democràtica de Catalunya                    |   8,295
+Girona | Partit Animalista contra el Maltractament Animal |   1,823
+Girona | Pirates de Catalunya–Per decidir-ho tot          |     327
+Girona | Guanyem Catalunya                                |     320
+
+Lleida | Junts pel Sí                                     | 126,922
+Lleida | Ciutadans–Partido de la Ciudadanía               |  26,612
+Lleida | Partit dels Socialistes de Catalunya (PSC-PSOE)  |  19,364
+Lleida | Candidatura d’Unitat Popular                     |  18,736
+Lleida | Partit Popular                                   |  16,761
+Lleida | Catalunya en Comú                                |  10,290
+Lleida | Unió Democràtica de Catalunya                    |   8,178
+Lleida | Partit Animalista contra el Maltractament Animal |   1,046
+Lleida | Guanyem Catalunya                                |     221
+
+Tarragona | Junts pel Sí                                     | 172,537
+Tarragona | Ciutadans–Partido de la Ciudadanía               |  80,374
+Tarragona | Partit dels Socialistes de Catalunya (PSC-PSOE)  |  49,016
+Tarragona | Partit Popular                                   |  36,968
+Tarragona | Candidatura d’Unitat Popular                     |  30,613
+Tarragona | Catalunya en Comú                                |  27,773
+Tarragona | Unió Democràtica de Catalunya                    |  11,120
+Tarragona | Partit Animalista contra el Maltractament Animal |   2,862
+Tarragona | Guanyem Catalunya                                |     626

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

@@ -0,0 +1,109 @@
+# 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

@@ -0,0 +1,96 @@
+# 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

data/lib/sapor/regional_data/catalonia.rb

@@ -1,7 +1,7 @@
 # encoding: utf-8
 #
 # Statistical Analysis of Polling Results (SAPoR)
-# Copyright (C) 2014 Filip van Laenen <f.a.vanlaenen@ieee.org>
+# Copyright (C) 2016 Filip van Laenen <f.a.vanlaenen@ieee.org>
 #
 # This file is part of SAPoR.
 #
@@ -22,34 +22,40 @@ module Sapor
   # The regional data for Catalonia.
   #
   class Catalonia < Area
+    include Singleton
     def area_code
       'ES-CT'
     end
 
     def coalitions
       [['Junts pel Sí'],
-       ['Junts pel Sí',
-        "Candidatura d'Unitat Popular – Alternativa d'Esquerres"]]
+       ['Junts pel Sí', 'Candidatura d’Unitat Popular'],
+       ['Junts pel 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_2012_adapted_to_2015
-      if @overall_election_results_of_2012_adapted_to_2015.nil?
-        @overall_election_results_of_2012_adapted_to_2015 = \
-          summarize_election_results(election_results_of_2012_adapted_to_2015)
+    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_2012_adapted_to_2015
+      @overall_election_results_of_2015
     end
 
     def population_size
-      # Voter turnout in 2012
-      # Source: Catalonian parliamentary election, 2012, Wikipedia, retrieved on
-      # 22 July 2015.
-      # URL: https://en.wikipedia.org/wiki/Catalonian_parliamentary_election,_2012
-      3_668_310
+      # 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)
@@ -67,19 +73,19 @@ module Sapor
 
     THRESHOLD = 0.03
 
-    def election_results_of_2012_adapted_to_2015
-      if @election_results_of_2012_adapted_to_2015.nil?
-        @election_results_of_2012_adapted_to_2015 = load_election_results( \
-          'catalonia-2012-2015.psv')
+    def election_results_of_2015
+      if @election_results_of_2015.nil?
+        @election_results_of_2015 = load_election_results( \
+          'catalonia-2015.psv')
       end
-      @election_results_of_2012_adapted_to_2015
+      @election_results_of_2015
     end
 
     def electoral_system
       if @electoral_system.nil?
-        @electoral_system = Proportional.new( \
-          overall_election_results_of_2012_adapted_to_2015,
-          election_results_of_2012_adapted_to_2015,
+        @electoral_system = MultiDistrictProportional.new( \
+          overall_election_results_of_2015,
+          election_results_of_2015,
           SEAT_DISTRIBUTION,
           DhondtDenominators,
           THRESHOLD)