closest_neighbours 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1dc9ec134c754981b57d69366f513ec4768678472b18d5cf79c61513bd625b12
-  data.tar.gz: 27c1a7596b2708fab789d7e695d39455d104b7de76f00e0271bd6c3a4d3dec46
+  metadata.gz: 576f497b27d6ebba11b54ebb51a3ec247930037fbe149ed0e2ae92bb8b073c92
+  data.tar.gz: b4d3540e6218de82d923eeb688819d13ece9610967bfc09bdad62dcf08804cb3
 SHA512:
-  metadata.gz: c01f230fb3bc47584b249804c216d55bb16a2cff8dceecb187dd6a82d0bb7d860a6032a08c278f0a5ecaf1910100a36c3e7df5a3dc849d0bd2a34a29b5fd1b7b
-  data.tar.gz: 2bf2f4574fc4b2f0db9fbd36a7485bc790418b3e9b67c87570f827694ce5e0ab5fb9cf87343c663b6ddc8866abaf13fea9e16b6768c501531e368e63c2f54fef
+  metadata.gz: ea2d077995597448fa9430e97c07f1f5a127a1fdc5f33cf6b08152cffa307ecde35cdf044ef0f111de07a3f0562cd8d12aa2cd7d30cd16c87ec44e1eb704e5de
+  data.tar.gz: bd1c0aff794d5aedcfeaa2be93970f3574e227d46e58ea0eb7fac632da15c3d11324c169724c51d0178637d08e88b9a117492404021b0bd917802a049fa50b29

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    closest_neighbours (0.2.0)
+    closest_neighbours (0.2.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/closest_neighbours/grouper.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'closest_neighbours/indexer'
+
 module ClosestNeighbours
   # Split an Enumerable into specified number of groups containing the closest elements in each group.
   class Grouper
@@ -8,76 +10,52 @@ module ClosestNeighbours
     end
 
     def call(groups = 1, data = [])
-      @groups = groups
-      @data = data
-
-      validate!
-
-      if groups >= size
-        wraped_data + blanks
-      else
-        ranges.map { |range| ordered_data[range] }
-      end
-    end
-
-    private
-
-    attr_reader :groups, :data, :orderer
-
-    def validate!
       raise NonIntegerGroupsError unless groups.is_a? Integer
       raise NonEnumberableArgumentError unless data.is_a? Enumerable
       raise InsufficientGroupsError if groups < 1
-      raise IncomparableElementError unless comparable_elements?
-    end
+      raise IncomparableElementError unless data.all? { |e| e <=> data.first }
 
-    def size
-      data.count
+      GrouperHelper.new(groups, orderer.call(data)).call
     end
 
-    def blanks
-      Array.new(number_of_blanks, [])
-    end
+    private
 
-    def number_of_blanks
-      [0, groups - size].max
-    end
+    attr_reader :orderer
 
-    def wraped_data
-      ordered_data.map { |x| [x] }
-    end
+    # Helper class to index data and extract ranges from an enumberble
+    class GrouperHelper
+      def initialize(groups, data)
+        @groups = groups
+        @data = data
+      end
 
-    def ranges
-      [0..indexes[0]] +
-        (indexes << size).each_cons(2)
-                         .map { |(left, right)| (left + 1)..right }
-    end
+      def call
+        if groups == 1
+          [data]
+        elsif groups >= data.count
+          cells + blanks
+        else
+          ranges.map { |range| data[range] }
+        end
+      end
 
-    def indexes
-      @indexes ||= differences_with_indices
-                   .lazy
-                   .map(&:last)
-                   .first(groups - 1)
-                   .sort
-    end
+      private
 
-    def differences_between_each_pair
-      ordered_data.each_cons(2).map { |(a, b)| b - a }
-    end
+      attr_reader :groups, :data
 
-    def differences_with_indices
-      differences_between_each_pair
-        .map.with_index { |x, i| [x, i] }
-        .sort
-        .reverse
-    end
+      def cells
+        data.map { |x| [x] }
+      end
 
-    def ordered_data
-      @ordered_data ||= orderer.call(data)
-    end
+      def blanks
+        Array.new([0, groups - data.count].max, [])
+      end
 
-    def comparable_elements?
-      data.all? { |e| data.first <=> e }
+      def ranges
+        Indexer.new(groups, data).call
+               .each_cons(2)
+               .map { |(left, right)| left...right }
+      end
     end
   end
 end

data/lib/closest_neighbours/indexer.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+module ClosestNeighbours
+  # Determines the indexes where the data need to be grouped
+  class Indexer
+    def initialize(groups = 1, data = [])
+      @groups = groups
+      @data = data
+    end
+
+    def call
+      [0] + indexes + [data.count]
+    end
+
+    private
+
+    attr_reader :groups, :data
+
+    def indexes
+      if same?
+        even
+      else
+        dynamic
+      end
+    end
+
+    def same?
+      differences_between_each_element.all? { |x| x == differences_between_each_element.first }
+    end
+
+    def even
+      (1...groups).map do |i|
+        i * (data.count / groups.to_f).ceil
+      end
+    end
+
+    def dynamic
+      differences_between_each_element
+        .with_index
+        .sort_by { |(diff, _)| -diff }
+        .first(groups - 1)
+        .map { |(_, i)| i + 1 }
+        .sort
+    end
+
+    def differences_between_each_element
+      data.lazy
+          .each_cons(2)
+          .map { |(lower, higher)| higher - lower }
+    end
+  end
+end

data/lib/closest_neighbours/version.rb

@@ -1,3 +1,3 @@
 module ClosestNeighbours
-  VERSION = '0.2.0'.freeze
+  VERSION = '0.2.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: closest_neighbours
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - David Milanese
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-17 00:00:00.000000000 Z
+date: 2021-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -137,6 +137,7 @@ files:
 - lib/closest_neighbours/errors/non_enumberable_argument_error.rb
 - lib/closest_neighbours/errors/non_integer_groups_error.rb
 - lib/closest_neighbours/grouper.rb
+- lib/closest_neighbours/indexer.rb
 - lib/closest_neighbours/orderers/default_order.rb
 - lib/closest_neighbours/orderers/sorted_order.rb
 - lib/closest_neighbours/version.rb
@@ -146,7 +147,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/aussidavid/closest_neighbours
   source_code_uri: https://github.com/aussidavid/closest_neighbours
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -162,7 +163,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Takes an array of elements, groups them by their ordered closest neighbors
   into n groups