librtree 0.8.1 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 126a8974cacf26f7c8603d161d4d7de0c121abdf5a0bc45b8244178156cbdca7
-  data.tar.gz: 1dd3115fb8a2eb08dd5a8968ad201978b2a956dde48e210cf648027365d91fa9
+  metadata.gz: 9f559b211be3e93ded31a86b61c68ea28cdea151ef62d0c64a79aa38131fa5a7
+  data.tar.gz: 7df99f8990a461d60e2276a20891be62c1dc27e6279a2226f2fec6d63d30f5dd
 SHA512:
-  metadata.gz: 148bffff79b038c562620bd583f6437bced0426af7210a3a289023162634f681ef1579b523cab78a6ef057be07075868b3e49b06cc48bc4747fdedfd2d0380d8
-  data.tar.gz: 375703fbd60f42cf8722188c6fd654bcbc7ceec5886b19705c5993140fb0973a7c68c14df89e8255cef467e13c586579e94691557847ad5b6168bbfb80075eb5
+  metadata.gz: d6c204e2ba3a7b26fe2ab8ba1148b159a21cc697061d672fa2ccff85924dc56c2a9f19b6241d68e5ec96e3b5f955ffc617ecfc26bc9db94cb0f2190e3178e693
+  data.tar.gz: c831af24c76a719bfae623a5b525840cf910065426833589d8c04160524e576daf4ad13daf2793387931599187ad80f6bc596aaf21b72334e5230a449cda818d

data/ext/rtree/rtree.c

@@ -8,7 +8,7 @@
 
 typedef struct
 {
-  void *rtree;
+  rtree_t *rtree;
 } lrt_t;
 
 static void lrt_free(void *p)
@@ -341,6 +341,51 @@ static VALUE lrt_clone(VALUE self)
   return obj;
 }
 
+static VALUE state_size_access(VALUE self, size_t (*f)(const state_t*))
+{
+  lrt_t *lrt;
+  Data_Get_Struct(self, lrt_t, lrt);
+  return INT2NUM(f(lrt->rtree->state));
+}
+
+static VALUE lrt_dim(VALUE self)
+{
+  return state_size_access(self, state_dims);
+}
+
+static VALUE lrt_page_size(VALUE self)
+{
+  return state_size_access(self, state_page_size);
+}
+
+static VALUE lrt_node_size(VALUE self)
+{
+  return state_size_access(self, state_node_size);
+}
+
+static VALUE lrt_rect_size(VALUE self)
+{
+  return state_size_access(self, state_rect_size);
+}
+
+static VALUE lrt_branch_size(VALUE self)
+{
+  return state_size_access(self, state_branch_size);
+}
+
+static VALUE lrt_branching_factor(VALUE self)
+{
+  return state_size_access(self, state_branching_factor);
+}
+
+static VALUE lrt_unit_sphere_volume(VALUE self)
+{
+  lrt_t *lrt;
+  Data_Get_Struct(self, lrt_t, lrt);
+  return DBL2NUM(state_unit_sphere_volume(lrt->rtree->state));
+}
+
+
 void Init_rtree(void)
 {
   VALUE cls = rb_const_get(rb_cObject, rb_intern("RTreeC"));
@@ -356,6 +401,13 @@ void Init_rtree(void)
   rb_define_method(cls, "json_write", lrt_json_write, 1);
   rb_define_method(cls, "bsrt_write", lrt_bsrt_write, 1);
   rb_define_method(cls, "eq?", lrt_identical, 1);
+  rb_define_method(cls, "dim", lrt_dim, 0);
+  rb_define_method(cls, "page_size", lrt_page_size, 0);
+  rb_define_method(cls, "node_size", lrt_node_size, 0);
+  rb_define_method(cls, "rect_size", lrt_rect_size, 0);
+  rb_define_method(cls, "branch_size", lrt_branch_size, 0);
+  rb_define_method(cls, "branching_factor", lrt_branching_factor, 0);
+  rb_define_method(cls, "unit_sphere_volume", lrt_unit_sphere_volume, 0);
   rb_define_singleton_method(cls, "json_read", lrt_json_read, 1);
   rb_define_singleton_method(cls, "bsrt_read", lrt_bsrt_read, 1);
   rb_define_singleton_method(cls, "csv_read", lrt_csv_read, 3);

data/lib/rtree.rb

@@ -1,4 +1,4 @@
-# The C extension
+# The Ruby/C interface, which is not documented in YARD.
 class RTreeC ; end
 
 # @author RTree J. J. Green
@@ -233,7 +233,7 @@ class RTree < RTreeC
   #   is much faster than rebuilding the R-tree; in this Ruby interface
   #   the callback must convert C floats to Ruby, yield them to the
   #   block and then convert the returned Ruby Floats to C; so we would
-  #   expect that it loses much of its competetive advantage when
+  #   expect that it loses much of its competitive advantage when
   #   compared to an R-tree rebuild.
   def update!
     super
@@ -252,7 +252,7 @@ class RTree < RTreeC
   end
 
   # Serialise to JSON stream
-  # @param io [IO] a writeable stream
+  # @param io [IO] a writable stream
   # @return [self]
   # @see .json_read
   # @example Write to file
@@ -262,7 +262,7 @@ class RTree < RTreeC
   end
 
   # Serialise to BSRT (binary serialised R-tree) stream
-  # @param io [IO] a writeable stream
+  # @param io [IO] a writable stream
   # @return [self]
   # @see .bsrt_read
   # @example Write to file
@@ -292,7 +292,7 @@ class RTree < RTreeC
   end
 
   # Equality of RTrees.  This is a rather strict equality,
-  # not only must the tree have the same rectangkes, they
+  # not only must the tree have the same rectangles, they
   # must be in the same order. Certainly {#clone} will produce
   # an instance which is equal in this sense.
   # @return [Boolean] true if the instances are identical
@@ -302,6 +302,42 @@ class RTree < RTreeC
 
   alias_method(:==, :eq?)
 
+  # @return [Integer] the dimension of the R-tree
+  def dim
+    super
+  end
+
+  # @return [Integer] the bytes in a page of memory
+  def page_size
+    super
+  end
+
+  # @return [Integer] the size in bytes of a node
+  def node_size
+    super
+  end
+
+  # @return [Integer] the size in bytes of a rectangle
+  def rect_size
+    super
+  end
+
+  # @return [Integer] the size in bytes of a branch
+  def branch_size
+    super
+  end
+
+  # @return [Integer] the number of branches from each node
+  def branching_factor
+    super
+  end
+
+  # @return [Float] the volume of the unit sphere in the R-tree's
+  #   dimension
+  def unit_sphere_volume
+    super
+  end
+
   private
 
   attr_reader :split, :node_page
@@ -334,6 +370,7 @@ class RTree < RTreeC
     result
   end
 
+
 end
 
 require 'rtree/rtree'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: librtree
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
 platform: ruby
 authors:
 - J.J. Green
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-19 00:00:00.000000000 Z
+date: 2021-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler