comp_tree 0.7.6 → 1.0.0

data/test/{common.rb → comp_tree_test_base.rb}

@@ -1,11 +1,13 @@
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../devel'
 
 require 'test/unit'
 require 'comp_tree'
-#require 'benchmark'
 
-module TestCommon
+module TestBase
   if ARGV.include?("--bench")
+    require 'benchmark'
+
     def separator
       puts
       puts "-"*60
@@ -23,7 +25,18 @@ module TestCommon
       end
     end
   else
-    def separator() end
-    def bench_output(desc = nil, stream = STDOUT, &block) end
+    module Benchmark
+      class << self
+        def measure
+          yield
+        end
+      end
+    end
+
+    def separator()
+    end
+
+    def bench_output(desc = nil, stream = STDOUT, &block)
+    end
   end
 end

data/test/{test_drain.rb → drain_test.rb}

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/common'
+require File.dirname(__FILE__) + '/comp_tree_test_base'
 
 class TestDrain < Test::Unit::TestCase
-  include TestCommon
+  include TestBase
 
   def drain
     500000.times { }
@@ -17,10 +17,9 @@ class TestDrain < Test::Unit::TestCase
       driver.define(:height, :border, &func)
       driver.define(:border, &func)
       driver.define(:offset, &func)
-      #bench_output "number of threads: #{threads}"
-      #bench = Benchmark.measure { driver.compute(:area, threads) }
-      driver.compute(:area, threads)
-      #bench_output bench
+      bench_output "number of threads: #{threads}"
+      bench = Benchmark.measure { driver.compute(:area, threads) }
+      bench_output bench
     }
   end
 

data/test/exception_test.rb

@@ -0,0 +1,117 @@
+require File.dirname(__FILE__) + '/comp_tree_test_base'
+
+class TestException < Test::Unit::TestCase
+  def test_exception
+    test_error = Class.new StandardError
+    [true, false].each { |define_all|
+      [true, false].each { |abort_on_exception|
+        (1..20).each { |num_threads|
+          error = (
+            begin
+              CompTree.build { |driver|
+                driver.define(:area, :width, :height, :offset) {
+                  |width, height, offset|
+                  width*height - offset
+                }
+                
+                driver.define(:width, :border) { |border|
+                  2 + border
+                }
+    
+                driver.define(:height, :border) { |border|
+                  3 + border
+                }
+                
+                if define_all
+                  driver.define(:border) {
+                    raise test_error
+                  }
+                end
+                
+                driver.define(:offset) {
+                  7
+                }
+          
+                begin
+                  previous = Thread.abort_on_exception
+                  Thread.abort_on_exception = abort_on_exception
+                  driver.compute(:area, num_threads) 
+                ensure
+                  Thread.abort_on_exception = previous
+                end
+              }
+              nil
+            rescue Exception => e
+              e
+            end
+          )
+    
+          if define_all
+            assert_block { error.is_a? test_error }
+          else
+            assert_block { error.is_a? CompTree::NoFunctionError }
+            assert_equal(
+              "no function was defined for node `:border'",
+              error.message
+            )
+          end
+        }
+      }
+    }
+  end 
+
+  def test_num_threads
+    CompTree.build do |driver|
+      driver.define(:root) { }
+      assert_raises(RangeError) { driver.compute(:root, 0) }
+      assert_raises(RangeError) { driver.compute(:root, -1) }
+      assert_raises(RangeError) { driver.compute(:root, -11) }
+
+      assert_raises(TypeError) { driver.compute(:root, "11") }
+      assert_raises(TypeError) { driver.compute(:root, {}) }
+      assert_raises(TypeError) { driver.compute(:root, Object.new) }
+      assert_raises(TypeError) { driver.compute(:root, true) }
+      assert_raises(TypeError) { driver.compute(:root, nil) }
+    end
+  end
+
+  def test_invalid_node
+    (1..20).each { |num_threads|
+      CompTree.build do |driver|
+        driver.define(:root) { }
+        assert_nothing_raised {
+          driver.compute(:root, num_threads)
+        }
+
+        error = assert_raises(CompTree::NoNodeError) {
+          driver.compute(:a, num_threads)
+        }
+        assert_equal "no node named `:a'", error.message
+        assert_equal :a, error.node_name
+
+        error = assert_raises(CompTree::NoNodeError) {
+          driver.compute(nil, num_threads)
+        }
+        assert_equal nil, error.node_name
+        assert_equal "no node named `nil'", error.message
+        assert_equal "#<CompTree::NoNodeError: #{error.message}>", error.inspect
+      end
+    }
+  end
+
+  def test_missing_function
+    (1..20).each { |num_threads|
+      CompTree.build { |driver|
+        driver.define(:f, :x) { |x|
+          x + 33
+        }
+        error = assert_raises(CompTree::NoFunctionError) {
+          driver.compute(:f, num_threads)
+        }
+        msg = "no function was defined for node `:x'"
+        assert_equal msg, error.message
+        assert_equal "#<CompTree::NoFunctionError: #{msg}>", error.inspect
+      }
+    }
+  end
+end

data/test/{test_flood.rb → flood_test.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/common'
+require File.dirname(__FILE__) + '/comp_tree_test_base'
 
 class TestFlood < Test::Unit::TestCase
   def test_thread_flood

data/test/{test_grind.rb → grind_test.rb}

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/common'
+require File.dirname(__FILE__) + '/comp_tree_test_base'
 
 class TestGrind < Test::Unit::TestCase
-  include TestCommon
+  include TestBase
 
   GENERATOR_DATA = {
     :level_range => 1..5,
@@ -32,7 +32,7 @@ class TestGrind < Test::Unit::TestCase
         RETURN_FLAG
       }
       build_tree = lambda { |parent, children, level|
-        #trace "building #{parent} --> #{children.join(' ')}"
+        #puts "building #{parent} --> #{children.join(' ')}"
         
         driver.define(parent, *children, &drain)
 
@@ -55,22 +55,21 @@ class TestGrind < Test::Unit::TestCase
     args[:level_range].each { |num_levels|
       args[:children_range].each { |num_children|
         separator
-        #bench_output {%{num_levels}}
-        #bench_output {%{num_children}}
+        bench_output {%{num_levels}}
+        bench_output {%{num_children}}
         driver = generate_comp_tree(
           num_levels,
           num_children,
           args[:drain_iterations])
         args[:thread_range].each { |threads|
-         #bench_output {%{threads}}
+         bench_output {%{threads}}
           2.times {
             driver.reset(ROOT)
-            #result = nil
-            #bench = Benchmark.measure {
-            #  result = driver.compute(ROOT, threads)
-            #}
-            result = driver.compute(ROOT, threads)
-            #bench_output bench
+            result = nil
+            bench = Benchmark.measure {
+              result = driver.compute(ROOT, threads)
+            }
+            bench_output bench
             assert_equal(result, RETURN_FLAG)
           }
         }

data/test/readme_test.rb

@@ -0,0 +1,5 @@
+require File.dirname(__FILE__) + "/comp_tree_test_base"
+
+require "jumpstart"
+
+Jumpstart.doc_to_test("README.rdoc", "Synopsis")

data/test/{test_sequential.rb → sequential_test.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/common'
+require File.dirname(__FILE__) + '/comp_tree_test_base'
 
 class TestSequential < Test::Unit::TestCase
   def test_sequential

data/test/{test_throw.rb → throw_test.rb}

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/common'
+require File.dirname(__FILE__) + '/comp_tree_test_base'
 
 class TestThrow < Test::Unit::TestCase
   EXPECTED = RUBY_VERSION >= "1.9.0" ? ArgumentError : ThreadError

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: comp_tree
 version: !ruby/object:Gem::Version 
-  version: 0.7.6
+  version: 1.0.0
 platform: ruby
 authors: 
 - James M. Lawrence
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-21 00:00:00 -04:00
+date: 2009-09-13 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
-description: CompTree is a framework for parallelizing interrelated computations.
+description: CompTree is parallel computation tree structure based upon concepts from pure functional programming.
 email: 
 - quixoticsycophant@gmail.com
 executables: []
@@ -24,85 +24,84 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - CHANGES.rdoc
-- MANIFEST
 - README.rdoc
 - Rakefile
 - devel/jumpstart.rb
-- devel/jumpstart/lazy_attribute.rb
-- devel/jumpstart/ruby.rb
-- devel/jumpstart/simple_installer.rb
 - install.rb
 - lib/comp_tree.rb
 - lib/comp_tree/algorithm.rb
+- lib/comp_tree/comp_tree.rb
 - lib/comp_tree/driver.rb
 - lib/comp_tree/error.rb
 - lib/comp_tree/node.rb
-- lib/comp_tree/queue.rb
-- lib/comp_tree/queue_new.rb
-- lib/comp_tree/queue_old.rb
-- test/common.rb
-- test/test_basic.rb
-- test/test_circular.rb
-- test/test_drain.rb
-- test/test_exception.rb
-- test/test_flood.rb
-- test/test_grind.rb
-- test/test_sequential.rb
-- test/test_throw.rb
+- lib/comp_tree/queue/queue.rb
+- lib/comp_tree/queue/queue_18.rb
+- lib/comp_tree/queue/queue_19.rb
+- test/basic_test.rb
+- test/circular_test.rb
+- test/comp_tree_test_base.rb
+- test/drain_test.rb
+- test/exception_test.rb
+- test/flood_test.rb
+- test/grind_test.rb
+- test/readme_test.rb
+- test/sequential_test.rb
+- test/throw_test.rb
+- MANIFEST
 has_rdoc: true
 homepage: http://comptree.rubyforge.org
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --main
 - README.rdoc
 - --title
-- "comp_tree: Automatic parallelism and lazy evaluation via pure functional programming."
+- "comp_tree: A simple framework for parallelizing computations."
 - --exclude
 - CHANGES.rdoc
 - --exclude
-- MANIFEST
-- --exclude
 - README.rdoc
 - --exclude
 - Rakefile
 - --exclude
 - devel/jumpstart.rb
 - --exclude
-- devel/jumpstart/lazy_attribute.rb
-- --exclude
-- devel/jumpstart/ruby.rb
-- --exclude
-- devel/jumpstart/simple_installer.rb
-- --exclude
 - install.rb
 - --exclude
+- lib/comp_tree.rb
+- --exclude
 - lib/comp_tree/algorithm.rb
 - --exclude
 - lib/comp_tree/node.rb
 - --exclude
-- lib/comp_tree/queue.rb
+- lib/comp_tree/queue/queue.rb
 - --exclude
-- lib/comp_tree/queue_new.rb
+- lib/comp_tree/queue/queue_18.rb
 - --exclude
-- lib/comp_tree/queue_old.rb
+- lib/comp_tree/queue/queue_19.rb
 - --exclude
-- test/common.rb
+- test/basic_test.rb
 - --exclude
-- test/test_basic.rb
+- test/circular_test.rb
 - --exclude
-- test/test_circular.rb
+- test/comp_tree_test_base.rb
 - --exclude
-- test/test_drain.rb
+- test/drain_test.rb
 - --exclude
-- test/test_exception.rb
+- test/exception_test.rb
 - --exclude
-- test/test_flood.rb
+- test/flood_test.rb
 - --exclude
-- test/test_grind.rb
+- test/grind_test.rb
 - --exclude
-- test/test_sequential.rb
+- test/readme_test.rb
 - --exclude
-- test/test_throw.rb
+- test/sequential_test.rb
+- --exclude
+- test/throw_test.rb
+- --exclude
+- MANIFEST
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -120,9 +119,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: comptree
-rubygems_version: 1.3.1
+rubygems_version: 1.3.5
 signing_key: 
-specification_version: 2
-summary: Automatic parallelism and lazy evaluation via pure functional programming.
+specification_version: 3
+summary: A simple framework for parallelizing computations.
 test_files: []
 

data/devel/jumpstart/lazy_attribute.rb

@@ -1,38 +0,0 @@
-
-class Jumpstart
-  #
-  # Mixin for lazily-evaluated attributes.
-  #
-  module LazyAttribute
-    #
-    # &block is evaluated when this attribute is requested.  The same
-    # result is returned for subsequent calls until the attribute is
-    # assigned a different value.
-    #
-    def attribute(reader, &block)
-      writer = "#{reader}="
-
-      singleton = (class << self ; self ; end)
-
-      define_evaluated_reader = lambda { |value|
-        singleton.class_eval {
-          remove_method(reader)
-          define_method(reader) { value }
-        }
-      }
-
-      singleton.class_eval {
-        define_method(reader) {
-          value = block.call
-          define_evaluated_reader.call(value)
-          value
-        }
-          
-        define_method(writer) { |value|
-          define_evaluated_reader.call(value)
-          value
-        }
-      }
-    end
-  end
-end

data/devel/jumpstart/ruby.rb

@@ -1,44 +0,0 @@
-
-require 'rbconfig'
-
-class Jumpstart
-  module Ruby
-    EXECUTABLE = lambda {
-      name = File.join(
-        Config::CONFIG["bindir"],
-        Config::CONFIG["RUBY_INSTALL_NAME"]
-      )
-
-      if Config::CONFIG["host"] =~ %r!(mswin|cygwin|mingw)! and
-          File.basename(name) !~ %r!\.(exe|com|bat|cmd)\Z!i
-        name + Config::CONFIG["EXEEXT"]
-      else
-        name
-      end
-    }.call
-
-    class << self
-      def run(*args)
-        cmd = [EXECUTABLE, *args]
-        unless system(*cmd)
-          cmd_str = cmd.map { |t| "'#{t}'" }.join(", ")
-          raise "system(#{cmd_str}) failed with status #{$?.exitstatus}"
-        end
-      end
-      
-      def with_warnings(value = true)
-        previous = $VERBOSE
-        $VERBOSE = value
-        begin
-          yield
-        ensure
-          $VERBOSE = previous
-        end
-      end
-      
-      def no_warnings(&block)
-        with_warnings(false, &block)
-      end
-    end
-  end
-end

data/devel/jumpstart/simple_installer.rb

@@ -1,85 +0,0 @@
-
-require 'rbconfig'
-require 'fileutils'
-require 'find'
-
-class Jumpstart
-  class SimpleInstaller
-    def initialize
-      dest_root = Config::CONFIG["sitelibdir"]
-      sources = []
-      Find.find("./lib") { |source|
-        if install_file?(source)
-          sources << source
-        end
-      }
-      @spec = sources.inject(Array.new) { |acc, source|
-        if source == "./lib"
-          acc
-        else
-          dest = File.join(dest_root, source.sub(%r!\A\./lib!, ""))
-  
-          install = lambda {
-            if File.directory?(source)
-              unless File.directory?(dest)
-                puts "mkdir #{dest}"
-                FileUtils.mkdir(dest)
-              end
-            else
-              puts "install #{source} --> #{dest}"
-              FileUtils.install(source, dest)
-            end
-          }
-            
-          uninstall = lambda {
-            if File.directory?(source)
-              if File.directory?(dest)
-                puts "rmdir #{dest}"
-                FileUtils.rmdir(dest)
-              end
-            else
-              if File.file?(dest)
-                puts "rm #{dest}"
-                FileUtils.rm(dest)
-              end
-            end
-          }
-  
-          acc << {
-            :source => source,
-            :dest => dest,
-            :install => install,
-            :uninstall => uninstall,
-          }
-        end
-      }
-    end
-  
-    def install_file?(source)
-      File.directory?(source) or
-      (File.file?(source) and File.extname(source) == ".rb")
-    end
-
-    def install
-      @spec.each { |entry|
-        entry[:install].call
-      }
-    end
-  
-    def uninstall
-      @spec.reverse.each { |entry|
-        entry[:uninstall].call
-      }
-    end
-
-    def run(args = ARGV)
-      if args.empty?
-        install
-      elsif args.size == 1 and args.first == "--uninstall"
-        uninstall
-      else
-        raise "unrecognized arguments: #{args.inspect}"
-      end
-    end
-  end
-end

data/lib/comp_tree/queue.rb

@@ -1 +0,0 @@
-require "comp_tree/queue_" + (RUBY_VERSION < "1.9.0" ? "old" : "new")

data/test/test_exception.rb

@@ -1,84 +0,0 @@
-require File.dirname(__FILE__) + '/common'
-
-class TestException < Test::Unit::TestCase
-  def test_exception
-    test_error = Class.new StandardError
-    [true, false].each { |define_all|
-      [true, false].each { |abort_on_exception|
-        error = (
-          begin
-            CompTree.build { |driver|
-              driver.define(:area, :width, :height, :offset) {
-                |width, height, offset|
-                width*height - offset
-              }
-              
-              driver.define(:width, :border) { |border|
-                2 + border
-              }
-  
-              driver.define(:height, :border) { |border|
-                3 + border
-              }
-              
-              if define_all
-                driver.define(:border) {
-                  raise test_error
-                }
-              end
-              
-              driver.define(:offset) {
-                7
-              }
-        
-              begin
-                previous = Thread.abort_on_exception
-                Thread.abort_on_exception = abort_on_exception
-                driver.compute(:area, 99) 
-              ensure
-                Thread.abort_on_exception = previous
-              end
-            }
-            nil
-          rescue => e
-            e
-          end
-        )
-  
-        if define_all
-          assert_block { error.is_a? test_error }
-        else
-          assert_block { error.is_a? CompTree::NoFunctionError }
-        end
-      }
-    }
-  end 
-
-  def test_num_threads
-    CompTree.build do |driver|
-      driver.define(:root) { }
-      error = CompTree::ArgumentError
-      assert_raises(error) { driver.compute(:root, 0) }
-      assert_raises(error) { driver.compute(:root, :threads => 0) }
-      assert_raises(error) { driver.compute(:root, -1) }
-      assert_raises(error) { driver.compute(:root, :threads => -1) }
-      assert_raises(error) { driver.compute(:root, -11) }
-      assert_raises(error) { driver.compute(:root, :threads => -11) }
-    end
-  end
-
-  def test_invalid_node
-    CompTree.build do |driver|
-      driver.define(:root) { }
-      assert_nothing_raised {
-        driver.compute(:root, 33)
-      }
-      assert_raises(CompTree::ArgumentError) {
-        driver.compute(:a, 33)
-      }
-      assert_raises(CompTree::ArgumentError) {
-        driver.compute(nil, 33)
-      }
-    end
-  end
-end