sapor 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a527f30bf6e8c2cc885284da9ce2d738fa4dd3636598e1e17ce7ceaa681f0d30
-  data.tar.gz: 55de26c7841c888820df2aee2606c0ce2ed14834a0bf5e56ad03ee57ab3d3f74
+  metadata.gz: d9db9878d88eba52cd75bd216c3fd4b98f72786aff78b781cd76b4dc9d0d68c6
+  data.tar.gz: f5ee7d583d0728b24adf93f1728398043ce77649694f328b1aac1830c80a6e91
 SHA512:
-  metadata.gz: 2bfc4afadfd3fa586ffa69d17ac83c230cb4f1410016b7466e4ca40a607f0d219e44577f7ca4535773251767f637afcb1da5c71ec24f1399110db741b897deb6
-  data.tar.gz: cb3aaf03010ac985332ed7d5ed506d5fa6cda3010207d7d35aa94775630fb155e77f22d1c8fdcf0c58fb2e727b18bd121623589bb8aa50881be5acf7c8498837
+  metadata.gz: 2a1dbf105b97217abfaa3cb2065be93f931e08fb670539cab5f35dcdbc74e9a224b7dbc0b6cdaebb5406f04723f33658c40a7be17aceee83a06c127f6c33d0f4
+  data.tar.gz: 21f6c3faca8b6300bfcc1800683f56de35cc8046b46bc2739b3a1a2641b64241456cac25e74933a893143aa57d66069a695ee8c34a897b2a0e5b713020ec8749

data/lib/sapor.rb

@@ -118,6 +118,7 @@ require 'sapor/regional_data/portugal_with_a_ch_and_il_without_paf'
 require 'sapor/regional_data/portugal_with_a_without_paf'
 require 'sapor/regional_data/portugal_with_ch_and_il_without_paf'
 require 'sapor/regional_data/portugal_without_paf'
+require 'sapor/regional_data/romania'
 require 'sapor/regional_data/slovakia'
 require 'sapor/regional_data/slovenia'
 require 'sapor/regional_data/spain'

data/lib/sapor/poll.rb

@@ -89,8 +89,8 @@ module Sapor
       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,
+      Luxembourg.instance, Netherlands.instance, Romania.instance,
+      Slovakia.instance, Slovenia.instance, Spain.instance, Sweden.instance,
       Sweden20140914.instance, UnitedKingdom.instance,
       UnitedKingdomWithBrexit.instance, UnitedKingdomWithBrexitAndChuk.instance,
       UnitedKingdomWithTig.instance, Utopia.instance]).map do |area|

data/lib/sapor/regional_data/european_union_portugal.rb

@@ -51,7 +51,7 @@ module Sapor
                    'Coligação Democrática Unitária (GUE/NGL)'],
                   ['CDS–Partido Popular (EPP)',
                    'Partido Social Democrata (EPP)'],
-                  ['Chega (ECR)'],
+                  ['Chega (ID)'],
                   ['Partido Socialista (S&D)'],
                   ['LIVRE (Greens/EFA)',
                    'Pessoas–Animais–Natureza (Greens/EFA)']].freeze

data/lib/sapor/regional_data/romania.rb

@@ -0,0 +1,107 @@
+#
+# 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
+#
+
+module Sapor
+  #
+  # The regional data for Romania.
+  #
+  class Romania < Area
+    include Singleton
+
+    def area_code
+      'RO'
+    end
+
+    def coalitions
+      COALITIONS
+    end
+
+    def no_of_seats
+      NO_OF_SEATS
+    end
+
+    def population_size
+      POPULATION_SIZE
+    end
+
+    def seats(simulation)
+      electoral_system.project(simulation)
+    end
+
+    def threshold
+      THRESHOLD
+    end
+
+    private
+
+    A2020_COALITION = 'Alianța 2020 USR-PLUS'.freeze
+    ALDE_PARTY = 'Partidul Alianța Liberalilor și Democraților'.freeze
+    # PLUS_PARTY = 'Partidul Libertății, Unității și Solidarității'.freeze
+    PMP_PARTY = 'Partidul Mișcarea Populară'.freeze
+    PNL_PARTY = 'Partidul Național Liberal'.freeze
+    PRO_PARTY = 'PRO România'.freeze
+    PSD_PARTY = 'Partidul Social Democrat'.freeze
+    UDMR_PARTY = 'Uniunea Democrată Maghiară din România'.freeze
+    # USR_PARTY = 'Uniunea Salvați România'.freeze
+
+    COALITIONS = [[A2020_COALITION, ALDE_PARTY, PMP_PARTY, PNL_PARTY],
+                  [A2020_COALITION, ALDE_PARTY, PMP_PARTY, PNL_PARTY,
+                   UDMR_PARTY],
+                  [A2020_COALITION, ALDE_PARTY, PNL_PARTY],
+                  [A2020_COALITION, ALDE_PARTY, PNL_PARTY, UDMR_PARTY],
+                  [A2020_COALITION, PMP_PARTY],
+                  [A2020_COALITION, PMP_PARTY, PNL_PARTY],
+                  [A2020_COALITION, PMP_PARTY, PNL_PARTY, UDMR_PARTY],
+                  [A2020_COALITION, PNL_PARTY],
+                  [A2020_COALITION, PNL_PARTY, UDMR_PARTY],
+                  [ALDE_PARTY, PMP_PARTY, PNL_PARTY, UDMR_PARTY],
+                  [ALDE_PARTY, PNL_PARTY, UDMR_PARTY],
+                  [ALDE_PARTY, PRO_PARTY, PSD_PARTY],
+                  [ALDE_PARTY, PSD_PARTY],
+                  [PMP_PARTY, PNL_PARTY],
+                  [PMP_PARTY, PNL_PARTY, UDMR_PARTY],
+                  [PNL_PARTY, UDMR_PARTY],
+                  # [ALDE_PARTY, PLUS_PARTY, PMP_PARTY, PNL_PARTY, UDMR_PARTY,
+                  #  USR_PARTY],
+                  [PNL_PARTY],
+                  [PRO_PARTY, PSD_PARTY]].freeze
+
+    NO_OF_SEATS = 312
+
+    # Voter turnout on 11 December 2016
+    # Source: Web page with the official results of the elections of 11 December
+    # 2016, downloaded on 22 February 2020,
+    # https://en.wikipedia.org/wiki/2016_Romanian_legislative_election
+    POPULATION_SIZE = 7_047_384
+
+    THRESHOLD = 0.05
+    COALITION_LIST_THRESHOLD = 0.08
+    COALITION_LISTS = [A2020_COALITION].freeze
+    MINORITY_LISTS = [UDMR_PARTY].freeze
+
+    def electoral_system
+      if @electoral_system.nil?
+        @electoral_system = SingleDistrictProportional.new(
+          NO_OF_SEATS, DhondtDenominators, THRESHOLD, 0, false,
+          COALITION_LIST_THRESHOLD, COALITION_LISTS, MINORITY_LISTS
+        )
+      end
+      @electoral_system
+    end
+  end
+end

data/lib/sapor/single_district_proportional.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+
 #
 # Statistical Analysis of Polling Results (SAPoR)
 # Copyright (C) 2020 Filip van Laenen <f.a.vanlaenen@ieee.org>
@@ -22,16 +22,24 @@ module Sapor
   # Class representing a proportional electoral system with only one district.
   #
   class SingleDistrictProportional
-    def initialize(no_of_seats, denominators_class, threshold = 0, bonus = 0)
+    def initialize(no_of_seats, denominators_class, threshold = 0, bonus = 0,
+                   other_eligible = true, coalition_list_threshold = 1,
+                   coalition_lists = [], minority_lists = [])
       @no_of_seats = no_of_seats
       @denominators_class = denominators_class
       @threshold = threshold
       @bonus = bonus
+      @other_eligible = other_eligible
+      @coalition_list_threshold = coalition_list_threshold
+      @coalition_lists = coalition_lists
+      @minority_lists = minority_lists
     end
 
     def project(simulation)
-      threshold = simulation.values.inject(:+).to_f * @threshold
-      quotients = quotients(simulation, threshold)
+      votes_sum = simulation.values.inject(:+).to_f
+      threshold = votes_sum * @threshold
+      coalition_list_threshold = votes_sum * @coalition_list_threshold
+      quotients = quotients(simulation, threshold, coalition_list_threshold)
       sorted_quotients = quotients.sort { |a, b| b.last <=> a.last }
       seats = sorted_quotients.map(&:first).slice(0, @no_of_seats)
       result = create_empty_result(simulation)
@@ -46,7 +54,7 @@ module Sapor
       simulation.each_key do |choice|
         result[choice] = 0
       end
-      result[simulation.max { |a, b| a.last <=> b.last }[0]] = @bonus
+      result[simulation.max_by(&:last)[0]] = @bonus
       result[OTHER] = 0
       result
     end
@@ -61,10 +69,15 @@ module Sapor
       end
     end
 
-    def quotients(votes, threshold)
+    def quotients(votes, threshold, coalition_list_threshold)
       quotients = []
       votes.each_pair do |choice, new_value|
-        next if new_value < threshold
+        next if choice == OTHER && !@other_eligible
+        next unless @minority_lists.include?(choice) ||
+                    @coalition_lists.include?(choice) &&
+                    new_value >= coalition_list_threshold ||
+                    !@coalition_lists.include?(choice) &&
+                    new_value >= threshold
         @denominators_class.get(@no_of_seats).each do |d|
           quotients << [choice, new_value.to_f / d]
         end

data/sapor.gemspec

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

data/spec/unit/romania_spec.rb

@@ -0,0 +1,69 @@
+
+#
+# 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
+#
+
+require 'spec_helper'
+
+describe Sapor::Romania, '#area_code' do
+  it 'returns RO as the area code' do
+    expect(Sapor::Romania.instance.area_code).to eq('RO')
+  end
+end
+
+describe Sapor::Romania, '#no_of_seats' do
+  it 'returns 312 as the number of seats' do
+    expect(Sapor::Romania.instance.no_of_seats).to eq(312)
+  end
+end
+
+describe Sapor::Romania, '#population_size' do
+  it 'returns a population size of 7,047,384' do
+    expect(Sapor::Romania.instance.population_size).to \
+      eq(7_047_384)
+  end
+end
+
+describe Sapor::Romania, '#seats' do
+  it 'calculates the number of seats for the election of 2014' do
+    results = { 'Partidul Social Democrat' => 3_204_864,
+                'Partidul Național Liberal' => 1_412_377,
+                'Uniunea Salvați România' => 625_154,
+                'Uniunea Democrată Maghiară din România' => 435_969,
+                'Partidul Alianța Liberalilor și Democraților' => 396_386,
+                'Partidul Mișcarea Populară' => 376_891,
+                'Partidul România Unită' => 196_397,
+                'Partidul România Mare' => 73_264,
+                'Partidul Ecologist Român' => 62_414,
+                'Alianța Noastră România' => 61_206,
+                'Partidul Socialist Român' => 24_580,
+                'Partida Romilor „Pro Europa”' => 13_126 }
+    seats = Sapor::Romania.instance.seats(results)
+    expect(seats['Partidul Social Democrat']).to eq(154 + 2)
+    expect(seats['Partidul Național Liberal']).to eq(69 - 1)
+    expect(seats['Uniunea Salvați România']).to eq(30)
+    expect(seats['Uniunea Democrată Maghiară din România']).to eq(21)
+    expect(seats['Partidul Alianța Liberalilor și Democraților']).to eq(20 - 1)
+    expect(seats['Partidul Mișcarea Populară']).to eq(18)
+    expect(seats['Partidul România Unită']).to eq(0)
+    expect(seats['Partidul România Mare']).to eq(0)
+    expect(seats['Partidul Ecologist Român']).to eq(0)
+    expect(seats['Alianța Noastră România']).to eq(0)
+    expect(seats['Partidul Socialist Român']).to eq(0)
+    expect(seats['Partida Romilor „Pro Europa”']).to eq(0)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sapor
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Filip van Laenen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-17 00:00:00.000000000 Z
+date: 2020-02-27 00:00:00.000000000 Z
 dependencies: []
 description: SAPoR
 email:
@@ -208,6 +208,7 @@ files:
 - lib/sapor/regional_data/portugal_with_a_without_paf.rb
 - lib/sapor/regional_data/portugal_with_ch_and_il_without_paf.rb
 - lib/sapor/regional_data/portugal_without_paf.rb
+- lib/sapor/regional_data/romania.rb
 - lib/sapor/regional_data/slovakia.rb
 - lib/sapor/regional_data/slovenia.rb
 - lib/sapor/regional_data/spain-20160626.psv
@@ -320,6 +321,7 @@ files:
 - spec/unit/pseudorandom_multirange_enumerator_spec.rb
 - spec/unit/referendum_polychotomy_spec.rb
 - spec/unit/representatives_polychotomy_spec.rb
+- spec/unit/romania_spec.rb
 - spec/unit/slovakia_spec.rb
 - spec/unit/slovenia_spec.rb
 - spec/unit/spain_spec.rb
@@ -445,6 +447,7 @@ test_files:
 - spec/unit/pseudorandom_multirange_enumerator_spec.rb
 - spec/unit/referendum_polychotomy_spec.rb
 - spec/unit/representatives_polychotomy_spec.rb
+- spec/unit/romania_spec.rb
 - spec/unit/slovakia_spec.rb
 - spec/unit/slovenia_spec.rb
 - spec/unit/spain_spec.rb