more_math 0.0.3 → 0.0.4

data/.travis.yml

@@ -1,6 +1,7 @@
 rvm:
   - 1.8.7
   - 1.9.2
+  - 1.9.3
   - ruby-head
   - ree
   - rbx

data/CHANGES

@@ -1,3 +1,6 @@
+2011-12-25 (0.0.4)
+ * Support simplecov
+ * Add more tests
 2011-10-08 (0.0.3)
  * Add permutation and subset implementations
 2011-09-26 (0.0.2)

data/Gemfile

@@ -3,3 +3,7 @@
 source :rubygems
 
 gemspec
+
+group :development do
+  gem 'simplecov'
+end

data/VERSION

@@ -1 +1 @@
-0.0.3
+0.0.4

data/lib/more_math/distributions.rb

@@ -31,7 +31,7 @@ module MoreMath
         -1 / 0.0
       when p >= 1
         1 / 0.0
-      when p == 0.5 # This is a bit sloppy, maybe improve this later.
+      when (p - 0.5).abs <= Float::EPSILON
         @mu
       else
         begin

data/lib/more_math/string_numeral.rb

@@ -5,7 +5,9 @@ module MoreMath
     include ::MoreMath::NumberifyStringFunction
 
     def self.from(object, alphabet = 'a'..'z')
-      if object.respond_to?(:to_str)
+      if Symbol === object
+        StringNumeral.from_string(object.to_s, alphabet)
+      elsif object.respond_to?(:to_str)
         StringNumeral.from_string(object.to_str, alphabet)
       elsif object.respond_to?(:to_int)
         StringNumeral.from_number(object.to_int, alphabet)
@@ -40,12 +42,13 @@ module MoreMath
       @number ||= numberify_string(@string, @alphabet)
     end
     alias to_i number
+    alias to_int number
 
     def string
       @string ||= stringify_number(@number, @alphabet).freeze
     end
-
     alias to_s string
+    alias to_str string
 
     def inspect
       "#<#{self.class}: #{string.inspect} #{number.inspect}>"
@@ -125,8 +128,18 @@ module MoreMath
       self
     end
 
-    def to_string_numeral
-      self
+    def eql?(other)
+      if other.respond_to?(:to_int)
+        to_int == other.to_int
+      elsif other.respond_to?(:to_str)
+        to_str == other.to_str
+      end
+    end
+
+    alias == eql?
+
+    def hash
+      number.hash
     end
 
     private
@@ -141,8 +154,8 @@ module MoreMath
         ::MoreMath::StringNumeral.from(other, alphabet)
       end
 
-      def to_sn(alphabet = 'a'..'z')
-        StringNumeral === self ? self : StringNumeral.from(self, alphabet)
+      def to_string_numeral(alphabet = 'a'..'z')
+        StringNumeral(self, alphabet)
       end
     end
   end

data/lib/more_math/version.rb

@@ -1,6 +1,6 @@
 module MoreMath
   # MoreMath version
-  VERSION         = '0.0.3'
+  VERSION         = '0.0.4'
   VERSION_ARRAY   = VERSION.split(/\./).map { |x| x.to_i } # :nodoc:
   VERSION_MAJOR   = VERSION_ARRAY[0] # :nodoc:
   VERSION_MINOR   = VERSION_ARRAY[1] # :nodoc:

data/more_math.gemspec

@@ -2,34 +2,34 @@
 
 Gem::Specification.new do |s|
   s.name = "more_math"
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
-  s.date = "2011-10-27"
+  s.date = "2011-12-25"
   s.description = "Library that provides more mathematical functions/algorithms than standard Ruby."
   s.email = "flori@ping.de"
   s.extra_rdoc_files = ["README.rdoc", "lib/more_math/cantor_pairing_function.rb", "lib/more_math/version.rb", "lib/more_math/functions.rb", "lib/more_math/sequence.rb", "lib/more_math/linear_regression.rb", "lib/more_math/string_numeral.rb", "lib/more_math/ranking_common.rb", "lib/more_math/subset.rb", "lib/more_math/histogram.rb", "lib/more_math/constants/functions_constants.rb", "lib/more_math/numberify_string_function.rb", "lib/more_math/distributions.rb", "lib/more_math/exceptions.rb", "lib/more_math/newton_bisection.rb", "lib/more_math/permutation.rb", "lib/more_math/continued_fraction.rb", "lib/more_math.rb"]
-  s.files = [".gitignore", ".travis.yml", "CHANGES", "Gemfile", "LICENSE", "README.rdoc", "Rakefile", "VERSION", "lib/more_math.rb", "lib/more_math/cantor_pairing_function.rb", "lib/more_math/constants/functions_constants.rb", "lib/more_math/continued_fraction.rb", "lib/more_math/distributions.rb", "lib/more_math/exceptions.rb", "lib/more_math/functions.rb", "lib/more_math/histogram.rb", "lib/more_math/linear_regression.rb", "lib/more_math/newton_bisection.rb", "lib/more_math/numberify_string_function.rb", "lib/more_math/permutation.rb", "lib/more_math/ranking_common.rb", "lib/more_math/sequence.rb", "lib/more_math/string_numeral.rb", "lib/more_math/subset.rb", "lib/more_math/version.rb", "more_math.gemspec", "tests/test_cantor_pairing_function.rb", "tests/test_continued_fraction.rb", "tests/test_distribution.rb", "tests/test_functions.rb", "tests/test_histogram.rb", "tests/test_newton_bisection.rb", "tests/test_numberify_string_function.rb", "tests/test_permutation.rb", "tests/test_sequence.rb", "tests/test_subset.rb"]
+  s.files = [".gitignore", ".travis.yml", "CHANGES", "Gemfile", "LICENSE", "README.rdoc", "Rakefile", "VERSION", "lib/more_math.rb", "lib/more_math/cantor_pairing_function.rb", "lib/more_math/constants/functions_constants.rb", "lib/more_math/continued_fraction.rb", "lib/more_math/distributions.rb", "lib/more_math/exceptions.rb", "lib/more_math/functions.rb", "lib/more_math/histogram.rb", "lib/more_math/linear_regression.rb", "lib/more_math/newton_bisection.rb", "lib/more_math/numberify_string_function.rb", "lib/more_math/permutation.rb", "lib/more_math/ranking_common.rb", "lib/more_math/sequence.rb", "lib/more_math/string_numeral.rb", "lib/more_math/subset.rb", "lib/more_math/version.rb", "more_math.gemspec", "tests/cantor_pairing_function_test.rb", "tests/continued_fraction_test.rb", "tests/distribution_test.rb", "tests/functions_test.rb", "tests/histogram_test.rb", "tests/newton_bisection_test.rb", "tests/numberify_string_function_test.rb", "tests/permutation_test.rb", "tests/sequence_test.rb", "tests/string_numeral_test.rb", "tests/subset_test.rb", "tests/test_helper.rb"]
   s.homepage = "http://flori.github.com/more_math"
   s.rdoc_options = ["--title", "MoreMath -- More Math in Ruby", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
+  s.rubygems_version = "1.8.13"
   s.summary = "Library that provides more mathematics."
-  s.test_files = ["tests/test_subset.rb", "tests/test_permutation.rb", "tests/test_cantor_pairing_function.rb", "tests/test_continued_fraction.rb", "tests/test_newton_bisection.rb", "tests/test_functions.rb", "tests/test_distribution.rb", "tests/test_sequence.rb", "tests/test_histogram.rb", "tests/test_numberify_string_function.rb"]
+  s.test_files = ["tests/subset_test.rb", "tests/sequence_test.rb", "tests/histogram_test.rb", "tests/string_numeral_test.rb", "tests/cantor_pairing_function_test.rb", "tests/distribution_test.rb", "tests/permutation_test.rb", "tests/continued_fraction_test.rb", "tests/numberify_string_function_test.rb", "tests/functions_test.rb", "tests/test_helper.rb", "tests/newton_bisection_test.rb"]
 
   if s.respond_to? :specification_version then
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<gem_hadar>, ["~> 0.1.1"])
+      s.add_development_dependency(%q<gem_hadar>, ["~> 0.1.4"])
       s.add_runtime_dependency(%q<tins>, ["~> 0.3"])
     else
-      s.add_dependency(%q<gem_hadar>, ["~> 0.1.1"])
+      s.add_dependency(%q<gem_hadar>, ["~> 0.1.4"])
       s.add_dependency(%q<tins>, ["~> 0.3"])
     end
   else
-    s.add_dependency(%q<gem_hadar>, ["~> 0.1.1"])
+    s.add_dependency(%q<gem_hadar>, ["~> 0.1.4"])
     s.add_dependency(%q<tins>, ["~> 0.3"])
   end
 end

data/tests/{test_cantor_pairing_function.rb → cantor_pairing_function_test.rb}

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
-require 'test/unit'
+require 'test_helper'
 require 'more_math'
 
-class TestCantorPairingFunction < Test::Unit::TestCase
+class CantorPairingFunctionTest < Test::Unit::TestCase
   include MoreMath::Functions
 
   def test_cantor_pairing_function

data/tests/{test_continued_fraction.rb → continued_fraction_test.rb}

@@ -1,12 +1,13 @@
 #!/usr/bin/env ruby
 
-require 'test/unit'
+require 'test_helper'
 require 'more_math'
 
-class TestContinuedFraction < Test::Unit::TestCase
+class ContinuedFractionTest < Test::Unit::TestCase
   include MoreMath
 
   def setup
+    @zero = ContinuedFraction.for_a([-1,2,3]).for_b([2,3,3])
     @none1 = ContinuedFraction.for_a proc {}
     @none2 = ContinuedFraction.for_a {}
     @phi = ContinuedFraction.new
@@ -25,6 +26,7 @@ class TestContinuedFraction < Test::Unit::TestCase
   end
 
   def test_continued_fractions
+    assert @zero[].zero?
     assert @none1[1].nan?
     assert @none2[1].nan?
     assert_in_delta 1.618033, @phi[], 1E-6
@@ -37,4 +39,16 @@ class TestContinuedFraction < Test::Unit::TestCase
     assert_in_delta Math.atan(0.5), @atan[0.5], 1E-10
     assert_in_delta Math::PI, @pi[], 1E-10
   end
+
+  def test_invalid_arguments
+    assert_raise(ArgumentError) { ContinuedFraction.for_a }
+    assert_raise(ArgumentError) { ContinuedFraction.for_b }
+  end
+
+
+  def test_to_proc
+    atan = @atan.to_proc
+    assert_kind_of Proc, atan
+    assert_in_delta Math::PI, 4 * atan[1], 1E-10
+  end
 end

data/tests/{test_distribution.rb → distribution_test.rb}

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
-require 'test/unit'
+require 'test_helper'
 require 'more_math'
 
-class TestDistribution < Test::Unit::TestCase
+class DistributionTest < Test::Unit::TestCase
   include MoreMath
 
   def setup
@@ -44,6 +44,7 @@ class TestDistribution < Test::Unit::TestCase
     ps.zip(zs) do |p, z|
       assert_in_delta(-z, std.inverse_probability(1 - p), 1E-2)
     end
+    assert_in_delta 0, std.inverse_probability(0.5), 1E-6
   end
 
   def test_chisquaredistribution

data/tests/{test_functions.rb → functions_test.rb}

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
-require 'test/unit'
+require 'test_helper'
 require 'more_math'
 
-class TestFunctions < Test::Unit::TestCase
+class FunctionsTest < Test::Unit::TestCase
   include MoreMath::Functions
 
   def gammaP5_2(x)

data/tests/{test_histogram.rb → histogram_test.rb}

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
 
-require 'test/unit'
+require 'test_helper'
 require 'more_math'
 require 'stringio'
 
-class TestHistogram < Test::Unit::TestCase
+class HistogramTest < Test::Unit::TestCase
   include MoreMath
 
   def test_histogram

data/tests/{test_newton_bisection.rb → newton_bisection_test.rb}

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
-require 'test/unit'
+require 'test_helper'
 require 'more_math'
 
-class TestNewtonBisection < Test::Unit::TestCase
+class NewtonBisectionTest < Test::Unit::TestCase
   include MoreMath
 
   def test_bracket

data/tests/{test_numberify_string_function.rb → numberify_string_function_test.rb}

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
-require 'test/unit'
+require 'test_helper'
 require 'more_math'
 
-class TestNumberifyStringFunction < Test::Unit::TestCase
+class NumberifyStringFunctionTest < Test::Unit::TestCase
   include MoreMath::Functions
 
   def test_log_ceil
@@ -37,6 +37,8 @@ class TestNumberifyStringFunction < Test::Unit::TestCase
     assert_equal 3, numberify_string('c', 'abc')
     assert_equal 4, numberify_string('aa', 'abc')
     assert_equal 5, numberify_string('ab', 'abc')
+    assert_equal 5, numberify_string('ab', %w[a b c])
+    assert_equal 5, numberify_string('ab', 'a'..'c')
   end
 
   def test_numberify_string_inv_function

data/tests/{test_permutation.rb → permutation_test.rb}

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
-require 'test/unit'
+require 'test_helper'
 require 'more_math'
 
-class TestPermutation < Test::Unit::TestCase
+class PermutationTest < Test::Unit::TestCase
   include MoreMath
 
   def setup

data/tests/{test_sequence.rb → sequence_test.rb}

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
-require 'test/unit'
+require 'test_helper'
 require 'more_math'
 
-class TestSequence < Test::Unit::TestCase
+class SequenceTest < Test::Unit::TestCase
   include MoreMath
 
   def setup
@@ -184,6 +184,7 @@ class TestSequence < Test::Unit::TestCase
     assert_in_delta 0.3, @flat.median, 1E-8
     assert_in_delta 0.3, @flat.percentile(75), 1E-8
     assert_equal 100, @flat.histogram(10).to_a.first[1]
+    assert @flat.linear_regression.residues.all? { |r| r.abs <= 1E-6 }
   end
 
   def test_half
@@ -202,6 +203,7 @@ class TestSequence < Test::Unit::TestCase
     assert_in_delta 37.375, @half.percentile(75), 1E-8
     assert_equal [10] * 10, counts = @half.histogram(10).to_a.transpose[1]
     assert_equal 100, counts.inject { |s, x| s + x }
+    assert @half.linear_regression.residues.all? { |r| r.abs <= 0.5 }
   end
 
   def test_rand
@@ -285,6 +287,7 @@ class TestSequence < Test::Unit::TestCase
     assert_equal [3, 4, 9, 12, 18, 14, 4, 5, 0, 1],
       counts = @book.histogram(10).to_a.transpose[1]
     assert_equal 70, counts.inject { |s, x| s + x }
+    assert @flat.linear_regression.residues.all? { |r| r.abs <= 1E-6 }
   end
 
   def test_cover

data/tests/string_numeral_test.rb

@@ -0,0 +1,65 @@
+#!/usr/bin/env ruby
+
+require 'test_helper'
+require 'more_math'
+
+class StringNumeralTest < Test::Unit::TestCase
+  include MoreMath
+
+  def test_equality
+    s = StringNumeral.from('abc')
+    t = 731.to_string_numeral
+    u = StringNumeral(:abc)
+    assert_equal t, s
+    assert_equal 'abc', s
+    assert_equal u, t
+    assert_equal s, u
+    assert_equal s.hash, t.hash
+  end
+
+  def test_displaying
+    s = StringNumeral.from('abc')
+    assert_equal 'abc', s.string
+    assert_equal 'abc', s.to_s
+    assert_equal 'abc', s.to_str
+    assert_equal 731, s.to_i
+    assert_equal 731, s.to_int
+    assert_equal '#<MoreMath::StringNumeral: "abc" 731>', s.inspect
+  end
+
+  def test_succ
+    s = StringNumeral.from('abc', 'abc')
+    t = s.succ
+    assert_equal 'aca', t.string
+    s.succ!
+    assert_equal 'aca', s.string
+  end
+
+  def test_pred
+    s = StringNumeral.from('aca', 'abc')
+    t = s.pred
+    assert_equal 'abc', t.string
+    s.pred!
+    assert_equal 'abc', s.string
+  end
+
+  def test_arithmetics
+    s = StringNumeral.from('abc', 'abc')
+    assert_equal 54, 3 * s
+    assert_equal 54, s * 3
+    assert_equal 6, s / 3
+    assert_equal 3, 54 / s
+    assert_equal 19, s + 1
+    assert_equal 19, 1 + s
+    assert_equal 17, s - 1
+    assert_equal 1, 19 - s
+    assert_equal 324, s ** 2
+    assert_equal 0, s % 2
+    assert_equal 9, s >> 1
+    assert_equal 36, s << 1
+    assert_equal 2, s ^ 16
+    assert_equal 19, s | 1
+    assert_equal 2, s & 2
+    assert_equal 1, s[1]
+  end
+end

data/tests/{test_subset.rb → subset_test.rb}

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
-require 'test/unit'
+require 'test_helper'
 require 'more_math'
 
-class TestSubset < Test::Unit::TestCase
+class SubsetTest < Test::Unit::TestCase
   include MoreMath
 
   def test_empty_set
@@ -15,7 +15,8 @@ class TestSubset < Test::Unit::TestCase
   end
 
   def test_three_element_set
-    assert_equal [[], [1], [2], [1, 2], [3], [1, 3], [2, 3], [1, 2, 3]],
-      Subset.for([1, 2, 3]).map(&:value)
+    expected = [[], [1], [2], [1, 2], [3], [1, 3], [2, 3], [1, 2, 3]]
+    assert_equal expected, Subset.for([1, 2, 3]).map(&:value)
+    assert_equal expected, Subset.power_set([1, 2, 3])
   end
 end

data/tests/test_helper.rb

@@ -0,0 +1,7 @@
+if ENV['START_SIMPLECOV'].to_i == 1
+  require 'simplecov'
+  SimpleCov.start do
+    add_filter "#{File.basename(File.dirname(__FILE__))}/"
+  end
+end
+require 'test/unit'

metadata

@@ -1,44 +1,60 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: more_math
-version: !ruby/object:Gem::Version
-  version: 0.0.3
+version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 4
+  version: 0.0.4
 platform: ruby
-authors:
+authors: 
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-27 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-12-25 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: gem_hadar
-  requirement: &2156570840 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.1.1
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 1
+        - 4
+        version: 0.1.4
   type: :development
-  prerelease: false
-  version_requirements: *2156570840
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: tins
-  requirement: &2156570220 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.3'
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 3
+        version: "0.3"
   type: :runtime
-  prerelease: false
-  version_requirements: *2156570220
-description: Library that provides more mathematical functions/algorithms than standard
-  Ruby.
+  version_requirements: *id002
+description: Library that provides more mathematical functions/algorithms than standard Ruby.
 email: flori@ping.de
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.rdoc
 - lib/more_math/cantor_pairing_function.rb
 - lib/more_math/version.rb
@@ -57,7 +73,7 @@ extra_rdoc_files:
 - lib/more_math/permutation.rb
 - lib/more_math/continued_fraction.rb
 - lib/more_math.rb
-files:
+files: 
 - .gitignore
 - .travis.yml
 - CHANGES
@@ -84,52 +100,64 @@ files:
 - lib/more_math/subset.rb
 - lib/more_math/version.rb
 - more_math.gemspec
-- tests/test_cantor_pairing_function.rb
-- tests/test_continued_fraction.rb
-- tests/test_distribution.rb
-- tests/test_functions.rb
-- tests/test_histogram.rb
-- tests/test_newton_bisection.rb
-- tests/test_numberify_string_function.rb
-- tests/test_permutation.rb
-- tests/test_sequence.rb
-- tests/test_subset.rb
+- tests/cantor_pairing_function_test.rb
+- tests/continued_fraction_test.rb
+- tests/distribution_test.rb
+- tests/functions_test.rb
+- tests/histogram_test.rb
+- tests/newton_bisection_test.rb
+- tests/numberify_string_function_test.rb
+- tests/permutation_test.rb
+- tests/sequence_test.rb
+- tests/string_numeral_test.rb
+- tests/subset_test.rb
+- tests/test_helper.rb
 homepage: http://flori.github.com/more_math
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --title
 - MoreMath -- More Math in Ruby
 - --main
 - README.rdoc
-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'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
 summary: Library that provides more mathematics.
-test_files:
-- tests/test_subset.rb
-- tests/test_permutation.rb
-- tests/test_cantor_pairing_function.rb
-- tests/test_continued_fraction.rb
-- tests/test_newton_bisection.rb
-- tests/test_functions.rb
-- tests/test_distribution.rb
-- tests/test_sequence.rb
-- tests/test_histogram.rb
-- tests/test_numberify_string_function.rb
+test_files: 
+- tests/subset_test.rb
+- tests/sequence_test.rb
+- tests/histogram_test.rb
+- tests/string_numeral_test.rb
+- tests/cantor_pairing_function_test.rb
+- tests/distribution_test.rb
+- tests/permutation_test.rb
+- tests/continued_fraction_test.rb
+- tests/numberify_string_function_test.rb
+- tests/functions_test.rb
+- tests/test_helper.rb
+- tests/newton_bisection_test.rb