rpi-calculator 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe9f6cbe5a2d86bdb0df8cc879ba181ccae27ce7
-  data.tar.gz: c497116aa966d9a8c0ded0514821e074b0439a24
+  metadata.gz: 1f53e5620fb6cc90d905cfbf6f55a29a27fb6f79
+  data.tar.gz: 42d390dc079ed74c5dcef40544c6a6ae047f8cd5
 SHA512:
-  metadata.gz: 09beefe6335bd4524e31d2fd6ffb24da1e3c115d1c040da45a7316b3807bd65b777105871644877ba13cc2675048add676a1b535e130ad860d066cd87ec32f51
-  data.tar.gz: 468510c00225638661f858abff7db3e0cd25bbe882060e4c39537887c454bc34081954533ff33d292ca6be368c4c1c65840e28055e800faf91df77cc313b4185
+  metadata.gz: 345b0c263347bd011edd83ab3da855c5ec79eff9729132b6b35764f3a4bb956d8cca756723a32939390cffaff18b1222f49b95b73e953119da37a73068eef0ba
+  data.tar.gz: 1fa7c9b66c0328ea12646bff5658341fa3136afe3285a30c4dd20bca9ae37193844b184fd678a0d6706ef66036ade9848b43ba067338ad6301931504aec08e70

data/lib/crashing_the_dance/rpi_calculator.rb

@@ -9,9 +9,13 @@ module CrashingTheDance
     # also use fixtures to test them. simple, lightweight.
     def self.calculate(teams, games)
       by_team = games_by_team(teams, games)
-      teams = calculate_rpi teams, by_team
+      teams = build_rpi teams, by_team
       calculate_owp teams, by_team
       calculate_oowp teams
+      calculate_conference_owp teams, by_team
+      calculate_conference_oowp teams
+      calculate_nonconference_owp teams, by_team
+      calculate_nonconference_oowp teams
       teams
     end
 
@@ -29,7 +33,31 @@ module CrashingTheDance
       end
     end
 
-    def self.calculate_rpi(teams, games_by_team)
+    def self.calculate_conference_oowp(teams)
+      teams.each do |team|
+        team.calculate_conference_oowp teams
+      end
+    end
+
+    def self.calculate_conference_owp(teams, games_by_team)
+      teams.each do |team|
+        team.calculate_conference_owp(games_by_team)
+      end
+    end
+
+    def self.calculate_nonconference_oowp(teams)
+      teams.each do |team|
+        team.calculate_nonconference_oowp teams
+      end
+    end
+
+    def self.calculate_nonconference_owp(teams, games_by_team)
+      teams.each do |team|
+        team.calculate_nonconference_owp(games_by_team)
+      end
+    end
+
+    def self.build_rpi(teams, games_by_team)
       teams.map { |team| RPI.new team, games_by_team[team] }
     end
 

data/lib/crashing_the_dance/rpi_calculator/opponent_game.rb

@@ -54,6 +54,10 @@ module CrashingTheDance
         @which_team == :visitor && !neutral?
       end
 
+      def conference?
+        game.conference?
+      end
+
       private
 
       def scores

data/lib/crashing_the_dance/rpi_calculator/rpi.rb

@@ -1,14 +1,19 @@
 module CrashingTheDance
   module RpiCalculator
     class RPI
-      attr_reader :team, :games, :wins, :losses, :rpi_wins, :rpi_losses
+      attr_reader :team,
+                  :games, :games_conference, :games_nonconference,
+                  :wins, :losses,
+                  :rpi_wins, :rpi_losses,
+                  :wins_conference, :losses_conference,
+                  :rpi_wins_conference, :rpi_losses_conference,
+                  :wins_nonconference, :losses_nonconference,
+                  :rpi_wins_nonconference, :rpi_losses_nonconference
 
       def initialize(team, games)
         @team = team
-        @games = games
-        @owp = 0.0
-        @oowp = 0.0
-        @rpi = nil
+        initialize_games(games)
+        initialize_rpi
         calculate_record
       end
 
@@ -28,6 +33,22 @@ module CrashingTheDance
         end
       end
 
+      def rpi_win_percentage_conference
+        if games_conference.count > 0
+          rpi_wins_conference / (rpi_wins_conference + rpi_losses_conference)
+        else
+          0.0
+        end
+      end
+
+      def rpi_win_percentage_nonconference
+        if games_nonconference.count > 0
+          rpi_wins_nonconference / (rpi_wins_nonconference + rpi_losses_nonconference)
+        else
+          0.0
+        end
+      end
+
       def owp
         @owp
       end
@@ -36,10 +57,34 @@ module CrashingTheDance
         @oowp
       end
 
+      def owp_conference
+        @owp_conference
+      end
+
+      def oowp_conference
+        @oowp_conference
+      end
+
+      def owp_nonconference
+        @owp_nonconference
+      end
+
+      def oowp_nonconference
+        @oowp_nonconference
+      end
+
       def rpi
         @rpi ||= calculate_rpi
       end
 
+      def rpi_conference
+        @rpi_conference ||= calculate_rpi_conference
+      end
+
+      def rpi_nonconference
+        @rpi_nonconference ||= calculate_rpi_nonconference
+      end
+
       # To calculate opponent's winning percentage (OWP), you remove games against
       # the team in question.
       # However, for the purpose of calculating OWP and OOWP, use standard WP.
@@ -66,12 +111,84 @@ module CrashingTheDance
         end
       end
 
+      # hate this repitition but not yet sure how to consolidate
+      # the logic is roughly the same, but they
+      # set separate instance variables
+      def calculate_conference_owp(games_by_team)
+        if games_conference.count > 0
+          sum_owp = games_conference.inject(0.0) do |sum, game|
+            sked = opponent_schedule game.opponent, games_by_team
+            ow = sked.inject(0) { |wins, og| wins + og.wins }
+            sum + (sked.empty? ? 0.0 : (ow.to_f / sked.count.to_f))
+          end
+          @owp_conference = sum_owp / games_conference.count.to_f
+        end
+      end
+
+      def calculate_conference_oowp(all_teams)
+        if games_conference.count > 0
+          sum_oowp = games_conference.inject(0.0) do |sum, game|
+            opponent = all_teams.find { |t| game.opponent.eql? t.team }
+            sum + opponent.owp
+          end
+          @oowp_conference = sum_oowp / games_conference.count.to_f
+        end
+      end
+
+      def calculate_nonconference_owp(games_by_team)
+        if games_nonconference.count > 0
+          sum_owp = games_nonconference.inject(0.0) do |sum, game|
+            sked = opponent_schedule game.opponent, games_by_team
+            ow = sked.inject(0) { |wins, og| wins + og.wins }
+            sum + (sked.empty? ? 0.0 : (ow.to_f / sked.count.to_f))
+          end
+          @owp_nonconference = sum_owp / games_nonconference.count.to_f
+        end
+      end
+
+      def calculate_nonconference_oowp(all_teams)
+        if games_nonconference.count > 0
+          sum_oowp = games_nonconference.inject(0.0) do |sum, game|
+            opponent = all_teams.find { |t| game.opponent.eql? t.team }
+            sum + opponent.owp
+          end
+          @oowp_nonconference = sum_oowp / games_nonconference.count.to_f
+        end
+      end
+
       private
 
+      def initialize_games(games)
+        @games = games
+        @games_conference = games.select { |game| game.conference? }
+        @games_nonconference = games.reject { |game| game.conference? }
+      end
+
+      def initialize_rpi
+        @owp = 0.0
+        @oowp = 0.0
+        @owp_conference = 0.0
+        @oowp_conference = 0.0
+        @owp_nonconference = 0.0
+        @oowp_nonconference = 0.0
+        @rpi = nil
+        @rpi_conference = nil
+        @rpi_nonconference = nil
+      end
+
       def calculate_rpi
         0.25 * rpi_win_percentage + 0.5 * owp + 0.25 * oowp
       end
 
+      # these are common, how can we consolidate?
+      def calculate_rpi_conference
+        0.25 * rpi_win_percentage_conference + 0.5 * owp_conference + 0.25 * oowp_conference
+      end
+
+      def calculate_rpi_nonconference
+        0.25 * rpi_win_percentage_nonconference + 0.5 * owp_nonconference + 0.25 * oowp_nonconference
+      end
+
       # filters out games against this team
       def opponent_schedule(opponent, games_by_team)
        all = games_by_team[opponent] || []
@@ -80,13 +197,53 @@ module CrashingTheDance
 
       # w/l is commonly used, so can we extract it to a module?
       def calculate_record
+        initialize_wl
+        initialize_wl_conference
+        initialize_wl_nonconference
+        games.each do |game|
+          calculate_wl game
+          calculate_wl_conference game
+          calculate_wl_nonconference game
+        end
+      end
+
+      def initialize_wl
         @wins = @rpi_wins = 0
         @losses = @rpi_losses = 0
-        games.each do |game|
+      end
+
+      def initialize_wl_conference
+        @wins_conference = @rpi_wins_conference = 0
+        @losses_conference = @rpi_losses_conference = 0
+      end
+
+      def initialize_wl_nonconference
+        @wins_nonconference = @rpi_wins_nonconference = 0
+        @losses_nonconference = @rpi_losses_nonconference = 0
+      end
+
+      def calculate_wl(game)
           @wins       += 1 if game.win?
           @losses     += 1 if game.loss?
           @rpi_wins   += game.rpi_wins
           @rpi_losses += game.rpi_losses
+      end
+
+      def calculate_wl_conference(game)
+        if game.conference?
+          @wins_conference       += 1 if game.win?
+          @losses_conference     += 1 if game.loss?
+          @rpi_wins_conference   += game.rpi_wins
+          @rpi_losses_conference += game.rpi_losses
+        end
+      end
+
+      def calculate_wl_nonconference(game)
+        unless game.conference?
+          @wins_nonconference       += 1 if game.win?
+          @losses_nonconference     += 1 if game.loss?
+          @rpi_wins_nonconference   += game.rpi_wins
+          @rpi_losses_nonconference += game.rpi_losses
         end
       end
     end

data/lib/crashing_the_dance/rpi_calculator/version.rb

@@ -1,5 +1,5 @@
 module CrashingTheDance
   module RpiCalculator
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/spec/fixtures/games-palm-conference.csv

@@ -0,0 +1,23 @@
+vis_team,vis_score,home_team,home_score,neutral,conference
+Notre Dame,0,Valparaiso,1,,C
+Valparaiso,1,Indiana,0,,C
+Valparaiso,0,Purdue,1,,C
+Michigan State,0,Notre Dame,1,
+Notre Dame,0,Purdue,1
+Notre Dame,0,IUPUI,1
+Indiana,0,Kentucky,1
+Indiana,0,Ball State,1
+Duke,0,Purdue,1,N
+UCLA,0,Purdue,1
+IUPUI,0,Duke,1,N
+Duke,1,IUPUI,0,
+IUPUI,0,Duke,1,
+IUPUI,0,Duke,1
+IUPUI,0,UCLA,1
+Ball State,0,UCLA,1
+UCLA,1,Ball State,0
+Kentucky,0,Ball State,1
+Schmoo,0,Michigan State,1
+Schmoo,0,Michigan State,1
+Schmoo,0,Kentucky,1
+Schmoo,0,Kentucky,1,N

data/spec/fixtures/games-palm-nonconference.csv

@@ -0,0 +1,23 @@
+vis_team,vis_score,home_team,home_score,neutral,conference
+Notre Dame,0,Valparaiso,1,,
+Valparaiso,1,Indiana,0,,
+Valparaiso,0,Purdue,1,,
+Michigan State,0,Notre Dame,1,
+Notre Dame,0,Purdue,1
+Notre Dame,0,IUPUI,1
+Indiana,0,Kentucky,1
+Indiana,0,Ball State,1
+Duke,0,Purdue,1,N
+UCLA,0,Purdue,1
+IUPUI,0,Duke,1,N
+Duke,1,IUPUI,0,
+IUPUI,0,Duke,1,
+IUPUI,0,Duke,1
+IUPUI,0,UCLA,1
+Ball State,0,UCLA,1
+UCLA,1,Ball State,0
+Kentucky,0,Ball State,1
+Schmoo,0,Michigan State,1
+Schmoo,0,Michigan State,1
+Schmoo,0,Kentucky,1
+Schmoo,0,Kentucky,1,N

data/spec/fixtures/teams-palm-conference.csv

@@ -0,0 +1,12 @@
+name
+Valparaiso
+Notre Dame
+Indiana
+Purdue
+Michigan State
+IUPUI
+Kentucky
+Ball State
+Duke
+UCLA
+Schmoo

data/spec/fixtures/teams-palm-nonconference.csv

@@ -0,0 +1,12 @@
+name
+Valparaiso
+Notre Dame
+Indiana
+Purdue
+Michigan State
+IUPUI
+Kentucky
+Ball State
+Duke
+UCLA
+Schmoo

data/spec/lib/rpi_calculator_spec.rb

@@ -70,6 +70,18 @@ describe "RPI calculator" do
       expect(valpo.win_percentage).to be_within(0.0001).of(0.0000)
     end
 
+    it "calculates the right conference win/loss record" do
+      valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
+      expect(valpo.wins_conference).to eq(0)
+      expect(valpo.losses_conference).to eq(0)
+    end
+
+    it "calculates the right nonconference win/loss record" do
+      valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
+      expect(valpo.wins_nonconference).to eq(0)
+      expect(valpo.losses_nonconference).to eq(0)
+    end
+
     it "calculates the RPI OWP" do
       valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
       expect(valpo.owp).to be_within(0.0001).of(0.0)
@@ -84,6 +96,16 @@ describe "RPI calculator" do
       valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
       expect(valpo.rpi).to be_within(0.0001).of(0.0)
     end
+
+    it "calculates the conference RPI" do
+      valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
+      expect(valpo.rpi_conference).to be_within(0.0001).of(0.0)
+    end
+
+    it "calculates the nonconference RPI" do
+      valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
+      expect(valpo.rpi_nonconference).to be_within(0.0001).of(0.0)
+    end
   end
 
   # This comes from Jerry Palm's example RPI scenario at
@@ -102,6 +124,18 @@ describe "RPI calculator" do
       expect(valpo.win_percentage).to be_within(0.0001).of(0.6667)
     end
 
+    it "calculates the right conference win/loss record" do
+      valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
+      expect(valpo.wins_conference).to eq(0)
+      expect(valpo.losses_conference).to eq(0)
+    end
+
+    it "calculates the right non-conference win/loss record" do
+      valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
+      expect(valpo.wins_nonconference).to eq(2)
+      expect(valpo.losses_nonconference).to eq(1)
+    end
+
     it "calculates the RPI win/loss record" do
       valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
       expect(valpo.rpi_wins).to be_within(0.0001).of(2.0)
@@ -125,6 +159,134 @@ describe "RPI calculator" do
     end
   end
 
+  # the same as the Palm scenario with all Valpo games as conference games
+  # using all games will make it easier to verify ground truth
+  context "the Palm scenario as conference" do
+    before(:each) do
+      @teams = teams_fixture 'palm-conference'
+      games = games_fixture 'palm-conference'
+      @rpi = CrashingTheDance::RpiCalculator.calculate @teams, games
+    end
+
+    it "calculates the right conference win/loss record" do
+      valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
+      expect(valpo.wins_conference).to eq(2)
+      expect(valpo.losses_conference).to eq(1)
+    end
+
+    it "calculates the conference RPI win/loss record" do
+      valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
+      expect(valpo.rpi_wins_conference).to be_within(0.0001).of(2.0)
+      expect(valpo.rpi_losses_conference).to be_within(0.0001).of(0.6)
+    end
+
+    it "calculates the conference RPI" do
+      valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
+      expect(valpo.rpi_conference).to be_within(0.0001).of(0.5777)
+    end
+
+    it "calculates the nonconference RPI" do
+      valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
+      expect(valpo.rpi_nonconference).to be_within(0.0001).of(0.0000)
+    end
+
+    it "calculates the right non-conference win/loss record" do
+      valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
+      expect(valpo.wins_nonconference).to eq(0)
+      expect(valpo.losses_nonconference).to eq(0)
+    end
+
+    it "calculates the non-conference RPI win/loss record" do
+      valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
+      expect(valpo.rpi_wins_nonconference).to be_within(0.0001).of(0.0)
+      expect(valpo.rpi_losses_nonconference).to be_within(0.0001).of(0.0)
+    end
+
+    it "calculates the conference RPI OWP" do
+      valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
+      expect(valpo.owp_conference).to be_within(0.0001).of(0.4444)
+    end
+
+    it "calculates the conference RPI OOWP" do
+      valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
+      expect(valpo.oowp_conference).to be_within(0.0001).of(0.6528)
+    end
+
+    it "calculates the non-conference RPI OWP" do
+      valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
+      expect(valpo.owp_nonconference).to be_within(0.0001).of(0.0000)
+    end
+
+    it "calculates the nonconference RPI OOWP" do
+      valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
+      expect(valpo.oowp_nonconference).to be_within(0.0001).of(0.0000)
+    end
+  end
+
+  # the same as the Palm scenario with all Valpo games as conference games
+  # using all games will make it easier to verify ground truth
+  context "the Palm scenario as nonconference" do
+    before(:each) do
+      @teams = teams_fixture 'palm-nonconference'
+      games = games_fixture 'palm-nonconference'
+      @rpi = CrashingTheDance::RpiCalculator.calculate @teams, games
+    end
+
+    it "calculates the right nonconference win/loss record" do
+      valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
+      expect(valpo.wins_nonconference).to eq(2)
+      expect(valpo.losses_nonconference).to eq(1)
+    end
+
+    it "calculates the nonconference RPI win/loss record" do
+      valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
+      expect(valpo.rpi_wins_nonconference).to be_within(0.0001).of(2.0)
+      expect(valpo.rpi_losses_nonconference).to be_within(0.0001).of(0.6)
+    end
+
+    it "calculates the nonconference RPI" do
+      valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
+      expect(valpo.rpi_nonconference).to be_within(0.0001).of(0.5777)
+    end
+
+    it "calculates the conference RPI" do
+      valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
+      expect(valpo.rpi_conference).to be_within(0.0001).of(0.0000)
+    end
+
+    it "calculates the right conference win/loss record" do
+      valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
+      expect(valpo.wins_conference).to eq(0)
+      expect(valpo.losses_conference).to eq(0)
+    end
+
+    it "calculates the conference RPI win/loss record" do
+      valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
+      expect(valpo.rpi_wins_conference).to be_within(0.0001).of(0.0)
+      expect(valpo.rpi_losses_conference).to be_within(0.0001).of(0.0)
+    end
+
+    it "calculates the nonconference RPI OWP" do
+      valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
+      expect(valpo.owp_nonconference).to be_within(0.0001).of(0.4444)
+    end
+
+    it "calculates the nonconference RPI OOWP" do
+      valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
+      expect(valpo.oowp_nonconference).to be_within(0.0001).of(0.6528)
+    end
+
+    it "calculates the conference RPI OWP" do
+      valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
+      expect(valpo.owp_conference).to be_within(0.0001).of(0.0000)
+    end
+
+    it "calculates the conference RPI OOWP" do
+      valpo = @rpi.find { |team| team.team.name.eql? "Valparaiso" }
+      expect(valpo.oowp_conference).to be_within(0.0001).of(0.0000)
+    end
+  end
+
   context "full season" do
   end
 end

data/spec/spec_helper.rb

@@ -11,10 +11,14 @@ Team = Struct.new(:name, :id) do
   end
 end
 
-Game = Struct.new(:vis_team, :home_team, :vis_score, :home_score, :neutral) do
+Game = Struct.new(:vis_team, :home_team, :vis_score, :home_score, :neutral, :conference) do
   def neutral?
     !neutral.nil? && neutral == "N"
   end
+
+  def conference?
+    !conference.nil? && conference == "C"
+  end
 end
 
 def games_fixture(which)
@@ -29,7 +33,7 @@ def games_fixture(which)
                       teams.find { |team| team.name.eql?(row["home_team"]) },
                       row["vis_score"].to_i,
                       row["home_score"].to_i,
-                      row["neutral"])
+                      row["neutral"], row["conference"])
   end
   games
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rpi-calculator
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Andy Cox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-23 00:00:00.000000000 Z
+date: 2014-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,8 +98,12 @@ files:
 - lib/crashing_the_dance/rpi_calculator/version.rb
 - rpi-calculator.gemspec
 - spec/fixtures/games-onegame.csv
+- spec/fixtures/games-palm-conference.csv
+- spec/fixtures/games-palm-nonconference.csv
 - spec/fixtures/games-palm.csv
 - spec/fixtures/teams-onegame.csv
+- spec/fixtures/teams-palm-conference.csv
+- spec/fixtures/teams-palm-nonconference.csv
 - spec/fixtures/teams-palm.csv
 - spec/fixtures/teams-single.csv
 - spec/lib/opponent_game_spec.rb
@@ -131,8 +135,12 @@ specification_version: 4
 summary: On your computer, calculatin' your RPI.
 test_files:
 - spec/fixtures/games-onegame.csv
+- spec/fixtures/games-palm-conference.csv
+- spec/fixtures/games-palm-nonconference.csv
 - spec/fixtures/games-palm.csv
 - spec/fixtures/teams-onegame.csv
+- spec/fixtures/teams-palm-conference.csv
+- spec/fixtures/teams-palm-nonconference.csv
 - spec/fixtures/teams-palm.csv
 - spec/fixtures/teams-single.csv
 - spec/lib/opponent_game_spec.rb