sciolyff 0.4.1 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b5ade4d7bbd00e33e30bfeafffb0b30532e8210280ca6eae2b7720010fff532f
-  data.tar.gz: 6955635e1bb01bb523c21633e4610583b4cabfc0349c9d1e9475ad9b5fae7307
+  metadata.gz: 1df5842018efc9a43a221327ed3ab70da6b1f7a995a341351f5328445943106c
+  data.tar.gz: 9111707bd2043e8ce33c164913c33b3773f14de12ca281732eb9f53a44b23d99
 SHA512:
-  metadata.gz: b308389be5811e1fa13c93d08111d639f3c50dc64c1aed146e103aa048a02512c69558220b6e4e5f68bf10ef18c02a5995cde3715ade6932228cf24a05258c4a
-  data.tar.gz: f38152c0da8db0f4bcd7e0bd19fd473e11a92b6ff6cc09a4a6f21cfbfca1b7ee141e66fc568e9c6c517f0446702cad459eddbfd40cb0e0edc2f9165a3f28a4d9
+  metadata.gz: e18866a3c37f6cc04783f70021f2ce0ffbd139765f0b2be376c3719b2dac3c16a8239fa2235e21ae64c6c9732dc4cff8754e4cba310a1eec26bfbcc800fd8ae1
+  data.tar.gz: 07421bcb80b5605bdcd7e96151f1080ff595ffb39136dbd2331016a4a7aecbaf0d8ee7354182dac014922bdf7e26e3b29af52b270204b1aa8a13f5a58c441540

data/bin/sciolyff

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

data/lib/sciolyff/placings.rb

@@ -21,7 +21,8 @@ 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 place]
+        info = Set.new %i[event team participated disqualified exempt place]
+        info << :unknown
         assert Set.new(placing.keys).subset? info
       end
     end
@@ -62,10 +63,37 @@ module SciolyFF
       end
     end
 
+    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]
+        end
+      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
+        end
+      end
+    end
+
     def test_each_placing_has_valid_place
       @placings.select { |p| p.instance_of? Hash }.each do |placing|
         next if placing[:disqualified] == true ||
-                placing.key?(:participated)
+                placing.key?(:participated) ||
+                placing[:unknown] == true ||
+                placing[:exempt] == true
 
         assert_instance_of Integer, placing[:place]
         max_place = @placings.count do |p|

data/lib/sciolyff/scores.rb

@@ -21,7 +21,7 @@ module SciolyFF
 
     def test_each_score_does_not_have_extra_info
       @scores.select { |s| s.instance_of? Hash }.each do |score|
-        a = %i[event team participated disqualified score tier]
+        a = %i[event team participated disqualified exempt unknown score tier]
         a << :'tiebreaker place'
         info = Set.new a
         assert Set.new(score.keys).subset? info
@@ -64,10 +64,27 @@ module SciolyFF
       end
     end
 
+    def test_each_score_has_valid_exempt
+      @scores.select { |s| s.instance_of? Hash }.each do |score|
+        if score.key? :exempt
+          assert_includes [true, false], score[:exempt]
+        end
+      end
+    end
+
+    def test_each_score_has_valid_unknown
+      @scores.select { |s| s.instance_of? Hash }.each do |score|
+        if score.key? :unknown
+          assert_includes [true, false], score[:unknown]
+        end
+      end
+    end
+
     def test_each_score_has_valid_score
       @scores.select { |s| s.instance_of? Hash }.each do |score|
         next if score[:disqualified] == true ||
-                score[:participated] == false
+                score.key?(:participated) ||
+                placing[:exempt] == true
 
         assert_kind_of Numeric, score[:score]
       end

data/lib/sciolyff.rb

@@ -55,6 +55,7 @@ module SciolyFF
     def initialize(rep)
       @rep = rep
       @exhibition_teams_count = rep[:Teams].count { |t| t[:exhibition] }
+      @exempt_placings_count = rep[:Placings].count { |p| p[:exempt] }
       @team_points_cache = {}
 
       @tournament = rep[:Tournament]
@@ -75,8 +76,10 @@ module SciolyFF
       placing = @placings_by_event[event_name][team_number]
       number_of_teams = number_of_competing_teams(event_name)
 
-      if placing[:disqualified] then number_of_teams + 2
+      if placing[:exempt] then 0
+      elsif 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
       else calculate_event_points(placing)
       end
@@ -136,11 +139,12 @@ module SciolyFF
     def calculate_event_points(placing)
       return placing[:place] if simple_placing?(placing)
 
-      # Points is place minus number of exhibition teams with a better place
+      # Points is place minus number of exhibition and exempt teams with a
+      # better place
       placing[:place] -
         @placings_by_event[placing[:event]]
         .values
-        .select { |p| @teams_by_number[p[:team]][:exhibition] && p[:place] }
+        .select { |p| p[:place] && exhibition_or_exempt_placing?(p) }
         .count { |p| p[:place] < placing[:place] }
     end
 
@@ -154,7 +158,12 @@ module SciolyFF
     end
 
     def simple_placing?(placing)
-      @exhibition_teams_count.zero? || @events_by_name[placing[:event]][:trial]
+      @events_by_name[placing[:event]][:trial] ||
+        (@exhibition_teams_count.zero? && @exempt_placings_count.zero?)
+    end
+
+    def exhibition_or_exempt_placing?(placing)
+      @teams_by_number[placing[:team]][:exhibition] || placing[:exempt]
     end
 
     def break_tie(team_number_a, team_number_b)

metadata

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