sciolyff 0.7.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fa5d842e42bc16f982593c2035ba2c753b91ce4bf39f330ece71a8dff70371c
-  data.tar.gz: 2ceecc1b1830a25f71e77327ab3ea6859ac1299be30cb4ceaeca431faf286377
+  metadata.gz: c0b0585e73d7a00ceda5496078ca65998b8bea5fa1ece51bd76ac4c496074767
+  data.tar.gz: 3f9770165cfccc02e9d575b457ebf397e7f6a65d6861fbb9ee27959f9614445d
 SHA512:
-  metadata.gz: 8852c727705a1de79952ee46dabf8092db727603b599111c4c95d5c092109c7e6c93f9e5926a318b87ec0dba605800483b7fbff327663b83a01679387dee28e7
-  data.tar.gz: 30f12194806aeb5eff2080d674e1e925174324d031a9f4d34575facb48ccc3ab61f7d4287e8fc266902cd6d6a66c3455494f03731e913ff8f6322352d815277a
+  metadata.gz: ebacad7be6d0faa35892d239d48562b37d894919ea0b41bc40d4ebd668b306c3a2dda093605d18c0a924735366ab061597f941375f938c71313440beb1941bc5
+  data.tar.gz: f9ab9e0d567ef8cbf9d5740e7205f49324715ce0db3633716a689e61170a9ad2a576ac1ecd78029f1b8864b9255690ee36b793db2b0ef8b2d3c3bbd09eba16f0

data/bin/sciolyff

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

data/lib/sciolyff/interpreter/event.rb

@@ -40,10 +40,14 @@ module SciolyFF
       @placings_by_team[team]
     end
 
-    def competing_teams
-      return placings.map(&:team) if trial?
+    def maximum_place
+      return placings.size if trial?
 
-      placings.map(&:team).reject(&:exhibition?)
+      tournament.maximum_place
+    end
+
+    def maximum_points
+      maximum_place + 2
     end
   end
 end

data/lib/sciolyff/interpreter/model.rb

@@ -5,7 +5,6 @@ module SciolyFF
   class Interpreter::Model
     def initialize(rep, index)
       @rep = rep[pluralize_for_key(self.class)][index]
-      @cache = {}
     end
 
     def link_to_other_models(interpreter)

data/lib/sciolyff/interpreter/placing.rb

@@ -50,23 +50,19 @@ module SciolyFF
     end
 
     def points
-      return 0 unless considered_for_team_points?
-
-      isolated_points
+      @points ||= if !considered_for_team_points? then 0
+                  else isolated_points
+                  end
     end
 
     def isolated_points
-      return @cache[:points] if @cache[:points]
-
-      n = event.competing_teams.count
+      n = event.maximum_place
 
-      @cache[:points] =
-        if    disqualified?        then n + 2
-        elsif did_not_participate? then n + 1
-        elsif participation_only?  then n
-        elsif unknown?             then n - 1
-        else  calculate_points
-        end
+      if    disqualified? then n + 2
+      elsif did_not_participate? then n + 1
+      elsif participation_only? || unknown? then n
+      else  [calculate_points, n].min
+      end
     end
 
     def considered_for_team_points?
@@ -78,12 +74,25 @@ module SciolyFF
       !(event.trial? || event.trialed? || exempt?)
     end
 
+    def points_affected_by_exhibition?
+      considered_for_team_points? && place && !exhibition_placings_behind.zero?
+    end
+
+    def points_limited_by_maximum_place?
+      tournament.custom_maximum_place? &&
+        (unknown? || (place && calculate_points > event.maximum_place))
+    end
+
     private
 
     def calculate_points
       return place if event.trial?
 
-      place - event.placings.count do |p|
+      place - exhibition_placings_behind
+    end
+
+    def exhibition_placings_behind
+      @exhibition_placings_behind ||= event.placings.count do |p|
         (p.exempt? || p.team.exhibition?) &&
           p.place &&
           p.place < place

data/lib/sciolyff/interpreter/team.rb

@@ -59,9 +59,7 @@ module SciolyFF
     end
 
     def points
-      return @cache[:points] if @cache[:points]
-
-      @cache[:points] = placings.sum(&:points) + penalties.sum(&:points)
+      @points ||= placings.sum(&:points) + penalties.sum(&:points)
     end
 
     def worst_placings_to_be_dropped
@@ -79,16 +77,16 @@ module SciolyFF
     end
 
     def medal_counts
-      (1..@tournament.max_points_per_event).map do |medal_points|
+      (1..@tournament.events.first.maximum_points).map do |medal_points|
         placings.select(&:considered_for_team_points?)
                 .count { |p| p.points == medal_points }
       end
     end
 
     def trial_event_medal_counts
-      (1..@tournament.max_points_per_event(trial: true)).map do |medal_points|
+      (1..@tournament.events.last.maximum_points).map do |medal_points|
         placings.select { |p| p.event.trial? }
-                .count { |p| p.points == medal_points }
+                .count { |p| p.isolated_points == medal_points }
       end
     end
   end

data/lib/sciolyff/interpreter/tournament.rb

@@ -68,10 +68,14 @@ module SciolyFF
       exempt_placings? ? @rep[:'exempt placings'] : 0
     end
 
-    def max_points_per_event(trial: false)
-      return @teams.size + 2 if trial
+    def custom_maximum_place?
+      maximum_place != @teams.count { |t| !t.exhibition? }
+    end
+
+    def maximum_place
+      return @rep[:'maximum place'] if @rep[:'maximum place']
 
-      @teams.count { |t| !t.exhibition? } + 2
+      @teams.count { |t| !t.exhibition? }
     end
   end
 end

data/lib/sciolyff/placings.rb

@@ -107,6 +107,8 @@ module SciolyFF
     end
 
     def test_each_placing_has_valid_unknown
+      skip if SciolyFF.rep[:Tournament]&.key? :'maximum place'
+
       @placings.select { |p| p.instance_of? Hash }.each do |placing|
         next unless placing.key? :unknown
 

data/lib/sciolyff/tournament.rb

@@ -24,6 +24,7 @@ module SciolyFF
     def test_does_not_have_extra_info
       info = Set.new %i[name location level division state year date]
       info << :'short name' << :'worst placings dropped' << :'exempt placings'
+      info << :'maximum place'
       assert Set.new(@tournament.keys).subset? info
     end
 
@@ -84,5 +85,10 @@ module SciolyFF
       skip unless @tournament.key? :'exempt placings'
       assert_instance_of Integer, @tournament[:'exempt placings']
     end
+
+    def test_has_valid_maximum_place
+      skip unless @tournament.key? :'maximum place'
+      assert_instance_of Integer, @tournament[:'maximum place']
+    end
   end
 end

metadata

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