librtree 0.9.1 → 1.0.1

data/ext/rtree/lib/spvol.c

@@ -0,0 +1,48 @@
+/* Autogenerated by spvol.py, do not edit */
+
+#include "spvol.h"
+
+int spvol(size_t dim, double *val)
+{
+  static const double table[] = {
+    0x1.0000000000000p+1,
+    0x1.921fb54442d18p+1,
+    0x1.0c152382d7366p+2,
+    0x1.3bd3cc9be45dep+2,
+    0x1.50e1eb50f3976p+2,
+    0x1.4abbce625be53p+2,
+    0x1.2e6290cef4eedp+2,
+    0x1.03c1f081b5ac4p+2,
+    0x1.a6358a2b69ee8p+1,
+    0x1.466bc6775aae2p+1,
+    0x1.e254a1c03f10dp+0,
+    0x1.55d3c7e3cbffap+0,
+    0x1.d23deea12eccap-1,
+    0x1.32d2cce62bd86p-1,
+    0x1.86991141a8ff6p-2,
+    0x1.e1f506891babbp-3,
+    0x1.20bab3dc8101bp-3,
+    0x1.50783487ee782p-4,
+    0x1.7dec9576c3b57p-5,
+    0x1.a6d1f2a204a8cp-6,
+    0x1.c915f468284fep-7,
+    0x1.e3074fde8871fp-8,
+    0x1.f378691d9b076p-9,
+    0x1.f9d38a3763cc3p-10,
+    0x1.f61f536576352p-11,
+    0x1.e8f434d018d63p-12,
+    0x1.d3658f946c006p-13,
+    0x1.b6e24f44b128fp-14,
+    0x1.95114f4a6c2b5p-15,
+    0x1.6fadb9f155744p-16,
+    0x1.4866e45924c72p-17,
+    0x1.20c62c2f2d7f5p-18,
+  };
+  static const size_t table_size = sizeof(table) / sizeof(double);
+  if (dim < 1) return 1;
+  size_t n = dim - 1;
+  if (n >= table_size) return 1;
+  *val = table[n];
+  return 0;
+}
+

data/ext/rtree/lib/spvol.h

@@ -0,0 +1,13 @@
+/*
+  spvol.h
+  Copyright (c) J.J. Green 2020
+*/
+
+#ifndef SPVOL_H
+#define SPVOL_H
+
+#include <stddef.h>
+
+int spvol(size_t, double*);
+
+#endif

data/ext/rtree/lib/state.c

@@ -0,0 +1,169 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "rtree/state.h"
+#include "rtree/branch.h"
+#include "rtree/node.h"
+
+#include "page.h"
+#include "constants.h"
+#include "spvol.h"
+
+#include <errno.h>
+#include <string.h>
+
+#ifdef HAVE_TGMATH_H
+#include <tgmath.h>
+#else
+#include <math.h>
+#endif
+
+#ifdef HAVE_UNISTD_H
+#include <unistd.h>
+#endif
+
+
+#define SPLIT_MASK ((1 << 2) - 1)
+#define SPLIT_SHIFT 0
+
+static state_flags_t flags_split(state_flags_t flags)
+{
+  return (flags << SPLIT_SHIFT) & SPLIT_MASK;
+}
+
+state_flags_t state_split(const state_t *state)
+{
+  return flags_split(state->flags);
+}
+
+#define NODE_PAGE_MASK ((1 << 8) - 1)
+#define NODE_PAGE_SHIFT 2
+
+static state_flags_t flags_node_page(state_flags_t flags)
+{
+  return (flags >> NODE_PAGE_SHIFT) & NODE_PAGE_MASK;
+}
+
+state_flags_t state_node_page(const state_t *state)
+{
+  return flags_node_page(state->flags);
+}
+
+/*
+  For dim 2 with floats and 4K page-size we find that a node-page
+  of 8 gives reasonable performance; here we guess a formula which
+  scales the way you would expect and choose the parameter 64 so that
+  it gives  8 in the dim 2 float case.  No doubt one could do better
+  with a case-by-case optimisation, but there are a lot of cases to
+  consider, look at that later ...
+*/
+
+static size_t node_page_default(size_t dims, size_t npg, size_t psz)
+{
+  if (npg != 0) return npg;
+  size_t guess = psz / (dims * SIZEOF_RTREE_COORD_T * 64);
+  return guess ? guess : 1;
+}
+
+state_t* state_new(size_t dims, state_flags_t flags)
+{
+  if (dims == 0)
+    {
+      errno = EDOM;
+      return NULL;
+    }
+
+  size_t psz;
+
+  if (page_size(&psz) != 0)
+    return NULL;
+
+  const size_t
+    npg = node_page_default(dims, flags_node_page(flags), psz),
+    nsz = psz / npg,
+    bsz = branch_sizeof(2 * dims),
+    factor = node_num_branch(nsz, bsz);
+
+  if (factor < 2)
+    {
+      errno = EINVAL;
+      return NULL;
+    }
+
+  double volume;
+
+  if (spvol(dims, &volume) != 0)
+    {
+      errno = EDOM;
+      return NULL;
+    }
+
+  state_t *state = malloc(sizeof(state_t));
+
+  if (state == NULL)
+    {
+      errno = ENOMEM;
+      return NULL;
+    }
+
+  state->dims = dims;
+  state->factor = factor;
+  state->size.page = psz;
+  state->size.branch = bsz;
+  state->size.node = nsz;
+  state->volume = volume;
+  state->flags = flags;
+  state->rectf.spherical_volume = rectf_spherical_volume(dims);
+  state->rectf.combine = rectf_combine(dims);
+
+  return state;
+}
+
+state_t* state_clone(const state_t *src)
+{
+  state_t *dest;
+
+  if ((dest = malloc(sizeof(state_t))) != NULL)
+    {
+      memcpy(dest, src, sizeof(state_t));
+      return dest;
+    }
+
+  errno = ENOMEM;
+  return NULL;
+}
+
+void state_destroy(state_t *state)
+{
+  free(state);
+}
+
+bool state_identical(const state_t *a, const state_t *b)
+{
+  if (a && b)
+    {
+      return
+        (state_dims(a) == state_dims(b)) &&
+        (state_page_size(a) == state_page_size(b)) &&
+        (state_node_size(a) == state_node_size(b)) &&
+        (state_rect_size(a) == state_rect_size(b)) &&
+        (state_branching_factor(a) == state_branching_factor(b));
+    }
+
+  return ! (a || b);
+}
+
+extern size_t state_dims(const state_t*);
+extern size_t state_page_size(const state_t*);
+extern size_t state_node_size(const state_t*);
+extern size_t state_rect_size(const state_t*);
+extern size_t state_branch_size(const state_t*);
+extern size_t state_branching_factor(const state_t*);
+extern double state_unit_sphere_volume(const state_t*);
+extern size_t state_bytes(const state_t*);
+extern rtree_coord_t state_rsv(const state_t*, const rtree_coord_t*);
+extern void state_rc(const state_t*,
+                     const rtree_coord_t*,
+                     const rtree_coord_t*,
+                     rtree_coord_t*);

data/ext/rtree/rtree.c

@@ -55,6 +55,16 @@ static VALUE rt_release(VALUE self)
   return self;
 }
 
+static VALUE rt_empty(VALUE self)
+{
+  rtree_t *rtree;
+  TypedData_Get_Struct(self, rtree_t, &rtree_type, rtree);
+  if (rtree_empty(rtree))
+    return Qtrue;
+  else
+    return Qfalse;
+}
+
 static VALUE rt_height(VALUE self)
 {
   rtree_t *rtree;
@@ -505,6 +515,7 @@ void Init_rtree(void)
   rb_define_method(cRTreeBase, "free", rt_release, 0);
   rb_define_method(cRTreeBase, "clone", rt_clone, 0);
   rb_define_method(cRTreeBase, "update!", rt_update, 0);
+  rb_define_method(cRTreeBase, "empty?", rt_empty, 0);
   rb_define_method(cRTreeBase, "height", rt_height, 0);
   rb_define_method(cRTreeBase, "add_rect", rt_add_rect, 2);
   rb_define_method(cRTreeBase, "search", rt_search, 1);

data/lib/rtree.rb

@@ -14,9 +14,9 @@ require 'fcntl'
 
 # @author RTree J. J. Green
 #
-# A Ruby wrapper around
-# {http://soliton.vm.bytemark.co.uk/pub/jjg/en/code/librtree librtree}
-# implementing the R-tree spatial index of Guttman-Green.
+# A Ruby native extension implementing the R-tree spatial index of
+# Guttman-Green.  The code is an emebded version of
+# {http://soliton.vm.bytemark.co.uk/pub/jjg/en/code/librtree librtree}.
 #
 # Use
 #
@@ -355,7 +355,7 @@ class RTree < RTreeBase
   # @return [Boolean] true if the RTree is empty
   #
   def empty?
-    height.zero?
+    super
   end
 
   # Serialise to JSON stream

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: librtree
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 1.0.1
 platform: ruby
 authors:
 - J.J. Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-21 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.22'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.22'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -103,7 +117,55 @@ extensions:
 - ext/rtree/extconf.rb
 extra_rdoc_files: []
 files:
+- CHANGELOG.md
+- COPYING
+- README.md
 - ext/rtree/extconf.rb
+- ext/rtree/lib/README.md
+- ext/rtree/lib/bindex.c
+- ext/rtree/lib/bindex.h
+- ext/rtree/lib/bounds.h
+- ext/rtree/lib/branch.c
+- ext/rtree/lib/branches.c
+- ext/rtree/lib/bsrt.c
+- ext/rtree/lib/bsrt.h
+- ext/rtree/lib/constants.h
+- ext/rtree/lib/csv.c
+- ext/rtree/lib/csv.h
+- ext/rtree/lib/endianness.h
+- ext/rtree/lib/error.c
+- ext/rtree/lib/json.c
+- ext/rtree/lib/json.h
+- ext/rtree/lib/mk/Hdr.mk
+- ext/rtree/lib/mk/MakeDepend
+- ext/rtree/lib/mk/Obj.mk
+- ext/rtree/lib/node.c
+- ext/rtree/lib/package.c
+- ext/rtree/lib/page.c
+- ext/rtree/lib/page.h
+- ext/rtree/lib/postscript.c
+- ext/rtree/lib/rect.c
+- ext/rtree/lib/rectf.c
+- ext/rtree/lib/rtree-base.c
+- ext/rtree/lib/rtree.h
+- ext/rtree/lib/rtree/branch.h
+- ext/rtree/lib/rtree/branches.h
+- ext/rtree/lib/rtree/error.h
+- ext/rtree/lib/rtree/extent.h
+- ext/rtree/lib/rtree/node.h
+- ext/rtree/lib/rtree/package.h
+- ext/rtree/lib/rtree/postscript.h
+- ext/rtree/lib/rtree/rect.h
+- ext/rtree/lib/rtree/rectf.h
+- ext/rtree/lib/rtree/search.h
+- ext/rtree/lib/rtree/state.h
+- ext/rtree/lib/rtree/types.h
+- ext/rtree/lib/search.c
+- ext/rtree/lib/split.c
+- ext/rtree/lib/split.h
+- ext/rtree/lib/spvol.c
+- ext/rtree/lib/spvol.h
+- ext/rtree/lib/state.c
 - ext/rtree/rtree.c
 - lib/rtree.rb
 homepage: https://gitlab.com/jjg/librtree-ruby
@@ -126,7 +188,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- The librtree library (1.0.6 or later)
+- The Jansson library
 rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4