birch 0.0.2 → 0.0.4

data/ext/birch/extconf.rb

@@ -1,3 +1,3 @@
 require 'mkmf'
 
-create_makefile('birch/birch')
+create_makefile('birch/native')

data/ext/birch/{birch.c → native.c}

@@ -41,7 +41,7 @@ static VALUE birch_edge_initialize(int argc, VALUE* argv, VALUE self) {
 	VALUE directed;
 	VALUE direction;
 
-	if (argc < 2 || argc > 4) {
+	if (argc < 3 || argc > 4) {
 		rb_raise(rb_eArgError, "Wrong number of arguments.");
 	} 
 	
@@ -64,7 +64,7 @@ static VALUE birch_root(VALUE self) {
 	VALUE parent;
 	VALUE tmp;
 	
-	parent = rb_iv_get(ancestor, "@parent");
+  parent = rb_iv_get(self, "@parent");
 	
 	if (parent == Qnil) {
 		return self;
@@ -145,7 +145,6 @@ static VALUE birch_unset(VALUE self, VALUE feature) {
 
 /* Return the total number of nodes in the subtree */
 static VALUE birch_size(VALUE self) {
-	
 
 	VALUE children;
 	int sum;
@@ -154,17 +153,14 @@ static VALUE birch_size(VALUE self) {
 	
 	children = rb_iv_get(self, "@children");
 	len = RARRAY_LEN(children);
-	sum = 0;
-	
+
+	sum = 0;	
 	for (i=0; i<len; i++) {
-		sum += rb_funcall(
-			RARRAY_PTR(children)[i], 
-			rb_intern("size"), 0
-		);
+		sum += NUM2INT(rb_funcall(RARRAY_PTR(children)[i], rb_intern("size"), 0));
 	}
 	
-	return INT2NUM(sum);
-	
+	// subtree size is our node size (1) + all childen sizes
+	return INT2NUM(1 + sum);
 }
 
 /* Iterate over each children of the node. */
@@ -294,12 +290,12 @@ static VALUE birch_link(VALUE self, VALUE edge) {
 
 /* Remove from parent and set as root */
 static VALUE birch_set_as_root(VALUE self) {
-	
+
 	// Set the parent to be nil.
 	rb_iv_set(self, "@parent", Qnil);
 	
 	// Return self.
-	return self;
+	return Qnil;
 	
 }
 
@@ -314,7 +310,7 @@ static VALUE birch_remove(VALUE self, VALUE id) {
 	);
 	
 	// Raise an exception if the value can't be found.
-	if (val == Qundef) { 
+	if (val == Qnil) { 
 		rb_raise(rb_eArgError, 
 		"Given ID is not a children of this node.");
 		return Qnil;
@@ -343,7 +339,8 @@ static VALUE birch_remove_all(VALUE self) {
 	long children_len;
 	
 	children = rb_iv_get(self, "@children");
-	
+	children_len = RARRAY_LEN(children);
+
 	for (i = 0; i < children_len; i++) {
 		rb_funcall(
 			RARRAY_PTR(children)[i], 
@@ -354,7 +351,7 @@ static VALUE birch_remove_all(VALUE self) {
 	rb_iv_set(self, "@children", rb_ary_new());
 	rb_iv_set(self, "@children_hash", rb_hash_new());
 	
-	return self;
+  return Qnil;
 }
 
 /* This class is a node for an N-ary tree data structure
@@ -365,7 +362,7 @@ static VALUE birch_remove_all(VALUE self) {
  * RubyTree is licensed under the BSD license and can
  * be found at http://rubytree.rubyforge.org/rdoc/.
  */
-void Init_birch(void) {
+void Init_native(void) {
 
 	birch = rb_define_module("Birch");
 	
@@ -417,10 +414,10 @@ void Init_birch(void) {
 	birch_edge = rb_define_class_under(birch, "Edge", rb_cObject);
 	
 	// Attribute readers
-	rb_attr(birch_tree, rb_intern("node_a"), 1, 0, 0);
-	rb_attr(birch_tree, rb_intern("node_b"), 1, 0, 0);
-	rb_attr(birch_tree, rb_intern("directed"), 1, 0, 0);
-	rb_attr(birch_tree, rb_intern("direction"), 1, 0, 0);
+	rb_attr(birch_edge, rb_intern("node_a"), 1, 0, 0);
+	rb_attr(birch_edge, rb_intern("node_b"), 1, 0, 0);
+	rb_attr(birch_edge, rb_intern("directed"), 1, 0, 0);
+	rb_attr(birch_edge, rb_intern("direction"), 1, 0, 0);
 	
 	rb_define_method(birch_edge, "initialize", birch_edge_initialize, -1);
 	

data/lib/birch.rb

@@ -1 +1,6 @@
-require 'birch/birch'
+if RUBY_PLATFORM =~ /java/
+  require 'birch/pure'
+else
+  require 'birch/native'
+end
+require 'birch/version'

data/lib/birch/pure.rb

@@ -0,0 +1,132 @@
+module Birch
+
+  class Tree
+    
+    attr_accessor :id, :value
+    attr_accessor :parent, :features
+    attr_reader :children, :edges
+
+    def initialize(value, id)
+      @value, @id = value, id
+      @parent = nil
+      @children = []
+      @children_hash = {}
+      @features = {}
+      @edges = []
+    end
+
+    def root
+      @parent.nil? ? self : root(parent)
+    end
+
+    def add(node_or_nodes)
+      nodes = [node_or_nodes].flatten
+      nodes.each do |node|
+        @children << node
+        @children_hash[node.id] = node
+        node.parent = self
+      end
+      nodes.first
+    end
+    alias_method :<<, :add
+
+    def get(feature)
+      case feature
+      when :id 
+        @id
+      when :value
+        @value
+      else
+        @features[feature]
+      end
+    end
+    alias_method :[], :get
+
+    def set(feature, value)
+      @features[feature] = value
+    end 
+    alias_method :[]=, :set
+
+    def unset(feature)
+      @features.delete(feature)
+    end
+
+    def size
+      1 + (@children.map(&:size).reduce(:+) || 0)
+    end
+
+    def each
+      @children.each{|c| yield c}
+    end
+
+    def find(id_or_node)
+      id = id_or_node.is_a?(Tree) ? id_or_node.id : id_or_node
+      return @children_hash[id] if @children_hash.has_key?(id)
+      @children.each{|c|  r = c.find(id); return r if r}
+      nil
+    end
+
+    def is_leaf?; @children.empty?; end
+    def is_root?; @parent.nil?; end
+    def has_children?; !@children.empty?; end
+    def has_edges?; !@edges.empty?; end
+    def has_parent?; !@parent.nil? ;end
+    def has_features?; !@features.empty?; end
+
+    def has_feature?(feature)
+      @features.has_key?(feature)
+    end
+
+    alias_method :has?, :has_feature?
+
+    def link(edge)
+      @edges << edge
+      edge
+    end
+
+    def set_as_root!
+      if has_parent?
+        @parent = nil
+      else
+        raise "Node is already the root."
+      end
+      nil
+    end
+
+    def remove(id)
+      node = @children_hash.delete(id)
+      if node.nil?
+        raise ArgumentError, 
+        "Given ID is not a children of this node."
+      end
+      @children.delete(node)
+      node.set_as_root!
+      node
+    end
+
+    def remove_all!
+      @children.each{|c| c.set_as_root!}
+      @children = []
+      @children_hash = {}
+      nil
+    end
+  end
+
+  class Edge
+    attr_reader :node_a, :node_b
+    attr_reader :directed, :direction
+
+    def initialize(node_a, node_b, directed = false, direction = 0)
+      unless [3, 4].include?(args.size)
+        raise ArgumentError, "Wrong number of arguments."
+      end
+      @node_a = args[0]
+      @node_b = args[1]
+      @directed = args[2]
+      @direction = args.size == 4 ? args[3] : nil
+    end
+  end
+
+end
+
+

data/lib/birch/version.rb

@@ -1,3 +1,3 @@
-class Birch
-  VERSION = '0.0.2'
+module Birch
+  VERSION = '0.0.4'
 end

metadata

@@ -1,27 +1,62 @@
 --- !ruby/object:Gem::Specification
 name: birch
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
 - Louis Mullie
+- Colin Surprenant
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-29 00:00:00.000000000 Z
-dependencies: []
+date: 2012-12-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+- !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'
 description: ! ' '
 email:
 - louis.mullie@gmail.com
+- colin.surprenant@gmail.com
 executables: []
 extensions:
 - ext/birch/extconf.rb
 extra_rdoc_files: []
 files:
+- lib/birch/pure.rb
 - lib/birch/version.rb
 - lib/birch.rb
-- ext/birch/birch.c
+- ext/birch/native.c
 - ext/birch/extconf.rb
 homepage: https://github.com/louismullie/birch
 licenses: []
@@ -46,5 +81,5 @@ rubyforge_project:
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: Birch is a generic tree implementation for Ruby, in C.
+summary: A basic Ruby tree implementation with an optional C extension for speed.
 test_files: []