spatial_stats 0.2.2 → 1.0.0

data/lib/spatial_stats/weights/weights_matrix.rb

@@ -11,13 +11,12 @@ module SpatialStats
       ##
       # A new instance of WeightsMatrix
       #
-      # @param [Array] keys ordered list of keys used in weights
-      # @param [Hash] weights hash of format +{key: [{j_id: neighbor_key, weight: 1}]}+ that describe the relations between neighbors
+      # @param [Hash] weights hash of format +{key: [{id: neighbor_key, weight: 1}]}+ that describe the relations between neighbors
       #
       # @return [WeightsMatrix]
-      def initialize(keys, weights)
-        @keys = keys
+      def initialize(weights)
         @weights = weights
+        @keys = weights.keys
         @n = keys.size
       end
       attr_accessor :keys, :weights, :n
@@ -26,41 +25,76 @@ module SpatialStats
       # Compute the n x n Numo::Narray of the weights hash.
       #
       # @example
-      #   hash = {1 => [{j_id: 2, weight: 1}], 2 => [{j_id: 1, weight: 1},
-      #       {j_id: 3, weight: 1}], 3 => [{j_id: 2, weight: 1}]}
+      #   hash = {1 => [{id: 2, weight: 1}], 2 => [{id: 1, weight: 1},
+      #       {id: 3, weight: 1}], 3 => [{id: 2, weight: 1}]}
       #   wm = WeightsMatrix.new(hash.keys, hash)
       #   wm.full
       #   # => Numo::DFloat[[0, 1, 0], [1, 0, 1], [0, 1, 0]]
       #
       # @return [Numo::DFloat]
-      def full
-        # returns a square matrix Wij using @keys as the order of items
-        @full ||= begin
-          rows = []
-          @keys.each do |i|
-            # iterate through each key to get the data for the row
-            row = @keys.map do |j|
-              neighbors = @weights[i]
-              match = neighbors.find { |neighbor| neighbor[:j_id] == j }
-              if match
-                match[:weight]
-              else
-                0
-              end
+      def dense
+        @dense ||= begin
+          mat = Numo::DFloat.zeros(n, n)
+          keys.each_with_index do |key, i|
+            neighbors = weights[key]
+            neighbors.each do |neighbor|
+              j = keys.index(neighbor[:id])
+              weight = neighbor[:weight]
+
+              # assign the weight to row and column
+              mat[i, j] = weight
             end
-            rows << row
           end
 
-          Numo::DFloat.cast(rows)
+          mat
         end
       end
 
       ##
-      # Row standardized version of +#full+
+      # Compute the CSR representation of the weights.
       #
-      # @return [Numo::DFloat]
-      def standardized
-        @standardized ||= full.row_standardized
+      # @return [CSRMatrix]
+      def sparse
+        @sparse ||= CSRMatrix.new(dense.to_a.flatten, n, n)
+      end
+
+      ##
+      # Row standardized version of the weights matrix.
+      # Will return a new version of the weights matrix with standardized
+      # weights.
+      #
+      # @return [WeightsMatrix]
+      def standardize
+        new_weights = weights
+
+        new_weights.transform_values do |neighbors|
+          sum = neighbors.reduce(0.0) { |acc, neighbor| acc + neighbor[:weight] }
+
+          neighbors.map do |neighbor|
+            hash = neighbor
+            hash[:weight] /= sum
+          end
+        end
+
+        self.class.new(new_weights)
+      end
+
+      ##
+      # Windowed version of the weights matrix.
+      # If a row already has an entry for itself, it will be skipped.
+      #
+      # @return [WeightsMatrix]
+      def window
+        new_weights = weights
+
+        new_weights.each do |key, neighbors|
+          unless neighbors.find { |neighbor| neighbor[:id] == key }
+            new_neighbors = (neighbors << { id: key, weight: 1 })
+            new_weights[key] = new_neighbors.sort_by { |neighbor| neighbor[:id] }
+          end
+        end
+
+        self.class.new(new_weights)
       end
     end
   end

data/lib/spatial_stats.rb

@@ -6,6 +6,7 @@ require 'spatial_stats/global'
 require 'spatial_stats/local'
 require 'spatial_stats/narray_ext'
 require 'spatial_stats/queries'
+require 'spatial_stats/spatial_stats' # c extensions
 require 'spatial_stats/utils'
 require 'spatial_stats/weights'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spatial_stats
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Keith Doggett
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-03 00:00:00.000000000 Z
+date: 2020-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: numo-narray
@@ -80,6 +80,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
@@ -115,12 +129,17 @@ description: An ActiveRecord/PostGIS extension that provides statistical methods
 email:
 - keith.doggett887@gmail.com
 executables: []
-extensions: []
+extensions:
+- ext/spatial_stats/extconf.rb
 extra_rdoc_files: []
 files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- ext/spatial_stats/csr_matrix.c
+- ext/spatial_stats/csr_matrix.h
+- ext/spatial_stats/extconf.rb
+- ext/spatial_stats/spatial_stats.c
 - lib/spatial_stats.rb
 - lib/spatial_stats/enumerable_ext.rb
 - lib/spatial_stats/global.rb
@@ -139,6 +158,7 @@ files:
 - lib/spatial_stats/queries/variables.rb
 - lib/spatial_stats/queries/weights.rb
 - lib/spatial_stats/railtie.rb
+- lib/spatial_stats/spatial_stats.so
 - lib/spatial_stats/utils.rb
 - lib/spatial_stats/utils/lag.rb
 - lib/spatial_stats/version.rb
@@ -151,6 +171,8 @@ homepage: https://www.github.com/keithdoggett/spatial_stats
 licenses:
 - MIT
 metadata:
+  homepage_uri: https://www.github.com/keithdoggett/spatial_stats
+  source_code_uri: https://www.github.com/keithdoggett/spatial_stats
   documentation_uri: https://keithdoggett.github.io/spatial_stats/
 post_install_message: 
 rdoc_options: []