peach 0.4 → 0.5

data/Gemfile

@@ -0,0 +1,3 @@
+source "http://rubygems.org"
+
+gemspec

data/Gemfile.lock

@@ -0,0 +1,22 @@
+PATH
+  remote: .
+  specs:
+    peach (0.5)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    rake (0.9.2.2)
+    shoulda (3.0.1)
+      shoulda-context (~> 1.0.0)
+      shoulda-matchers (~> 1.0.0)
+    shoulda-context (1.0.0)
+    shoulda-matchers (1.0.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  peach!
+  rake
+  shoulda

data/Rakefile

@@ -1,3 +1,6 @@
+require 'bundler'
+Bundler::GemHelper.install_tasks
+
 require 'rake'
 require 'rake/testtask'
 

data/lib/peach.rb

@@ -1,70 +1,61 @@
+# monkey patch Enumerable by reopening it. Enumerable.send(:include, Peach) 
+# doesn't seem to work as it should.  
 module Peach
-  def peach(pool = nil, &b)
-    pool ||= $peach_default_threads || size
-    raise "Thread pool size less than one?" unless pool >= 1
-    div = (size/pool).to_i      # should already be integer
-    div = 1 unless div >= 1     # each thread better do something!
+  class EmptyThreadPoolError < RuntimeError
+  end
+end
 
-    threads = (0...size).step(div).map do |chunk|
-      Thread.new(chunk, [chunk+div,size].min) do |lower, upper|
-        (lower...upper).each{|j| yield(slice(j))}
+module Enumerable
+  def _peach_run(pool = nil, &b)
+    pool ||= $peach_default_threads || count
+    unless pool >= 1
+      raise Peach::EmptyThreadPoolError, "Thread pool size less than one"
+    end
+    div = (count/pool).to_i # should already be integer
+    div = 1 unless div >= 1 # each thread better do something!
+
+    threads = []
+    each_slice(div).with_index do |slice, idx|
+      threads << Thread.new(slice) do |thread_slice|
+        yield thread_slice, idx, div
       end
     end
-    threads.each { |t| t.join }
+    threads.each{|t| t.join }
     self
   end
 
-  def pmap(pool = nil, &b)
-    pool ||= $peach_default_threads || size
-    raise "Thread pool size less than one?" unless pool >= 1
-    div = (size/pool).to_i      # should already be integer
-    div = 1 unless div >= 1     # each thread better do something!
-
-    result = Array.new(size)
+  def peach(pool = nil, &b)
+    _peach_run(pool) do |thread_slice, idx, div|
+      thread_slice.each{|elt| yield elt}
+    end
+  end
 
-    threads = (0...size).step(div).map do |chunk|
-      Thread.new(chunk, [chunk+div,size].min) do |lower, upper|
-        (lower...upper).each{|j| result[j] = yield(slice(j))}
+  def pmap(pool = nil, &b)
+    result = Array.new(count)
+    lock = Mutex.new
+
+    _peach_run(pool) do |thread_slice, idx, div|
+      thread_slice.each_with_index do |elt, offset| 
+        local_result = yield elt
+        lock.synchronize do
+          result[(idx*div)+offset] = local_result
+        end
       end
     end
-    threads.each { |t| t.join }
     result
   end
 
-  def pselect(n = nil, &b)
-    peach_run(:select, b, n)
-  end
-
-
+  def pselect(pool = nil, &b)
+    results, result = [],[]
+    lock = Mutex.new
 
-  protected
-  def peach_run(meth, b, n = nil)
-    threads, results, result = [],[],[]
-    peach_divvy(n).each_with_index do |x,i|
-      threads << Thread.new { results[i] = x.send(meth, &b)}
+    _peach_run(pool) do |thread_slice, idx, div|
+      local_result = thread_slice.select(&b)
+      lock.synchronize do
+        results[idx] = local_result
+      end
     end
-    threads.each {|t| t.join }
     results.each {|x| result += x if x}
     result
   end
-  
-  def peach_divvy(n = nil)
-    return [] if size == 0
-
-    n ||= $peach_default_threads || size
-    n = size if n > size
-
-    lists = []
-
-    div = (size/n).floor
-    offset = 0
-    for i in (0...n-1)
-      lists << slice(offset, div)
-      offset += div
-    end
-    lists << slice(offset...size)
-    lists
-  end
 end
-
-Array.send(:include, Peach)

data/lib/peach/version.rb

@@ -0,0 +1,3 @@
+module Peach
+  VERSION = "0.5"
+end

data/peach.gemspec

@@ -0,0 +1,20 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "peach/version"
+
+Gem::Specification.new do |s|
+  s.name = 'peach'
+  s.version = Peach::VERSION
+  s.authors = ['Ben Hughes']
+  s.email = 'ben@pixelmachine.org'
+  s.summary = 'Parallel Each and other parallel things'
+  s.homepage = 'http://peach.rubyforge.org'
+  
+  s.files = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+  
+  s.add_development_dependency('rake')
+  s.add_development_dependency('shoulda')
+end

data/test/peach_test.rb

@@ -10,12 +10,12 @@ class PeachTest < Test::Unit::TestCase
       normal_f = f.to_s[1..-1].to_sym
 
       setup do
-        @data = [1, 2, 3, 5, 8]
+        @data = [1, 2, 3, 5, 8]*10001
         @block = lambda{|i| i**2}
       end
       should "return the same result as #{normal_f}" do
         assert_equal @data.send(normal_f, &@block),
-          @data.send(f, nil, &@block)
+          @data.send(f, 100, &@block)
       end
     end
   end
@@ -38,39 +38,4 @@ class PeachTest < Test::Unit::TestCase
     end
   end
 
-  context "divvy" do
-    setup do
-      @data = [1, 2, 3, 4, 5]
-    end
-
-    context "on empty list" do
-      should "return empty list" do
-        assert_equal [], [].send(:peach_divvy)
-      end
-    end
-
-    context "when n is nil" do
-      should "put 1 element into each division" do
-        assert_equal @data.size, @data.send(:peach_divvy).size
-      end
-    end
-
-    context "when n is less than array size" do
-      should "put create n divisions" do
-        assert_equal 2, @data.send(:peach_divvy, 2).size
-      end
-
-      should "not lose any array elements" do
-        assert_equal @data.size, @data.send(:peach_divvy, 2).inject(0) {|sum, i|
-          sum + i.size
-        }
-      end
-    end
-
-    context "when n is greater than array size" do
-      should "only create 'array size' divisions" do
-        assert_equal @data.size, @data.send(:peach_divvy, 42).size
-      end
-    end
-  end
 end

metadata

@@ -1,70 +1,98 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: peach
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-    - 0
-    - 4
-  version: "0.4"
+version: !ruby/object:Gem::Version
+  version: '0.5'
+  prerelease: 
 platform: ruby
-authors: 
-  - Ben Hughes
+authors:
+- Ben Hughes
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-11-17 00:00:00 -05:00
-default_executable: 
-dependencies: []
-
+date: 2012-07-03 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: ben@pixelmachine.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-  - README
-  - LICENSE
-  - Rakefile
-  - lib/peach.rb
-  - bn/peach_bn.rb
-  - bn/peach_test.rb
-  - test/test_helper.rb
-  - test/peach_test.rb
-  - web/index.html
-  - web/Peach.sketch.png
-has_rdoc: true
+files:
+- Gemfile
+- Gemfile.lock
+- LICENSE
+- README
+- Rakefile
+- bn/peach_bn.rb
+- bn/peach_test.rb
+- lib/peach.rb
+- lib/peach/version.rb
+- peach.gemspec
+- test/peach_test.rb
+- test/test_helper.rb
+- web/Peach.sketch.png
+- web/index.html
 homepage: http://peach.rubyforge.org
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
-  - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-          - 0
-        version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-          - 0
-        version: "0"
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 1425915303928506863
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 1425915303928506863
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Parallel Each and other parallel things
-test_files: []
-
+test_files:
+- test/peach_test.rb
+- test/test_helper.rb