comp_tree 1.1.1 → 1.1.2

data/CHANGES.rdoc

@@ -1,6 +1,11 @@
 
 = comp_tree Changes
 
+== Version 1.1.2
+
+* optimizations
+* doc fixes
+
 == Version 1.1.1
 
 * fix documentation

data/devel/levitate.rb

@@ -250,7 +250,7 @@ class Levitate
   include Util
 
   def initialize(gem_name)
-    $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
+    $LOAD_PATH.unshift File.expand_path(File.dirname(__FILE__) + '/../lib')
 
     require 'rubygems/package_task'
 
@@ -402,11 +402,7 @@ class Levitate
   end
 
   attribute :extra_rdoc_files do
-    result = []
-    [readme_file, history_file].each { |file|
-      result << file if File.file?(file)
-    }
-    result
+    [readme_file, history_file].select { |file| File.file?(file) }
   end
 
   attribute :browser do
@@ -482,9 +478,11 @@ class Levitate
       begin
         sections[send("#{section}_section")].
         gsub("\n", " ").
-        split(%r!\.\s*!m).
+        split(%r!\.\s+!m).
         first(send("#{section}_sentences")).
-        join(".  ") << "."
+        join(". ").
+        concat(".").
+        sub(%r!\.+\Z!, ".")
       rescue
         "FIXME: #{section}"
       end
@@ -753,7 +751,11 @@ class Levitate
 
   def define_changes
     task :changes do
-      header = "\n\n== Version ____\n\n"
+      if File.read(history_file).index version
+        raise "version not updated"
+      end
+
+      header = "\n\n== Version #{version}\n\n"
 
       bullets = `git log --format=%s #{last_release}..HEAD`.lines.map { |line|
         "* #{line}"

data/lib/comp_tree.rb

@@ -65,7 +65,7 @@ module CompTree
   #       2
   #     }
   #     
-  #     # Compute the area using four parallel threads.
+  #     # Compute the area using up to four parallel threads.
   #     puts driver.compute(:area, 4)
   #     # => 63
   # 
@@ -74,6 +74,13 @@ module CompTree
   #     # => 63
   #   end
   #
+  # A custom <code>CompTree::Node</code> subclass may optionally be
+  # provided,
+  #
+  #   CompTree.build(:node_class => MyNode) { ... }
+  #
+  # This will build the tree with +MyNode+ instances.
+  #
   def self.build(opts = {})
     yield Driver.new(opts)
   end

data/lib/comp_tree/algorithm.rb

@@ -13,7 +13,9 @@ module CompTree
       workers.size.times { to_workers.push(nil) }
       workers.each { |t| t.join }
       
-      raise node.computed if node.computed.is_a? Exception
+      if node.computed.is_a? Exception
+        raise node.computed
+      end
       node.result
     end
 
@@ -26,8 +28,7 @@ module CompTree
       }
     end
 
-    def master_loop(root, arg1, workers, from_workers, to_workers)
-      max_threads = arg1 == 0 ? nil : arg1
+    def master_loop(root, max_threads, workers, from_workers, to_workers)
       num_working = 0
       node = nil
       while true
@@ -62,7 +63,7 @@ module CompTree
         # already computed
         #
         nil
-      elsif not node.locked? and node.children_results
+      elsif node.free? and node.children_results
         #
         # Node is not computed, not locked, and its children are
         # computed; ready to compute.
@@ -72,7 +73,7 @@ module CompTree
         #
         # locked or children not computed; recurse to children
         #
-        node.each_child { |child|
+        node.children.each { |child|
           found = find_node(child) and return found
         }
         nil

data/lib/comp_tree/driver.rb

@@ -29,11 +29,11 @@ module CompTree
     # to the block.  The block returns the result of this node's
     # computation.
     #
-    # In this example, a computation node named +area+ is defined
-    # which depends on the nodes +width+ and +height+.
+    # In the following example, a computation node named +:area+ is
+    # defined which depends on the nodes named +:width+ and +:height+.
     #
-    #   driver.define(:area, :width, :height) { |width, height|
-    #     width*height
+    #   driver.define(:area, :width, :height) { |w, h|
+    #     w*h
     #   }
     #
     def define(name, *child_names, &block)
@@ -110,15 +110,16 @@ module CompTree
         raise TypeError, "can't convert #{max_threads.class} into Integer"
       end
       if max_threads < 0
-        raise RangeError, "number of threads must be nonnegative"
+        raise RangeError, "max threads must be nonnegative"
       end
+
       root = @nodes[name] or raise NoNodeError.new(name)
       if root.computed
         root.result
       elsif max_threads == 1
         root.compute_now
       else
-        Algorithm.compute_parallel(root, max_threads)
+        Algorithm.compute_parallel(root, max_threads == 0 ? nil : max_threads)
       end
     end
   end

data/lib/comp_tree/node.rb

@@ -11,8 +11,7 @@ module CompTree
       :children,
       :function,
       :result,
-      :computed,
-      :lock_level
+      :computed
     )
 
     #
@@ -40,28 +39,9 @@ module CompTree
     # Reset the computation for this node and all children.
     #
     def reset
-      each_downward { |node|
-        node.reset_self
-      }
-    end
-
-    def each_downward(&block)
-      block.call(self)
-      @children.each { |child|
-        child.each_downward(&block)
-      }
-    end
-
-    def each_upward(&block)
-      block.call(self)
-      @parents.each { |parent|
-        parent.each_upward(&block)
-      }
-    end
-
-    def each_child
+      reset_self
       @children.each { |child|
-        yield(child)
+        child.reset
       }
     end
 
@@ -89,14 +69,12 @@ module CompTree
     # otherwise return nil.
     #
     def children_results
-      @children_results or (
-        @children_results = @children.map { |child|
-          unless child.computed
-            return nil
-          end
-          child.result
-        }
-      )
+      @children_results ||= @children.map { |child|
+        unless child.computed
+          return nil
+        end
+        child.result
+      }
     end
 
     #
@@ -116,19 +94,21 @@ module CompTree
       @result
     end
 
-    def locked?
-      @lock_level != 0
+    def free?
+      @lock_level.zero?
     end
 
     def lock
-      each_upward { |node|
-        node.lock_level += 1
+      @lock_level = @lock_level.succ
+      @parents.each { |parent|
+        parent.lock
       }
     end
 
     def unlock
-      each_upward { |node|
-        node.lock_level -= 1
+      @lock_level -= 1  # Fixnum#pred not in 1.8.6
+      @parents.each { |parent|
+        parent.unlock
       }
     end
   end

data/lib/comp_tree/version.rb

@@ -1,3 +1,3 @@
 module CompTree
-  VERSION = "1.1.1"
+  VERSION = "1.1.2"
 end

metadata

@@ -2,7 +2,7 @@
 name: comp_tree
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - James M. Lawrence
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-02 00:00:00 -05:00
+date: 2011-03-08 00:00:00 -05:00
 default_executable: 
 dependencies: []