sciolyff 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1df5842018efc9a43a221327ed3ab70da6b1f7a995a341351f5328445943106c
-  data.tar.gz: 9111707bd2043e8ce33c164913c33b3773f14de12ca281732eb9f53a44b23d99
+  metadata.gz: c122cfd4febace838879f0f46ec1e1890f7983ad05548407a8c4916e6bf2fcb9
+  data.tar.gz: 32742a12ef12038b920d7fd653ffb4619feeb54d1f8c0e0ebb5fd83a8f3364d4
 SHA512:
-  metadata.gz: e18866a3c37f6cc04783f70021f2ce0ffbd139765f0b2be376c3719b2dac3c16a8239fa2235e21ae64c6c9732dc4cff8754e4cba310a1eec26bfbcc800fd8ae1
-  data.tar.gz: 07421bcb80b5605bdcd7e96151f1080ff595ffb39136dbd2331016a4a7aecbaf0d8ee7354182dac014922bdf7e26e3b29af52b270204b1aa8a13f5a58c441540
+  metadata.gz: 7e8cf97567888b8c91419f0bae5710146b98b5672e6843f4362aa3d6bfe73bcec4eb1e2eacdd2220c3bba26b3e431d100a9b8766b9de5d55598d71b6e00bf0cc
+  data.tar.gz: de698eeeeae99948b6bff356f255e9f8bcbe253c3c03e7628eb89fb4956ec7f2f7666d92b04f1da3fc0d2d3fc4b5b6042b5b2f4d21fe4dd9a3ab34bb30efeae6

data/bin/sciolyff

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

data/lib/sciolyff/placings.rb

@@ -21,7 +21,7 @@ module SciolyFF
 
     def test_each_placing_does_not_have_extra_info
       @placings.select { |p| p.instance_of? Hash }.each do |placing|
-        info = Set.new %i[event team participated disqualified exempt place]
+        info = Set.new %i[event team participated disqualified exempt place tie]
         info << :unknown
         assert Set.new(placing.keys).subset? info
       end
@@ -65,26 +65,45 @@ module SciolyFF
 
     def test_each_placing_has_valid_exempt
       @placings.select { |p| p.instance_of? Hash }.each do |placing|
-        if placing.key? :exempt
-          assert_includes [true, false], placing[:exempt]
+        assert_includes [true, false], placing[:exempt] if placing.key? :exempt
+      end
+    end
+
+    def test_each_placing_has_valid_tie
+      @placings.select { |p| p.instance_of? Hash }.each do |placing|
+        next unless placing.key? :tie
+
+        assert_includes [true, false], placing[:tie]
+        next unless placing[:tie]
+
+        has_pair = @placings.find 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,
+               "The event #{placing[:event]} has unpaired ties at "\
+               "#{placing[:place]}"
       end
     end
 
     def test_each_placing_has_valid_unknown
       @placings.select { |p| p.instance_of? Hash }.each do |placing|
-        if placing.key? :unknown
-          assert_includes [true, false], placing[:unknown]
-          if placing[:unknown]
-            skip unless SciolyFF.rep[:Events].instance_of? Array
-
-            event = SciolyFF.rep[:Events].find do |e|
-              e[:name] == placing[:event]
-            end
-            assert event[:trial] || event[:trialed] || event.nil?,
-              'Cannot have unknown place for non-trial/trialed event'
-          end
+        next unless placing.key? :unknown
+
+        assert_includes [true, false], placing[:unknown]
+        next unless placing[:unknown]
+
+        skip unless SciolyFF.rep[:Events].instance_of? Array
+
+        event = SciolyFF.rep[:Events].find do |e|
+          e[:name] == placing[:event]
         end
+        assert event[:trial] || event[:trialed] || event.nil?,
+               'Cannot have unknown place for non-trial/trialed event'
       end
     end
 
@@ -98,11 +117,12 @@ module SciolyFF
         assert_instance_of Integer, placing[:place]
         max_place = @placings.count do |p|
           p[:event] == placing[:event] &&
-          !p[:disqualified] &&
-          p[:participated] != false
+            !p[:disqualified] &&
+            p[:participated] != false
         end
         assert_includes 1..max_place, placing[:place],
-          "The event #{placing[:event]} has an out-of-range placing"
+                        "The event #{placing[:event]} "\
+                        'has an out-of-range placing'
       end
     end
 
@@ -113,6 +133,7 @@ module SciolyFF
         next unless event.instance_of? Hash
 
         places = @placings.select { |p| p[:event] == event[:name] }
+                          .reject { |p| p[:tie] }
                           .map { |p| p[:place] }
                           .compact
 
@@ -120,7 +141,8 @@ module SciolyFF
           places.index(p) != i
         end
 
-        assert_empty dups, "The event #{event[:name]} has ties at #{dups}"
+        assert_empty dups,
+                     "The event #{event[:name]} has unmarked ties at #{dups}"
       end
     end
 

data/lib/sciolyff.rb

@@ -76,8 +76,7 @@ module SciolyFF
       placing = @placings_by_event[event_name][team_number]
       number_of_teams = number_of_competing_teams(event_name)
 
-      if placing[:exempt] then 0
-      elsif placing[:disqualified] then number_of_teams + 2
+      if placing[:disqualified] then number_of_teams + 2
       elsif placing[:participated] == false then number_of_teams + 1
       elsif placing[:unknown] then number_of_teams - 1
       elsif placing[:place].nil? then number_of_teams
@@ -153,6 +152,7 @@ module SciolyFF
         .values
         .reject { |p| @events_by_name[p[:event]][:trial] }
         .reject { |p| @events_by_name[p[:event]][:trialed] }
+        .reject { |p| p[:exempt] }
         .sum { |p| event_points(team_number, p[:event]) } \
       + team_points_from_penalties(team_number)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sciolyff
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Em Zhan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-06 00:00:00.000000000 Z
+date: 2019-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest