lib/vote/schulze/input.rb in vote-schulze-0.3.0 vs lib/vote/schulze/input.rb in vote-schulze-0.4.0

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
 module Vote
   module Schulze
     class Input
-      attr_reader :candidate_count, :voting_count, :voting_matrix
+      attr_reader :candidate_count, :voting_count, :voting_matrix,
+                  :candidate_names, :votes
 
       def initialize(voting_data, candidate_count = nil)
         @voting_data = voting_data
         @candidate_count = candidate_count
 
@@ -17,42 +18,45 @@
           insert_voting_string(@voting_data) if voting_data.is_a?(String)
         end
       end
 
       def insert_voting_array(voting_array)
+        @votes = voting_array
         voting_array.each do |vote|
           @voting_matrix.each_with_index do |_e, x, y|
             next if x == y
 
             @voting_matrix[x, y] += 1 if vote[x] > vote[y]
           end
         end
         @voting_count = voting_array.size
       end
 
-      def insert_voting_string(voting_string) # rubocop:disable Metrics/MethodLength, Metrics/AbcSize
+      def insert_voting_string(voting_string) # rubocop:todo all
         voting_array = []
         voting_string.split(/\n|\n\r|\r/).each do |voter|
-          voter = voter.split(/=/)
+          voter = voter.split('=')
           vcount = voter.size == 1 ? 1 : voter[0].to_i
 
-          vcount.times do
-            tmp = voter.last.split(/;/)
-            tmp2 = []
+          tmp = voter.last.split(';')
+          tmp2 = []
 
-            tmp.map! { |e| [e, @candidate_count - tmp.index(e)] }
-            # find equal-weighted candidates
-            tmp.map do |e|
-              if e[0].size > 1
-                e[0].split(/,/).each do |f|
-                  tmp2 << [f, e[1]]
-                end
-              else
-                tmp2 << e
+          tmp.map! { |e| [e, @candidate_count - tmp.index(e)] }
+          # find equal-weighted candidates
+          tmp.map do |e|
+            if e[0].size > 1
+              e[0].split(',').each do |f|
+                tmp2 << [f, e[1]]
               end
+            else
+              tmp2 << e
             end
+          end
 
-            voting_array << (tmp2.sort.map { |e| e[1] }) # order, strip & add
+          @candidate_names ||= tmp2.map { |e| e[0] }.sort
+          vote = tmp2.sort.map { |e| e[1] } # order, strip & add
+          vcount.times do
+            voting_array << vote
           end
         end
 
         insert_voting_array(voting_array)
       end