gtfs_stops_clustering 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bd1d3d49ce47faac98cf22d674adab3d37d0afc1a0b7b55ecba36fe5cde3bac3
-  data.tar.gz: 3b6572e53a4268c2e8def8dd80e8605768e425dd05570827822b80ce0448a100
+  metadata.gz: bf75afd13663d9ebf254d37a24763336b5f411c174f3e8b9743af32c0f3843e9
+  data.tar.gz: 16d82b24fbd8b2170917f87745b68874802f95a151ebe500bf51cba408edd7b1
 SHA512:
-  metadata.gz: a7f35b9d4c35f638b5baac0fa384f50e44db4ef1a20cfc119c74c184b1d900c1207704c1503094fb85c63ea84c9acf283c4cb33e8e7efa7ae13aa5d18e5d5d67
-  data.tar.gz: 6b5c325393774c7f926891445c09f82eda11fbdb1b5528942e31284f2c5c946ceada56aabe82911a8167956a933ffce1ec17fb599a71ace3853e24dcbec059a9
+  metadata.gz: 5efc4d7c36b869092e9147f5b350af0178cf968d08e9df1fe94705e7277f19b6d3bccdd91e94ba4c23735a827125263a2ac7dec5dee4768da6314fe49326ea6b
+  data.tar.gz: 01e7f5fa34685099706249c1f40e64f40986fce2fc64a78f8696d6be967a1bbafdc2c5706830d7b5b423d984df3b232e3fe96acc02507a10d5fbb2f23eaa6792

data/.rubocop.yml

@@ -11,3 +11,12 @@ Style/StringLiteralsInInterpolation:
 
 Layout/LineLength:
   Max: 140
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Metrics/MethodLength:
+  Max: 25
+
+Metrics/AbcSize:
+  Max: 20

data/gtfs_stops_clustering.gemspec

@@ -32,10 +32,6 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  # spec.files = ["lib/gtfs_stops_clustering.rb", "lib/gtfs_stops_clustering/data_import.rb", "lib/gtfs_stops_clustering/dbscan.rb",
-  #               "lib/gtfs_stops_clustering/redis_geodata.rb", "lib/gtfs_stops_clustering/version.rb",
-  #               "lib/gtfs_stops_clustering/input_consistency_checks.rb"]
-
   spec.add_runtime_dependency "csv", "~> 3.2", ">= 3.2.8"
   spec.add_runtime_dependency "distance_measures", "~> 0.0.6"
   spec.add_runtime_dependency "geocoder", "~> 1.8", ">= 1.8.2"

data/lib/gtfs_stops_clustering/dbscan.rb

@@ -4,6 +4,7 @@ require "distance_measures"
 require "text"
 require "geocoder"
 require_relative "redis_geodata"
+require_relative "utils"
 
 # Array class
 class Array
@@ -50,31 +51,26 @@ module DBSCAN
 
         if neighbors.size >= options[:min_points]
           current_cluster += 1
-          point.cluster = current_cluster
-          cluster = [point].push(add_connected(neighbors, current_cluster))
-          clusters[current_cluster] = cluster.flatten
-
-          # Get Cluster Name
-          labels = clusters[current_cluster].map { |e| e.label.capitalize }
-          cluster_name = find_cluster_name(labels)
-
-          # Get Cluster Position
-          cluster_pos = find_cluster_position(clusters[current_cluster])
-
-          clusters[current_cluster].each do |e|
-            e.cluster_name = cluster_name
-            e.cluster_pos = cluster_pos
-          end
+          create_cluster(current_cluster, point, neighbors)
+          update_cluster_info(current_cluster)
         else
           clusters[-1].push(point)
         end
       end
     end
 
-    def results
-      hash = {}
-      @clusters.dup.each { |cluster_index, value| hash[cluster_index] = value.flatten.map(&:items) unless value.flatten.empty? }
-      hash
+    def create_cluster(cluster_index, point, neighbors)
+      point.cluster = cluster_index
+      cluster = [point].push(add_connected(neighbors, cluster_index))
+      @clusters[cluster_index] = cluster.flatten
+    end
+
+    def update_cluster_info(cluster_index)
+      labels = @clusters[cluster_index].map { |e| e.label.capitalize }
+      @clusters[cluster_index].each do |e|
+        e.cluster_name = Utils.find_cluster_name(labels)
+        e.cluster_pos = Utils.find_cluster_position(clusters[cluster_index])
+      end
     end
 
     def labeled_results
@@ -103,16 +99,10 @@ module DBSCAN
       neighbors = []
       geosearch_results = geosearch(point.items[1], point.items[0])
       geosearch_results.each do |neighbor_pos|
-        coordinates = neighbor_pos.split(",")
-        neighbor = @points.find do |elem|
-          elem.items[0] == coordinates[1] &&
-            elem.items[1] == coordinates[0]
-        end
+        neighbor = Utils.find_inmediate_neighbor(neighbor_pos, @points)
         next unless neighbor
 
-        string_distance = Text::Levenshtein.distance(point.label.downcase, neighbor.label.downcase)
-        similarity = 1 - string_distance.to_f / [point.label.length, point.label.length].max
-        neighbors.push(neighbor) if similarity > options[:similarity]
+        neighbors.push(neighbor) if Utils.string_similarity(point.label.downcase, neighbor.label.downcase) > options[:similarity]
       end
       neighbors
     end
@@ -139,30 +129,8 @@ module DBSCAN
 
       cluster_points
     end
-
-    def find_cluster_name(labels)
-      words = labels.map { |label| label.strip.split }
-      common_title = ""
-
-      # Loop through each word index starting from the first
-      (0...words.first.length).each do |i|
-        words_at_index = words.map { |word_list| word_list[i] }
-
-        break unless words_at_index.uniq.length == 1
-
-        common_title += " #{words_at_index.first.capitalize}"
-      end
-
-      common_title.strip! ? common_title : labels.first
-    end
-    def find_cluster_position(cluster)
-      total_lat = cluster.map { |e| e.items[0].to_f }.sum
-      total_lon = cluster.map { |e| e.items[1].to_f }.sum
-      avg_lat = total_lat / cluster.size
-      avg_lon = total_lon / cluster.size
-      [avg_lat, avg_lon]
-    end
   end
+
   # Point class
   class Point
     attr_accessor :items, :cluster, :visited, :label, :cluster_name, :cluster_pos
@@ -182,7 +150,7 @@ module DBSCAN
     end
   end
 
-  def DBSCAN(* args)
+  def dbscan(* args)
     clusterer = Clusterer.new(*args)
     clusterer.labeled_results
   end

data/lib/gtfs_stops_clustering/utils.rb

@@ -0,0 +1,41 @@
+# lib/utils.rb
+
+# Utils class
+class Utils
+  def self.find_cluster_name(labels)
+    words = labels.map { |label| label.strip.split }
+    common_title = ""
+
+    # Loop through each word index starting from the first
+    (0...words.first.length).each do |i|
+      words_at_index = words.map { |word_list| word_list[i] }
+
+      break unless words_at_index.uniq.length == 1
+
+      common_title += " #{words_at_index.first.capitalize}"
+    end
+
+    common_title.strip! ? common_title : labels.first
+  end
+
+  def self.find_cluster_position(cluster)
+    total_lat = cluster.map { |e| e.items[0].to_f }.sum
+    total_lon = cluster.map { |e| e.items[1].to_f }.sum
+    avg_lat = total_lat / cluster.size
+    avg_lon = total_lon / cluster.size
+    [avg_lat, avg_lon]
+  end
+
+  def self.string_similarity(str1, str2)
+    string_distance = Text::Levenshtein.distance(str1.downcase, str2.downcase)
+    1 - string_distance.to_f / [str1.length, str2.length].max
+  end
+
+  def self.find_inmediate_neighbor(neighbor_pos, points)
+    coordinates_split = neighbor_pos.split(",")
+    points.find do |elem|
+      elem.items[0] == coordinates_split[1] &&
+        elem.items[1] == coordinates_split[0]
+    end
+  end
+end

data/lib/gtfs_stops_clustering/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module GtfsStopsClustering
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

data/lib/gtfs_stops_clustering.rb

@@ -37,19 +37,17 @@ module GtfsStopsClustering
     def create_stops_merged
       gtfs_stops = []
       @gtfs_paths.each do |gtfs_path|
-        begin
-          gtfs = GTFS::Source.build(gtfs_path)
-          gtfs_stops << gtfs.stops
-        rescue GTFS::InvalidSourceException => e
-          raise IOError "Error occurred while building GTFS from #{gtfs_path}: #{e.message}"
-        end
+        gtfs = GTFS::Source.build(gtfs_path)
+        gtfs_stops << gtfs.stops
+      rescue GTFS::InvalidSourceException => e
+        raise IOError "Error occurred while building GTFS from #{gtfs_path}: #{e.message}"
       end
       gtfs_stops.flatten
     end
 
     def clusterize_stops
       data = import_stops_data(@gtfs_stops, @stops_config_path)
-      @clusters = DBSCAN(data[:stops_data],
+      @clusters = dbscan(data[:stops_data],
                          data[:stops_redis_geodata],
                          epsilon: @epsilon,
                          min_points: @min_points,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gtfs_stops_clustering
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Pietro Visconti
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-12-08 00:00:00.000000000 Z
+date: 2023-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: csv
@@ -166,6 +166,7 @@ files:
 - lib/gtfs_stops_clustering/dbscan.rb
 - lib/gtfs_stops_clustering/input_consistency_checks.rb
 - lib/gtfs_stops_clustering/redis_geodata.rb
+- lib/gtfs_stops_clustering/utils.rb
 - lib/gtfs_stops_clustering/version.rb
 - lib/stops_corner_cases.txt
 - sig/gtfs_stops_clustering.rbs