sciolyff 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f3cd6e98f70075a515863431f659b59fcc88f7ab9bd6d01ee46329cbc5bf4eb1
-  data.tar.gz: 966829031a03f79bac525757c2cef44ccc515829afb066bd04779ddf6e3fb596
+  metadata.gz: 3bc0709e109b89da26d0c66d2f1f0ef69a9b2ca2f4ac729a74ac156d2bf20f5e
+  data.tar.gz: 1c0cd81c92947527ba549dc4bf53d0c7e6c403b090694976fc601061526c0a66
 SHA512:
-  metadata.gz: 382ae2b2de24a1ed587d2e7c89273d55b2f5e84c26ca8d8a7f68e16d0eb15f5e612eff41f627fe83529a6458f4fd75867952c2461ce6043fc17f08ae7a555c3c
-  data.tar.gz: 24d865ebbff8545257810b9ede5f31d32cf232a8a69c52ff3f6e9c79f860af4ca32d6733a1c41039ff29f78d61e3e1fe67485663d76846f4c539069e775b9295
+  metadata.gz: d6b3e37f27e29b78df485db79c6a0ca756d56fee18f42f135aba843f7284016451d32ae1992d73e5532c4477411d39b74bcfff924013db550616d79d7cb78df7
+  data.tar.gz: e5ac57ff0cd5d495903ba47c09f81663b5d6c5860d2994767205cae1da2cc85f3f038483d3f378c3bc2393bcb98c2cb36e6cc5942d81582865111321b2ad34a7

data/bin/sciolyff

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

data/lib/sciolyff.rb

@@ -64,12 +64,17 @@ module SciolyFF
       @penalties_by_team = index_array(rep[:Penalties], [:team])
     end
 
+    def nonexhibition_teams
+      @teams_by_number.reject { |_, t| t[:exhibition] }
+    end
+
     def event_points(team_number, event_name)
       placing = @placings_by_event[event_name][team_number]
+      number_of_teams = number_of_competing_teams(event_name)
 
-      if placing[:disqualified] then @teams_by_number.count + 2
-      elsif placing[:participated] == false then @teams_by_number.count + 1
-      elsif placing[:place].nil? then @teams_by_number.count
+      if placing[:disqualified] then number_of_teams + 2
+      elsif placing[:participated] == false then number_of_teams + 1
+      elsif placing[:place].nil? then number_of_teams
       else calculate_event_points(placing)
       end
     end
@@ -93,13 +98,16 @@ module SciolyFF
       @teams_by_number
         .values
         .sort do |a, b|
+        next  1 if  a[:exhibition] && !b[:exhibition]
+        next -1 if !a[:exhibition] &&  b[:exhibition]
+
         cmp = team_points(a[:number]) - team_points(b[:number])
         cmp.zero? ? break_tie(a[:number], b[:number]) : cmp
       end
     end
 
     def medal_counts(team_number)
-      (1..(@teams_by_number.count + 2)).map do |m|
+      (1..(nonexhibition_teams.count + 2)).map do |m|
         @events_by_name
           .values
           .reject { |e| e[:trial] || e[:trialed] }
@@ -119,7 +127,15 @@ module SciolyFF
       end
     end
 
+    def number_of_competing_teams(event_name)
+      return @teams_by_number.count if @events_by_name[event_name][:trial]
+
+      nonexhibition_teams.count
+    end
+
     def calculate_event_points(placing)
+      return placing[:place] if @events_by_name[placing[:event]][:trial]
+
       # Points is place minus number of exhibition teams with a better place
       placing[:place] -
         @placings_by_event[placing[:event]]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sciolyff
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Em Zhan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-27 00:00:00.000000000 Z
+date: 2019-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest