peach 0.2 → 0.4

data/lib/peach.rb

@@ -1,10 +1,34 @@
 module Peach
-  def peach(n = nil, &b)
-    peach_run(:each, b, n)
+  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!
+
+    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))}
+      end
+    end
+    threads.each { |t| t.join }
+    self
   end
 
-  def pmap(n = nil, &b)
-    peach_run(:map, b, n)
+  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)
+
+    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))}
+      end
+    end
+    threads.each { |t| t.join }
+    result
   end
 
   def pselect(n = nil, &b)

data/test/peach_test.rb

@@ -2,6 +2,8 @@ require File.join(File.dirname(__FILE__), "test_helper")
 
 require File.join(File.dirname(__FILE__), "..", "lib", "peach")
 
+require 'thread'
+
 class PeachTest < Test::Unit::TestCase
   [:peach, :pmap, :pselect].each do |f|
     context "Parallel function #{f}" do
@@ -18,6 +20,24 @@ class PeachTest < Test::Unit::TestCase
     end
   end
 
+  [:peach, :pmap, :pselect].each do |f|
+    context "#{f}" do
+      [nil, 101, 99, 51, 49, 20, 5, 1].each do |pool|
+        should "invoke the block exactly once for each array item," +
+          " with thread pool size of #{pool.inspect}" do
+          source_array = (0...100).to_a
+          q = Queue.new()
+          source_array.send(f, pool) {|i| q.push(i)}
+          result_array = []
+          until q.empty?
+            result_array << q.pop
+          end
+          assert_equal source_array, result_array.sort
+        end
+      end
+    end
+  end
+
   context "divvy" do
     setup do
       @data = [1, 2, 3, 4, 5]
@@ -41,12 +61,12 @@ class PeachTest < Test::Unit::TestCase
       end
 
       should "not lose any array elements" do
-        assert_equal @data.size, @data.send(:peach_divvy, 2).inject(0) {|sum, i| 
+        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

metadata

@@ -1,15 +1,19 @@
 --- !ruby/object:Gem::Specification 
 name: peach
 version: !ruby/object:Gem::Version 
-  version: "0.2"
+  prerelease: false
+  segments: 
+    - 0
+    - 4
+  version: "0.4"
 platform: ruby
 authors: 
-- Ben Hughes
+  - Ben Hughes
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2009-04-05 00:00:00 -04:00
+date: 2010-11-17 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -22,41 +26,45 @@ 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: false
+  - 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
 homepage: http://peach.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: []
 
 require_paths: 
-- lib
+  - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+          - 0
+        version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.1
+rubygems_version: 1.3.6
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Parallel Each and other parallel things
 test_files: []