dhash-vips 0.0.3.1 → 0.0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03ffc3c4fc6be2ae3ae4c1e5a2f171fc8857c2d7
-  data.tar.gz: ce8343991945f7ca860048959e8006a767190ce3
+  metadata.gz: ef9b532c31699dd2445292844b5d0760a9e79351
+  data.tar.gz: b4e52489d194424a01c9954053bd38a910178124
 SHA512:
-  metadata.gz: 435d8b302eb1405ca99ddaf61a75d8ae37464be2b98657b8f2f8fb6c2e531e08b78e6850d9a010cd48865932180295bc76337cf644f2ad796c3fcb6066be4550
-  data.tar.gz: 71d0739f76714b023b53a1cd38e90f59a78a577a9547679bfbb3b395cc4e9338a0a08116ca232a5be4146cfb62375459f5cccdb330dc3711c3d886f2e2938f36
+  metadata.gz: f8a286f3b357af1b1fddfc20bda62bb018868b68952f4e706c2a2a336ae12ca24f15d32a0b267ed574295740cb3e3b8efcb83fbf3a8eb75be2f5894662c46444
+  data.tar.gz: f643c1d3b9e6bd13a269cf3ceb5b9ea6ec7dffc27927c4d1cc9384201285be74b335e62a167faf89c5cb0295936a449f10c0201eb987937ae4f050119d662fff

data/Rakefile

@@ -2,6 +2,7 @@ STDOUT.sync = true
 
 require "bundler/gem_tasks"
 
+
 task :default => %w{ spec }
 
 require "rspec/core/rake_task"
@@ -9,11 +10,13 @@ RSpec::Core::RakeTask.new :spec do |t|
   t.verbose = false
 end
 
+
 visualize_hash = lambda do |hash|
   puts hash.to_s(2).rjust(64, ?0).gsub(/(?<=.)/, '\0 ').scan(/.{16}/)
 end
 
-task :compare_pixelation do |_, args|
+desc "Compare how Vips and ImageMagick resize images to 9x8"
+task :compare_pixelation do |_|
   require_relative "lib/dhash-vips"
   require "dhash"
 
@@ -33,9 +36,10 @@ task :compare_pixelation do |_, args|
   end
 end
 
-task :compare_kernels do |_, args|
+desc "Compare how Vips resizes image to 9x8 with different kernels"
+task :compare_kernels do |_|
   require_relative "lib/dhash-vips"
-  require "dhash"
+  # require "dhash"
 
   %i{ nearest linear cubic lanczos2 lanczos3 }.each do |kernel|
     hashes = ARGV.drop(1).map do |arg|
@@ -45,3 +49,144 @@ task :compare_kernels do |_, args|
     puts "kernel: #{kernel}, distance: #{DHashVips::DHash.hamming *hashes}"
   end
 end
+
+
+desc "Compare the quality of Dhash, DHashVips::DHash and DHashVips::IDHash -- run it only after `rake test`"
+task :compare_matrixes do |_|
+  require "dhash"
+  require_relative "lib/dhash-vips"
+  require "mll"
+  [Dhash, DHashVips::DHash, DHashVips::IDHash].each do |m|
+    hashes = %w{
+      71662d4d4029a3b41d47d5baf681ab9a.jpg
+      ad8a37f872956666c3077a3e9e737984.jpg
+      1d468d064d2e26b5b5de9a0241ef2d4b.jpg
+      92d90b8977f813af803c78107e7f698e.jpg
+      309666c7b45ecbf8f13e85a0bd6b0a4c.jpg
+      3f9f3db06db20d1d9f8188cd753f6ef4.jpg
+      df0a3b93e9412536ee8a11255f974141.jpg
+      679634ff89a31279a39f03e278bc9a01.jpg
+    }.map{ |filename| m.calculate "images/#{filename}" }
+    table = MLL::table[m.method(:hamming), [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]
+    end
+    p array.map &:sort
+  end
+end
+
+# ruby -c Rakefile && rm -f ab.png && rake compare_images -- fc762fa286489d8afc80adc8cdcb125e.jpg 9c2c240ec02356472fb532f404d28dde.jpg 2>/dev/null && ql ab.png
+desc "Visualizes the IDHash difference measurement between two images"
+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}"
+
+  require "delegate"
+  class ImageMutable < SimpleDelegator
+    %i{ draw_line draw_circle }.each do |m|
+      define_method "#{m}!" do |*args|
+        __setobj__ self.send m, *args
+        self
+      end
+    end
+  end
+  a, b = ARGV.drop(1).map do |filename|
+    image = Vips::Image.new_from_file filename
+    ImageMutable.new image.resize(8.fdiv(image.width), vscale: 8.fdiv(image.height)).colourspace("b-w").
+                           resize(100, vscale: 100, kernel: :nearest).colourspace("srgb")
+  end
+
+  ad = ha >> 128
+  ai = ha - (ad << 128)
+  bd = hb >> 128
+  bi = hb - (bd << 128)
+
+  n = 0
+  [[a, ad, ai], [b, bd, bi]].each do |image, xd, xi|
+    127.downto(0).each do |i|
+      if i > 63
+        y, x = (127 - i).divmod 8
+      else
+        x, y = (63 - i).divmod 8
+      end
+      x = (image.width  * (x + 0.5) / 8).round
+      y = (image.height * (y + 0.5) / 8).round
+      if i > 63
+        (x-2..x+2).map do |x| [
+          [x,  y                                        , x, (y + image.height / 16 - 1) % image.height],
+          [x, (y + image.height / 16 + 1) % image.height, x, (y + image.height /  8    ) % image.height],
+        ] end
+      else
+        (y-2..y+2).map do |y| [
+          [ x                                      , y, (x + image.width / 16 - 1) % image.width, y],
+          [(x + image.width / 16 + 1) % image.width, y, (x + image.width /  8    ) % image.width, y],
+        ] end
+      end.each do |coords1, coords2|
+        n += 1
+        image.draw_line! (1 - xd[i]) * 255, *coords1
+        image.draw_line!      xd[i]  * 255, *coords2
+      end if ai[i] + bi[i] > 0 && ad[i] != bd[i]
+      cx, cy = if i > 63
+        [x, y + 20]
+      else
+        [x + 20, y]
+      end
+      image.draw_circle!      xd[i]  * 255, cx, cy, 11, fill: true if xi[i] > 0
+      image.draw_circle! (1 - xd[i]) * 255, cx, cy, 10, fill: true if xi[i] > 0
+    end
+  end
+  puts "distance: #{n / 10}"
+
+  a.join(b.__getobj__, :horizontal, shim: 10).write_to_file "ab.png"
+end
+
+desc "Benchmarks Dhash, DHashVips::DHash and DHashVips::IDHash"
+task :compare_speed do
+  require "dhash"
+  require_relative "lib/dhash-vips"
+
+  filenames = %w{
+    71662d4d4029a3b41d47d5baf681ab9a.jpg
+    ad8a37f872956666c3077a3e9e737984.jpg
+    1d468d064d2e26b5b5de9a0241ef2d4b.jpg
+    92d90b8977f813af803c78107e7f698e.jpg
+    309666c7b45ecbf8f13e85a0bd6b0a4c.jpg
+    3f9f3db06db20d1d9f8188cd753f6ef4.jpg
+    df0a3b93e9412536ee8a11255f974141.jpg
+    679634ff89a31279a39f03e278bc9a01.jpg
+  }.flat_map do |filename|
+    image = Vips::Image.new_from_file "images/#{filename}"
+    [0, 1, 2, 3].map do |a|
+      "benchmark/#{a}_#{filename}".tap do |filename|
+        next if File.exist? filename
+        FileUtils.mkdir_p "benchmark"
+        image.rot(a).write_to_file filename
+      end
+    end
+  end
+
+  require "benchmark"
+  puts "load and calculate:"
+  hashes = []
+  Benchmark.bm 18 do |bm|
+    [Dhash, DHashVips::DHash, DHashVips::IDHash].each do |m|
+      bm.report m do
+        hashes.push filenames.map &m.method(:calculate)
+      end
+    end
+  end
+  puts "hamming (1000 times):"
+  Benchmark.bm 18 do |bm|
+    [Dhash, DHashVips::DHash, DHashVips::IDHash].zip(hashes) do |m, hs|
+      bm.report m do
+        hs.product hs do |h1, h2|
+          1000.times{ m.hamming h1, h2 }
+        end
+      end
+    end
+  end
+
+end

data/lib/dhash-vips.rb

@@ -1,10 +1,9 @@
 require_relative "dhash-vips/version"
 require "vips"
-require "mll"
 
 module DHashVips
-  module DHash
 
+  module DHash
     extend self
 
     def hamming a, b
@@ -28,15 +27,13 @@ module DHashVips
 
   end
 
+  require "mll"
   module IDHash
     extend self
 
     def hamming a, b
-      ad = a >> 128
-      ai = a - (ad << 128)
-      bd = b >> 128
-      bi = b - (bd << 128)
-      ((ai | bi) & (ad ^ bd)).to_s(2).count "1"
+      # TODO: the hash_size=8 is hardcoded here
+      ((a | b) & (a >> 128 ^ b >> 128)).to_s(2).count "1"
     end
 
     def median array
@@ -72,7 +69,7 @@ module DHashVips
           d.flatten.map{ |c| c.abs >= m ? 1 : 0 }.join.to_i(2),
         ]
       end
-      (((((d1 << 64) + d2) << 64) + i1) << 64) + i2
+      (((((d1 << hash_size * hash_size) + d2) << hash_size * hash_size) + i1) << hash_size * hash_size) + i2
     end
 
   end

data/lib/dhash-vips/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhash-vips
 version: !ruby/object:Gem::Version
-  version: 0.0.3.1
+  version: 0.0.3.2
 platform: ruby
 authors:
 - Victor Maslov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-30 00:00:00.000000000 Z
+date: 2017-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-vips