math_probability 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 512ad96cd9913406ad58ea4fbeefa4d09e13032f
-  data.tar.gz: 857404e2821e0b4b0dec8077340b35f2b87d0a17
+  metadata.gz: 126b15b6b5d89b948f88d15ed649551fca41dd58
+  data.tar.gz: a6cbc805e89281180ccd401ed840c6652adf11be
 SHA512:
-  metadata.gz: 606b30f62503ca92d8804887298bab08304db167417a5617fe9dd2be18080349ececf8da413fb9d19ce8c55ed6dce7a1ff2f516eef5079d0baf17f63cb99f503
-  data.tar.gz: 12649f47c02bc83d8eab0a36cddaf90d2ac91fa7489b068da1186b6d1ca88d56bd328ffa7782b5712a355e6acd0e57dbe3925fcd1219b4dbbd1758e788cece09
+  metadata.gz: 8aaf432baa59badd5b8e441aafdbae9bf24e88ef1724c332d008601e9fdac24e993bacfdd904e52db183638fa2df437d7a5c5eb8415890f6a0eb05c84d848452
+  data.tar.gz: b5ec7a3931ec40893e0c0ddb64b519b4d2d34970132317a6b875cc9eeb10c05235e2fd39686c670e5dfbbfe4535b5ec596fc20cb00f33b361e43e2ab2f8f70a7

data/lib/math_probability/version.rb

@@ -1,3 +1,3 @@
 module MathProbability
-  VERSION = "0.1.1"
+  VERSION = "0.2.0"
 end

data/lib/math_probability.rb

@@ -27,10 +27,22 @@ module MathProbability
       (((objects.factoral)/((objects-at_a_time).factoral))*(1.0/(at_a_time.factoral))).to_i
     end
 
-    def self.probability(choice, outcomes)
+    def self.probability(choices, outcomes, reduce=true)
       answer ||= []
-      a = choice.to_f / outcomes
-      answer << a << "#{a*100}%" << "#{choice}/#{outcomes}"
+      a = choices.to_f / outcomes
+      answer << a << "#{a*100}%" << (reduce ? reduced_fraction(choices, outcomes) : "#{choices}/#{outcomes}")
+    end
+
+    private
+
+    def self.reduced_fraction(nominator, denominator)
+      lcd ||= denominator
+      denominator.downto(2).each do |n|
+        if nominator % n == 0 && denominator % n == 0 && n != denominator && n < lcd
+          lcd = n
+        end
+      end
+      lcd != denominator ? "#{nominator/lcd}/#{denominator/lcd}" : "#{nominator}/#{denominator}"
     end
 
   end

data/test/lib/math_probability/math_probability_test.rb

@@ -31,6 +31,14 @@ describe MathProbability::Probability do
   it "should return all forms of Probability" do
     subject.probability(1,2).must_equal([0.5, "50.0%", "1/2"])
   end
+
+  it "should return a reduced fraction" do
+    subject.probability(2,4).must_equal([0.5, "50.0%", "1/2"])
+  end
+
+  it "should not return a reduced fraction if flag is set to false" do
+    subject.probability(2,4,false).must_equal([0.5, "50.0%", "2/4"])
+  end
  
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: math_probability
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Rob Race