wildfalcon-skating-system 0.0.1 → 0.0.2

data/README

@@ -3,5 +3,182 @@ Skating System
 
 Provides an implementation of the skating system used for scoring dance comeptitions, as well as a few other types of competition.
 
+The skating system is as follows:
+
+
+ ********* The Marking of Adjudicators' Cards
+   1.
+      In all rounds each judge must vote for the number of couples
+   demanded by the Chairman of Adjudicators. 
+
+   2.
+      In the Final round each judge shall place all the competing
+   couples in order of merit in each of the dances. 
+
+   3.
+      In the Final round the judge shall mark his first couple 1, his
+   second couple 2, his third 3, and so on in each of the dances. 
+
+   4.
+      A judge must not tie couples for any place in the Final of any dance.
+
+      Note:
+
+            Number of Couples to Dance in a Final
+
+         1.            
+           In the Final round the open system of marking shall be used. 
+
+         2.
+            When judges are instructed to select six couples for a
+            Final and six couples are clearly chosen only that number
+            shall dance. The same procedure would be observed if the 
+            Chairman's instructions were for any other number. 
+
+         3.
+            If it is intended that six couples shall dance in a Final
+            and through a tie more couples qualify for consideration
+            the number to dance shall be decided by the Chairman. The
+            same procedure would be observed if it is intended to have
+            a Final of any other number.  
+
+********* The Allocation of Positions in Each Dance
+   5.
+      The winner of a particular dance is the couple who is placed
+      first by an absolute majority of judges; second, the couple who
+      is placed second or higher by an absolute majority. The
+      remaining positions are allocated in a similar way. 
+
+      If More that One Couple have a Majority for the Same Position
+
+   6.
+      The couple with the largest majority shall be allocated the
+      position under review, and the couple with the next largest
+      majority, the following position. 
+
+      Note:
+
+      If the position under review is the "2nd" and two couples have a
+      majority of "2nd and higher" places, the couple with the larger
+      majority shall be placed "2nd" and the other couple "3rd". 
+
+      We now examine the remaining competitors' markings, and the
+      couple with the largest majority of "3rd and higher" places
+      shall be allocated the next position, which in this example, is
+      the "4th". 
+
+      If none of the remaining couples has a majority of "3rd and
+      higher" places, then include the "4th" places (and, if
+      necessary, lower places). 
+
+********* If Two or More Couples have an Equal Majority for the Same Position
+   7.
+      a) If such majorities are equal, then the lowest total of marks
+      given by those judges who form the majority, shall determine the
+      allocation of the position under review. 
+
+      Note:
+
+      If the position under review is the "2nd" and two couples have a
+      similar majority of "2nd and higher" places, the couple with the
+      lower total of marks given by those judges who form the
+      majority, shall be allocated the "2nd" position and the other
+      couple the "3rd". 
+
+      b) If the totals of the marks are equal, then the next lower
+      place (or places, if necessary), in respect of the particular
+      couples concerned, must be included. 
+
+      Note:
+
+      It should be noted that only the couples who have a majority for
+      the position under review (say, for example, the "2nd" position)
+      must be considered at this stage, and only their "3rd" places
+      (and, if necessary, lower places) should be referred to, until
+      the "2nd" position has been allocated. 
+
+      A definite result will eventually be obtained unless the
+      remaining markings are exactly the same, and should the latter
+      be the case, there will, of course, be a tie for "2nd"
+      position. If two couples were concerned, they would be allocated
+      "2 1/2" each. 
+
+
+********* If No Couple receives a Majority for the Position Under Review
+   8.
+      If no couple receives a majority of "Firsts" then the winner is
+      the couple who are placed "2nd and higher" by a majority of
+      judges. 
+
+      If no couple receives a majority of "1st" and "2nd" places, then
+      the "3rd" places (and if necessary, lower places) must be
+      included. (Subject to Rules 6 and 7). 
+
+      The "2nd" and other places should be calculated in a similar
+      way.
+
+********* Compilation of the Final Summary
+   9.
+      When all the dances have been concluded, the order ascertained
+      for each dance shall be carried to another sheet, showing the
+      position achieved by each couple in each dance. The first in
+      each dance shall be given one mark, the second two, and so
+      on. These place marks shall be added up and the couple with the
+      lowest aggregate shall be the winner. 
+
+
+********* If there is a Tie for a Place in the Final Summary
+  10.
+      a) If this results in a tie for first place, the winner shall be
+      the couple who has actually won the greater number of dances. 
+
+      b) If there is a tie for the "2nd" place, the "2nd" prize shall
+      be awarded to the couple who has obtained "2nd and higher" in
+      the greatest number of dances. If the couples have obtained the
+      same number of "2nd and higher" place marks, then add the "2nd
+      and higher" place marks together and the couple with the lowest
+      total should be awarded second prize. 
+
+      Note:
+
+      If more than two couples tie for second place, the second prize
+      shall be awarded to the couple who has obtained the most "2nd
+      and higher" place marks. Still only considering the remaining
+      "tied" couples, the "3rd" prize is awarded to the couple who has
+      won the most "3rd and higher" place marks. 
+
+      c) If there is a tie for any remaining places they shall be
+      decided on similar principles. 
+
+  11.
+
+      If after applying Rules 9 and 10 this still results in a tie,
+      then treat the judges' marks of the "tied" couples over all
+      dances, as for an individual dance (Rules 5 to 8). If this still
+      results in a tie, there shall be at the discretion of the
+      organizers of the competition, either a re-dance or the prizes
+      for the places under review shall be divided. 
+
+      a) If the tie is for first place, a majority of "1st" marks to
+      the credit of either of the "tied" couples (4 dances-5
+      judges-majority 11) would win. If neither of the "tied" couples
+      receive a majority of "firsts" see Rule 8. 
+
+      b) If the tie is for second place, a majority of "2nd and
+      higher" marks to the credit of either of the "tied" couples
+      would be necessary. If neither of the "tied" couples obtain a
+      majority of "2nd and higher" marks see Rule 8. 
+
+      c) The "3rd" or any other "tied" places should be decided on similar principles.
+
+      d) If 3 (or more) couples tie for a place under Rule 10 (say,
+      2nd place) Rule 11 is applied to all couples concerned in the
+      tie, and the best couple is awarded the "2nd" place. Rule 10 is
+      now applied to the remaining "tied" couples for consideration of
+      the place now under review, which is the "3rd". However, if they
+      now tie for "3rd" under Rule 10, then Rule 11 is again applied
+      to these "tied" couples, commencing this time with the "3rd and
+      higher" judges's marks in the individual dances. 
+
 It is distributed under the MIT Licence, see licence.txt for the details
 

data/lib/skating_system.rb

@@ -1,4 +1,5 @@
 require 'skating_system/performance_results'
+require 'skating_system/ranking'
 require 'skating_system/scorer'
 
 module SkatingSystem

data/lib/skating_system/performance_results.rb

@@ -15,10 +15,26 @@ module SkatingSystem
       end
     end
     
+    def ranking
+      return @ranking if @ranking
+      @ranking =SkatingSystem::Ranking.new
+      @marks.each do |entree, data|
+         @ranking.add(data[:result], entree)
+      end
+      @ranking
+    end
+    
+    def [](key)
+      @marks[key]
+    end
+
+    
+    
+    private
     def sum_marks(entree, position)
       sum=0
       @marks[entree].each do |judge, place|
-        sum += place if place <= position
+        sum += place if place <= position 
       end
       sum
     end
@@ -37,7 +53,7 @@ module SkatingSystem
         sorted_candidate = candidates(place).sort do |entree1, entree2| 
           comparator = @tally[entree2][place] <=> @tally[entree1][place] 
           if comparator==0
-            comparator = sum_marks(entree2, place) <=> sum_marks(entree1, place) 
+            comparator = sum_marks(entree1, place) <=> sum_marks(entree2, place) 
           end 
           comparator
         end
@@ -59,12 +75,7 @@ module SkatingSystem
       end
       candidates
     end
-
-    def [](key)
-      @marks[key]
-    end
-
-    private
+    
     #Tallys the number of judges who marked each entree in each place or heigher
     # and writes the results to @tally
     # eg given the results

data/lib/skating_system/ranking.rb

@@ -0,0 +1,34 @@
+module SkatingSystem
+  class Ranking
+    attr_accessor :rank_table
+    
+    def initialize
+      @rank_table={ }
+    end
+    
+    #Ads a new result to this ranking
+    def add(place, competitor)
+      raise "too many couples in higher placings" if places_higher_than(place) >= place
+      
+      competitors = @rank_table[place] || []
+      competitors  << competitor
+      @rank_table[place] = competitors
+    end
+
+    def place_for(competitor)
+      rank_table.each do |key, value|
+        return key if value.include?(competitor)
+      end
+      raise "Unkown competitor"
+    end
+
+    def places_higher_than(place)
+      higher_placings = 0
+      1.upto(place-1) do |p|
+        higher_placings +=  @rank_table[p] ? @rank_table[p].size : 0
+      end
+      return higher_placings
+    end
+
+  end
+end

data/spec/spec/performance_results_spec.rb

@@ -58,156 +58,50 @@ describe SkatingSystem::PerformanceResults, "tallying the marks" do
   it "should know how many 3rd or better places entree3 got" do
     @performance_resuts[@entree3][3].should be(3)
   end
-  
 end
-#
-#
-#describe "scoring a final that can be decided on just rule 5" do
-#  before(:all) do
-#    @performance_resuts = PerformanceResults.new
-#    
-#    @judge1 = mock_model(Judge)
-#    @judge2 = mock_model(Judge)
-#    @judge3 = mock_model(Judge)
-#    
-#    @entree1 = mock_model(Entree)
-#    @entree2 = mock_model(Entree)
-#    @entree3 = mock_model(Entree)
-#    
-#    #    A  B  C     1 2 3
-#    # 1  1  1  3     2 2 3    1
-#    # 2  2  3  2     0 2 3    2
-#    # 3  3  2  3     0 1 3    3
-#    @couples_marks = { @entree1=>{@judge1=>1, @judge2=>1, @judge3=>3 },
-#      @entree2=>{@judge1=>2, @judge2=>3, @judge3=>2 },
-#      @entree3=>{@judge1=>3, @judge2=>2, @judge3=>3 }} 
-#    
-#    @performance_resuts.score(@couples_marks)
-#  end
-#  
-#  it "should list entree 1 as first place" do
-#    @performance_resuts[@entree1][:result].should be(1)
-#  end 
-#  
-#  it "should list entree 2 as second place" do
-#    @performance_resuts[@entree2][:result].should be(2)
-#  end 
-#
-#  it "should list entree 3 as third place" do
-#    @performance_resuts[@entree3][:result].should be(3)
-#  end 
-#end
-#
-#
-#describe "scoring a final that requires rule 6" do
-#  
-#  before(:all) do
-#    @performance_resuts = PerformanceResults.new
-#    
-#    @judgea = mock_model(Judge)
-#    @judgeb = mock_model(Judge)
-#    @judgec = mock_model(Judge)
-#    @judged = mock_model(Judge)
-#    @judgee = mock_model(Judge)
-#    
-#    @entree1 = mock_model(Entree, :number=>1)
-#    @entree2 = mock_model(Entree, :number=>2)
-#    @entree3 = mock_model(Entree, :number=>3)
-#    @entree4 = mock_model(Entree, :number=>4)
-#    @entree5 = mock_model(Entree, :number=>5)
-#    
-#    #    A  B  C  D  E    1  2  3  4  5 
-#    # 1  1  1  1  5  5    3              1
-#    # 2  4  2  4  1  2    1  3           3
-#    # 3  2  4  2  2  1    1  4           2
-#    # 4  3  5  3  4  4          2        5
-#    # 5  5  3  5  3  3          3        4
-#    
-#    @couples_marks = { 
-#      @entree1=>{@judgea=>1, @judgeb=>1, @judgec=>1, @judged=>5, @judgee=>5 },
-#      @entree2=>{@judgea=>4, @judgeb=>2, @judgec=>4, @judged=>1, @judgee=>2 },
-#      @entree3=>{@judgea=>2, @judgeb=>4, @judgec=>2, @judged=>2, @judgee=>1 },
-#      @entree4=>{@judgea=>3, @judgeb=>5, @judgec=>3, @judged=>4, @judgee=>4 },      
-#      @entree5=>{@judgea=>5, @judgeb=>3, @judgec=>5, @judged=>3, @judgee=>3 }
-#    } 
-#    
-#    @performance_resuts.score(@couples_marks)
-#  end
-#  
-#  it "should list entree 1 as first place" do
-#    @performance_resuts[@entree1][:result].should be(1)
-#  end 
-#  
-#  it "should list entree 2 as third place" do
-#    @performance_resuts[@entree2][:result].should be(3)
-#  end 
-#
-#  it "should list entree 3 as second place" do
-#    @performance_resuts[@entree3][:result].should be(2)
-#  end 
-#
-#  it "should list entree 4 as fifth place" do
-#    @performance_resuts[@entree4][:result].should be(5)
-#  end 
-#
-#  it "should list entree 5 as forth place" do
-#    @performance_resuts[@entree5][:result].should be(4)
-#  end 
-#end
-#
-#
-#describe "scoring a final that requires rule 7" do
-#  
-#  before(:all) do
-#    @performance_resuts = PerformanceResults.new
-#    
-#    @judgea = mock_model(Judge)
-#    @judgeb = mock_model(Judge)
-#    @judgec = mock_model(Judge) 
-#    @judged = mock_model(Judge)
-#    @judgee = mock_model(Judge)
-#    
-#    @entree1 = mock_model(Entree, :number=>1)
-#    @entree2 = mock_model(Entree, :number=>2)
-#    @entree3 = mock_model(Entree, :number=>3)
-#    @entree4 = mock_model(Entree, :number=>4)
-#    @entree5 = mock_model(Entree, :number=>5)
-#    
-#    #    A  B  C  D  E    1  2  3  4  5 
-#    # 1  1  1  1  5  5    3              1
-#    # 2  2  4  3  2  2       3           3
-#    # 3  4  2  4  1  1    2  3           2
-#    # 4  3  5  2  4  4       1  2        5
-#    # 5  5  3  5  3  3          3        4
-#    
-#    @couples_marks = { 
-#      @entree1=>{@judgea=>1, @judgeb=>1, @judgec=>1, @judged=>5, @judgee=>5 },
-#      @entree3=>{@judgea=>2, @judgeb=>3, @judgec=>4, @judged=>2, @judgee=>2 },
-#      @entree2=>{@judgea=>4, @judgeb=>2, @judgec=>4, @judged=>1, @judgee=>1 },
-#      @entree4=>{@judgea=>3, @judgeb=>5, @judgec=>2, @judged=>4, @judgee=>4 },      
-#      @entree5=>{@judgea=>5, @judgeb=>3, @judgec=>5, @judged=>3, @judgee=>3 }
-#    } 
-#      
-#    @performance_resuts.score(@couples_marks)
-#  end
-#  
-#  it "should list entree 1 as first place" do
-#    @performance_resuts[@entree1][:result].should be(1)
-#  end 
-#  
-#  it "should list entree 2 as third place" do
-#    @performance_resuts[@entree2][:result].should be(3)
-#  end 
-#
-#  it "should list entree 3 as second place" do
-#    @performance_resuts[@entree3][:result].should be(2)
-#  end 
-#
-#  it "should list entree 4 as fifth place" do
-#    @performance_resuts[@entree4][:result].should be(5)
-#  end 
-#
-#  it "should list entree 5 as forth place" do
-#    @performance_resuts[@entree5][:result].should be(4)
-#  end 
-#end
+
+describe SkatingSystem::PerformanceResults, "getting the rankings" do
+  before(:each) do
+    @performance_resuts = SkatingSystem::PerformanceResults.new
+    
+    @judge1 = mock("Judge")
+    @judge2 = mock("Judge")
+    @judge3 = mock("Judge")
+    
+    @entree1 = mock("Entree")
+    @entree2 = mock("Entree")
+    @entree3 = mock("Entree")
+    
+    #    A  B  C     1 2 3
+    # 1  1  1  3     2 2 3    1
+    # 2  2  3  2     0 2 3    2
+    # 3  3  2  3     0 1 3    3
+    @couples_marks = { @entree1=>{@judge1=>1, @judge2=>1, @judge3=>3 },
+      @entree2=>{@judge1=>2, @judge2=>3, @judge3=>2 },
+      @entree3=>{@judge1=>3, @judge2=>2, @judge3=>3 }} 
+
+    SkatingSystem::Ranking.stub!(:new).and_return(@ranking = mock(SkatingSystem::Ranking))
+    @ranking.stub!(:add) 
+
+              @performance_resuts.score(@couples_marks)
+  end
+
+  it "should return a Ranking when asked for one" do
+    @performance_resuts.ranking.should be(@ranking)
+  end
+
+  it "should add couple 1 to the ranking in first place" do
+    @ranking.should_receive(:add).with(1, @entree1)
+    @performance_resuts.ranking
+  end
+
+  it "should add couple 2 to the ranking in second place" do
+    @ranking.should_receive(:add).with(2, @entree2)
+    @performance_resuts.ranking
+  end
+
+  it "should add couple 3 to the ranking in third place" do
+    @ranking.should_receive(:add).with(3, @entree3)
+    @performance_resuts.ranking
+  end
+end

data/spec/spec/ranking_spec.rb

@@ -0,0 +1,61 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+
+describe SkatingSystem::Ranking do
+  before(:each) do
+    @ranking = SkatingSyatem::Ranking.new
+  end
+end
+
+
+describe SkatingSystem::Ranking, "adding new results" do
+  
+  before(:each) do
+    @ranking = SkatingSystem::Ranking.new
+  end
+    
+  it "should put an entry in first place when they are entered in first place" do
+    entree = mock("Entree")
+    @ranking.add(1, entree)
+    @ranking.place_for(entree).should be(1)
+  end
+  
+  it "should put both entries in first place when entered in first place, even if there is already a first place" do
+    entree1 = mock("Entree")
+    entree2 = mock("Entree")
+    @ranking.add(1, entree1)
+    @ranking.add(1, entree2)
+    @ranking.place_for(entree1).should be(1)
+    @ranking.place_for(entree2).should be(1)
+  end
+  
+  it "should put an entry in second place when entred in second place" do
+    entree = mock("Entree")
+    @ranking.add(2, entree)
+    @ranking.place_for(entree).should be(2)
+  end
+
+  it "should put both in second place when netered in second place, even if there is already a second place" do
+    entree1 = mock("Entree")
+    entree2 = mock("Entree")
+    @ranking.add(2, entree1)
+    @ranking.add(2, entree2)
+    @ranking.place_for(entree1).should be(2)
+    @ranking.place_for(entree2).should be(2)
+  end
+  
+  it "should not allow an entry in second place if there are two first places" do       
+    entree1 = mock("Entree")
+    entree2 = mock("Entree")
+    entree3 = mock("Entree")
+    @ranking.add(1, entree1)
+    @ranking.add(1, entree2)
+    lambda{ @ranking.add(2, entree3)}.should raise_error
+  end
+
+  it "should reise an exception if asked about an unknown entree" do
+    lambda{ @ranking.place_for(mock("Entree"))}.should raise_error
+  end
+
+  
+  
+end

data/spec/spec_helper.rb

@@ -2,7 +2,9 @@ dir = File.dirname(__FILE__)
 lib_path = File.expand_path("#{dir}/../lib")
 $LOAD_PATH.unshift lib_path unless $LOAD_PATH.include?(lib_path)
 
+require 'rubygems'
 require 'skating_system'
+require 'ruby-debug'
 
 Spec::Runner.configure do |config|
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wildfalcon-skating-system
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Laurie Young
@@ -25,10 +25,12 @@ files:
 - lib/skating_system.rb
 - lib/skating_system/scorer.rb
 - lib/skating_system/performance_results.rb
+- lib/skating_system/ranking.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 - spec/spec/scorer_spec.rb
 - spec/spec/performance_results_spec.rb
+- spec/spec/ranking_spec.rb
 - README
 has_rdoc: true
 homepage: