lulu 0.0.3 → 0.0.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZWFjMGJjNzk1NGM5YzRjYTQxYmZkMDUxMTA4OWJhZmI1YjMyYzZjYg==
+    OTEyMjAyN2MwMjQ5MjJhMDEwZjQzMjRmMWRhYTRiYzUwYjZkZWZkOA==
   data.tar.gz: !binary |-
-    YTRkMjY0YzcyNWVlZWVjN2I2NWI5MmE3ZjI3NGE0M2Y1NzkxMzhkMQ==
+    NWM2MzllZGU0MDJhMjMxYzg0NTUxMWMyYmNlMmUyMDc5MGZmZDgxNQ==
 SHA512:
   metadata.gz: !binary |-
-    NTE3YmQxOTljNzA2MjU5MDljYmRkZGE1ZjNjMWIyNTgyNzczYzZmNzM2ODdh
-    Y2M2Mzg4NDk1OGM5MzNmNjgzZTY5ZmYyZGJkNzg0MGRmYmYwNDBkYzU0MDc5
-    ZWM2NmRhNTk0MzZhZWFlZjMzOWI2MjkzYWVlNmU0Y2E2YjFmYWE=
+    NjNjYjJlODhiYTFlMzA4ZDRlOTdhNTk0MjZlNTU5NjI4NTE4MDRjMWI5NDg4
+    MzY4M2NiNDEyYTliZDdmN2Y3MjkzM2ZmZmJjMmZkOGIxNmNjMWY1YTkyMTgx
+    YjA0Y2Q0MGRlN2M2MGRkOTdhOTFlZWEzNWMyOTEwNGFiNGQ1M2I=
   data.tar.gz: !binary |-
-    NTFhMzc0MDY1YjhjMWUwYjE1ZTgwY2FlZTAyOTk0NTI4MmFkNGNiMzkxYjAw
-    NTY1M2Q5ODQ4YThmZjNhYzRkN2UxYjk2OTk0OTVjOWQ0ODQ1NjRhM2U1NjA2
-    NzBjYmMwNWE3NGEyODA2MDBjYjM2MjNmMTM5N2UwMjFlN2Q1ZTc=
+    OTkxMjhlMjcxZjNkMzUyYzEyNTZlZTkyZjZkNzIwOTAzNmNmYzRjMmZmNTY4
+    YjM5YjkyNDM0N2JjMzMwZWZmYjVhY2E5YWYxNzY2NmVhNWZjM2E3MDE1YWEw
+    NTg1Njc0ZTQxYjdiZDNlNTFiMDE1OWUxOWUzMDY3YzdhZTlkMGI=

data/ext/lulu/lulu.c

@@ -31,29 +31,29 @@ typedef struct marker_list_s {
 #define MARKER_LIST_DECL(Name)  MARKER_LIST Name[1]; init_marker_list(Name)
 #define ml_set_marker_list_info(L, Kind, Scale)  mr_info_set((L)->info, (Kind), (Scale))
 
-void init_marker_list(MARKER_LIST *list) {
+static void init_marker_list(MARKER_LIST *list) {
     mr_info_init(list->info);
     list->markers = NULL;
     list->size = list->max_size = 0;
 }
 
-MARKER_LIST *new_marker_list(void) {
+static MARKER_LIST *new_marker_list(void) {
     NewDecl(MARKER_LIST, list);
     init_marker_list(list);
     return list;
 }
 
-void clear_marker_list(MARKER_LIST *list) {
+static void clear_marker_list(MARKER_LIST *list) {
     Free(list->markers);
     init_marker_list(list);
 }
 
-void free_marker_list(MARKER_LIST *list) {
+static void free_marker_list(MARKER_LIST *list) {
     clear_marker_list(list);
     Free(list);
 }
 
-void add_marker(MARKER_LIST *list, MARKER_COORD x, MARKER_COORD y, MARKER_SIZE size) {
+static void add_marker(MARKER_LIST *list, MARKER_COORD x, MARKER_COORD y, MARKER_SIZE size) {
     if (list->size >= list->max_size) {
         list->max_size = 4 + 2 * list->max_size;
         RenewArray(list->markers, list->max_size);
@@ -62,7 +62,7 @@ void add_marker(MARKER_LIST *list, MARKER_COORD x, MARKER_COORD y, MARKER_SIZE s
     mr_set(list->info, marker, x, y, size);
 }
 
-void ensure_headroom(MARKER_LIST *list) {
+static void ensure_headroom(MARKER_LIST *list) {
     int needed_size = 2 * list->size - 1;
     if (list->max_size < needed_size) {
         list->max_size = needed_size;
@@ -70,7 +70,7 @@ void ensure_headroom(MARKER_LIST *list) {
     }
 }
 
-void compress(MARKER_LIST *list) {
+static void compress(MARKER_LIST *list) {
     int dst = 0;
     for (int src = 0; src < list->size; src++)
         if (!mr_deleted_p(list->markers + src)) {
@@ -84,24 +84,24 @@ void compress(MARKER_LIST *list) {
 
 // -------- Ruby API implementation --------------------------------------------
 
-static void rb_api_free_marker_list(void *list) {
+static void lulu_rb_api_free_marker_list(void *list) {
     free_marker_list(list);
 }
 
-static VALUE rb_api_new_marker_list(VALUE klass) {
+static VALUE lulu_rb_api_new_marker_list(VALUE klass) {
     MARKER_LIST *list = new_marker_list();
-    return Data_Wrap_Struct(klass, 0, rb_api_free_marker_list, list);
+    return Data_Wrap_Struct(klass, 0, lulu_rb_api_free_marker_list, list);
 }
 
 #define MARKER_LIST_FOR_VALUE_DECL(Var) MARKER_LIST *Var; Data_Get_Struct(Var ## _value, MARKER_LIST, Var)
 
-static VALUE rb_api_initialize_copy(VALUE dst_value, VALUE src_value)
+static VALUE lulu_rb_api_initialize_copy(VALUE dst_value, VALUE src_value)
 #define ARGC_initialize_copy 1
 {
     if (dst_value == src_value)
         return src_value;
 
-    if (TYPE(src_value) != T_DATA || RDATA(src_value)->dfree != (RUBY_DATA_FUNC)rb_api_free_marker_list)
+    if (TYPE(src_value) != T_DATA || RDATA(src_value)->dfree != (RUBY_DATA_FUNC)lulu_rb_api_free_marker_list)
         rb_raise(rb_eTypeError, "type mismatch (copy_marker_list)");
 
     MARKER_LIST_FOR_VALUE_DECL(src);
@@ -115,7 +115,7 @@ static VALUE rb_api_initialize_copy(VALUE dst_value, VALUE src_value)
     return dst_value;
 }
 
-static VALUE rb_api_clear(VALUE self_value)
+static VALUE lulu_rb_api_clear(VALUE self_value)
 #define ARGC_clear 0
 {
     MARKER_LIST_FOR_VALUE_DECL(self);
@@ -123,7 +123,7 @@ static VALUE rb_api_clear(VALUE self_value)
     return self_value;
 }
 
-static VALUE rb_api_set_info(VALUE self_value, VALUE kind_value, VALUE scale_value)
+static VALUE lulu_rb_api_set_info(VALUE self_value, VALUE kind_value, VALUE scale_value)
 #define ARGC_set_info 2
 {
     MARKER_LIST_FOR_VALUE_DECL(self);
@@ -144,7 +144,7 @@ static VALUE rb_api_set_info(VALUE self_value, VALUE kind_value, VALUE scale_val
     return self_value;
 }
 
-static VALUE rb_api_add(VALUE self_value, VALUE x_value, VALUE y_value, VALUE size_value)
+static VALUE lulu_rb_api_add(VALUE self_value, VALUE x_value, VALUE y_value, VALUE size_value)
 #define ARGC_add 3
 {
     MARKER_LIST_FOR_VALUE_DECL(self);
@@ -152,14 +152,14 @@ static VALUE rb_api_add(VALUE self_value, VALUE x_value, VALUE y_value, VALUE si
     return INT2FIX(self->size);
 }
 
-static VALUE rb_api_length(VALUE self_value)
+static VALUE lulu_rb_api_length(VALUE self_value)
 #define ARGC_length 0
 {
     MARKER_LIST_FOR_VALUE_DECL(self);
     return INT2FIX(self->size);
 }
 
-static VALUE rb_api_marker(VALUE self_value, VALUE index)
+static VALUE lulu_rb_api_marker(VALUE self_value, VALUE index)
 #define ARGC_marker 1
 {
     MARKER_LIST_FOR_VALUE_DECL(self);
@@ -175,7 +175,7 @@ static VALUE rb_api_marker(VALUE self_value, VALUE index)
     return Qnil;
 }
 
-static VALUE rb_api_parts(VALUE self_value, VALUE index)
+static VALUE lulu_rb_api_parts(VALUE self_value, VALUE index)
 #define ARGC_parts 1
 {
     MARKER_LIST_FOR_VALUE_DECL(self);
@@ -197,7 +197,7 @@ static VALUE rb_api_parts(VALUE self_value, VALUE index)
     return Qnil;
 }
 
-static VALUE rb_api_deleted(VALUE self_value, VALUE index)
+static VALUE lulu_rb_api_deleted(VALUE self_value, VALUE index)
 #define ARGC_deleted 1
 {
     MARKER_LIST_FOR_VALUE_DECL(self);
@@ -207,7 +207,7 @@ static VALUE rb_api_deleted(VALUE self_value, VALUE index)
     return Qnil;
 }
 
-static VALUE rb_api_compress(VALUE self_value)
+static VALUE lulu_rb_api_compress(VALUE self_value)
 #define ARGC_compress 0
 {
     MARKER_LIST_FOR_VALUE_DECL(self);
@@ -215,23 +215,25 @@ static VALUE rb_api_compress(VALUE self_value)
     return INT2FIX(self->size);
 }
 
-static VALUE rb_api_merge(VALUE self_value)
+static VALUE lulu_rb_api_merge(VALUE self_value)
 #define ARGC_merge 0
 {
     MARKER_LIST_FOR_VALUE_DECL(self);
-    ensure_headroom(self);
     compress(self);
+    ensure_headroom(self);
     self->size = merge_markers_fast(self->info, self->markers, self->size);
     return INT2FIX(self->size);
 }
 
-#define FUNCTION_TABLE_ENTRY(Name) { #Name, RUBY_METHOD_FUNC(rb_api_ ## Name), ARGC_ ## Name }
+#define FUNCTION_TABLE_ENTRY(Name) { #Name, RUBY_METHOD_FUNC(lulu_rb_api_ ## Name), ARGC_ ## Name }
 
-static struct ft_entry {
+struct ft_entry {
     const char *name;
     VALUE (*func)(ANYARGS);
     int argc;
-} function_table[] = {
+};
+
+static struct ft_entry function_table[] = {
     FUNCTION_TABLE_ENTRY(add),
     FUNCTION_TABLE_ENTRY(compress),
     FUNCTION_TABLE_ENTRY(clear),
@@ -246,10 +248,12 @@ static struct ft_entry {
 
 #define STRING_CONST_TABLE_ENTRY(Name) { #Name, Name }
 
-static struct sct_entry {
+struct sct_entry {
     const char *name;
     const char *val;
-} string_const_table[] = {
+};
+
+static struct sct_entry string_const_table[] = {
     STRING_CONST_TABLE_ENTRY(EXT_VERSION)
 };
 
@@ -257,7 +261,7 @@ void Init_lulu(void)
 {
     VALUE module = rb_define_module("Lulu");
     VALUE klass = rb_define_class_under(module, "MarkerList", rb_cObject);
-    rb_define_alloc_func(klass, rb_api_new_marker_list);
+    rb_define_alloc_func(klass, lulu_rb_api_new_marker_list);
 
     for (int i = 0; i < STATIC_ARRAY_SIZE(function_table); i++) {
         struct ft_entry *e = function_table + i;

data/ext/lulu/marker.h

@@ -8,6 +8,8 @@
 #ifndef MARKER_H_
 #define MARKER_H_
 
+#include "namespace.h"
+
 typedef double MARKER_COORD;
 typedef double MARKER_DISTANCE;
 /**
@@ -57,14 +59,31 @@ typedef struct marker_extent_s {
 #define mr_s(M) ((M)->y - (M)->r)
 #define mr_n(M) ((M)->y + (M)->r)
 
+#define mr_init(Marker, NMarkers)   NAME(mr_init)(Marker, NMarkers)
 void mr_init(MARKER *marker, int n_markers);
+
+#define mr_reset_parts(Marker) NAME(mr_reset_parts)(Marker)
 void mr_reset_parts(MARKER *marker);
+
+#define mr_info_init(Info)  NAME(mr_info_init)(Info)
 void mr_info_init(MARKER_INFO *info);
+
+#define mr_info_set(Info, Kind, Scale) NAME(mr_info_set)(Info, Kind, Scale)
 void mr_info_set(MARKER_INFO *info, MARKER_KIND kind, MARKER_DISTANCE scale);
+
+#define mr_set(Info, Marker, X, Y, Size)    NAME(mr_set)(Info, Marker, X, Y, Size)
 void mr_set(MARKER_INFO *info, MARKER *marker, MARKER_COORD x, MARKER_COORD y, MARKER_SIZE size);
+
+#define mr_merge(Info, Markers, Merged, A, B)   NAME(mr_merge)(Info, Markers, Merged, A, B)
 void mr_merge(MARKER_INFO *info, MARKER *markers, int merged, int a, int b);
+
+#define mr_distance(Info, A, B)     NAME(mr_distance)(Info, A, B)
 MARKER_DISTANCE mr_distance(MARKER_INFO *info, MARKER *a, MARKER *b);
+
+#define size_to_radius(Info, Size)  NAME(size_to_radius)(Info, Size)
 MARKER_DISTANCE size_to_radius(MARKER_INFO *info, MARKER_SIZE size);
+
+#define get_marker_array_extent(A, NMarkers, Ext)   NAME(get_marker_array_extent)(A, NMarkers, Ext)
 void get_marker_array_extent(MARKER *a, int n_markers, MARKER_EXTENT *ext);
 
 #endif /* MARKER_H_ */

data/ext/lulu/merger.h

@@ -8,8 +8,10 @@
 #ifndef MERGER_H_
 #define MERGER_H_
 
+#include "namespace.h"
 #include "marker.h"
 
+#define merge_markers_fast(Info, Markers, MarkersSize)  NAME(merge_markers_fast)(Info, Markers, MarkersSize)
 int merge_markers_fast(MARKER_INFO *info, MARKER *markers, int markers_size);
 
 #endif /* MERGER_H_ */

data/ext/lulu/namespace.h

@@ -0,0 +1,14 @@
+/*
+ * namespace.h
+ *
+ *  Created on: Apr 3, 2014
+ *      Author: generessler
+ */
+
+#ifndef NAMESPACE_H_
+#define NAMESPACE_H_
+
+#define NAME(X) lulu_ ## X
+
+#endif /* NAMESPACE_H_ */
+

data/ext/lulu/pq.h

@@ -8,6 +8,8 @@
 #ifndef PRIORITY_QUEUE_H_
 #define PRIORITY_QUEUE_H_
 
+#include "namespace.h"
+
 typedef double PRIORITY_QUEUE_VALUE;
 
 typedef struct priority_queue_s {
@@ -19,37 +21,46 @@ typedef struct priority_queue_s {
 } PRIORITY_QUEUE;
 
 // Initialize a newly allocated priority queue structure.
+#define pq_init(Q)  NAME(pq_init)(Q)
 void pq_init(PRIORITY_QUEUE *q);
 
 #define PRIORITY_QUEUE_DECL(Q) PRIORITY_QUEUE Q[1]; pq_init(Q)
 
 // Clear a previously initialized and possibly set up priority queue, returning
 // it to the initialized state but with all resourced freed.
+#define pq_clear(Q) NAME(pq_clear)(Q)
 void pq_clear(PRIORITY_QUEUE *q);
 
 // Build the queue with given pre-allocated and filled array of values.
+#define pq_set_up(Q, Values, Size)   NAME(pq_set_up)(Q, Values, Size)
 void pq_set_up(PRIORITY_QUEUE *q, PRIORITY_QUEUE_VALUE *values, int size);
 
 // Build the queue with given pre-allocated and filled array of values
 // and given heap indices.  Note the indices are owned by the heap
 // after set up and will be freed with the heap.
+#define pq_set_up_heap(Q, Heap, Size, Values, MaxSize)  NAME(pq_set_up_heap)(Q, Heap, Size, Values, MaxSize)
 void pq_set_up_heap(PRIORITY_QUEUE *q,
         int *heap, int size,
         PRIORITY_QUEUE_VALUE *values, int max_size);
 
 // Return the index of the minimum value on the queue.
+#define pq_peek_min(Q)  NAME(pq_peek_min)(Q)
 int pq_peek_min(PRIORITY_QUEUE *q);
 
 // Remove and return the index of the minimum value on the queue.
+#define pq_get_min(Q)   NAME(pq_get_min)(Q)
 int pq_get_min(PRIORITY_QUEUE *q);
 
 // Update the queue given that the value at index i has changed.
+#define pq_update(Q, I) NAME(pq_update)(Q, I)
 void pq_update(PRIORITY_QUEUE *q, int i);
 
 // Add a new value with index i into the queue.
+#define pq_add(Q, I)    NAME(pq_add)(Q, I)
 void pq_add(PRIORITY_QUEUE *q, int i);
 
 // Delete index i from the heap, making the corresponding key an orphan.
+#define pq_delete(Q, I) NAME(pq_delete)(Q, I)
 void pq_delete(PRIORITY_QUEUE *q, int i);
 
 // Return an array containing indices currently in the heap.

data/ext/lulu/qt.h

@@ -8,6 +8,7 @@
 #ifndef QT_H_
 #define QT_H_
 
+#include "namespace.h"
 #include "marker.h"
 
 typedef struct node_s {
@@ -46,13 +47,27 @@ typedef struct quadtree_s {
 
 #define QUADTREE_DECL(Name) QUADTREE Name[1]; qt_init(Name)
 
+#define qt_init(T)  NAME(qt_init)(T)
 void qt_init(QUADTREE *qt);
+
+#define qt_setup(T, MaxDepth, X, Y, W, H, Info) NAME(qt_setup)(T, MaxDepth, X, Y, W, H, Info)
 void qt_setup(QUADTREE *qt, int max_depth,
         MARKER_COORD x, MARKER_COORD y, MARKER_DISTANCE w, MARKER_DISTANCE h,
         MARKER_INFO *info);
+
+#define qt_clear(T) NAME(qt_clear)(T)
+void qt_clear(QUADTREE *qt);
+
+#define qt_insert(T, Marker)    NAME(qt_insert)(T, Marker)
 void qt_insert(QUADTREE *qt, MARKER *marker);
+
+#define qt_delete(T, Marker)    NAME(qt_delete)(T, Marker)
 void qt_delete(QUADTREE *qt, MARKER *marker);
+
+#define qt_nearest(T, Marker)   NAME(qt_nearest)(T, Marker)
 MARKER *qt_nearest(QUADTREE *qt, MARKER *marker);
+
+#define qt_nearest_wrt(Markers, T, A)   NAME(qt_nearest_wrt)(Markers, T, A)
 int qt_nearest_wrt(MARKER *markers, QUADTREE *qt, int a);
 
 #endif /* QT_H_ */

data/ext/lulu/test.h

@@ -8,6 +8,8 @@
 #ifndef TEST_H_
 #define TEST_H_
 
+#ifdef UNIT_TESTS
+
 #include "marker.h"
 
 int emit_markers(const char *name, MARKER *markers, int n_markers);
@@ -22,4 +24,6 @@ int qt_test(int size);
 int pq_test(int size);
 int merge_test(int test_markers_size);
 
+#endif
+
 #endif /* TEST_H_ */

data/ext/lulu/utility.h

@@ -8,6 +8,8 @@
 #ifndef UTILITY_H_
 #define UTILITY_H_
 
+#include "namespace.h"
+
 #define STATIC_ARRAY_SIZE(A) ((int)(sizeof A / sizeof A[0]))
 
 #ifdef LULU_STD_C
@@ -30,7 +32,10 @@
     Ptr = NULL; \
 } while (0)
 
+#define safe_malloc(Size, File, Line)   NAME(safe_malloc)(Size, File, Line)
 void *safe_malloc(size_t size, const char *file, int line);
+
+#define safe_realloc(P, Size, File, Line)   NAME(safe_realloc)(P, Size, File, Line)
 void *safe_realloc(void *p, size_t size, const char *file, int line);
 
 #endif
@@ -72,6 +77,7 @@ void trace(const char *fmt, ...);
 #define TRACE(Args)
 #endif
 
+#define high_bit_position(N)    NAME(high_bit_position)(N)
 int high_bit_position(unsigned n);
 
 #endif /* UTILITY_H_ */

data/lib/lulu/version.rb

@@ -1,3 +1,3 @@
 module Lulu
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/lib/marker_list_spec.rb

@@ -3,14 +3,7 @@ require 'spec_helper'
 # Test the Lulu API.
 describe Lulu::MarkerList do
 
-  TEST_SIZE = 10000
-
-  let(:list) do
-    list = Lulu::MarkerList.new
-    srand(42)
-    TEST_SIZE.times{ |n| list.add(Random.rand(1000), Random.rand(1000), Random.rand(100)) }
-    list
-  end
+  let(:list) { new_marker_list }
 
   it 'should have length matching number of markers added' do
     list.length.should == TEST_SIZE
@@ -36,4 +29,8 @@ describe Lulu::MarkerList do
     n.should == list.compress
   end
 
+  it 'should perform fine over multiple runs with unit increases in input length to provoke memory bugs' do
+    1000.times { |i| new_marker_list(10000 + i).merge }
+  end
+
 end

data/spec/spec_helper.rb

@@ -1 +1,10 @@
-require 'lulu'
+require 'lulu'
+
+TEST_SIZE = 10000
+
+def new_marker_list(size = TEST_SIZE)
+  list = Lulu::MarkerList.new
+  srand(42)
+  TEST_SIZE.times{ |n| list.add(Random.rand(1000), Random.rand(1000), Random.rand(100)) }
+  list
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lulu
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Gene Ressler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,6 +96,7 @@ files:
 - ext/lulu/marker.h
 - ext/lulu/merger.c
 - ext/lulu/merger.h
+- ext/lulu/namespace.h
 - ext/lulu/pq.c
 - ext/lulu/pq.h
 - ext/lulu/qt.c