bribera-rubyvor 0.0.8 → 0.0.9

data/Manifest.txt

@@ -25,5 +25,6 @@ lib/ruby_vor/version.rb
 lib/ruby_vor/visualizer.rb
 rubyvor.gemspec
 test/test_computation.rb
+test/test_point.rb
 test/test_priority_queue.rb
 test/test_voronoi_interface.rb

data/ext/rb_cComputation.c

@@ -128,7 +128,8 @@ RubyVor_from_points(VALUE self, VALUE pointsArray)
 VALUE
 RubyVor_minimum_spanning_tree(int argc, VALUE *argv, VALUE self)
 {
-    VALUE mst, dist_proc, nodes, nnGraph, points, queue, tmp, adjacent, adjacentData, adjacentDistance, latestAddition, latestAdditionData, floatMax;
+    VALUE mst, dist_proc, nodes, nnGraph, points, queue, tmp, adjacent, adjacentData, adjacentDistance, current, currentData, floatMax;
+    ID i_call, i_push, i_pop, i_has_key;
     long i;
 
     /* 0 mandatory, 1 optional */
@@ -148,6 +149,12 @@ RubyVor_minimum_spanning_tree(int argc, VALUE *argv, VALUE self)
         rb_raise(rb_eTypeError, "wrong argument type %s (expected %s)", rb_obj_classname(dist_proc), rb_class2name(rb_cProc));
     }
 
+    // Set up interned values
+    i_call     = rb_intern("call");
+    i_push     = rb_intern("push");
+    i_pop      = rb_intern("pop");
+    i_has_key  = rb_intern("has_key?");
+    
     points  = rb_iv_get(self, "@points");
     queue   = rb_eval_string("RubyVor::PriorityQueue.new");
     nnGraph = RubyVor_nn_graph(self);
@@ -166,46 +173,45 @@ RubyVor_minimum_spanning_tree(int argc, VALUE *argv, VALUE self)
         /* 4: in_q */
         rb_ary_push(tmp, Qtrue);
 
-        rb_funcall(queue, rb_intern("push"), 2, tmp, (i == 0) ? rb_float_new(0.0) : floatMax);
+        rb_funcall(queue, i_push, 2, tmp, (i == 0) ? rb_float_new(0.0) : floatMax);
     }
-    nodes = rb_obj_clone(rb_funcall(queue, rb_intern("data"), 0));
+    nodes = rb_obj_clone(rb_iv_get(queue, "@data"));
     
-    while(RTEST(latestAddition = rb_funcall(queue, rb_intern("pop"), 0))) {
-        latestAdditionData = rb_funcall(latestAddition, rb_intern("data"), 0);
+    while(RTEST(current = rb_funcall(queue, i_pop, 0))) {
+        currentData = rb_iv_get(current, "@data");
         
         /* mark in_q */
-        rb_ary_store(latestAdditionData, 4, Qfalse);
+        rb_ary_store(currentData, 4, Qfalse);
 
         /* check for presence of parent */
-        if (RTEST(RARRAY(latestAdditionData)->ptr[1])) {
+        if (RTEST(RARRAY(currentData)->ptr[1])) {
             /* push this node into adjacency_list of parent */
-            rb_ary_push(RARRAY(rb_funcall(RARRAY(latestAdditionData)->ptr[1], rb_intern("data"), 0))->ptr[3], latestAddition);
+            rb_ary_push(RARRAY(rb_iv_get(RARRAY(currentData)->ptr[1], "@data"))->ptr[3], current);
             /* push parent into adjacency_list of this node */
-            rb_ary_push(RARRAY(latestAdditionData)->ptr[3], RARRAY(latestAdditionData)->ptr[1]);
+            rb_ary_push(RARRAY(currentData)->ptr[3], RARRAY(currentData)->ptr[1]);
         }
 
-        for (i = 0; i < RARRAY(RARRAY(latestAdditionData)->ptr[2])->len; i++) {
+        for (i = 0; i < RARRAY(RARRAY(currentData)->ptr[2])->len; i++) {
             /* grab indexed node */
-            adjacent = RARRAY(nodes)->ptr[FIX2LONG(RARRAY(RARRAY(latestAdditionData)->ptr[2])->ptr[i])];
-            adjacentData = rb_funcall(adjacent, rb_intern("data"), 0);
+            adjacent = RARRAY(nodes)->ptr[FIX2LONG(RARRAY(RARRAY(currentData)->ptr[2])->ptr[i])];
+            adjacentData = rb_iv_get(adjacent, "@data");
         
             /* check in_q -- only look at new nodes */
             if (Qtrue == RARRAY(adjacentData)->ptr[4]) {
 
                 /* compare points by node -- adjacent against current */
-                adjacentDistance = rb_funcall(dist_proc,
-                                              rb_intern("call"), 2,
-                                              RARRAY(points)->ptr[FIX2LONG(RARRAY(latestAdditionData)->ptr[0])],
+                adjacentDistance = rb_funcall(dist_proc, i_call, 2,
+                                              RARRAY(points)->ptr[FIX2LONG(RARRAY(currentData)->ptr[0])],
                                               RARRAY(points)->ptr[FIX2LONG(RARRAY(adjacentData)->ptr[0])]);
 
                 /* If the new distance is better than our current priority, exchange them. */
-                if (RFLOAT(adjacentDistance)->value < RFLOAT(rb_funcall(adjacent, rb_intern("priority"), 0))->value) {
+                if (RFLOAT(adjacentDistance)->value < RFLOAT(rb_iv_get(adjacent, "@priority"))->value) {
                     /* set new :parent */
-                    rb_ary_store(adjacentData, 1, latestAddition);
+                    rb_ary_store(adjacentData, 1, current);
                     /* update priority */
-                    rb_funcall(adjacent, rb_intern("priority="), 1, adjacentDistance);
+                    rb_iv_set(adjacent, "@priority", adjacentDistance);
                     /* percolate up into correctn position */
-                    RubyVor_percolate_up(queue, rb_funcall(adjacent, rb_intern("index"), 0));
+                    RubyVor_percolate_up(queue, rb_iv_get(adjacent, "@index"));
                 }
             }
         }
@@ -213,22 +219,22 @@ RubyVor_minimum_spanning_tree(int argc, VALUE *argv, VALUE self)
 
     mst = rb_hash_new();
     for (i = 0; i < RARRAY(nodes)->len; i++) {
-        latestAddition = RARRAY(nodes)->ptr[i];
-        latestAdditionData = rb_funcall(latestAddition, rb_intern("data"), 0);
-        if (!NIL_P(RARRAY(latestAdditionData)->ptr[1])) {
-            adjacentData = rb_funcall(RARRAY(latestAdditionData)->ptr[1], rb_intern("data"), 0);
+        current = RARRAY(nodes)->ptr[i];
+        currentData = rb_iv_get(current, "@data");
+        if (!NIL_P(RARRAY(currentData)->ptr[1])) {
+            adjacentData = rb_iv_get(RARRAY(currentData)->ptr[1], "@data");
             tmp = rb_ary_new2(2);
-            if (FIX2LONG(RARRAY(latestAdditionData)->ptr[0]) < FIX2LONG(RARRAY(adjacentData)->ptr[0])) {
-                rb_ary_push(tmp, RARRAY(latestAdditionData)->ptr[0]);
+            if (FIX2LONG(RARRAY(currentData)->ptr[0]) < FIX2LONG(RARRAY(adjacentData)->ptr[0])) {
+                rb_ary_push(tmp, RARRAY(currentData)->ptr[0]);
                 rb_ary_push(tmp, RARRAY(adjacentData)->ptr[0]);
             } else {
                 rb_ary_push(tmp, RARRAY(adjacentData)->ptr[0]);                
-                rb_ary_push(tmp, RARRAY(latestAdditionData)->ptr[0]);
-            }
-            if (!RTEST(rb_funcall(mst, rb_intern("has_key?"), 1, tmp))) {
-                rb_hash_aset(mst, tmp, rb_funcall(latestAddition, rb_intern("priority"), 0));
-
+                rb_ary_push(tmp, RARRAY(currentData)->ptr[0]);
             }
+            
+            /* if (!st_lookup(RHASH(mst)->tbl, tmp, 0)) { */
+            rb_hash_aset(mst, tmp, rb_iv_get(current, "@priority"));
+            /* } */
         }
     }
 

data/lib/ruby_vor/version.rb

@@ -1,3 +1,3 @@
 module RubyVor
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

data/lib/ruby_vor/visualizer.rb

@@ -2,7 +2,7 @@ require 'libxml'
 module RubyVor
   class Visualizer
 
-    COLORS = %w{black blue red purple gray lime yellow orange pink}
+    COLORS = %w{black red blue lime gray yellow purple orange pink}
     
     include LibXML
       
@@ -208,8 +208,8 @@ module RubyVor
 
     def self.new_color
       a = rand(256)
-      b = rand(256)# ^ a
-      c = rand(256)# ^ (a | b)
+      b = rand(256) | a
+      c = rand(256) ^ b
       
       "rgb(#{[a,b,c].sort{|k,l| rand(3)-1}.join(',')})"
     end

data/rubyvor.gemspec

@@ -2,16 +2,16 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rubyvor}
-  s.version = "0.0.8"
+  s.version = "0.0.9"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brendan Ribera"]
-  s.date = %q{2008-12-23}
+  s.date = %q{2009-01-01}
   s.description = %q{RubyVor provides efficient computation of Voronoi diagrams and Delaunay triangulation for a set of Ruby points. It is intended to function as a complemenet to GeoRuby. These structures can be used to compute a nearest-neighbor graph for a set of points. This graph can in turn be used for proximity-based clustering of the input points.}
   s.email = ["brendan.ribera+rubyvor@gmail.com"]
   s.extensions = ["ext/extconf.rb"]
   s.extra_rdoc_files = ["History.txt", "Manifest.txt", "README.txt"]
-  s.files = ["History.txt", "Manifest.txt", "README.txt", "Rakefile", "ext/Doc", "ext/edgelist.c", "ext/extconf.rb", "ext/geometry.c", "ext/heap.c", "ext/memory.c", "ext/output.c", "ext/rb_cComputation.c", "ext/rb_cPoint.c", "ext/rb_cPriorityQueue.c", "ext/ruby_vor_c.c", "ext/ruby_vor_c.h", "ext/vdefs.h", "ext/voronoi.c", "lib/ruby_vor.rb", "lib/ruby_vor/computation.rb", "lib/ruby_vor/geo_ruby_extensions.rb", "lib/ruby_vor/point.rb", "lib/ruby_vor/priority_queue.rb", "lib/ruby_vor/version.rb", "lib/ruby_vor/visualizer.rb", "rubyvor.gemspec", "test/test_computation.rb", "test/test_priority_queue.rb", "test/test_voronoi_interface.rb"]
+  s.files = ["History.txt", "Manifest.txt", "README.txt", "Rakefile", "ext/Doc", "ext/edgelist.c", "ext/extconf.rb", "ext/geometry.c", "ext/heap.c", "ext/memory.c", "ext/output.c", "ext/rb_cComputation.c", "ext/rb_cPoint.c", "ext/rb_cPriorityQueue.c", "ext/ruby_vor_c.c", "ext/ruby_vor_c.h", "ext/vdefs.h", "ext/voronoi.c", "lib/ruby_vor.rb", "lib/ruby_vor/computation.rb", "lib/ruby_vor/geo_ruby_extensions.rb", "lib/ruby_vor/point.rb", "lib/ruby_vor/priority_queue.rb", "lib/ruby_vor/version.rb", "lib/ruby_vor/visualizer.rb", "rubyvor.gemspec", "test/test_computation.rb", "test/test_point.rb", "test/test_priority_queue.rb", "test/test_voronoi_interface.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/bribera/rubyvor}
   s.rdoc_options = ["--main", "README.txt"]
@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = %q{rubyvor}
   s.rubygems_version = %q{1.3.1}
   s.summary = %q{RubyVor provides efficient computation of Voronoi diagrams and Delaunay triangulation for a set of Ruby points}
-  s.test_files = ["test/test_computation.rb", "test/test_priority_queue.rb", "test/test_voronoi_interface.rb"]
+  s.test_files = ["test/test_computation.rb", "test/test_priority_queue.rb", "test/test_voronoi_interface.rb", "test/test_point.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/test/test_point.rb

@@ -0,0 +1,100 @@
+require 'rubygems'
+require 'minitest/unit'
+require File.dirname(__FILE__) + '/../lib/ruby_vor'
+
+class TestPoint < MiniTest::Unit::TestCase
+
+  def test_instantiation
+    a = b = nil
+    
+    assert_raises TypeError do
+      a = RubyVor::Point.new(:"10", 10)
+    end
+    
+    assert_raises TypeError do
+      a = RubyVor::Point.new(10, :"10")
+    end
+    
+    assert_nothing_raised do
+      a = RubyVor::Point.new(123.456, 789.10)
+      b = RubyVor::Point.new("123.456", "789.10")
+    end
+
+    assert_equal a, b
+  end
+  
+  def test_comparison
+    a = RubyVor::Point.new(10, 10)
+    b = RubyVor::Point.new(1,  1)
+
+    assert a > b
+    assert b < a
+    assert_equal -1, b <=> a
+  end
+
+  def test_equality
+    a = RubyVor::Point.new(10,   10)
+    b = RubyVor::Point.new(10.0, 10)
+    c = RubyVor::Point.new(10.0, 10.0)
+    d = RubyVor::Point.new(10,   10.0)
+    
+    z = RubyVor::Point.new(Math::PI, Math::PI)
+    o = a
+
+    
+    # Test equality of values; both == and eql? perform this function.
+    assert a == a
+    assert a == b
+    assert a == c
+    assert a == d
+    assert a == o
+    assert a.eql?(a)
+    assert a.eql?(b)
+    assert a.eql?(c)
+    assert a.eql?(d)
+    assert a.eql?(o)
+    
+    refute a == z
+    refute a.eql?(z)
+    
+
+    # Test object equality.
+    refute a.equal?(b)
+    refute a.equal?(c)
+    refute a.equal?(d)
+    refute a.equal?(z)
+    
+    assert a.equal?(a)
+    assert a.equal?(o)
+  end
+
+  def test_hash
+    a = RubyVor::Point.new(10,   10)
+    b = RubyVor::Point.new(10.0, 10)
+    c = RubyVor::Point.new(10.0, 10.0)
+    d = RubyVor::Point.new(10,   10.0)
+    
+    z = RubyVor::Point.new(Math::PI, Math::PI)
+    o = a
+
+    assert_equal a.hash, b.hash
+    assert_equal a.hash, c.hash
+    assert_equal a.hash, d.hash
+    assert_equal a.hash, o.hash
+
+    refute_equal a.hash, z.hash
+  end
+
+  private
+  
+  def assert_nothing_raised(&b)
+    begin
+      yield
+    rescue Exception => e
+      flunk "#{mu_pp(e)} exception encountered, expected no exceptions"
+      return
+    end
+    pass()
+  end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bribera-rubyvor
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors: 
 - Brendan Ribera
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-23 00:00:00 -08:00
+date: 2009-01-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,6 +60,7 @@ files:
 - lib/ruby_vor/visualizer.rb
 - rubyvor.gemspec
 - test/test_computation.rb
+- test/test_point.rb
 - test/test_priority_queue.rb
 - test/test_voronoi_interface.rb
 has_rdoc: true
@@ -94,3 +95,4 @@ test_files:
 - test/test_computation.rb
 - test/test_priority_queue.rb
 - test/test_voronoi_interface.rb
+- test/test_point.rb