bribera-rubyvor 0.0.2 → 0.0.3

data/History.txt

@@ -1,3 +1,7 @@
+=== 0.0.3 / 2008-12-03
+
+* Fixed a segfault by using rb_ary_push instead of direct pointer manipulation. Much simpler.
+
 === 0.0.2 / 2008-12-03
 
 * Computations succeed on a naive Point class, returning raw values for the associated Voronoi Diagram and Delaunay triangulation.

data/Manifest.txt

@@ -13,7 +13,7 @@ ext/vdefs.h
 ext/voronoi.c
 ext/voronoi_interface.c
 lib/ruby_vor.rb
-lib/ruby_vor/decomposition.rb
+lib/ruby_vor/computation.rb
 lib/ruby_vor/point.rb
 lib/ruby_vor/version.rb
 rubyvor.gemspec

data/ext/memory.c

@@ -1,8 +1,9 @@
 
 /*** MEMORY.C ***/
 
+#include <ruby.h>
 #include <stdio.h>
-#include <stdlib.h>  /* malloc(), exit() */
+#include <stdlib.h>  /* malloc() */
 
 #include "vdefs.h"
 
@@ -61,17 +62,15 @@ update_memory_map(char * newp)
 char *
 myalloc(unsigned n)
 {
-    char * t ;
+    char * t;
+    
     if ((t=(char*)malloc(n)) == (char *) 0)
-    {
-        fprintf(stderr,"Insufficient memory processing site %d (%d bytes in use)\n",
-                rubyvorState.siteidx, total_alloc) ;
-        exit(0) ;
-    }
-    total_alloc += n ;
+        rb_raise(rb_eNoMemError, "Insufficient memory processing site %d (%d bytes in use)\n", rubyvorState.siteidx, total_alloc);
+
+    total_alloc += n;
     
     update_memory_map(t);
-    return (t) ;
+    return (t);
 }
 
 char *
@@ -81,24 +80,25 @@ myrealloc(void * oldp, unsigned n, unsigned oldn)
     int i;
     
     if ((newp=(char*)realloc(oldp, n)) == (char *) 0)
-    {
-        fprintf(stderr,"Insufficient memory processing site %d (%d bytes in use)\n",
-                rubyvorState.siteidx, total_alloc) ;
-        exit(0) ;
-    }
+        rb_raise(rb_eNoMemError, "Insufficient memory processing site %d (%d bytes in use)\n", rubyvorState.siteidx, total_alloc);
 
-    total_alloc += (n - oldn) ;
+    total_alloc += (n - oldn);
 
     update_memory_map(newp);
 
     // Mark oldp as freed, since free() was called by realloc.
-    for (i=0; i<nallocs; i++) {
-        if (memory_map[i] != (char*)0 && memory_map[i] == oldp) {
+    //
+    // TODO: this seems naive; measure if this is a bottleneck & use a hash table or some other scheme if it is.
+    for (i=0; i<nallocs; i++)
+    {
+        if (memory_map[i] != (char*)0 && memory_map[i] == oldp)
+        {
             memory_map[i] = (char*)0;
             break;
         }
     }
-    return (newp) ;
+    
+    return (newp);
 }
     
 
@@ -115,6 +115,4 @@ void free_all(void)
 	}
 	free(memory_map);
 	nallocs = 0;
-
-    debug_memory();
 }

data/ext/vdefs.h

@@ -64,7 +64,7 @@ typedef struct tagVoronoiState
     int sorted, plot, debug, siteidx;
     float xmin, xmax, ymin, ymax;
     Site * sites;
-    void * decomp;
+    void * comp;
     void (* storeT)(int, int, int);
     void (* storeL)(float, float, float);
     void (* storeE)(int, int, int);

data/ext/voronoi.c

@@ -3,7 +3,7 @@
 
 #include <ruby.h>
 #include <vdefs.h>
-
+#include <stdio.h>
 
 // Static method definitions: C -> Ruby storage methods.
 static void storeTriangulationTriplet(const int, const int, const int);
@@ -41,8 +41,6 @@ void initialize_state(int debug)
     // TODO: remove C plot references
     if (rubyvorState.plot)
         plotinit();
-    
-    debug_memory();
 }
 
 void
@@ -50,28 +48,36 @@ voronoi(Site *(*nextsite)(void))
 {
     Site * newsite, * bot, * top, * temp, * p, * v ;
     Point newintstar ;
-    int pm ;
+    int pm , c;
     Halfedge * lbnd, * rbnd, * llbnd, * rrbnd, * bisector ;
     Edge * e ;
 
+    c = 0;
+    
     PQinitialize() ;
     rubyvorState.bottomsite = (*nextsite)() ;
+    if (rubyvorState.debug) fprintf(stderr, "bnys ");
     out_site(rubyvorState.bottomsite) ;
     ELinitialize() ;
     newsite = (*nextsite)() ;
+    
     while (1)
     {
+        
+        if (rubyvorState.debug) fprintf(stderr, "%d ", c++);
+        
         if(!PQempty())
-        {
             newintstar = PQ_min() ;
-        }
+        
         if (newsite != (Site *)NULL && (PQempty()
             || newsite -> coord.y < newintstar.y
             || (newsite->coord.y == newintstar.y
             && newsite->coord.x < newintstar.x)))
         {
+            if (rubyvorState.debug) fprintf(stderr, "nss ");
             /* new site is smallest */
             {
+                if (rubyvorState.debug) fprintf(stderr, "bnys ");
                 out_site(newsite) ;
             }
             lbnd = ELleftbnd(&(newsite->coord)) ;
@@ -98,12 +104,14 @@ voronoi(Site *(*nextsite)(void))
         }
         else if (!PQempty())   /* intersection is smallest */
         {
+            if (rubyvorState.debug) fprintf(stderr, "!pqe ");
             lbnd = PQextractmin() ;
             llbnd = ELleft(lbnd) ;
             rbnd = ELright(lbnd) ;
             rrbnd = ELright(rbnd) ;
             bot = leftreg(lbnd) ;
             top = rightreg(rbnd) ;
+            if (rubyvorState.debug) fprintf(stderr, "bnyt ");
             out_triple(bot, top, rightreg(lbnd)) ;
             v = lbnd->vertex ;
             makevertex(v) ;
@@ -148,11 +156,9 @@ voronoi(Site *(*nextsite)(void))
          lbnd = ELright(lbnd))
     {
         e = lbnd->ELedge ;
+        if (rubyvorState.debug) fprintf(stderr, "bnye ");
         out_ep(e) ;
     }
-
-    // After completing calculations
-    debug_memory();
 }
 
 
@@ -171,13 +177,12 @@ storeTriangulationTriplet(const int a, const int b, const int c)
 
     // Create a new triplet from the three incoming points
     triplet = rb_ary_new2(3);
-    RARRAY(triplet)->len = 3;
-    RARRAY(triplet)->ptr[0] = INT2FIX(a);
-    RARRAY(triplet)->ptr[1] = INT2FIX(b);
-    RARRAY(triplet)->ptr[2] = INT2FIX(c);
+    rb_ary_push(triplet, INT2FIX(a));
+    rb_ary_push(triplet, INT2FIX(b));
+    rb_ary_push(triplet, INT2FIX(c));
 
     // Get the existing raw triangulation
-    trArray = rb_funcall(*(VALUE *)rubyvorState.decomp, rb_intern("delaunay_triangulation_raw"), 0);
+    trArray = rb_funcall(*(VALUE *)rubyvorState.comp, rb_intern("delaunay_triangulation_raw"), 0);
 
     // Add the new triplet to it
     rb_ary_push(trArray, triplet);
@@ -192,17 +197,16 @@ storeLine(const float a, const float b, const float c)
     
     // Create a new line from the three values
     line = rb_ary_new2(4);
-    RARRAY(line)->len = 4;
-    RARRAY(line)->ptr[0] = ID2SYM(rb_intern("l"));
-    RARRAY(line)->ptr[1] = rb_float_new(a);
-    RARRAY(line)->ptr[2] = rb_float_new(b);
-    RARRAY(line)->ptr[3] = rb_float_new(c);
+    rb_ary_push(line, ID2SYM(rb_intern("l")));
+    rb_ary_push(line, rb_float_new(a));
+    rb_ary_push(line, rb_float_new(b));
+    rb_ary_push(line, rb_float_new(c));
 
     // Get the existing raw voronoi diagram
-    lArray = rb_funcall(*(VALUE *)rubyvorState.decomp, rb_intern("voronoi_diagram_raw"), 0);
+    lArray = rb_funcall(*(VALUE *)rubyvorState.comp, rb_intern("voronoi_diagram_raw"), 0);
 
     // Add the new line to it
-    rb_ary_push(lArray, line);    
+    rb_ary_push(lArray, line);
 }
 
 
@@ -218,17 +222,16 @@ storeEndpoint(const int l, const int v1, const int v2)
     
     // Create a new endpoint from the three values
     endpoint = rb_ary_new2(4);
-    RARRAY(endpoint)->len = 4;
-    RARRAY(endpoint)->ptr[0] = ID2SYM(rb_intern("e"));
-    RARRAY(endpoint)->ptr[1] = INT2FIX(l);
-    RARRAY(endpoint)->ptr[2] = INT2FIX(v1);
-    RARRAY(endpoint)->ptr[3] = INT2FIX(v2);
+    rb_ary_push(endpoint, ID2SYM(rb_intern("e")));
+    rb_ary_push(endpoint, INT2FIX(l));
+    rb_ary_push(endpoint, INT2FIX(v1));
+    rb_ary_push(endpoint, INT2FIX(v2));
 
     // Get the existing raw voronoi diagram
-    eArray = rb_funcall(*(VALUE *)rubyvorState.decomp, rb_intern("voronoi_diagram_raw"), 0);
+    eArray = rb_funcall(*(VALUE *)rubyvorState.comp, rb_intern("voronoi_diagram_raw"), 0);
 
     // Add the new endpoint to it
-    rb_ary_push(eArray, endpoint);    
+    rb_ary_push(eArray, endpoint);
 }
 
 
@@ -240,16 +243,15 @@ storeVertex(const float a, const float b)
     
     // Create a new vertex from the coordinates
     vertex = rb_ary_new2(3);
-    RARRAY(vertex)->len = 3;
-    RARRAY(vertex)->ptr[0] = ID2SYM(rb_intern("v"));
-    RARRAY(vertex)->ptr[1] = rb_float_new(a);
-    RARRAY(vertex)->ptr[2] = rb_float_new(b);
+    rb_ary_push(vertex, ID2SYM(rb_intern("v")));
+    rb_ary_push(vertex, rb_float_new(a));
+    rb_ary_push(vertex, rb_float_new(b));
 
     // Get the existing raw voronoi diagram
-    vArray = rb_funcall(*(VALUE *)rubyvorState.decomp, rb_intern("voronoi_diagram_raw"), 0);
+    vArray = rb_funcall(*(VALUE *)rubyvorState.comp, rb_intern("voronoi_diagram_raw"), 0);
 
     // Add the new vertex to it
-    rb_ary_push(vArray, vertex);    
+    rb_ary_push(vArray, vertex);
 }
 
 
@@ -264,14 +266,13 @@ storeSite(const float x, const float y)
     
     // Create a new site from the coordinates
     site = rb_ary_new2(3);
-    RARRAY(site)->len = 3;
-    RARRAY(site)->ptr[0] = ID2SYM(rb_intern("s"));
-    RARRAY(site)->ptr[1] = rb_float_new(x);
-    RARRAY(site)->ptr[2] = rb_float_new(y);
+    rb_ary_push(site, ID2SYM(rb_intern("s")));
+    rb_ary_push(site, rb_float_new(x));
+    rb_ary_push(site, rb_float_new(y));
 
     // Get the existing raw voronoi diagram
-    sArray = rb_funcall(*(VALUE *)rubyvorState.decomp, rb_intern("voronoi_diagram_raw"), 0);
+    sArray = rb_funcall(*(VALUE *)rubyvorState.comp, rb_intern("voronoi_diagram_raw"), 0);
 
     // Add the new site to it
-    rb_ary_push(sArray, site);    
+    rb_ary_push(sArray, site);
 }

data/ext/voronoi_interface.c

@@ -10,7 +10,7 @@ VoronoiState rubyvorState;
 
 static VALUE rb_mRubyVor;
 static VALUE rb_mVDDT;
-static VALUE rb_cDecomposition;
+static VALUE rb_cComputation;
 static int repeat, rit;
 
 // Static method definitions
@@ -27,10 +27,10 @@ Init_voronoi_interface(void)
     // Set up our Modules and Class.
     rb_mRubyVor       = rb_define_module("RubyVor");
     rb_mVDDT          = rb_define_module_under(rb_mRubyVor, "VDDT");
-    rb_cDecomposition = rb_define_class_under(rb_mVDDT, "Decomposition", rb_cObject);
+    rb_cComputation   = rb_define_class_under(rb_mVDDT, "Computation", rb_cObject);
 
     // Add methods.
-    rb_define_singleton_method(rb_cDecomposition, "from_points", from_points, 1);
+    rb_define_singleton_method(rb_cComputation, "from_points", from_points, 1);
 }
 
 
@@ -41,7 +41,7 @@ static VALUE
 from_points(VALUE self, VALUE pointsArray)
 {
     //VALUE returnValue;
-    VALUE * inPtr, newDecomp;
+    VALUE * inPtr, newComp;
     ID x, y;
 
     long i, inSize;
@@ -52,7 +52,7 @@ from_points(VALUE self, VALUE pointsArray)
     for (rit = 0; rit < repeat; rit++) {
 
     // Require T_ARRAY
-    Check_Type(pointsArray, T_ARRAY);
+    //Check_Type(pointsArray, T_ARRAY);
 
     // Intern our point access methods
     x = rb_intern("x");
@@ -72,14 +72,13 @@ from_points(VALUE self, VALUE pointsArray)
 
     
     // Initialize rubyvorState
-    initialize_state(0/* debug? */);
+    initialize_state(/* debug? */ 0);
+    debug_memory();
     
     // Create our return object.
-    newDecomp = rb_funcall(self, rb_intern("new"), 0);
+    newComp = rb_funcall(self, rb_intern("new"), 1, pointsArray);
     // Store it in rubyvorState so we can populate its values.
-    rubyvorState.decomp = (void *) &newDecomp;
-
-
+    rubyvorState.comp = (void *) &newComp;
     //
     // Read in the sites, sort, and compute xmin, xmax, ymin, ymax
     //
@@ -127,22 +126,27 @@ from_points(VALUE self, VALUE pointsArray)
         rubyvorState.ymin = rubyvorState.sites[0].coord.y;
         rubyvorState.ymax = rubyvorState.sites[rubyvorState.nsites-1].coord.y;
         
-    }    
+    }
 
     
     // Perform the computation
     voronoi(nextone);
+    debug_memory();
+    
+    // Get rid of our comp reference
+    rubyvorState.comp = (void *)NULL;
     
     // Free our allocated objects
-    free_all();
+    free_all();    
+    debug_memory();
 
     if (rubyvorState.debug)
-        fprintf(stderr,"FINISHED ITERATION %i\n", repeat + 1);
+        fprintf(stderr,"FINISHED ITERATION %i\n", rit + 1);
 
     
-    }
+    } // end repeat...
     
-    return newDecomp;
+    return newComp;
 }
 
 

data/lib/ruby_vor/computation.rb

@@ -0,0 +1,28 @@
+module RubyVor
+  
+  # Voronoi Digram and Delaunay Triangulation namespace.
+  module VDDT
+    
+    # Represents a computation from a set of 2-dimensional points
+    class Computation
+      attr_reader :points, :voronoi_diagram_raw, :delaunay_triangulation_raw
+      
+      def initialize(points=[], vd_raw=[], dt_raw=[])
+        @voronoi_diagram_raw = vd_raw
+        @delaunay_triangulation_raw   = dt_raw
+      end
+
+      class << self
+
+        # Compute the voronoi diagram and delaunay triangulation from a set of points.
+        #
+        # This implementation uses Steven Fortune's sweepline algorithm, which runs in O(n log n) time and O(n) space.
+        # It is limited to 2-dimensional space, therefore it expects to receive an array of objects that respond to 'x' and 'y' methods.
+        def from_points(p)
+          # Stub; implemented as C function in voronoi_interface.so
+        end        
+      end
+      
+    end
+  end
+end

data/lib/ruby_vor/point.rb

@@ -1,19 +1,9 @@
 module RubyVor
+  # Basic 2-d point
   class Point
     attr_accessor :x, :y
     def initialize(x=0.0,y=0.0)
-      @x = x
-      @y = y
-    end
-
-    class << self
-      def test_large
-        a = []
-        1000000.times {
-          a << new(100000.0 * rand, 100000.0 * rand)
-        }
-        a
-      end
+      @x = x; @y = y
     end
   end
 end

data/lib/ruby_vor/version.rb

@@ -1,3 +1,3 @@
 module RubyVor
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/lib/ruby_vor.rb

@@ -1,13 +1,13 @@
 $:.unshift File.dirname(__FILE__)
 $:.unshift File.join(File.dirname(__FILE__), '..', 'ext')
-require 'voronoi_interface.so'
+
 require 'ruby_vor/version'
 require 'ruby_vor/point'
-require 'ruby_vor/decomposition'
+require 'ruby_vor/computation'
+
+# Require voronoi_interface.so last to clobber old from_points
+require 'voronoi_interface.so'
 
+# DOC HERE
 module RubyVor
-  def self.test_l
-    VDDT::Decomposition.from_points(Point.test_large)
-  end
-  
 end

data/rubyvor.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{rubyvor}
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brendan Ribera"]
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   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/vdefs.h", "ext/voronoi.c", "ext/voronoi_interface.c", "lib/ruby_vor.rb", "lib/ruby_vor/decomposition.rb", "lib/ruby_vor/point.rb", "lib/ruby_vor/version.rb", "rubyvor.gemspec", "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/vdefs.h", "ext/voronoi.c", "ext/voronoi_interface.c", "lib/ruby_vor.rb", "lib/ruby_vor/computation.rb", "lib/ruby_vor/point.rb", "lib/ruby_vor/version.rb", "rubyvor.gemspec", "test/test_voronoi_interface.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://github.com/bribera/rubyvor}
   s.rdoc_options = ["--main", "README.txt"]

data/test/test_voronoi_interface.rb

@@ -12,14 +12,14 @@ class TestVoronoiInterface < MiniTest::Unit::TestCase
   end
   
   def test_diagram_correct
-    # Perform the decomposition.
-    decomp = RubyVor::VDDT::Decomposition.from_points(sample_points)
+    # Perform the computation.
+    comp = RubyVor::VDDT::Computation.from_points(sample_points)
 
     # Test each raw entry against three basic assertions:
     #  * entry lengths must match
     #  * entry types must match
     #  * entry values must match, with allowance for rounding errors (i.e. within a very small delta)
-    decomp.voronoi_diagram_raw.each_with_index do |computed_entry, i|
+    comp.voronoi_diagram_raw.each_with_index do |computed_entry, i|
       sample_entry = example_diagram_raw[i]
 
       
@@ -36,13 +36,13 @@ class TestVoronoiInterface < MiniTest::Unit::TestCase
   
 
   def test_triangulation_correct
-    # Perform the decomposition.
-    decomp = RubyVor::VDDT::Decomposition.from_points(sample_points)
+    # Perform the computation.
+    comp = RubyVor::VDDT::Computation.from_points(sample_points)
 
     # One assertion:
     #  * raw triangulation must match exactly.
     
-    assert_equal example_triangulation_raw, decomp.delaunay_triangulation_raw
+    assert_equal example_triangulation_raw, comp.delaunay_triangulation_raw
   end
   
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: bribera-rubyvor
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Brendan Ribera
@@ -48,7 +48,7 @@ files:
 - ext/voronoi.c
 - ext/voronoi_interface.c
 - lib/ruby_vor.rb
-- lib/ruby_vor/decomposition.rb
+- lib/ruby_vor/computation.rb
 - lib/ruby_vor/point.rb
 - lib/ruby_vor/version.rb
 - rubyvor.gemspec

data/lib/ruby_vor/decomposition.rb

@@ -1,22 +0,0 @@
-module RubyVor
-  module VDDT
-    class Decomposition
-      attr_reader :voronoi_diagram_raw, :delaunay_triangulation_raw
-      def initialize(vd_raw=[], dt_raw=[])
-        @voronoi_diagram_raw = vd_raw
-        @delaunay_triangulation_raw   = dt_raw
-      end
-      
-      private
-
-      def voronoi_diagram_raw=(v)
-        @voronoi_diagram_raw = v
-      end
-
-      def delaunay_triangulation_raw=(v)
-        @delaunay_triangulation_raw = v
-      end
-      
-    end
-  end
-end