more_math 0.0.4 → 0.1.0

data/.gitignore

@@ -1,4 +1,5 @@
 .*.sw[pon]
+.AppleDouble
 .rvmrc
 Gemfile.lock
 coverage

data/.travis.yml

@@ -4,5 +4,10 @@ rvm:
   - 1.9.3
   - ruby-head
   - ree
-  - rbx
-  - jruby
+  - rbx-18mode
+  - rbx-19mode
+  - jruby-18mode
+  - jruby-19mode
+matrix:
+  allow_failures:
+    - rvm: ruby-head

data/CHANGES

@@ -1,3 +1,6 @@
+2012-10-31 (0.1.0)
+ * Included the Permutation features identity, power, and from_mapping
+   contributed by Pramukta Kumar <prak@mac.com>
 2011-12-25 (0.0.4)
  * Support simplecov
  * Add more tests

data/Rakefile

@@ -10,11 +10,12 @@ GemHadar do
   summary     'Library that provides more mathematics.'
   description 'Library that provides more mathematical functions/algorithms than standard Ruby.'
   test_dir    'tests'
-  ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock', 'coverage', '.rvmrc'
+  ignore      '.*.sw[pon]', 'pkg', 'Gemfile.lock', 'coverage', '.rvmrc', '.AppleDouble'
   readme      'README.rdoc'
   title       "#{name.camelize} -- More Math in Ruby"
 
   dependency  'tins', '~>0.3'
+  development_dependency 'utils'
 
   install_library do
     libdir = CONFIG["sitelibdir"]

data/VERSION

@@ -1 +1 @@
-0.0.4
+0.1.0

data/lib/more_math/permutation.rb

@@ -18,6 +18,7 @@ module MoreMath
     # in the range of <code>0</code> and <code>indices.size - 1</code>. This is
     # for example the result of a call to the Permutation#value method.
     def self.from_value(indices)
+      indices = indices.clone
       obj = new(indices.size)
       obj.instance_eval do
         self.rank = rank_indices(indices)
@@ -50,6 +51,53 @@ module MoreMath
       perm
     end
 
+    # Shortcut to generate the identity permutation that has
+    # Permutation#size <code>n</code>.
+    def self.identity(n)
+      new(n)
+    end
+
+    # Returns the identity permutation that has the same Permutation#size as this
+    # instance.
+    def identity
+      self.class.new(size)
+    end
+
+    # Builds a permutation that maps <code>a</code> into <code>b</code>.
+    # Both arguments must be the same length and must contain the same
+    # elements.  If these arrays contain duplicate elements, the solution
+    # will not be unique.
+    def self.for_mapping(a, b)
+      a.size == b.size or
+        raise ArgumentError, "Initial and final lists must be the same length"
+
+      lookup = Hash.new { |h, k| h[k] = [] }
+      a.size.times { |i| lookup[a[i]] <<= i }
+
+      value = Array.new(b.size) do |i|
+        e = b[i]
+        lookup[e].pop or raise ArgumentError, "no corresponding element for #{e.inspect}"
+      end
+      Permutation.from_value value
+    end
+
+    # Computes the nth power (ie the nth repeated permutation) of this instance.
+    # Negative powers are taken to be powers of the inverse.
+    def power(n)
+      if n.respond_to?(:to_int)
+        n = n.to_int
+      else
+        raise TypeError, "#{n.inspect} cannot be converted to an integer"
+      end
+      if n >= 0
+        (1..n).inject(identity) { |p, e| p * self }
+      else # negative powers are taken to be powers of the inverse
+        -power(-n)
+      end
+    end
+
+    alias ** power
+
     # Assigns <code>m</code> to the rank attribute of this Permutation
     # instance. That implies that the indices produced by a call to the
     # Permutation#value method of this instance is the permutation ranked with
@@ -149,7 +197,7 @@ module MoreMath
     def compose(other)
       size == other.size or raise ArgumentError,
         "permutations of unequal sizes cannot be composed!"
-      indices = self.value
+      indices = value
       composed = other.value.map { |i| indices[i] }
       klon = clone
       klon.rank = rank_indices(composed)
@@ -227,6 +275,8 @@ module MoreMath
       @@fcache[n]
     end
 
+    # Rank the indices of the permutation +p+. Beware that this method may
+    # change its argument +p+.
     def rank_indices(p)
       result = 0
       for i in 0...size
@@ -238,6 +288,8 @@ module MoreMath
       result
     end
 
+    # Unrank the rank +m+, that is create a permutation of the appropriate size
+    # and rank as an array of indices and return it.
     def unrank_indices(m)
       result = Array.new(size, 0)
       for i in 0...size

data/lib/more_math/version.rb

@@ -1,6 +1,6 @@
 module MoreMath
   # MoreMath version
-  VERSION         = '0.0.4'
+  VERSION         = '0.1.0'
   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,37 @@
 
 Gem::Specification.new do |s|
   s.name = "more_math"
-  s.version = "0.0.4"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Florian Frank"]
-  s.date = "2011-12-25"
+  s.date = "2012-11-01"
   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.extra_rdoc_files = ["README.rdoc", "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", "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/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.13"
+  s.rubygems_version = "1.8.24"
   s.summary = "Library that provides more mathematics."
-  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"]
+  s.test_files = ["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"]
 
   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.4"])
+      s.add_development_dependency(%q<gem_hadar>, ["~> 0.1.8"])
+      s.add_development_dependency(%q<utils>, [">= 0"])
       s.add_runtime_dependency(%q<tins>, ["~> 0.3"])
     else
-      s.add_dependency(%q<gem_hadar>, ["~> 0.1.4"])
+      s.add_dependency(%q<gem_hadar>, ["~> 0.1.8"])
+      s.add_dependency(%q<utils>, [">= 0"])
       s.add_dependency(%q<tins>, ["~> 0.3"])
     end
   else
-    s.add_dependency(%q<gem_hadar>, ["~> 0.1.4"])
+    s.add_dependency(%q<gem_hadar>, ["~> 0.1.8"])
+    s.add_dependency(%q<utils>, [">= 0"])
     s.add_dependency(%q<tins>, ["~> 0.3"])
   end
 end

data/tests/permutation_test.rb

@@ -194,8 +194,7 @@ class PermutationTest < Test::Unit::TestCase
   def test_project
     too_big = Array.new(10)
     @perms.each_with_index do |perms, i|
-      assert_equal(@projected[i],
-                   perms.map { |p| p.project(@projected[i][0]) })
+      assert_equal(@projected[i], perms.map { |p| p.project(@projected[i][0]) })
       assert_raises(ArgumentError) { perms.project }
       assert_raises(ArgumentError) { perms.project(too_big) }
     end
@@ -251,4 +250,62 @@ class PermutationTest < Test::Unit::TestCase
                    perm.map { |p| p.odd? })
     end
   end
+
+  def test_identity
+    a = ("A".."Z").to_a
+    b = a.shuffle
+    p = Permutation.for_mapping(a, b)
+    assert_equal(Permutation.identity(p.size), Permutation.from_value((0..25).to_a))
+    assert_equal(Permutation.identity(p.size), p.identity)
+    assert_equal(p * -p, p.identity)
+  end
+
+  def test_for_mapping_basic
+    a = (0..99).to_a
+    b = a.shuffle
+    ref = Permutation.from_value(b)
+    assert_equal(Permutation.for_mapping(a, b), ref)
+  end
+
+
+  def test_for_mapping_random
+    a = ("A".."Z").to_a
+    b = a.shuffle
+    p = Permutation.for_mapping(a, b)
+    assert_equal(p.project(a), b)
+    3.times { a.push("Z") }
+    b = a.shuffle
+    p = Permutation.for_mapping(a, b)
+    assert_equal(p.project(a), b)
+  end
+
+  def test_for_mappings_random_objects
+    a = [Array.new, Hash.new, nil, 0]
+    b = [Hash.new, nil, Array.new, 0]
+    p = Permutation.for_mapping(a, b)
+    assert_equal(p.value, [1, 2, 0, 3])
+  end
+
+  def test_mapping_for_non_arrays
+    a = "abcdef"
+    b = a.split('').shuffle * ''
+    p = Permutation.for_mapping(a, b)
+    assert_equal(p.project(a), b)
+  end
+
+  def test_power
+    4.times do |i|
+      perms = Permutation.new(i)
+      perms.each do |perm|
+        assert_equal(perm * perm, perm ** 2)
+        assert_equal(perm * perm * perm, perm ** 3)
+        assert_equal(perm * perm * perm * perm, perm ** 4)
+        assert_equal(perm, perm ** 1)
+        assert_equal(Permutation.identity(i), perm ** 0)
+        assert_equal(-perm, perm ** -1)
+        assert_equal(-perm * -perm, perm ** -2)
+      end
+    end
+    assert_raise(TypeError) { Permutation.new(4).random ** 'nix' }
+  end
 end

metadata

@@ -1,79 +1,89 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: more_math
-version: !ruby/object:Gem::Version 
-  hash: 23
+version: !ruby/object:Gem::Version
+  version: 0.1.0
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 4
-  version: 0.0.4
 platform: ruby
-authors: 
+authors:
 - Florian Frank
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-12-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-01 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: gem_hadar
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.8
+  type: :development
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 1
-        - 4
-        version: 0.1.4
+      - !ruby/object:Gem::Version
+        version: 0.1.8
+- !ruby/object:Gem::Dependency
+  name: utils
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: tins
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: tins
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 0
-        - 3
-        version: "0.3"
+      - !ruby/object:Gem::Version
+        version: '0.3'
   type: :runtime
-  version_requirements: *id002
-description: Library that provides more mathematical functions/algorithms than standard Ruby.
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.3'
+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
-- 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/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/continued_fraction.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
 - lib/more_math.rb
-files: 
+files:
 - .gitignore
 - .travis.yml
 - CHANGES
@@ -114,50 +124,45 @@ files:
 - 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 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 654456015096180665
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.13
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Library that provides more mathematics.
-test_files: 
-- tests/subset_test.rb
-- tests/sequence_test.rb
-- tests/histogram_test.rb
-- tests/string_numeral_test.rb
+test_files:
 - 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/distribution_test.rb
 - tests/functions_test.rb
-- tests/test_helper.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