spatial_stats 1.0.4 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 053a1b234d54d2231e35c7eb74547b086f7415fc96190bc7d3afb25f51dd879e
-  data.tar.gz: a85d682009559812fb20695c5bea8f2978acf49a12d0b3df2506d58ced8c5e77
+  metadata.gz: 6d7d2e6e57d8059f55f1bb9128f670ae02da382005a80111410a4c72c69ce04b
+  data.tar.gz: df3018cdf87fd2d5d19cb788855252497466bfd383cb13a078c8f91693a4b2c7
 SHA512:
-  metadata.gz: 868ec3b50f4b1b9fc261d6dd94439bba62a08d4c496a48d164c41590d1cd5a088c87de682a7cb96bcf4dbe0d534b5cf35e136e39d42c505ba8cc1f4c3569a3d4
-  data.tar.gz: b767cc6ed7f22ce4096965a6172f77d21a348d51bd84dc3b96f0d51bf16e2f4f92617e21e9bcda1a36eeda2cd5c07c51452dd55d9e5a62567e206bf7a06c8fe0
+  metadata.gz: e95cf8d912d4f6a606871f8f78484157f2aa234ce500f343ec0a7a722b6b470c6e89f733d6e103d27f2d9bd133882aa22af88a0ff67fc62b1358c6df38b7dab5
+  data.tar.gz: 53738b1d1cdc77a840eea583baaa26a77f3b50ab8b540822f3da20b8c88801de2666a22944d244b2bd896b3edae0b2d49ea068c1f6507ba38c4170cefa2a42cb

data/ext/spatial_stats/csr_matrix.c

@@ -22,9 +22,17 @@ size_t csr_matrix_memsize(const void *ptr)
     return sizeof(*csr);
 }
 
+const rb_data_type_t csr_matrix_type = {
+    "SpatialStats::Weights::CSRMatrix",
+    {NULL, csr_matrix_free, csr_matrix_memsize},
+    0,
+    0,
+    RUBY_TYPED_FREE_IMMEDIATELY
+};
+
 VALUE csr_matrix_alloc(VALUE self)
 {
-    csr_matrix *csr = malloc(sizeof(csr_matrix));
+    csr_matrix *csr = ALLOC(csr_matrix);
     return TypedData_Wrap_Struct(self, &csr_matrix_type, csr);
 }
 
@@ -64,7 +72,7 @@ void mat_to_sparse(csr_matrix *csr, VALUE data, VALUE keys, VALUE num_rows)
         // if it is, add array len to nnz
         row = rb_hash_aref(data, key);
         Check_Type(row, T_ARRAY);
-        nnz += rb_array_len(row);
+        nnz += (int)RARRAY_LEN(row); // Explicit cast to int
     }
 
     values = malloc(sizeof(double) * nnz);
@@ -82,7 +90,7 @@ void mat_to_sparse(csr_matrix *csr, VALUE data, VALUE keys, VALUE num_rows)
 
         key = rb_ary_entry(keys, i);
         row = rb_hash_aref(data, key);
-        m = rb_array_len(row);
+        m = (int)RARRAY_LEN(row); // Explicit cast to int
 
         for (j = 0; j < m; j++)
         {
@@ -140,7 +148,7 @@ VALUE csr_matrix_initialize(VALUE self, VALUE data, VALUE num_rows)
     keys = rb_funcall(data, rb_intern("keys"), 0);
 
     // check dimensions are correct
-    if (NUM2INT(num_rows) != rb_array_len(keys))
+    if (NUM2INT(num_rows) != (int)RARRAY_LEN(keys)) // Explicit cast to int
     {
         rb_raise(rb_eArgError, "n_rows != keys.size, check your dimensions");
     }
@@ -249,7 +257,7 @@ VALUE csr_matrix_mulvec(VALUE self, VALUE vec)
 
     TypedData_Get_Struct(self, csr_matrix, &csr_matrix_type, csr);
 
-    if (rb_array_len(vec) != csr->n)
+    if (RARRAY_LEN(vec) != csr->n)
     {
         rb_raise(rb_eArgError, "Dimension Mismatch CSRMatrix.n != vec.size");
     }
@@ -294,7 +302,7 @@ VALUE csr_matrix_dot_row(VALUE self, VALUE vec, VALUE row)
 
     TypedData_Get_Struct(self, csr_matrix, &csr_matrix_type, csr);
 
-    if (rb_array_len(vec) != csr->n)
+    if (RARRAY_LEN(vec) != csr->n)
     {
         rb_raise(rb_eArgError, "Dimension Mismatch CSRMatrix.n != vec.size");
     }

data/ext/spatial_stats/csr_matrix.h

@@ -14,13 +14,7 @@ typedef struct csr_matrix
 void csr_matrix_free(void *mat);
 size_t csr_matrix_memsize(const void *ptr);
 
-// ruby VALUE for csr_matrix
-static const rb_data_type_t csr_matrix_type = {
-    "SpatialStats::Weights::CSRMatrix",
-    {NULL, csr_matrix_free, csr_matrix_memsize},
-    0,
-    0,
-    RUBY_TYPED_FREE_IMMEDIATELY};
+extern const rb_data_type_t csr_matrix_type;
 
 void mat_to_sparse(csr_matrix *csr, VALUE data, VALUE keys, VALUE num_rows);
 VALUE csr_matrix_alloc(VALUE self);

data/ext/spatial_stats/spatial_stats.c

@@ -15,7 +15,7 @@ void Init_spatial_stats()
 {
     VALUE spatial_stats_mod = rb_define_module("SpatialStats");
     VALUE weights_mod = rb_define_module_under(spatial_stats_mod, "Weights");
-    VALUE csr_matrix_class = rb_define_class_under(weights_mod, "CSRMatrix", rb_cData);
+    VALUE csr_matrix_class = rb_define_class_under(weights_mod, "CSRMatrix", rb_cObject);
 
     rb_define_alloc_func(csr_matrix_class, csr_matrix_alloc);
     rb_define_method(csr_matrix_class, "initialize", csr_matrix_initialize, 2);

data/lib/spatial_stats/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SpatialStats
-  VERSION = '1.0.4'
+  VERSION = '2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spatial_stats
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Keith Doggett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-19 00:00:00.000000000 Z
+date: 2024-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -42,14 +42,14 @@ dependencies:
   name: activerecord-postgis-adapter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
 - !ruby/object:Gem::Dependency
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.8.3
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -182,14 +182,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: An ActiveRecord/PostGIS extension that provides statistical methods to spatial