elo-ratings 0.0.0 → 0.0.1

data/README.rdoc

@@ -13,9 +13,13 @@ It is bundled under the ext directory of this project
 = EloRatings
 
 The goal of this gem was to provide a simple interface to Bayeselo in ruby.
+Advantage is set to zero (no advan advantage modifier to player 1)
 There has currently been no attempt to reproduce all functionality provided by Bayeselo.
 
 
+Only tested in ruby 1.9.1
+Ruby 1.9.2 throws some form of bus error at end of execution.
+
 == Copyright
 
 Copyright (c) 2010 phillc. See LICENSE.txt for

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.0.1

data/elo-ratings.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{elo-ratings}
-  s.version = "0.0.0"
+  s.version = "0.0.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["phillc"]
@@ -79,6 +79,7 @@ Gem::Specification.new do |s|
     "ext/bayeselo/date.h",
     "ext/bayeselo/debug.h",
     "ext/bayeselo/elomain.cpp",
+    "ext/bayeselo/eloratings.cpp",
     "ext/bayeselo/extconf.rb",
     "ext/bayeselo/list.h",
     "ext/bayeselo/listi.h",
@@ -93,7 +94,6 @@ Gem::Specification.new do |s|
     "ext/bayeselo/position.h",
     "ext/bayeselo/random.cpp",
     "ext/bayeselo/random.h",
-    "ext/bayeselo/rb_bayeselo.cpp",
     "ext/bayeselo/readstr.cpp",
     "ext/bayeselo/readstr.h",
     "ext/bayeselo/square.h",
@@ -102,11 +102,11 @@ Gem::Specification.new do |s|
     "ext/bayeselo/version.cpp",
     "ext/bayeselo/version.h",
     "ext/bayeselo/version_number.h",
-    "lib/bayeselo.rb",
-    "lib/bayeselo/bayeselo.rb",
-    "lib/bayeselo/c_bayeselo.rb",
-    "test/bayeselo/test_bayeselo.rb",
-    "test/bayeselo/test_c_bayeselo.rb",
+    "lib/elo_ratings.rb",
+    "lib/elo_ratings/c_bayeselo.rb",
+    "lib/elo_ratings/results.rb",
+    "test/elo_ratings/test_c_bayeselo.rb",
+    "test/elo_ratings/test_results.rb",
     "test/helper.rb"
   ]
   s.homepage = %q{http://github.com/phillc/elo-ratings}
@@ -115,8 +115,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.7}
   s.summary = %q{Ruby wrapper for bayeselo}
   s.test_files = [
-    "test/bayeselo/test_bayeselo.rb",
-    "test/bayeselo/test_c_bayeselo.rb",
+    "test/elo_ratings/test_c_bayeselo.rb",
+    "test/elo_ratings/test_results.rb",
     "test/helper.rb"
   ]
 

data/ext/bayeselo/{rb_bayeselo.cpp → eloratings.cpp}

@@ -62,12 +62,12 @@ float CBayeselo::CountGames(int i) {
 }
 
 extern "C"
-void Init_bayeselo()
+void Init_elo_ratings()
 {
-    Rice::Module mBayeselo = define_module("Bayeselo");
+    Rice::Module mEloRatings = define_module("EloRatings");
     
     Data_Type<CBayeselo> c_bayeselo =
-            define_class_under<CBayeselo>(mBayeselo, "CBayeselo")
+            define_class_under<CBayeselo>(mEloRatings, "CBayeselo")
             .define_constructor(Constructor<CBayeselo>())
             .define_method("get_players", &CBayeselo::GetPlayers)
             .define_method("append", &CBayeselo::Append)

data/ext/bayeselo/extconf.rb

@@ -1,6 +1,6 @@
 require 'mkmf-rice'
 
-extension_name = 'bayeselo'
-have_library("stdc++")
-dir_config(extension_name)
+extension_name = 'elo_ratings'
+# have_library("stdc++")
+# dir_config(extension_name)
 create_makefile(extension_name)

data/lib/elo_ratings.rb

@@ -0,0 +1,9 @@
+Dir[File.dirname(__FILE__) + '/elo_ratings/*.rb'].each {|file| require file }
+
+require File.dirname(__FILE__) + '/../ext/bayeselo/elo_ratings'
+
+module EloRatings
+  Draw = 1
+  Player1Win = 2
+  Player2Win = 0
+end

data/lib/elo_ratings/c_bayeselo.rb

@@ -0,0 +1,5 @@
+module EloRatings
+  class CBayeselo
+    # methods provided by rb_bayeselo.cpp
+  end
+end

data/lib/elo_ratings/results.rb

@@ -0,0 +1,41 @@
+module EloRatings
+  class Results
+    def initialize
+      @c_bayeselo = CBayeselo.new
+      @players = []
+    end
+  
+    def add_game player_1, player_2, result
+      @c_bayeselo.append index_for!(player_1), index_for!(player_2), result
+    end
+    
+    def count_games_for player
+      return 0 if !exists? player
+      @c_bayeselo.count_games index_for(player)
+    end
+    
+    def elo_for player
+      return nil if !exists? player
+      @c_bayeselo.get_elo index_for(player)
+    end
+    
+    protected
+    
+    def exists? player
+      !!index_for(player)
+    end
+    
+    def index_for player
+      @players.index player
+    end
+    
+    def index_for! player
+      index = index_for player
+      if index.nil?
+        index = @players.length
+        @players << player
+      end
+      index
+    end
+  end
+end

data/test/{bayeselo → elo_ratings}/test_c_bayeselo.rb

@@ -3,13 +3,13 @@ require 'helper'
 class TestCBayeselo < Test::Unit::TestCase
   context "append" do
     should "add the players" do
-      cbayeselo = Bayeselo::CBayeselo.new
+      cbayeselo = CBayeselo.new
       
-      cbayeselo.append 0, 1, CBayeselo::Player2
+      cbayeselo.append 0, 1, Player2Win
       assert_equal 2, cbayeselo.get_players
-      cbayeselo.append 1, 2, CBayeselo::Player2
+      cbayeselo.append 1, 2, Player2Win
       assert_equal 3, cbayeselo.get_players
-      cbayeselo.append 3, 4, CBayeselo::Player2
+      cbayeselo.append 3, 4, Player2Win
       assert_equal 5, cbayeselo.get_players
       assert_equal 1, cbayeselo.count_games(0)
       assert_equal 2, cbayeselo.count_games(1)
@@ -18,14 +18,14 @@ class TestCBayeselo < Test::Unit::TestCase
     end
     
     should "not be global" do
-      cbayeselo1 = Bayeselo::CBayeselo.new
-      cbayeselo2 = Bayeselo::CBayeselo.new
+      cbayeselo1 = CBayeselo.new
+      cbayeselo2 = CBayeselo.new
       
-      cbayeselo1.append 0, 1, CBayeselo::Player2
+      cbayeselo1.append 0, 1, Player2Win
       assert_equal 2, cbayeselo1.get_players
-      cbayeselo1.append 1, 2, CBayeselo::Player2
+      cbayeselo1.append 1, 2, Player2Win
       assert_equal 3, cbayeselo1.get_players
-      cbayeselo1.append 3, 4, CBayeselo::Player2
+      cbayeselo1.append 3, 4, Player2Win
       assert_equal 5, cbayeselo1.get_players
       assert_equal 1, cbayeselo1.count_games(0)
       assert_equal 2, cbayeselo1.count_games(1)
@@ -54,9 +54,9 @@ class TestCBayeselo < Test::Unit::TestCase
       #    3 a       -5  268  268     1   50%     5  100% 
       #    4 c       -5  268  268     1   50%     5  100%
       
-      cbayeselo = Bayeselo::CBayeselo.new
-      cbayeselo.append 0, 1, CBayeselo::Draw
-      cbayeselo.append 2, 3, CBayeselo::Draw
+      cbayeselo = CBayeselo.new
+      cbayeselo.append 0, 1, Draw
+      cbayeselo.append 2, 3, Draw
       assert_equal -5,  cbayeselo.get_elo(0)
       assert_equal 5, cbayeselo.get_elo(1)
       assert_equal -5, cbayeselo.get_elo(2)
@@ -66,11 +66,11 @@ class TestCBayeselo < Test::Unit::TestCase
   
   context "count_games" do
     should "return the number of games a player played" do
-      cbayeselo = Bayeselo::CBayeselo.new
-      cbayeselo.append 0, 1, CBayeselo::Player2
-      cbayeselo.append 2, 3, CBayeselo::Player2
-      cbayeselo.append 2, 0, CBayeselo::Player2
-      cbayeselo.append 11, 12, CBayeselo::Player2
+      cbayeselo = CBayeselo.new
+      cbayeselo.append 0, 1, Player2Win
+      cbayeselo.append 2, 3, Player2Win
+      cbayeselo.append 2, 0, Player2Win
+      cbayeselo.append 11, 12, Player2Win
       assert_equal 2, cbayeselo.count_games(0)
       assert_equal 1, cbayeselo.count_games(1)
       assert_equal 2, cbayeselo.count_games(2)

data/test/elo_ratings/test_results.rb

@@ -0,0 +1,41 @@
+require 'helper'
+
+class TestResults < Test::Unit::TestCase
+  context "add_game" do
+    should "accept the winner and loser and add a game to EloRatings" do
+      results = Results.new
+      results.add_game "a", 3, Player1Win
+      assert_equal 1, results.count_games_for("a")
+      assert_equal 1, results.count_games_for(3)
+    end
+    
+    should "record games for the same player" do
+      results = Results.new
+      results.add_game "a", "f", Player1Win
+      results.add_game "e", "a", Player1Win
+      results.add_game "k", "a", Player2Win
+      results.add_game "a", 1, Player2Win
+      assert_equal 4, results.count_games_for("a")
+    end
+  end
+  
+  context "count_games_for" do
+    should "return zero for a player that hasn't been added to a game yet" do
+      results = Results.new
+      assert_equal 0, results.count_games_for("a")
+    end
+  end
+  
+  context "elo_for" do
+    should "have exact opposite elo for two players" do
+      results = Results.new
+      results.add_game "a", "b", Player1Win
+      assert_equal results.elo_for("b"), results.elo_for("a") * -1
+    end
+    
+    should "return nil for for a player that hasn't been recorded yet" do
+      results = Results.new
+      assert_equal nil, results.elo_for("a")
+    end
+  end
+end

data/test/helper.rb

@@ -12,7 +12,8 @@ require 'shoulda'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'bayeselo'
+require 'elo_ratings'
 
 class Test::Unit::TestCase
+  include EloRatings
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: elo-ratings
 version: !ruby/object:Gem::Version 
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 0
-  - 0
-  version: 0.0.0
+  - 1
+  version: 0.0.1
 platform: ruby
 authors: 
 - phillc
@@ -24,6 +25,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -37,6 +39,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
         segments: 
         - 1
         - 0
@@ -52,6 +55,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 7
         segments: 
         - 1
         - 5
@@ -67,6 +71,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -80,6 +85,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -158,6 +164,7 @@ files:
 - ext/bayeselo/date.h
 - ext/bayeselo/debug.h
 - ext/bayeselo/elomain.cpp
+- ext/bayeselo/eloratings.cpp
 - ext/bayeselo/extconf.rb
 - ext/bayeselo/list.h
 - ext/bayeselo/listi.h
@@ -172,7 +179,6 @@ files:
 - ext/bayeselo/position.h
 - ext/bayeselo/random.cpp
 - ext/bayeselo/random.h
-- ext/bayeselo/rb_bayeselo.cpp
 - ext/bayeselo/readstr.cpp
 - ext/bayeselo/readstr.h
 - ext/bayeselo/square.h
@@ -181,11 +187,11 @@ files:
 - ext/bayeselo/version.cpp
 - ext/bayeselo/version.h
 - ext/bayeselo/version_number.h
-- lib/bayeselo.rb
-- lib/bayeselo/bayeselo.rb
-- lib/bayeselo/c_bayeselo.rb
-- test/bayeselo/test_bayeselo.rb
-- test/bayeselo/test_c_bayeselo.rb
+- lib/elo_ratings.rb
+- lib/elo_ratings/c_bayeselo.rb
+- lib/elo_ratings/results.rb
+- test/elo_ratings/test_c_bayeselo.rb
+- test/elo_ratings/test_results.rb
 - test/helper.rb
 has_rdoc: true
 homepage: http://github.com/phillc/elo-ratings
@@ -201,7 +207,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 87263453
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -210,6 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -221,6 +228,6 @@ signing_key:
 specification_version: 3
 summary: Ruby wrapper for bayeselo
 test_files: 
-- test/bayeselo/test_bayeselo.rb
-- test/bayeselo/test_c_bayeselo.rb
+- test/elo_ratings/test_c_bayeselo.rb
+- test/elo_ratings/test_results.rb
 - test/helper.rb

data/lib/bayeselo.rb

@@ -1,6 +0,0 @@
-Dir[File.dirname(__FILE__) + '/bayeselo/*.rb'].each {|file| require file }
-
-require File.dirname(__FILE__) + '/../ext/bayeselo/bayeselo'
-
-module Bayeselo
-end

data/lib/bayeselo/bayeselo.rb

@@ -1,11 +0,0 @@
-class Bayeselo
-  def initialize
-    @c_bayeselo = CBayeselo.new
-    @players = []
-  end
-  
-  def add_game players={}
-    players[:winner]
-    players[:loser]
-  end
-end

data/lib/bayeselo/c_bayeselo.rb

@@ -1,7 +0,0 @@
-class CBayeselo
-  Draw = 1
-  Player1 = 2
-  Player2 = 0
-  
-  # methods provided by rb_bayeselo.cpp
-end

data/test/bayeselo/test_bayeselo.rb

@@ -1,33 +0,0 @@
-require 'helper'
-
-class TestBayeselo < Test::Unit::TestCase
-  context "add_game" do
-    should "accept the winner and loser and add a game to bayeselo" do
-      bayeselo = Bayeselo.new
-      bayeselo.add_game :winner => "a", :loser => "b"
-      assert_equal 1, bayeselo.count_games("a")
-      assert_equal 1, bayeselo.count_games("b")
-    end
-    
-    should "record games for the same player" do
-      bayeselo = Bayeselo.new
-      bayeselo.add_game :winner => "a", :loser => "f"
-      bayeselo.add_game :winner => "e", :loser => "a"
-      bayeselo.add_game :winner => "a", :loser => "k"
-      assert_equal 3, bayeselo.count_games("a")
-    end
-  end
-  
-  context "get_elo" do
-    should "have exact opposite elo for two players" do
-      bayeselo = Bayeselo.new
-      bayeselo.add_game :winner => "a", :loser => "b"
-      assert_equal bayeselo.get_elo("b"), -bayeselo.get_elo("a")
-    end
-    
-    should "return nil for for a player that hasn't been recorded yet" do
-      bayeselo = Bayeselo.new
-      assert_equal nil, bayeselo.get_elo("a")
-    end
-  end
-end