imatcher 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ad15eab2eb3ec4656cafb23117199966625e18d
-  data.tar.gz: 3d15c721ce46ed7cbca79a0d9d4e310972ebcfc2
+  metadata.gz: cdc4ac5a873087643b65c5d5b196cb389c64bf96
+  data.tar.gz: 2c2641e6e1421b5627731cdcc9e912b289539dc2
 SHA512:
-  metadata.gz: b098cf87274c56a0089e795e686d6299ea91339d8bff948486ca25ea5a75e993fb1eb50d533416e2eddd18e035d1dc1330eb055e8a23ddb74e49d54c87f6b406
-  data.tar.gz: 11c76b5365728cfb495a764e15241d1aea897b8d1cf0642a0dceb870479ce2fc4f3bec87efd1c80ce59b12b8fc28d817cfda79013ec384cba7ed76bf7000635b
+  metadata.gz: 347587af896ae12f1647c897c2c8749aecc0546f8d50eb8a143a2d4dc7bd1193f24ca85ee204bf31c2064fd5b290f9b84ba8e7d9ca813a3745e45e9b2f95ffd1
+  data.tar.gz: fab3b1e8e9501e5cdb5db0c460a8bc414d4d0189af99c38d585759a49d561bac66124a3b08bc3d876942db5c3956dcf80e9f25316cef8c5a8fd60b546818119f

data/examples/performance.rb

@@ -0,0 +1,42 @@
+$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
+require 'benchmark/ips'
+require 'imatcher'
+
+a = Imatcher::Image.from_file(File.expand_path('../../spec/fixtures/a.png', __FILE__))
+b = Imatcher::Image.from_file(File.expand_path('../../spec/fixtures/a.png', __FILE__))
+
+rgb = Imatcher::Matcher.new
+grayscale = Imatcher::Matcher.new mode: :grayscale
+delta = Imatcher::Matcher.new mode: :delta
+
+Benchmark.ips do |x|
+  x.report 'RGB' do
+    rgb.compare(a, b)
+  end
+
+  x.report 'Grayscale' do
+    grayscale.compare(a, b)
+  end
+
+  x.report 'Delta E' do
+    delta.compare(a, b)
+  end
+
+  x.compare!
+end
+
+Benchmark.ips do |x|
+  x.report 'RGB' do
+    rgb.compare(a, b).difference_image
+  end
+
+  x.report 'Grayscale' do
+    grayscale.compare(a, b).difference_image
+  end
+
+  x.report 'Delta E' do
+    delta.compare(a, b).difference_image
+  end
+
+  x.compare!
+end

data/lib/imatcher/image.rb

@@ -43,5 +43,9 @@ module Imatcher
     def render_bounds(left, bot, right, top)
       rect(left, bot, right, top, rgb(255, 0, 0))
     end
+
+    def inspect
+      "Image:#{object_id}<#{width}x#{height}>"
+    end
   end
 end

data/lib/imatcher/matcher.rb

@@ -18,9 +18,9 @@ module Imatcher
       @mode = Modes.const_get(MODES[mode_type]).new(options)
     end
 
-    def compare(path_1, path_2)
-      a = Image.from_file(path_1)
-      b = Image.from_file(path_2)
+    def compare(a, b)
+      a = Image.from_file(a) unless a.is_a?(Image)
+      b = Image.from_file(b) unless b.is_a?(Image)
       raise SizesMismatchError,
             "Size mismatch: first image size: " \
             "#{a.width}x#{a.height}, " \

data/lib/imatcher/modes/base.rb

@@ -3,7 +3,7 @@ module Imatcher
     class Base # :nodoc:
       include ColorMethods
 
-      attr_reader :result, :threshold
+      attr_reader :result, :threshold, :bounds
 
       def initialize(threshold: 0.0)
         @threshold = threshold
@@ -12,6 +12,7 @@ module Imatcher
 
       def compare(a, b)
         result.image = a
+        @bounds = [0, 0, result.image.width - 1, result.image.height - 1]
 
         b.compare_each_pixel(a) do |b_pixel, a_pixel, x, y|
           next if pixels_equal?(b_pixel, a_pixel)
@@ -24,28 +25,25 @@ module Imatcher
 
       def diff(bg, diff)
         diff_image = background(bg)
-        diff_image.render_bounds(*calculate_bounds(diff))
         diff.each do |pixels_pair|
           pixels_diff(diff_image, *pixels_pair)
         end
-        create_diff_image(bg, diff_image)
+        create_diff_image(bg, diff_image).render_bounds(*bounds)
       end
 
       def score
         @result.diff.length.to_f / @result.image.pixels.length
       end
 
-      # rubocop:disable Metrics/AbcSize
-      def calculate_bounds(diff)
-        xmin, xmax, ymin, ymax = result.image.width, 0, result.image.height, 0
-        diff.each do |pixels_pair|
-          xmin = pixels_pair[2] if pixels_pair[2] < xmin
-          xmax = pixels_pair[2] if pixels_pair[2] > xmax
-          ymin = pixels_pair[3] if pixels_pair[3] < ymin
-          ymax = pixels_pair[3] if pixels_pair[3] > ymax
-        end
+      def update_result(*_args, x, y)
+        update_bounds(x, y)
+      end
 
-        [xmin - 1, ymin - 1, xmax + 1, ymax + 1]
+      def update_bounds(x, y)
+        bounds[0] = [x, bounds[0]].max
+        bounds[1] = [y, bounds[1]].max
+        bounds[2] = [x, bounds[2]].min
+        bounds[3] = [y, bounds[3]].min
       end
     end
   end

data/lib/imatcher/modes/delta.rb

@@ -4,10 +4,12 @@ module Imatcher
 
     # Compare pixels using Delta E distance.
     class Delta < Base
-      def initialize(threshold: 0.0)
-        @threshold = threshold
-        @result = Result.new(self, threshold)
+      attr_reader :tolerance
+
+      def initialize(options)
+        @tolerance = options.delete(:tolerance) || 0.01
         @delta_score = 0.0
+        super(options)
       end
 
       private
@@ -18,8 +20,10 @@ module Imatcher
 
       def update_result(a, b, x, y)
         d = euclid(a, b) / (MAX * Math.sqrt(3))
+        return if d <= tolerance
         @result.diff << [a, b, x, y, d]
         @delta_score += d
+        super
       end
 
       def background(bg)

data/lib/imatcher/modes/grayscale.rb

@@ -24,6 +24,7 @@ module Imatcher
       end
 
       def update_result(a, b, x, y)
+        super
         @result.diff << [a, b, x, y]
       end
 

data/lib/imatcher/modes/rgb.rb

@@ -10,6 +10,7 @@ module Imatcher
       end
 
       def update_result(a, b, x, y)
+        super
         @result.diff << [a, b, x, y]
       end
 
@@ -18,7 +19,7 @@ module Imatcher
       end
 
       def create_diff_image(bg, diff_image)
-        bg.to_grayscale.compose!(diff_image, 0, 0)
+        diff_image
       end
 
       def pixels_diff(d, a, b, x, y)

data/lib/imatcher/version.rb

@@ -1,3 +1,3 @@
 module Imatcher # :nodoc:
-  VERSION = "0.1.1".freeze
+  VERSION = "0.1.2".freeze
 end

data/spec/integrations/delta_spec.rb

@@ -7,9 +7,9 @@ describe Imatcher::Modes::Delta do
 
   let(:options) { { mode: :delta } }
 
-  context "with similar images" do
-    it "score around 0.094" do
-      expect(subject.score).to be_within(0.0005).of(0.094)
+  context "with darker image" do
+    it "score around 0.075" do
+      expect(subject.score).to be_within(0.005).of(0.075)
     end
 
     context "with custom threshold" do
@@ -32,12 +32,20 @@ describe Imatcher::Modes::Delta do
   context "with different images" do
     let(:path_2) { image_path "b" }
 
-    it "score around 0.0195" do
-      expect(subject.score).to be_within(0.0005).of(0.0195)
+    it "score around 0.0046" do
+      expect(subject.score).to be_within(0.0001).of(0.0046)
     end
 
     it "creates correct difference image" do
       expect(subject.difference_image).to eq(Imatcher::Image.from_file(image_path("delta_diff")))
     end
+
+    context "with high tolerance" do
+      let(:options) { { mode: :delta, tolerance: 0.1 } }
+
+      it "score around 0.0038" do
+        expect(subject.score).to be_within(0.0001).of(0.0038)
+      end
+    end
   end
 end

data/spec/integrations/grayscale_spec.rb

@@ -8,16 +8,16 @@ describe Imatcher::Modes::Grayscale do
   let(:options) { { mode: :grayscale } }
 
   context "darker image" do
-    it "score around 0.7" do
-      expect(subject.score).to be_within(0.05).of(0.75)
+    it "score around 0.95" do
+      expect(subject.score).to be_within(0.05).of(0.95)
     end
   end
 
   context "different images" do
     let(:path_2) { image_path "b" }
 
-    it "score around 0.02" do
-      expect(subject.score).to be_within(0.0005).of(0.009)
+    it "score around 0.005" do
+      expect(subject.score).to be_within(0.001).of(0.005)
     end
 
     it "creates correct difference image" do
@@ -37,8 +37,8 @@ describe Imatcher::Modes::Grayscale do
     context "different image" do
       let(:path_2) { image_path "b" }
 
-      it "score around 0.97" do
-        expect(subject.score).to be_within(0.005).of(0.97)
+      it "score around 0.016" do
+        expect(subject.score).to be_within(0.001).of(0.016)
       end
     end
 
@@ -55,16 +55,16 @@ describe Imatcher::Modes::Grayscale do
     let(:options) { { mode: :grayscale, tolerance: 8 } }
 
     context "darker image" do
-      it "score around 0.9" do
-        expect(subject.score).to be_within(0.005).of(0.9)
+      it "score around 0.96" do
+        expect(subject.score).to be_within(0.005).of(0.96)
       end
     end
 
     context "different image" do
       let(:path_2) { image_path "b" }
 
-      it "score around 0.027" do
-        expect(subject.score).to be_within(0.0005).of(0.027)
+      it "score around 0.006" do
+        expect(subject.score).to be_within(0.0005).of(0.006)
       end
     end
   end

data/spec/integrations/rgb_spec.rb

@@ -6,7 +6,7 @@ describe Imatcher::Modes::RGB do
   subject { Imatcher.compare(path_1, path_2, options) }
   let(:options) { {} }
 
-  context "with similar images" do
+  context "with darker" do
     it "score equals to 1" do
       expect(subject.score).to eq 1
     end
@@ -15,8 +15,8 @@ describe Imatcher::Modes::RGB do
   context "with different images" do
     let(:path_2) { image_path "b" }
 
-    it "score around 0.97" do
-      expect(subject.score).to be_within(0.005).of(0.97)
+    it "score around 0.016" do
+      expect(subject.score).to be_within(0.001).of(0.016)
     end
 
     it "creates correct difference image" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: imatcher
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - palkan
@@ -97,6 +97,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- examples/performance.rb
 - imatcher.gemspec
 - lib/imatcher.rb
 - lib/imatcher/color_methods.rb