games_dice 0.3.2 → 0.3.3

data/ext/games_dice/probabilities.c

@@ -8,10 +8,10 @@
 #endif
 
 // Force inclusion of hash declarations (only MRI includes by default)
-#if RJB_RUBY_VERSION_CODE < 190
-#include "st.h"
-#else
+#ifdef HAVE_RUBY_ST_H
 #include "ruby/st.h"
+#else
+#include "st.h"
 #endif
 
 VALUE Probabilities = Qnil;
@@ -230,7 +230,7 @@ static ProbabilityList *pl_add_distributions_mult( int mul_a, ProbabilityList *p
   int i,j;
   for ( i=0; i < pl_a->slots; i++ ) { for ( j=0; j < pl_b->slots; j++ ) {
     int k = mul_a * (i + pl_a->offset) + mul_b * (j + pl_b->offset) - combined_min;
-    pr[ i + j ] += (pl_a->probs)[i] * (pl_b->probs)[j];
+    pr[ k ] += (pl_a->probs)[i] * (pl_b->probs)[j];
   } }
   calc_cumulative( pl );
   return pl;

data/games_dice.gemspec

@@ -16,7 +16,14 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency "rspec", ">= 2.13.0"
   gem.add_development_dependency "rake", ">= 1.9.1"
   gem.add_development_dependency "yard", ">= 0.8.6"
-  gem.add_development_dependency "redcarpet", ">=2.3.0"
+
+  if RUBY_VERSION < "1.9.0"
+    # Red Carpet v3.0.0 does not compile for 1.8.7
+    gem.add_development_dependency "redcarpet", ">=2.3.0", "<3.0.0"
+  else
+    gem.add_development_dependency "redcarpet", ">=2.3.0"
+  end
+
   gem.add_development_dependency "rake-compiler"
 
   gem.add_dependency "parslet", ">= 1.5.0"

data/lib/games_dice/version.rb

@@ -1,3 +1,3 @@
 module GamesDice
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/spec/probability_spec.rb

@@ -78,6 +78,18 @@ describe GamesDice::Probabilities do
         h[4].should be_within(1e-9).of 2.0/24
         h[5].should be_within(1e-9).of 1.0/24
       end
+
+      it "should add asymmetric distributions accurately" do
+        da = GamesDice::Probabilities.new( [0.7,0.0,0.3], 2 )
+        db = GamesDice::Probabilities.new( [0.5,0.3,0.2], 2 )
+        pr = GamesDice::Probabilities.add_distributions_mult( 1, da, 2, db )
+        h = pr.to_h
+        h.should be_valid_distribution
+        h[6].should be_within(1e-9).of 0.7 * 0.5
+        h[8].should be_within(1e-9).of 0.7 * 0.3 + 0.3 * 0.5
+        h[10].should be_within(1e-9).of 0.7 * 0.2 + 0.3 * 0.3
+        h[12].should be_within(1e-9).of 0.3 * 0.2
+      end
     end
 
     describe "#from_h" do

metadata

@@ -1,121 +1,134 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: games_dice
-version: !ruby/object:Gem::Version
-  version: 0.3.2
+version: !ruby/object:Gem::Version 
+  hash: 21
   prerelease: 
+  segments: 
+  - 0
+  - 3
+  - 3
+  version: 0.3.3
 platform: ruby
-authors:
+authors: 
 - Neil Slater
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-07-11 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.13.0
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 59
+        segments: 
+        - 2
+        - 13
+        - 0
         version: 2.13.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.9.1
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 1
+        - 9
+        - 1
         version: 1.9.1
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.6
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: yard
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 51
+        segments: 
+        - 0
+        - 8
+        - 6
         version: 0.8.6
-- !ruby/object:Gem::Dependency
-  name: redcarpet
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 2.3.0
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: redcarpet
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 3
+        - 0
         version: 2.3.0
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    - - <
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
+        version: 3.0.0
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rake-compiler
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: parslet
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.0
-  type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 5
+        - 0
         version: 1.5.0
-description: A library for simulating dice. Use it to construct dice-rolling systems
-  used in role-playing and board games.
-email:
+  type: :runtime
+  version_requirements: *id006
+description: A library for simulating dice. Use it to construct dice-rolling systems used in role-playing and board games.
+email: 
 - slobo777@gmail.com
 executables: []
-extensions:
+
+extensions: 
 - ext/games_dice/extconf.rb
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -152,36 +165,38 @@ files:
 - spec/reroll_rule_spec.rb
 homepage: https://github.com/neilslater/games_dice
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -551610733776225625
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: -551610733776225625
+      version: "0"
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Simulates and explains dice rolls from simple "1d6" to complex "roll 7 ten-sided
-  dice, take best 3, results of 10 roll again and add on".
-test_files:
+summary: Simulates and explains dice rolls from simple "1d6" to complex "roll 7 ten-sided dice, take best 3, results of 10 roll again and add on".
+test_files: 
 - spec/bunch_spec.rb
 - spec/complex_die_spec.rb
 - spec/dice_spec.rb