sapor 0.1b1 → 0.2a1

data/lib/sapor/representatives_polychotomy.rb

@@ -0,0 +1,338 @@
+# 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
+  #
+  # Represents a polychotomy for the election of representatives.
+  #
+  class RepresentativesPolychotomy < Polychotomy
+    include NumberFormatter
+
+    def initialize(results, area, dichotomies, max_error, logger = nil)
+      @logger = logger
+      @coalitions = area.coalitions
+      super(results, area, dichotomies, max_error)
+      @seats = create_new_seats_distributions
+    end
+
+    def refine
+      no_of_new_simulations = 0
+      new_votes = create_new_votes_distributions
+      new_seats = create_new_seats_distributions
+      last_logger_info = 0
+      while @no_of_data_points == 0 || no_of_new_simulations == 0 ||
+            no_of_new_simulations < @no_of_simulations
+        no_of_new_simulations += try_next_data_point(new_votes, new_seats)
+        if @logger != nil && no_of_new_simulations > 0 && no_of_new_simulations % 131_072 == 0 && last_logger_info < no_of_new_simulations
+          @logger.info("#{with_thousands_separator(@no_of_simulations + no_of_new_simulations)} simulations done so far.")
+          last_logger_info = no_of_new_simulations
+        end
+      end
+      unless @no_of_simulations == 0
+        @error_estimate = calculate_error_estimate(new_votes)
+      end
+      @votes = merge_distributions(@votes, new_votes)
+      @seats = merge_distributions(@seats, new_seats)
+      @no_of_simulations += no_of_new_simulations
+    end
+
+    def try_next_data_point(new_votes, new_seats)
+      data_point = next_data_point
+      if data_point[OTHER] >= 0
+        simulate(new_votes, new_seats, data_point)
+        new_simulation = 1
+      else
+        new_simulation = 0
+      end
+      @no_of_data_points += 1
+      new_simulation
+    end
+
+    def report
+      choice_lengths = @choices.map(&:length)
+      choice_lengths << 6
+      max_choice_width = choice_lengths.max
+      max_seats_width = @area.no_of_seats.to_s.size
+      sorted_choices = sort_choices_by_result
+      choice_lines = sorted_choices.map.with_index do |choice, i|
+        next_choice = sorted_choices[i + 1]
+        create_choice_report_line(choice, next_choice, max_choice_width, max_seats_width)
+      end
+      coalition_lengths = @coalitions.map { |coalition| coalition_label(coalition).length }
+      coalition_lengths << 6
+      max_coalition_width = coalition_lengths.max
+      sorted_coalitions = sort_coalitions_by_result
+      coalition_lines = sorted_coalitions.map do |coalition|
+        create_coalition_report_line(coalition, max_coalition_width, max_seats_width)
+      end
+      'Most probable rounded fractions, fractions and 95% confidence' \
+      " intervals:\n" + 'Choice'.ljust(max_choice_width) +
+        "  Result    MPRF    MPF      CI(95%)      P(>↓)  Seats\n" +
+        choice_lines.join("\n") + "\n" +
+        'Coalition'.ljust(max_coalition_width) + '  Result    MPRF    MPF' \
+        "      CI(95%)     P(>50%)  Seats  P(>50%)\n" +
+        coalition_lines.join("\n")
+    end
+
+    def progress_report
+      space_size_ratio = space_size.to_f / @no_of_data_points
+      if space_size_ratio > 10
+        space_size_ratio = with_thousands_separator(space_size_ratio.round)
+      else
+        space_size_ratio = space_size_ratio.round(1)
+      end
+      "#{with_thousands_separator(@no_of_simulations)} simulations out of " \
+      "#{with_thousands_separator(@no_of_data_points)} data" \
+      " points, 1 / #{space_size_ratio} of search space size" \
+      " (#{with_thousands_separator(space_size)})."
+    end
+
+    def write_outputs(filename)
+      write_rankings(filename)
+      write_seats_confidence_intervals(filename)
+      write_seats_probabilities(filename)
+      write_coalitions_seats_confidence_intervals(filename)
+      write_coalitions_seats_probabilities(filename)
+      write_state_summary(filename)
+    end
+
+    private
+
+    def create_new_seats_distributions
+      seats = {}
+      @choices.each do |choice|
+        seats[choice] = CombinationsDistribution.new
+        Range.new(0, @area.no_of_seats).each do |value|
+          seats[choice][value] = 0.to_lf
+        end
+      end
+      @coalitions.each do |coalition|
+        seats[coalition] = CombinationsDistribution.new
+        Range.new(0, @area.no_of_seats).each do |value|
+          seats[coalition][value] = 0.to_lf
+        end
+      end
+      seats
+    end
+
+    def create_new_votes_distributions
+      votes = {}
+      @choices.each do |choice|
+        unless choice == OTHER
+          votes[choice] = CombinationsDistribution.new
+          @ranges[choice].each do |value|
+            votes[choice][value] = 0.to_lf
+          end
+        end
+      end
+      @coalitions.each do |coalition|
+        votes[coalition] = CombinationsDistribution.new
+      end
+      votes
+    end
+
+    def simulate(votes, seats, data_point)
+      combinations = 1.to_lf
+      data_point.each do |choice, value|
+        combinations *= BinomialsCache.binomial(value, @results[choice])
+      end
+      @combinations_sum += combinations
+      data_point.each do |choice, value|
+        votes[choice][value] += combinations unless choice == OTHER
+      end
+      @choices.each do |a|
+        @choices.each do |b|
+          if data_point[a] > data_point[b]
+            @comparisons[a + '>' + b] += combinations
+          end
+        end
+      end
+      @choices.sort { |a, b| data_point[b] <=> data_point[a] }.each_with_index do |choice, i|
+        @rankings[choice + '@' + i.to_s] += combinations
+      end
+      @coalitions.each do |coalition|
+        coalition_value = coalition.map { |choice| data_point.key?(choice) ? data_point[choice] : 0 }.inject(:+)
+        if votes[coalition][coalition_value].nil?
+          votes[coalition][coalition_value] = combinations
+        else
+          votes[coalition][coalition_value] += combinations
+        end
+      end
+      projection = @area.seats(data_point)
+      @choices.each do |choice|
+        if projection.key?(choice)
+          seats[choice][projection[choice]] += combinations
+        else
+          seats[choice][0] += combinations
+        end
+      end
+      @coalitions.each do |coalition|
+        coalition_value = coalition.map { |choice| projection.key?(choice) ? projection[choice] : 0 }.inject(:+)
+        if seats[coalition][coalition_value].nil?
+          seats[coalition][coalition_value] = combinations
+        else
+          seats[coalition][coalition_value] += combinations
+        end
+      end
+    end
+
+    def calculate_error_estimate(new_simulations)
+      error_estimate = 0
+      @choices.each do |choice|
+        unless choice == OTHER
+          mpv_new = calculate_most_probable_fraction(choice, new_simulations)
+          mpv_old = calculate_most_probable_fraction(choice, @votes)
+          delta = (mpv_new - mpv_old).abs
+          error_estimate = [error_estimate, delta].max
+        end
+      end
+      error_estimate
+    end
+
+    def merge_distributions(distributions1, distributions2)
+      merged_distributions = {}
+      @choices.each do |choice|
+        unless choice == OTHER
+          merged_distributions[choice] = distributions1[choice] + \
+                                         distributions2[choice]
+        end
+      end
+      @coalitions.each do |coalition|
+        merged_distributions[coalition] = distributions1[coalition] + \
+                                          distributions2[coalition]
+      end
+      merged_distributions
+    end
+
+    def coalition_label(coalition)
+      coalition.sort.join(' + ')
+    end
+
+    def sort_coalitions_by_result
+      @coalitions.sort do |a, b|
+        comparison = result(b) <=> result(a)
+        if comparison == 0
+          coalition_label(a) <=> coalition_label(b)
+        else
+          comparison
+        end
+      end
+    end
+
+    def coalition_result(coalition)
+      coalition.map { |choice| @results[choice].to_f }.inject(:+) / @results.values.inject(:+)
+    end
+
+    def create_choice_report_line(choice, next_choice, max_choice_width, max_seats_width)
+      ci_values = @votes[choice].confidence_interval(0.95)
+      confidence_interval = ci_values.map { |x| x.to_f / @area.population_size }
+      ci_seats = @seats[choice].confidence_interval(0.95)
+      choice.ljust(max_choice_width) + '  ' + \
+        six_char_percentage(result(choice)) + '  ' + \
+        six_char_percentage(most_probable_rounded_fraction(choice)) + '  ' + \
+        six_char_percentage(most_probable_fraction(choice)) + '  ' + \
+        six_char_percentage(confidence_interval.first) + '–' + \
+        six_char_percentage(confidence_interval.last) + '  ' + \
+        (next_choice.nil? ? '      ' : six_char_percentage(larger_than(choice, next_choice))) + '  ' + \
+        (max_seats_width == 1 ? ' ' : '') + \
+        ci_seats.first.to_s.rjust(max_seats_width) + '–' + \
+        ci_seats.last.to_s.rjust(max_seats_width)
+    end
+
+    def create_coalition_report_line(coalition, max_coalition_width, max_seats_width)
+      ci_values = @votes[coalition].confidence_interval(0.95)
+      majority_votes_probability = @votes[coalition].threshold_probability(0.5, @area.population_size)
+      confidence_interval = ci_values.map { |x| x.to_f / @area.population_size }
+      ci_seats = @seats[coalition].confidence_interval(0.95)
+      seats_majority = 1 + @area.no_of_seats / 2
+      majority_seats_probability = @seats[coalition].value_threshold_probability(seats_majority)
+      coalition_label(coalition).ljust(max_coalition_width) + '  ' + \
+        six_char_percentage(coalition_result(coalition)) + '  ' + \
+        six_char_percentage(most_probable_rounded_fraction(coalition)) + '  ' + \
+        six_char_percentage(most_probable_fraction(coalition)) + '  ' + \
+        six_char_percentage(confidence_interval.first) + '–' + \
+        six_char_percentage(confidence_interval.last) + '   ' + \
+        six_char_percentage(majority_votes_probability) + '  ' + \
+        (max_seats_width == 1 ? ' ' : '') + \
+        ci_seats.first.to_s.rjust(max_seats_width) + '–' + \
+        ci_seats.last.to_s.rjust(max_seats_width) + '    ' + \
+        six_char_percentage(majority_seats_probability)
+    end
+    
+    def write_seats_confidence_intervals(filename)
+      ci_filename = filename.gsub('.poll', '-polychotomy-seats-confidence-intervals.psv')
+      File.open(ci_filename, 'w') do |file| 
+        file.puts('Choice | CI(80%) Bottom | CI(80%) Top | CI(90%) Bottom | CI(90%) Top | CI(95%) Bottom | CI(95%) Top | CI(99%) Bottom | CI(99%) Top') 
+        @choices.each do | choice |
+          unless choice == OTHER
+            ci80 = @seats[choice].confidence_interval(0.8)
+            ci90 = @seats[choice].confidence_interval(0.9)
+            ci95 = @seats[choice].confidence_interval(0.95)
+            ci99 = @seats[choice].confidence_interval(0.99)
+            file.puts(choice + ' | ' + ci80.first.to_s + ' | ' + \
+                      ci80.last.to_s + ' | ' + ci90.first.to_s + ' | ' + \
+                      ci90.last.to_s + ' | ' + ci95.first.to_s + ' | ' + \
+                      ci95.last.to_s + ' | ' + ci99.first.to_s + ' | ' + \
+                      ci99.last.to_s)
+          end
+        end
+      end
+    end    
+
+    def write_seats_probabilities(filename)
+      ci_filename = filename.gsub('.poll', '-polychotomy-seats-probabilities.psv')
+      File.open(ci_filename, 'w') do |file| 
+        file.puts('Choice | ' + Range.new(0, @area.no_of_seats).to_a.join(' | '))
+        @choices.each do | choice |
+          unless choice == OTHER
+            file.puts(choice + ' | ' + @seats[choice].probabilities(Range.new(0, @area.no_of_seats).to_a).join(' | '))
+          end
+        end
+      end
+    end    
+
+    def write_coalitions_seats_confidence_intervals(filename)
+      ci_filename = filename.gsub('.poll', '-polychotomy-coalitions-seats-confidence-intervals.psv')
+      File.open(ci_filename, 'w') do |file| 
+        file.puts('Coalition | CI(80%) Bottom | CI(80%) Top | CI(90%) Bottom | CI(90%) Top | CI(95%) Bottom | CI(95%) Top | CI(99%) Bottom | CI(99%) Top') 
+        @coalitions.each do | coalition |
+          ci80 = @seats[coalition].confidence_interval(0.8)
+          ci90 = @seats[coalition].confidence_interval(0.9)
+          ci95 = @seats[coalition].confidence_interval(0.95)
+          ci99 = @seats[coalition].confidence_interval(0.99)
+          file.puts(coalition_label(coalition) + ' | ' + ci80.first.to_s + ' | ' + \
+                    ci80.last.to_s + ' | ' + ci90.first.to_s + ' | ' + \
+                    ci90.last.to_s + ' | ' + ci95.first.to_s + ' | ' + \
+                    ci95.last.to_s + ' | ' + ci99.first.to_s + ' | ' + \
+                    ci99.last.to_s)
+        end
+      end
+    end    
+
+    def write_coalitions_seats_probabilities(filename)
+      ci_filename = filename.gsub('.poll', '-polychotomy-coalitions-seats-probabilities.psv')
+      File.open(ci_filename, 'w') do |file| 
+        file.puts('Coalition | ' + Range.new(0, @area.no_of_seats).to_a.join(' | '))
+        @coalitions.each do | coalition |
+          file.puts(coalition_label(coalition) + ' | ' + @seats[coalition].probabilities(Range.new(0, @area.no_of_seats).to_a).join(' | '))
+        end
+      end
+    end
+  end
+end

data/lib/sapor/single_district_proportional.rb

@@ -0,0 +1,75 @@
+# 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
+  #
+  # Class representing a proportional electoral system with only one district.
+  #
+  class SingleDistrictProportional
+    def initialize(no_of_seats, denominators_class, threshold = 0, bonus = 0)
+      @no_of_seats = no_of_seats
+      @denominators_class = denominators_class
+      @threshold = threshold
+      @bonus = bonus
+    end
+
+    def project(simulation)
+      threshold = simulation.values.inject(:+).to_f * @threshold
+      quotients = quotients(simulation, 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)
+      add_seats_to_result(result, seats)
+      result
+    end
+
+    private
+
+    def create_empty_result(simulation)
+      result = {}
+      simulation.each_key do |choice|
+        result[choice] = 0
+      end
+      result[simulation.max { |a, b| a.last <=> b.last }[0]] = @bonus
+      result[OTHER] = 0
+      result
+    end
+
+    def add_seats_to_result(result, seats)
+      seats.each do |seat|
+        if result.key?(seat)
+          result[seat] += 1
+        else
+          result[seat] = 1
+        end
+      end
+    end
+
+    def quotients(votes, threshold)
+      quotients = []
+      votes.each_pair do |choice, new_value|
+        next if new_value < threshold
+        @denominators_class.get(@no_of_seats).each do |d|
+          quotients << [choice, new_value.to_f / d]
+        end
+      end
+      quotients
+    end
+  end
+end

data/lib/sapor.rb

@@ -1,7 +1,6 @@
-# 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.
 #
@@ -19,8 +18,14 @@
 
 # Library namespace
 module Sapor
-  def self.analyze(filename)
-    Poll.from_file(filename).analyze
+  def self.analyze(filename, arguments)
+    yaml_file = filename.gsub('.poll', '-state.yaml')
+    options = Options.new(arguments)
+    if File.exist?(yaml_file)
+      YAML::load(File.open(yaml_file)).continue_analysis(options)
+    else
+      Poll.from_file(filename).analyze(options)
+    end
   end
 end
 
@@ -32,13 +37,114 @@ require 'sapor/log4r_logger'
 require 'sapor/log_facade'
 require 'sapor/pseudorandom_multirange_enumerator'
 require 'sapor/binomials_cache'
+require 'sapor/options'
 require 'sapor/polychotomy'
+require 'sapor/referendum_polychotomy'
+require 'sapor/representatives_polychotomy'
 require 'sapor/first_past_the_post'
-require 'sapor/proportional'
-require 'sapor/leveled_proportional'
+require 'sapor/largest_remainder'
+require 'sapor/denominators'
+require 'sapor/single_district_proportional'
+require 'sapor/multi_district_proportional'
+require 'sapor/multi_district_leveled_proportional'
+require 'sapor/multi_district_variable_threshold_proportional'
 require 'sapor/regional_data/area'
+require 'sapor/regional_data/austria'
+require 'sapor/regional_data/belgium'
+require 'sapor/regional_data/belgium_brussels'
+require 'sapor/regional_data/belgium_flanders'
+require 'sapor/regional_data/belgium_wallonia'
 require 'sapor/regional_data/catalonia'
+require 'sapor/regional_data/catalonia-no-jxsi'
+require 'sapor/regional_data/catalonia-jxcat'
+require 'sapor/regional_data/denmark'
+require 'sapor/regional_data/denmark_with_e'
+require 'sapor/regional_data/denmark_with_e_and_p'
+require 'sapor/regional_data/denmark_with_p'
+require 'sapor/regional_data/estonia'
+require 'sapor/regional_data/european_union_27_austria'
+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_ireland'
+require 'sapor/regional_data/european_union_27_ireland_with_ia'
+require 'sapor/regional_data/european_union_27_italy'
+require 'sapor/regional_data/european_union_27_netherlands'
+require 'sapor/regional_data/european_union_27_poland'
+require 'sapor/regional_data/european_union_27_romania'
+require 'sapor/regional_data/european_union_27_slovakia'
+require 'sapor/regional_data/european_union_27_spain'
+require 'sapor/regional_data/european_union_27_sweden'
+require 'sapor/regional_data/european_union_austria'
+require 'sapor/regional_data/european_union_bulgaria'
+require 'sapor/regional_data/european_union_croatia'
+require 'sapor/regional_data/european_union_cyprus'
+require 'sapor/regional_data/european_union_czech_republic'
+require 'sapor/regional_data/european_union_denmark'
+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'
+require 'sapor/regional_data/european_union_greece'
+require 'sapor/regional_data/european_union_hungary'
+require 'sapor/regional_data/european_union_ireland'
+require 'sapor/regional_data/european_union_ireland_with_ia'
+require 'sapor/regional_data/european_union_italy'
+require 'sapor/regional_data/european_union_latvia'
+require 'sapor/regional_data/european_union_lithuania'
+require 'sapor/regional_data/european_union_luxembourg'
+require 'sapor/regional_data/european_union_malta'
+require 'sapor/regional_data/european_union_netherlands'
+require 'sapor/regional_data/european_union_northern_ireland'
+require 'sapor/regional_data/european_union_poland'
+require 'sapor/regional_data/european_union_portugal'
+require 'sapor/regional_data/european_union_romania'
+require 'sapor/regional_data/european_union_slovakia'
+require 'sapor/regional_data/european_union_slovenia'
+require 'sapor/regional_data/european_union_spain'
+require 'sapor/regional_data/european_union_sweden'
+require 'sapor/regional_data/finland'
+require 'sapor/regional_data/finland_with_sin'
+require 'sapor/regional_data/flanders'
+require 'sapor/regional_data/france'
+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'
+require 'sapor/regional_data/norwegian_municipality'
+require 'sapor/regional_data/poland'
+require 'sapor/regional_data/poland_with_ko_and_l_without_n_po_r_and_zl'
+require 'sapor/regional_data/poland_with_ko_konf_kp_l_and_zp_without_k_k15_n_pis_po_psl_r_and_zl'
+require 'sapor/regional_data/poland_with_ko_sld_and_wi_without_n_po_and_zl'
+require 'sapor/regional_data/poland_with_sld_and_wi_without_zl'
+require 'sapor/regional_data/poland_with_sld_without_zl'
+require 'sapor/regional_data/portugal'
+require 'sapor/regional_data/portugal_with_a_and_ch_without_paf'
+require 'sapor/regional_data/portugal_with_a_and_il_without_paf'
+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/slovakia'
+require 'sapor/regional_data/slovenia'
+require 'sapor/regional_data/spain'
+require 'sapor/regional_data/sweden'
+require 'sapor/regional_data/sweden_20140914'
 require 'sapor/regional_data/united_kingdom'
+require 'sapor/regional_data/united_kingdom_with_brexit'
+require 'sapor/regional_data/united_kingdom_with_brexit_and_chuk'
+require 'sapor/regional_data/united_kingdom_with_tig'
 require 'sapor/regional_data/utopia'
+require 'sapor/regional_data/wallonia'
 require 'sapor/poll'

data/sapor.gemspec

@@ -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.
 #
@@ -19,7 +19,7 @@
 
 Gem::Specification.new do |gem|
   gem.name = 'sapor'
-  gem.version = '0.1b1'
+  gem.version = '0.2a1'
   gem.authors = ['Filip van Laenen']
   gem.email = ['f.a.vanlaenen@ieee.org']
 

data/spec/integration/area_spec.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.
 #
@@ -21,7 +21,7 @@ require 'spec_helper'
 
 describe Sapor::Area, '#load_election_results' do
   it 'loads four constituencies for the 2012 election results for Catalonia' do
-    area = Sapor::Area.instance
+    area = Sapor::Area.new
     catalonia_2012 = area.load_election_results('catalonia-2012.psv')
     expect(catalonia_2012.size).to eq(4)
   end

data/spec/integration/poll_spec.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.
 #
@@ -54,6 +54,11 @@ describe Sapor::Poll, '#from_file' do
     expect(poll.area.area_code).to eq('UT')
   end
 
+  it 'reads a poll from a file and extracts type' do
+    poll = Sapor::Poll.from_file(SAMPLE_FILE)
+    expect(poll.type).to eq('Election')
+  end
+
   it 'reads a poll from a file and extracts first result' do
     poll = Sapor::Poll.from_file(SAMPLE_FILE)
     expect(poll.result('Red')).to eq(1)

data/spec/integration/sample.poll

@@ -1,7 +1,8 @@
 Area=UT
+Type=Election
 ==
 Red=1
 Green=2
 Blue=3
 Yellow=6
-Other=1
+Other=1

data/spec/spec_helper.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.
 #
@@ -24,7 +24,7 @@ require 'timeout'
 
 RSpec.configure do |config|
   config.around do |example|
-    Timeout.timeout(1) do
+    Timeout.timeout(2) do
       example.run
     end
   end