sciolyff 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e74a3f87dca96e2c00acbccb2f6c324ff669bc348af5e029b0b93a1d2fb50eb
-  data.tar.gz: a871c9a14be7c08449d5a94f71fc8d0d759a89d6b3e85c866dc86bebcf717735
+  metadata.gz: b5ade4d7bbd00e33e30bfeafffb0b30532e8210280ca6eae2b7720010fff532f
+  data.tar.gz: 6955635e1bb01bb523c21633e4610583b4cabfc0349c9d1e9475ad9b5fae7307
 SHA512:
-  metadata.gz: d45d2a1a73ad360be109d3bb5c6a3b778416de2a7833c54b9c4dc4e1b55ca4a299ed82b3d17817a3f5b906d1d745e574e39feac7ce8901a41558d8098fb3fbae
-  data.tar.gz: 54835c59ff8927dbdd9232edd185fc904563e4e6a4b19b6e2bdae8f0f4cb10845dcc3eb905a5f826113e4b7c2958745f62b276c711d3b138b87c4e3764cbd2a4
+  metadata.gz: b308389be5811e1fa13c93d08111d639f3c50dc64c1aed146e103aa048a02512c69558220b6e4e5f68bf10ef18c02a5995cde3715ade6932228cf24a05258c4a
+  data.tar.gz: f38152c0da8db0f4bcd7e0bd19fd473e11a92b6ff6cc09a4a6f21cfbfca1b7ee141e66fc568e9c6c517f0446702cad459eddbfd40cb0e0edc2f9165a3f28a4d9

data/bin/sciolyff

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

data/lib/sciolyff.rb

@@ -54,6 +54,9 @@ module SciolyFF
 
     def initialize(rep)
       @rep = rep
+      @exhibition_teams_count = rep[:Teams].count { |t| t[:exhibition] }
+      @team_points_cache = {}
+
       @tournament = rep[:Tournament]
       @events_by_name = index_array(rep[:Events], [:name])
       @teams_by_number = index_array(rep[:Teams], [:number])
@@ -80,12 +83,9 @@ module SciolyFF
     end
 
     def team_points(team_number)
-      @placings_by_team[team_number]
-        .values
-        .reject { |p| @events_by_name[p[:event]][:trial] }
-        .reject { |p| @events_by_name[p[:event]][:trialed] }
-        .sum { |p| event_points(team_number, p[:event]) } \
-      + team_points_from_penalties(team_number)
+      return @team_points_cache[team_number] if @team_points_cache[team_number]
+
+      @team_points_cache[team_number] = calculate_team_points(team_number)
     end
 
     def team_points_from_penalties(team_number)
@@ -134,7 +134,7 @@ module SciolyFF
     end
 
     def calculate_event_points(placing)
-      return placing[:place] if @events_by_name[placing[:event]][:trial]
+      return placing[:place] if simple_placing?(placing)
 
       # Points is place minus number of exhibition teams with a better place
       placing[:place] -
@@ -144,6 +144,19 @@ module SciolyFF
         .count { |p| p[:place] < placing[:place] }
     end
 
+    def calculate_team_points(team_number)
+      @placings_by_team[team_number]
+        .values
+        .reject { |p| @events_by_name[p[:event]][:trial] }
+        .reject { |p| @events_by_name[p[:event]][:trialed] }
+        .sum { |p| event_points(team_number, p[:event]) } \
+      + team_points_from_penalties(team_number)
+    end
+
+    def simple_placing?(placing)
+      @exhibition_teams_count.zero? || @events_by_name[placing[:event]][:trial]
+    end
+
     def break_tie(team_number_a, team_number_b)
       medal_counts(team_number_a)
         .zip(medal_counts(team_number_b))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sciolyff
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Em Zhan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-11 00:00:00.000000000 Z
+date: 2019-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.4
 signing_key: 
 specification_version: 4
 summary: A file format for Science Olympiad tournament results.