dhash-vips 0.0.3.2 → 0.0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ef9b532c31699dd2445292844b5d0760a9e79351
-  data.tar.gz: b4e52489d194424a01c9954053bd38a910178124
+  metadata.gz: bb131dc947f50e6d428a75c6518704b6797e1d30
+  data.tar.gz: 63dc5d70626192321675dbfeaa020c31812095ac
 SHA512:
-  metadata.gz: f8a286f3b357af1b1fddfc20bda62bb018868b68952f4e706c2a2a336ae12ca24f15d32a0b267ed574295740cb3e3b8efcb83fbf3a8eb75be2f5894662c46444
-  data.tar.gz: f643c1d3b9e6bd13a269cf3ceb5b9ea6ec7dffc27927c4d1cc9384201285be74b335e62a167faf89c5cb0295936a449f10c0201eb987937ae4f050119d662fff
+  metadata.gz: 8d1129484277dfcb2630aba294fdc2b2443017836376b556842a7d0faacbb4d4f77ef9e4e5f82653a32946c815c550182e26dd61b60f3c61a49fb589d539aa12
+  data.tar.gz: 8ca92c6b85bf56415ea5c3be928c93141fb8b4d3d733845843699ee028103e5416b0fe2520fb23817d9ee9596fad4dea3764d08d0a1c0edd79a47a047572949b

data/Rakefile

@@ -56,7 +56,7 @@ task :compare_matrixes do |_|
   require "dhash"
   require_relative "lib/dhash-vips"
   require "mll"
-  [Dhash, DHashVips::DHash, DHashVips::IDHash].each do |m|
+  [[Dhash, :hamming], [DHashVips::DHash, :hamming], [DHashVips::IDHash, :distance]].each do |m, dm|
     hashes = %w{
       71662d4d4029a3b41d47d5baf681ab9a.jpg
       ad8a37f872956666c3077a3e9e737984.jpg
@@ -67,7 +67,7 @@ task :compare_matrixes do |_|
       df0a3b93e9412536ee8a11255f974141.jpg
       679634ff89a31279a39f03e278bc9a01.jpg
     }.map{ |filename| m.calculate "images/#{filename}" }
-    table = MLL::table[m.method(:hamming), [hashes], [hashes]]
+    table = MLL::table[m.method(dm), [hashes], [hashes]]
     array = Array.new(4){ [] }
     hashes.size.times.to_a.repeated_combination(2) do |i, j|
       array[i == j ? 0 : (j - i).abs == 1 && (i + j - 1) % 4 == 0 ? [i, j] == [0, 1] ? 1 : 2 : 3].push table[i][j]
@@ -82,7 +82,7 @@ task :compare_images do |_|
   abort "there should be two image filenames passed as arguments" unless ARGV.size == 3
   require_relative "lib/dhash-vips"
   ha, hb = ARGV.drop(1).map &DHashVips::IDHash.method(:calculate)
-  puts "distance: #{DHashVips::IDHash.hamming ha, hb}"
+  puts "distance: #{DHashVips::IDHash.distance ha, hb}"
 
   require "delegate"
   class ImageMutable < SimpleDelegator
@@ -178,12 +178,12 @@ task :compare_speed do
       end
     end
   end
-  puts "hamming (1000 times):"
+  puts "distance (1000 times):"
   Benchmark.bm 18 do |bm|
-    [Dhash, DHashVips::DHash, DHashVips::IDHash].zip(hashes) do |m, hs|
+    [[Dhash, :hamming], [DHashVips::DHash, :hamming], [DHashVips::IDHash, :distance]].zip(hashes) do |(m, dm), hs|
       bm.report m do
         hs.product hs do |h1, h2|
-          1000.times{ m.hamming h1, h2 }
+          1000.times{ m.send dm, h1, h2 }
         end
       end
     end

data/lib/dhash-vips.rb

@@ -31,12 +31,12 @@ module DHashVips
   module IDHash
     extend self
 
-    def hamming a, b
+    def distance a, b
       # TODO: the hash_size=8 is hardcoded here
       ((a | b) & (a >> 128 ^ b >> 128)).to_s(2).count "1"
     end
 
-    def median array
+    @@median = lambda do |array|
       h = array.size / 2
       return array[h] if array[h] != array[h - 1]
       right = array.dup
@@ -46,15 +46,15 @@ module DHashVips
       return right.uniq[1] if left.count(left.last) > right.count(right.first)
       left.last
     end
-    fail unless 2 == median([1, 2, 2, 2, 2, 2, 3])
-    fail unless 3 == median([1, 2, 2, 2, 2, 3, 3])
-    fail unless 3 == median([1, 1, 2, 2, 3, 3, 3])
-    fail unless 2 == median([1, 1, 1, 2, 3, 3, 3])
-    fail unless 2 == median([1, 1, 2, 2, 2, 2, 3])
-    fail unless 2 == median([1, 2, 2, 2, 2, 3])
-    fail unless 3 == median([1, 2, 2, 3, 3, 3])
-    fail unless 1 == median([1, 1, 1])
-    fail unless 1 == median([1, 1])
+    fail unless 2 == @@median[[1, 2, 2, 2, 2, 2, 3]]
+    fail unless 3 == @@median[[1, 2, 2, 2, 2, 3, 3]]
+    fail unless 3 == @@median[[1, 1, 2, 2, 3, 3, 3]]
+    fail unless 2 == @@median[[1, 1, 1, 2, 3, 3, 3]]
+    fail unless 2 == @@median[[1, 1, 2, 2, 2, 2, 3]]
+    fail unless 2 == @@median[[1, 2, 2, 2, 2, 3]]
+    fail unless 3 == @@median[[1, 2, 2, 3, 3, 3]]
+    fail unless 1 == @@median[[1, 1, 1]]
+    fail unless 1 == @@median[[1, 1]]
 
     def calculate file, hash_size = 8
       image = Vips::Image.new_from_file file
@@ -62,11 +62,11 @@ module DHashVips
 
       array = image.to_a.map &:flatten
       d1, i1, d2, i2 = [array, array.transpose].flat_map do |a|
-        d = MLL::subtract[a, a.rotate(1)].to_a.map &:to_a
-        m = median d.flatten.map(&:abs).sort
+        d = MLL::subtract[a, a.rotate(1)].to_a.flat_map(&:to_a)
+        m = @@median.call d.map(&:abs).sort
         [
-          d.flatten.map{ |c| c     <  0 ? 1 : 0 }.join.to_i(2),
-          d.flatten.map{ |c| c.abs >= m ? 1 : 0 }.join.to_i(2),
+          d.map{ |c| c     <  0 ? 1 : 0 }.join.to_i(2),
+          d.map{ |c| c.abs >= m ? 1 : 0 }.join.to_i(2),
         ]
       end
       (((((d1 << hash_size * hash_size) + d2) << hash_size * hash_size) + i1) << hash_size * hash_size) + i2

data/lib/dhash-vips/version.rb

@@ -1,3 +1,3 @@
 module DHashVips
-  VERSION = "0.0.3.2"
+  VERSION = "0.0.4.0"
 end

data/spec/_spec.rb

@@ -3,7 +3,7 @@ require "dhash-vips"
 require "pp"
 
 [
-  [DHashVips::DHash, 17, 18, 22, 39],
+  [DHashVips::DHash, :hamming, 17, 18, 22, 39],
     # [[0, 17, 29, 27, 22, 29, 30, 29],
     #  [17, 0, 30, 26, 33, 36, 37, 36],
     #  [29, 30, 0, 18, 39, 30, 39, 36],
@@ -12,7 +12,7 @@ require "pp"
     #  [29, 36, 30, 30, 17, 0, 33, 30],
     #  [30, 37, 39, 35, 28, 33, 0, 5],
     #  [29, 36, 36, 34, 23, 30, 5, 0]]
-  [DHashVips::IDHash, 15, 23, 28, 64],
+  [DHashVips::IDHash, :distance, 15, 23, 28, 64],
     # [[0, 16, 30, 32, 46, 58, 43, 43],
     #  [16, 0, 28, 28, 47, 59, 46, 47],
     #  [30, 28, 0, 15, 53, 49, 53, 52],
@@ -22,7 +22,7 @@ require "pp"
     #  [43, 46, 53, 61, 43, 44, 0, 0],
     #  [43, 47, 52, 64, 45, 44, 0, 0]]
   # [DHashVips::IDHash, 14, 14, 21],
-].each do |lib, min_similar, max_similar, min_not_similar, max_not_similar|
+].each do |lib, dm, min_similar, max_similar, min_not_similar, max_not_similar|
 
 describe lib do
 
@@ -62,7 +62,7 @@ describe lib do
     end
 
     hashes = [*images, bw1, bw2].map &described_class.method(:calculate)
-    table = MLL::table[described_class.method(:hamming), [hashes], [hashes]]
+    table = MLL::table[described_class.method(dm), [hashes], [hashes]]
 
     # require "pp"
     # pp table

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dhash-vips
 version: !ruby/object:Gem::Version
-  version: 0.0.3.2
+  version: 0.0.4.0
 platform: ruby
 authors:
 - Victor Maslov