hungarian_algorithm_c 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 481b09c8e7febe93966818cf4e41e67147a8f816
-  data.tar.gz: ac1209fde8671eb74130a3f7739b89937b68f256
+  metadata.gz: 93a7a92bf3729fb33bc7c669b574d0b8d6745c76
+  data.tar.gz: 8b0dbc726cbbdd0ae011506864969a63a3dde4d3
 SHA512:
-  metadata.gz: 8719af8a5237221c1f640caa6383f728d7dc0a6c2f9f8e4a9beaaef7c46f2da97136ee0f33a533333b423b5f2a50d1947682031cc0975e8ac63657acc668c8e3
-  data.tar.gz: 5263ef767f25795c945e2a274ef2cc8e415b971b8ed1d9f64c385e27a876deaafa5c402a9efc63fb0c2af2f6e26c2278c15aedcd30c60892173784f3a387b3aa
+  metadata.gz: 22b1b5a810bc278a4631d76ee3e5e66304c3aac95df4521599a243688087f4b324bc1d7966e3031c910ed28c4dbf1876e8439a1c2f6802bf5082038f81d2b65f
+  data.tar.gz: 059bf391ceddd1cbff317559a50892c180f206759658d482b16003931d90181d6d97e5c896b67169716e5e5dcd189251fd267383530d587cef03bce749aa9cc3

data/README.md

@@ -8,7 +8,7 @@ Add the following to your [Gemfile](http://tosbourn.com/what-is-the-gemfile/):
 
 ```ruby
 # Gemfile
-gem 'hungarian_algorithm_c', github: 'deliveroo/hungarian_algorithm_c'
+gem 'hungarian_algorithm_c'
 ```
 
 Run `bundle install`.
@@ -44,7 +44,7 @@ HungarianAlgorithmC.find_pairings(costs)
 #=> [[0, 0], [1, 2], [2, 1]]
 ```
 
-**Note**: Your cost matrix should not have `Float::INFINITY` or _very very large_ numbers as those will not be interpreted appropriately [here](ext/hungarian_algorithm_c/hungarian_algorithm_c.c#L56).
+**Note**: Costs are held in the C code using `signed long long int`. If your matrix has values outside the range of the data type (e.g. `Float::INFINITY`, `BigNumber::INFINITY`, `-1e19`), they will be capped to the closest limit i.e. positive or negative 9_223_372_036_854_775_807.
 
 ## Acknowledgements
 

data/ext/hungarian_algorithm_c/hungarian_algorithm_c.c

@@ -53,8 +53,7 @@ VALUE pairs(VALUE self, VALUE flattened_array_ruby, VALUE row_size_val) {
 
   int index;
   for (index = 0; index < array_size; index++) {
-    long double element = NUM2DBL(rb_ary_entry(flattened_array_ruby, index));
-    long long int rounded_element = element;
+    signed long long int rounded_element = NUM2LL(rb_ary_entry(flattened_array_ruby, index));
     array_c[index] = rounded_element;
   }
 

data/lib/hungarian_algorithm_c/version.rb

@@ -1,3 +1,3 @@
 module HungarianAlgorithmC
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/hungarian_algorithm_c.rb

@@ -1,22 +1,48 @@
 require_relative './hungarian_algorithm_c.so'
 
 module HungarianAlgorithmC
+  # Limits for 'signed long long int' C data type
+  LIMITS = {
+    positive: +9_223_372_036_854_775_807,
+    negative: -9_223_372_036_854_775_807
+  }
+  private_constant :LIMITS
+
   class << self
-    def find_pairings(array)
-      validate!(array)
-      pairs(array.flatten, array.size)
+    def find_pairings(matrix)
+      validate!(matrix)
+      array = value_capped_flattened_array(matrix)
+      pairs(array, matrix.size)
+    end
+
+    def value_capped_flattened_array(matrix)
+      [].tap do |array|
+        matrix.each do |row|
+          row.each do |element|
+            array << begin
+              if element > LIMITS[:positive]
+                LIMITS[:positive]
+              elsif element < LIMITS[:negative]
+                LIMITS[:negative]
+              else
+                element
+              end
+            end
+          end
+        end
+      end
     end
 
-    def validate!(array)
-      return if rectangular?(array)
-      raise ArgumentError.new('array must be rectangular')
+    def validate!(matrix)
+      return if rectangular?(matrix)
+      raise ArgumentError.new('matrix must be rectangular')
     end
 
-    def rectangular?(array)
-      row_size = array.size
-      array.all? { |column| row_size == column.size }
+    def rectangular?(matrix)
+      row_size = matrix.size
+      matrix.all? { |column| row_size == column.size }
     end
 
-    private :pairs, :validate!, :rectangular?
+    private :pairs, :validate!, :rectangular?, :value_capped_flattened_array
   end
 end

data/spec/hungarian_algorithm_c_spec.rb

@@ -26,7 +26,7 @@ RSpec.describe HungarianAlgorithmC do
         ])
       end
 
-      context 'matrix contains Floa::INFINITY' do
+      context 'matrix contains Float::INFINITY' do
         let(:matrix_with_costs) { [
           [4, 3],
           [3, Float::INFINITY]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hungarian_algorithm_c
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Syed Humza Shah
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler