treebank 1.1.0 → 2.0.0

data/README

@@ -28,7 +28,7 @@ in a bracketed tree format.
 
 Bracketed tree strings can be used to create Node trees.
 
-   irb(main):006:0> t = Treebank::Node.new.from_s('(parent (child1) (child2))')
+   irb(main):006:0> t = Treebank::Node.from_s('(parent (child1) (child2))')
    => <Treebank::Node parent [child1 child2]>
    irb(main):007:0> puts t
    (parent (child1) (child2))
@@ -42,6 +42,7 @@ linguistic structure.
 
 * 1-0-0 ... First release
 * 1-1-0 ... Removed unnecessary fsa dependency from gemspec
+* 2-0-0 ... Changed from_s initialization
 
 = See Also
 

data/lib/treebank.rb

@@ -18,7 +18,7 @@
 # Treebank is the namespace that contains all tree-related functions.
 module Treebank
 
-  VERSION = "1.1.0"
+  VERSION = "2.0.0"
 
   # An enumerable list of tokens in a string representation of a tree
   #
@@ -244,14 +244,11 @@ module Treebank
     # * right ... right bracket symbol
     #
     # This function uses a Treebank::Parser object to create the tree from
-    # _s_.  This raises an error if this node is not empty.
-    def from_s(s, left = '(', right = ')')
-      raise 'This node is not empty.' if not self.empty?
-      nodes = Parser.new(TokenStream.new(s, left, right), self.class).collect
+    # _s_.
+    def Node.from_s(s, left = '(', right = ')')
+      nodes = Parser.new(TokenStream.new(s, left, right), self).collect
       raise "#{s} defines multiple trees" if nodes.length != 1
-      @label = nodes.first.label
-      @children = nodes.first.collect
-      self
+      nodes.first
     end
 
     # Stringify

data/test/test_treebank.rb

@@ -68,7 +68,7 @@ module ParseTreeMixin
   def test_tree_parse
     p = Treebank::Parser.new(Treebank::TokenStream.new('(A) (B)'), @node_class)
     trees = p.collect
-    assert_equal [@node_class.new.from_s('(A)'), @node_class.new.from_s('(B)')], trees
+    assert_equal [@node_class.from_s('(A)'), @node_class.from_s('(B)')], trees
     assert_kind_of @node_class, trees[0]
     assert_kind_of @node_class, trees[1]
     t = Treebank::Parser.new(Treebank::TokenStream.new('(A (B) (C))'), @node_class).collect.first
@@ -79,7 +79,7 @@ module ParseTreeMixin
   end
 
   def test_string_in_constructor
-    assert_equal [@node_class.new.from_s('(A)'), @node_class.new.from_s('(B)')], Treebank::Parser.new('(A) (B)', @node_class).collect
+    assert_equal [@node_class.from_s('(A)'), @node_class.from_s('(B)')], Treebank::Parser.new('(A) (B)', @node_class).collect
   end
 
 end
@@ -133,7 +133,7 @@ module NodeTestMixin
   # Test adding children in the constructor
   def test_constructor_children
     t = @node_class.new('a', ['b', 'c', 'd'])
-    assert_equal @node_class.new.from_s('(a (b) (c) (d) )'), t, 'Children in constructor'
+    assert_equal @node_class.from_s('(a (b) (c) (d) )'), t, 'Children in constructor'
   end
 
   # Add children
@@ -163,17 +163,17 @@ module NodeTestMixin
         (N (boy)))
      (VP
         (V (ran))))'
-    t = @node_class.new.from_s(s)
+    t = @node_class.from_s(s)
     assert_kind_of @node_class, t, 'from_s'
     assert_equal s, "#{t}", 'to_s'
-    m = @node_class.new.from_s(multiline_s)
+    m = @node_class.from_s(multiline_s)
     assert_equal t, m, 'Single-/multi-line equal'
   end
 
   # Simple enumeration
   def test_enumeration
     # Enumerate all children.
-    t = @node_class.new.from_s('(a (b (R) (S) ) (c (T) (U)) )')
+    t = @node_class.from_s('(a (b (R) (S) ) (c (T) (U)) )')
     assert_equal ['a', 'b', 'c', 'R', 'S', 'T', 'U'], t.each_breadth_first.collect {|node| node.label}, 'Full breadth first'
     assert_equal ['a', 'b', 'R', 'S', 'c', 'T', 'U'], t.each_depth_first.collect {|node| node.label}, 'Full depth first'
     # Enumerate children beneath a node.
@@ -188,10 +188,10 @@ module NodeTestMixin
 
   # Tree equivalence
   def test_equivalence
-    t1 = @node_class.new.from_s('(a (b (R) (S) ) (c (T) (U)) )')
-    t2 = @node_class.new.from_s('(a (b (R) (S) ) (c (T) (U)) )')
-    s1 = @node_class.new.from_s('(a (b (R) (S) ) (c (T) ) )')
-    s2 = @node_class.new.from_s('(a (c (R) (S) ) (b (T) (U) ) )')
+    t1 = @node_class.from_s('(a (b (R) (S) ) (c (T) (U)) )')
+    t2 = @node_class.from_s('(a (b (R) (S) ) (c (T) (U)) )')
+    s1 = @node_class.from_s('(a (b (R) (S) ) (c (T) ) )')
+    s2 = @node_class.from_s('(a (c (R) (S) ) (b (T) (U) ) )')
     assert_equal t1, t2, 'Tree equivalence'
     assert_not_equal t1, s1, 'Tree non-equivalence: different terminals'
     assert_not_equal t1, s2, 'Tree non-equivalence: reversed non-terminal labels'
@@ -199,7 +199,7 @@ module NodeTestMixin
   end
 
   def test_leaves
-    t = @node_class.new.from_s('(a (b c) (d e))')
+    t = @node_class.from_s('(a (b c) (d e))')
     leaves = t.each_depth_first.collect
     c = leaves[2]
     e = leaves[4]
@@ -229,7 +229,7 @@ class ParentedNodeTest < Test::Unit::TestCase
   end
 
   def test_ancestor_enumeration
-    t = @node_class.new.from_s('(a (b (R) (S) ) (c (T) (U)) )')
+    t = @node_class.from_s('(a (b (R) (S) ) (c (T) (U)) )')
     assert_equal [t], t.each_parent.collect, 'Ancestors from head'
     u = t.each_depth_first.find {|node| node.label == 'U'}
     assert_equal ['U', 'c', 'a'], u.each_parent.collect {|node| node.label}, 'Ancestors from leaf'

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: treebank
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2006-12-05 00:00:00 -08:00
+  version: 2.0.0
+date: 2007-01-12 00:00:00 -08:00
 summary: Treebank implements support for ordered n-ary branching tree structures
 require_paths: 
 - lib