geospatial 1.9.0 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d26cdfa5dc37ae8c5babc8fe2f9b75de730d8a77457eeedfd46e19fd78c26cf2
-  data.tar.gz: 87f0287c0c44849e126ed8787342d29bec1d234f53aa4e3a10ed2e211cc1f9c2
+  metadata.gz: 7b9278cfa60e44d9e04909e2b6b8a7525c736a7598b19a04d33765d628b7b0ad
+  data.tar.gz: 109c4077b0697a1725320a006aa3a3a2478ba0974dac557ec6be93e50e4b96be
 SHA512:
-  metadata.gz: 06d18d27fae0ff6effafa7113c95d6a85716b92c0f0c5e228bb5e32e089f2846f46086790e0800f3aabfc4abee36d4e0e58ad5f0b8b24634153e70e652301049
-  data.tar.gz: d77dd4410904c5dc17f0226fd226cec6c394d8fbf291e6cbfc068a167e2b551e2d64b5411d4e20c05c59639ca63efbccc84b559de35dff69a589fc9639b0509b
+  metadata.gz: 86c0acee5bd439284b99d27d1ee8cb86d1d7caed9acadda62ff057f3dc7afe00d4f79685e519360ed1eae3a847360445e8ce585a58155e095a42e5aa983bb883
+  data.tar.gz: 37b7366f03b68f2cca3cc28e36b5160954dfa921ec2a00613a5d8d1a862f1bfb48e52836a822d8ab04b91a1fa1f0286bd83b312e2d124774985d8dd855c5f29a

data/lib/geospatial/histogram.rb

@@ -7,50 +7,61 @@
 module Geospatial
 	# This location is specifically relating to a WGS84 coordinate on Earth.
 	class Histogram
-		def initialize(min = 0, max = 1, scale = 0.1)
+		def initialize(min: 0, max: 1, scale: 0.1)
 			@min = min
 			@max = max
 			@scale = scale
 			
-			@count = ((@max - @min) / @scale).ceil
-			@bins = [0] * @count
+			@count = 0
+			
+			@size = ((@max - @min) / @scale).ceil
+			@bins = [0] * @size
 			@offset = 0
 			@scale = scale
 		end
 		
-		attr :bins
+		attr_accessor :bins
+		
+		attr :count
 		
 		attr :offset
 		attr :scale
 		
+		def [] index
+			@bins[index]
+		end
+		
+		def size
+			@bins.size
+		end
+		
 		def map(value)
 			((value - @min) / @scale)
 		end
 		
 		def unmap(index)
-			@min + ((index + 0.5) * @scale)
+			@min + (index * @scale)
 		end
 		
 		def add(value, amount = 1)
-			index = map(value).floor
+			index = map(value).floor % @size
 			
-			if @bins[index]
+			if !block_given? or yield(index, value)
+				@count += 1
 				@bins[index] += amount
-			else
-				@bins[index] = amount
 			end
 			
-			return self
+			return index
 		end
 		
 		def inspect
 			buffer = String.new("\#<#{self.class}")
 			
 			@bins.each_with_index do |bin, index|
-				buffer << "\n#{unmap(index).to_s.rjust(8)}: #{bin}"
+				buffer << " #{unmap(index)}: #{bin}"
 			end
 			
-			buffer << "\n>"
+			buffer << ">"
 		end
 		
 		def each
@@ -60,11 +71,15 @@ module Geospatial
 				yield unmap(index), value
 			end
 		end
+		
+		def peaks
+			Peaks.new(self)
+		end
 	end
 	
 	class RadialHistogram < Histogram
-		def initialize(center, min = -180, max = 180, scale = 10)
-			super(min, max, scale)
+		def initialize(center, min: -180, max: 180, scale: 1)
+			super(min: min, max: max, scale: scale)
 			
 			@center = center
 		end
@@ -73,4 +88,58 @@ module Geospatial
 			super(point.bearing_from(@center), value)
 		end
 	end
+	
+	class Peaks
+		include Enumerable
+		
+		def initialize(values)
+			@values = values
+			@derivative = []
+			
+			s = @values.size
+			
+			@values.size.times do |i|
+				# Apply the Laplacian of Gaussians to compute the gradient changes:
+				# @derivative << (@values[i-2] * -1) + (@values[i-1] * -1) + (@values[i] * 4) + (@values[i+1-s] * -1) + (@values[i+2-s] * -1)
+				@derivative << (2.0 * @values[i-1]) + (-2.0 * @values[i+1-s])
+			end
+		end
+		
+		attr :derivative
+		
+		def each
+			return to_enum unless block_given?
+			
+			@derivative.each_with_index do |y2, x2|
+				x1 = x2 - 1
+				y1 = @derivative[x1]
+				
+				if (y1 <= 0 and y2 > 0) or (y1 > 0 and y2 <= 0)
+					# There has been a zero crossing, so we have a peak somewhere here:
+					g = (y2.to_f - y1.to_f)
+					m = (-y1.to_f / g)
+					
+					yield x1 + m, g
+				end
+			end
+		end
+		
+		def segments
+			return to_enum(:segments) unless block_given?
+			
+			gradients = self.to_a
+			
+			return if gradients.empty?
+			
+			index, gradient = gradients.first
+			
+			if gradient < 0
+				gradients.push gradients.shift
+			end
+			
+			gradients.each_slice(2) do |up, down|
+				yield up, down
+			end
+		end
+	end
 end

data/lib/geospatial/location.rb

@@ -158,10 +158,10 @@ module Geospatial
 		# calculate distance in metres between us and something else
 		# ref: http://codingandweb.blogspot.co.nz/2012/04/calculating-distance-between-two-points.html
 		def distance_from(other)
-			rlong1 = self.longitude * D2R 
-			rlat1 = self.latitude * D2R 
-			rlong2 = other.longitude * D2R 
-			rlat2 = other.latitude * D2R 
+			rlong1 = self.longitude * D2R
+			rlat1 = self.latitude * D2R
+			rlong2 = other.longitude * D2R
+			rlat2 = other.latitude * D2R
 			
 			dlon = rlong1 - rlong2
 			dlat = rlat1 - rlat2

data/lib/geospatial/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module Geospatial
-	VERSION = "1.9.0"
+	VERSION = "1.10.0"
 end

data/spec/geospatial/histogram_spec.rb

@@ -0,0 +1,30 @@
+#
+# Copyright, 2018, by Samuel G. D. Williams. <http://www.codeotaku.com>
+#
+# This file is part of the "geospatial" project and is released under the MIT license.
+#
+
+require 'geospatial/histogram'
+
+RSpec.describe Geospatial::Histogram do
+	subject do
+		described_class.new(min: -180, max: 180, scale: 10).tap do |histogram|
+			histogram.bins = [0, 80, 540, 101, 29, 1880, 41, 23, 115, 715, 362, 244, 358, 955, 50, 53, 11, 7, 151, 43, 353, 1514, 2, 2, 0, 0, 0, 0, 0, 6, 155, 1737, 959, 1482, 110, 0]
+		end
+	end
+	
+	it "should generate appropriate peaks" do
+		peaks = subject.peaks
+		
+		subject.bins.each_with_index do |v, i|
+			d = subject.peaks.derivative[i]
+			puts "#{i}, #{v}, #{d}"
+		end
+		
+		peaks.each do |x, dx|
+			puts "Peak at #{x}: #{dx}"
+		end
+		
+		puts peaks.segments.to_a.inspect
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geospatial
 version: !ruby/object:Gem::Version
-  version: 1.9.0
+  version: 1.10.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-08 00:00:00.000000000 Z
+date: 2018-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -92,6 +92,7 @@ files:
 - spec/geospatial/filter_spec.rb
 - spec/geospatial/hilbert_curve_spec.rb
 - spec/geospatial/hilbert_traverse_spec.rb
+- spec/geospatial/histogram_spec.rb
 - spec/geospatial/index_spec.rb
 - spec/geospatial/location_spec.rb
 - spec/geospatial/map_index_spec.rb
@@ -134,6 +135,7 @@ test_files:
 - spec/geospatial/filter_spec.rb
 - spec/geospatial/hilbert_curve_spec.rb
 - spec/geospatial/hilbert_traverse_spec.rb
+- spec/geospatial/histogram_spec.rb
 - spec/geospatial/index_spec.rb
 - spec/geospatial/location_spec.rb
 - spec/geospatial/map_index_spec.rb