sciolyff 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c122cfd4febace838879f0f46ec1e1890f7983ad05548407a8c4916e6bf2fcb9
-  data.tar.gz: 32742a12ef12038b920d7fd653ffb4619feeb54d1f8c0e0ebb5fd83a8f3364d4
+  metadata.gz: 9d439db52050ce2e14cdefb6e5d2520d1105dbea5dbe49a4cf5a5e83323a30bd
+  data.tar.gz: 1f6611b0af9696973430b849c5241a61ef9d23fa254db9cba12b4b08d3c8647d
 SHA512:
-  metadata.gz: 7e8cf97567888b8c91419f0bae5710146b98b5672e6843f4362aa3d6bfe73bcec4eb1e2eacdd2220c3bba26b3e431d100a9b8766b9de5d55598d71b6e00bf0cc
-  data.tar.gz: de698eeeeae99948b6bff356f255e9f8bcbe253c3c03e7628eb89fb4956ec7f2f7666d92b04f1da3fc0d2d3fc4b5b6042b5b2f4d21fe4dd9a3ab34bb30efeae6
+  metadata.gz: 2901fb2fdb8e8e7aa26e9cc97cd1c2c0989d1cc18233f1cd9b038c724dae54530b64be62d812abc03a753f92bed46763df2d487a7b377471d9559bfc809049d9
+  data.tar.gz: 61b9fca3f88e142116e211cf576b6751d98e99ba7a464433a96af2ec401b9f6a71acf4879ea247f6612965a65e5672b81264790e812cfb8006252e128190879c

data/bin/sciolyff

@@ -6,7 +6,7 @@ require 'yaml'
 require 'sciolyff'
 
 opts = Optimist.options do
-  version 'sciolyff 0.5.2'
+  version 'sciolyff 0.5.3'
   banner <<~STRING
     Checks if a given file is in the Scioly File Format
 

data/lib/sciolyff/placings.rb

@@ -76,15 +76,14 @@ module SciolyFF
         assert_includes [true, false], placing[:tie]
         next unless placing[:tie]
 
-        has_pair = @placings.find do |p_other|
+        all_paired = @placings.select do |p_other|
           p_other.instance_of?(Hash) &&
             p_other != placing &&
             p_other[:event] == placing[:event] &&
-            p_other[:event] == placing[:event] &&
-            p_other[:place] == placing[:place] &&
-            p_other[:tie]
-        end
-        assert has_pair,
+            p_other[:place] == placing[:place]
+        end.all? { |p_other| p_other[:tie] }
+
+        assert all_paired,
                "The event #{placing[:event]} has unpaired ties at "\
                "#{placing[:place]}"
       end

data/lib/sciolyff/teams.rb

@@ -83,5 +83,14 @@ module SciolyFF
                       .map { |t| t[:number] }
       assert_nil numbers.uniq!
     end
+
+    def test_each_suffix_is_unique_per_school
+      @teams.select { |t| t.instance_of? Hash }
+            .group_by { |t| [t[:school], t[:state], t[:city]] }
+            .each do |group, teams|
+        assert_nil teams.map { |t| t[:suffix] }.compact.uniq!,
+                   "#{group} has the same suffix for multiple teams"
+      end
+    end
   end
 end

data/lib/sciolyff/tournament.rb

@@ -23,6 +23,7 @@ module SciolyFF
 
     def test_does_not_have_extra_info
       info = Set.new %i[name location level division state year date]
+      info << :'short name'
       assert Set.new(@tournament.keys).subset? info
     end
 
@@ -31,6 +32,16 @@ module SciolyFF
       assert_instance_of String, @tournament[:name]
     end
 
+    def test_has_valid_short_name
+      skip unless @tournament.key? :'short name'
+      assert @tournament.key?(:name), 'Cannot have short name without name'
+      assert_instance_of String, @tournament[:'short name']
+
+      skip unless @tournament[:name].instance_of? String
+      assert @tournament[:'short name'].length < @tournament[:name].length,
+             'Length of short name must be shorter than length of name'
+    end
+
     def test_has_valid_location
       skip unless @tournament.key? :location
       assert_instance_of String, @tournament[:location]

data/lib/sciolyff.rb

@@ -170,7 +170,36 @@ module SciolyFF
       medal_counts(team_number_a)
         .zip(medal_counts(team_number_b))
         .map { |count| count.last - count.first }
+        .find(proc { break_second_tie(team_number_a, team_number_b) },
+              &:nonzero?)
+    end
+
+    def break_second_tie(team_number_a, team_number_b)
+      cmp = points_from_trial(team_number_a) - points_from_trial(team_number_b)
+      cmp.zero? ? break_third_tie(team_number_a, team_number_b) : cmp
+    end
+
+    def break_third_tie(team_number_a, team_number_b)
+      medal_counts_from_trial(team_number_a)
+        .zip(medal_counts_from_trial(team_number_b))
+        .map { |count| count.last - count.first }
         .find(proc { team_number_a <=> team_number_b }, &:nonzero?)
     end
+
+    def points_from_trial(team_number)
+      @placings_by_team[team_number]
+        .values
+        .select { |p| @events_by_name[p[:event]][:trial] }
+        .sum { |p| event_points(team_number, p[:event]) }
+    end
+
+    def medal_counts_from_trial(team_number)
+      (1..(@teams_by_number.count + 2)).map do |m|
+        @events_by_name
+          .values
+          .select { |e| e[:trial] }
+          .count { |e| event_points(team_number, e[:name]) == m }
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sciolyff
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Em Zhan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-10 00:00:00.000000000 Z
+date: 2019-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -81,7 +81,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="