birch 0.0.1 → 0.0.2

data/ext/birch/birch.c

@@ -1,5 +1,9 @@
 #include <ruby.h>
 
+static VALUE birch;
+static VALUE birch_tree;
+static VALUE birch_edge;
+
 /*
  * Initialize the node with its value and id.
  * Setup containers for the children, features
@@ -14,15 +18,14 @@ static VALUE birch_initialize(VALUE self, VALUE value, VALUE id)
 	VALUE edges;
 	
 	parent = Qnil;
-  children = rb_ary_new();
+	children = rb_ary_new();
 	children_hash = rb_hash_new();
 	features = rb_hash_new();
 	edges = rb_ary_new();
 	
 	rb_iv_set(self, "@value", value);
 	rb_iv_set(self, "@id", id);
-
-  rb_iv_set(self, "@parent", parent);
+	rb_iv_set(self, "@parent", parent);
 	rb_iv_set(self, "@children", children);
 	rb_iv_set(self, "@children_hash", children_hash);
 	rb_iv_set(self, "@features", features);
@@ -31,6 +34,29 @@ static VALUE birch_initialize(VALUE self, VALUE value, VALUE id)
   return self;
 }
 
+static VALUE birch_edge_initialize(int argc, VALUE* argv, VALUE self) {
+	
+	VALUE node_a;
+	VALUE node_b;
+	VALUE directed;
+	VALUE direction;
+
+	if (argc < 2 || argc > 4) {
+		rb_raise(rb_eArgError, "Wrong number of arguments.");
+	} 
+	
+	rb_iv_set(self, "@node_a", argv[0]);
+	rb_iv_set(self, "@node_b", argv[1]);
+	rb_iv_set(self, "@directed", argv[2]);
+	
+	if (argc == 4) {
+		rb_iv_set(self, "@direction", argv[3]);
+	} else {
+		rb_iv_set(self, "@direction", Qnil);
+	}
+	
+}
+
 /* Return the root of the tree. */
 static VALUE birch_root(VALUE self) {
 	
@@ -56,37 +82,48 @@ static VALUE birch_root(VALUE self) {
 	}
 }
 
-/* Add a child to this node. */
-static VALUE birch_add(VALUE self, VALUE child) {
+/* Add a child(ren) to this node. Return first child added. */
+static VALUE birch_add(VALUE self, VALUE node_or_nodes) {
 	
+	long i;
+	VALUE nodes;
+	VALUE child;
 	VALUE children;
 	VALUE children_hash;
-	
 	VALUE child_id;
 	
   children = rb_iv_get(self, "@children");
-	child_id = rb_funcall(child, rb_intern("id"), 0);
 	children_hash = rb_iv_get(self, "@children_hash");
 	
-  rb_funcall(children, rb_intern("push"), 1, child);
-	
-	rb_funcall(
-		children_hash, 
-		rb_intern("store"), 
-		2, child_id, child
-	);
-	
-	rb_iv_set(child, "@parent", self);
+	if (CLASS_OF(node_or_nodes) != rb_cArray) {
+		nodes = rb_ary_new();
+		rb_funcall(nodes, rb_intern("push"), 1, node_or_nodes);
+	} else {
+		nodes = node_or_nodes;
+	}
 	
-	return child;
+	for (i = 0; i < RARRAY_LEN(nodes); i++) {
+		
+		child = RARRAY_PTR(nodes)[i]; 
+		child_id = rb_iv_get(child, "@id");
+		
+		rb_funcall(children, rb_intern("push"), 1, child);
+
+		rb_funcall(children_hash, rb_intern("store"), 
+			2, child_id, child
+		);
+		rb_iv_set(child, "@parent", self);
+	}
+  
+	return RARRAY_PTR(nodes)[0];
 	
 }
 
 /* Return the feature with the supplied name. */
 static VALUE birch_get(VALUE self, VALUE feature) {
-	if (feature == rb_intern("id")) {
+	if (rb_intern("id") == SYM2ID(feature)) {	
 		return rb_iv_get(self, "@id");
-	} else if (feature == rb_intern("value")) {
+	} else if (SYM2ID(feature) == rb_intern("value")) {
 		return rb_iv_get(self, "@value");
 	} else {
 		return rb_hash_aref(rb_iv_get(self, "@features"), feature);
@@ -147,13 +184,18 @@ static VALUE birch_each(VALUE self) {
 	
 }
 
-static VALUE birch_find(VALUE self, VALUE id) {
+static VALUE birch_find(VALUE self, VALUE id_or_node) {
 	
+	VALUE id;
 	VALUE children_hash;
 	VALUE children;
 	VALUE result;
 	long i;
 	
+	if (rb_obj_is_kind_of(id_or_node, birch_tree)) {
+		id = rb_iv_get(id_or_node, "@id");
+	} else { id = id_or_node; }
+	
 	children_hash = rb_iv_get(self, "@children_hash");
 	result = rb_hash_aref(children_hash, id);
 	
@@ -198,25 +240,25 @@ static VALUE birch_has_children(VALUE self) {
 	}
 }
 
-/* Boolean - does the node have a parent? */
-static VALUE birch_has_parent(VALUE self) {
-  if (rb_iv_get(self, "@parent") == Qnil) {
+/* Boolean - does this node have children */
+static VALUE birch_has_edges(VALUE self) {
+	if (RARRAY_LEN(rb_iv_get(self, "@edges")) == 0) {
 		return Qfalse;
 	} else {
 		return Qtrue;
 	}
 }
 
-/* Boolean - does the node have edges? */
-static VALUE birch_has_edges(VALUE self) {
-	if (RARRAY_LEN(rb_iv_get(self, "@edges")) == 0) {
+/* Boolean - does the node have a parent? */
+static VALUE birch_has_parent(VALUE self) {
+  if (rb_iv_get(self, "@parent") == Qnil) {
 		return Qfalse;
 	} else {
 		return Qtrue;
 	}
 }
 
-/* Boolean - does the node have feature? */
+/* Boolean - does the node have the feature? */
 static VALUE birch_has_feature(VALUE self, VALUE feature) {
 	VALUE features;
 	features = rb_iv_get(self, "@features");
@@ -227,6 +269,16 @@ static VALUE birch_has_feature(VALUE self, VALUE feature) {
 	}
 }
 
+/* Boolean - does the node have features? */
+static VALUE birch_has_features(VALUE self) {
+	VALUE features;
+	features = rb_iv_get(self, "@features");
+  if (!RHASH(features)->ntbl) {
+		return Qfalse;
+	} else { return Qtrue; }
+}
+
+
 static VALUE birch_link(VALUE self, VALUE edge) {
 	
 	VALUE edges;
@@ -236,6 +288,8 @@ static VALUE birch_link(VALUE self, VALUE edge) {
 		edges, rb_intern("push"), 1, edge
 	);
 	
+	return edge;
+
 }
 
 /* Remove from parent and set as root */
@@ -313,42 +367,61 @@ static VALUE birch_remove_all(VALUE self) {
  */
 void Init_birch(void) {
 
-	VALUE module = rb_define_module("Birch");
-  VALUE klass = rb_define_class_under(module, "Tree", rb_cObject);
+	birch = rb_define_module("Birch");
+	
+	/* 
+	 * Birch::Tree
+	 */
+	 birch_tree = rb_define_class_under(birch, "Tree", rb_cObject);
 	
 	// Attribute accessors
-	rb_attr(klass, rb_intern("id"), 1, 1, 1);
-	rb_attr(klass, rb_intern("value"), 1, 1, 1);
+	rb_attr(birch_tree, rb_intern("id"), 1, 1, 1);
+	rb_attr(birch_tree, rb_intern("value"), 1, 1, 1);
+	rb_attr(birch_tree, rb_intern("parent"), 1, 1, 1);
+	rb_attr(birch_tree, rb_intern("features"), 1, 1, 1);
 	
 	// Attribute readers
-	rb_attr(klass, rb_intern("parent"), 1, 0, 0);
-	rb_attr(klass, rb_intern("children"), 1, 0, 0);
-	rb_attr(klass, rb_intern("features"), 1, 0, 0);
-	rb_attr(klass, rb_intern("edges"), 1, 0, 0);
+	rb_attr(birch_tree, rb_intern("children"), 1, 0, 0);
+	rb_attr(birch_tree, rb_intern("edges"), 1, 0, 0);
 	
 	// Methods
-	rb_define_method(klass, "initialize", birch_initialize, 2);
-	rb_define_method(klass, "root", birch_root, 0);
-	rb_define_method(klass, "<<", birch_add, 1);
-	rb_define_method(klass, "add", birch_add, 1);
-	rb_define_method(klass, "[]", birch_get, 1);
-	rb_define_method(klass, "get", birch_get, 1);
-	rb_define_method(klass, "[]=", birch_set, 2); 
-  rb_define_method(klass, "set", birch_set, 2); 
-	rb_define_method(klass, "unset", birch_unset, 1); 
-	rb_define_method(klass, "size", birch_size, 0);
-	rb_define_method(klass, "each", birch_each, 0);
-	rb_define_method(klass, "find", birch_find, 1);
-	rb_define_method(klass, "is_leaf?", birch_is_leaf, 0);
-	rb_define_method(klass, "is_root?", birch_is_root, 0);
-	rb_define_method(klass, "has_parent?", birch_has_parent, 0);
-	rb_define_method(klass, "has_children?", birch_has_children, 0);
-	rb_define_method(klass, "has_edges?", birch_has_edges, 0);
-	rb_define_method(klass, "has_feature?", birch_has_feature, 1);
-	rb_define_method(klass, "has?", birch_has_feature, 1);
-	rb_define_method(klass, "link", birch_link, 1);
-	rb_define_method(klass, "set_as_root!", birch_set_as_root, 0);
-	rb_define_method(klass, "remove", birch_remove, 1);
-	rb_define_method(klass, "remove_all!", birch_remove_all, 0); 
+	rb_define_method(birch_tree, "initialize", birch_initialize, 2);
+	rb_define_method(birch_tree, "root", birch_root, 0);
+	rb_define_method(birch_tree, "<<", birch_add, 1);
+	rb_define_method(birch_tree, "add", birch_add, 1);
+	rb_define_method(birch_tree, "[]", birch_get, 1);
+	rb_define_method(birch_tree, "get", birch_get, 1);
+	rb_define_method(birch_tree, "[]=", birch_set, 2);
+	rb_define_method(birch_tree, "set", birch_set, 2); 
+	rb_define_method(birch_tree, "unset", birch_unset, 1); 
+	rb_define_method(birch_tree, "size", birch_size, 0);
+	rb_define_method(birch_tree, "each", birch_each, 0);
+	rb_define_method(birch_tree, "find", birch_find, 1);
+	rb_define_method(birch_tree, "is_leaf?", birch_is_leaf, 0);
+	rb_define_method(birch_tree, "is_root?", birch_is_root, 0);
+	rb_define_method(birch_tree, "has_parent?", birch_has_parent, 0);
+	rb_define_method(birch_tree, "has_children?", birch_has_children, 0);
+	rb_define_method(birch_tree, "has_edges?", birch_has_edges, 0);
+	rb_define_method(birch_tree, "has_feature?", birch_has_feature, 1);
+	rb_define_method(birch_tree, "has_features?", birch_has_features, 0);
+	rb_define_method(birch_tree, "has?", birch_has_feature, 1);
+	rb_define_method(birch_tree, "link", birch_link, 1);
+	rb_define_method(birch_tree, "set_as_root!", birch_set_as_root, 0);
+	rb_define_method(birch_tree, "remove", birch_remove, 1);
+	rb_define_method(birch_tree, "remove_all!", birch_remove_all, 0); 
+	
+	/* 
+	 * Birch::Edge
+	 */
+
+	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_define_method(birch_edge, "initialize", birch_edge_initialize, -1);
 	
 }

data/lib/birch/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: birch
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-04 00:00:00.000000000 Z
+date: 2012-07-29 00:00:00.000000000 Z
 dependencies: []
 description: ! ' '
 email: