likes 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57b7324788939c732bf583a8396d012f9dbf35e0
-  data.tar.gz: 5b1ec8d43c48ab7f9a3a3b62aeada4a8e330ee7d
+  metadata.gz: 58af381a556319bc76bbc45920a35ab2dcae39c9
+  data.tar.gz: 9b9abb9348acc601d2fe6439667502d9976f6d49
 SHA512:
-  metadata.gz: 7260486cfbb33276b137441fc5a92f7ee7f380a52226ad3c7e504f323267dcfd01e51e6a22b148268f8893c39702b6d018a44999224ed7f87f21e574707fa9fa
-  data.tar.gz: af76dc2ed91190930d7dc1370934b6fa9facb3b24957bc18b63de0490c0902e83983524bc7740382c8c6d5536276ebcdd8a5af453988041823d8a21473d6be83
+  metadata.gz: a5d316f21c3e6bfd5f2b0d539615d6e136bd05d92e729d051dcb9105b1280cce2831ebc0a55d22e184ea485a273dfd035d519cb6294ec6fbf6f422a09482f91f
+  data.tar.gz: 537f9e0c770cc4ef77c9864acb1e0c4650d39cbf51d9c96aa5fe82312a6992e7ce3711af51bbdefeb63cec37c9901837e2c47fdc4d3c6647a9dc8b112c90c70a

data/lib/likes/engines/fast_jaccard_similarity.rb

@@ -38,6 +38,7 @@ module Likes
         @liked = liked
         @items = liked.keys
         @people = likes_of.keys
+        @similarity_limit = INFINITY
       end
 
       # Solves the problem and returns recommendation list
@@ -53,7 +54,7 @@ module Likes
       private
 
       attr_reader :person, :likes_of, :liked, :items, :people,
-        :signature, :hash_functions, :hashes
+        :signature, :hash_functions, :hashes, :similarity_limit
 
       def init_signature
         @signature = (0...MAX_HASH_FUNCTIONS_COUNT).map {
@@ -99,21 +100,41 @@ module Likes
       end
 
       def best_similarity
-        similarities.values.max
+        @_best_similarity ||= similarities.
+          values.
+          select { |similarity| similarity < similarity_limit }.
+          max
       end
 
       def candidates
+        return [] unless best_similarity
         Hash[similarities.select { |_, similarity|
           best_similarity <= similarity * ALLOW_FLUCTUATION
         }].keys
       end
 
       def recommendations
+        return [] if candidates.empty?
+        non_empty_recommendations(recommendations_candidate)
+      end
+
+      def recommendations_candidate
         candidates.map { |other_person, _|
           likes_of.fetch(other_person) - own_likes
         }.flatten.uniq
       end
 
+      def non_empty_recommendations(solution)
+        return next_recommendations if solution.empty?
+        solution
+      end
+
+      def next_recommendations
+        @similarity_limit = best_similarity
+        @_best_similarity = nil
+        recommendations
+      end
+
       # Full complexity: D * O(likeset size * log N) ~ O(N log N) with big constant
       def compute_signature
         each_like do |_, _, row, column|
@@ -130,11 +151,16 @@ module Likes
 
       def each_column_of_likes(item, row, &blk)
         # only columns with 1 in matrix:
-        liked.fetch(item).each_with_index do |person, column|
-          blk[item, person, row, column]
+        liked.fetch(item).each do |person|
+          blk[item, person, row, person_column(person)]
         end
       end
 
+      def person_column(person)
+        @_person_column ||= {}
+        @_person_column[person] ||= people.index(person)
+      end
+
       # Complexity: D * O(1)
       def signature_step(row, column)
         signature.each_with_index do |signature_row, index|

data/lib/likes/version.rb

@@ -1,3 +1,3 @@
 module Likes
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

data/spec/likes/engines/fast_jaccard_similarity_spec.rb

@@ -19,8 +19,8 @@ module Likes
       context "when somebody literally likes everything" do
         let(:raw_likeset) { Fixtures.somebody_likes_literally_everything }
 
-        it "possibly can choose this person as a candidate for recommendations" do
-          expect(likeset.recommendations_for(1).sort).to eq([4, 9]).or eq([3, 4, 6, 7, 9, 17, 19])
+        it "does not choose this person as a candidate for recommendations" do
+          expect(likeset.recommendations_for(1).sort).to eq([4, 9])
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: likes
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Alexey Fedorov