sqed 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e7eb1eb4ed58c823f9388bbe46f734834ff9825
-  data.tar.gz: 4ff58cb61cc0910791c8c0504ee65680b909c192
+  metadata.gz: df36b8e8052dc45504b1a8cfb4f511b7d5af680f
+  data.tar.gz: 2557f8b06d2c521893d4bbace2c9433be420e376
 SHA512:
-  metadata.gz: 4a33d512a77f4a36c883b059b1a6c3b975ae339bdb7ee01a05e10bd0251e16934bc3d712712d26d93c776e090efcc471bd9fbc8602d0f0b773d0ab1a5f3b6415
-  data.tar.gz: 6b48b416a4b7c7685e595956711c046026931816c9b897d9263d45b141b92de06ca5d45a78cb17b9f1bdca78c493b2770e9ac7aa7d29bc5679f3fc80adc0a52b
+  metadata.gz: a190d03073872ad472a422d96b8f62fce283c2936a18d53d6b90f7409e07acfc6f407a5125d88350a04ccecccef3709e7c4c82fa2059ba806f52685cb86948eb
+  data.tar.gz: d29c8d94a3d04c4a8461e11573fafdb7be8383d305ccb7222a05b9cb123fd4e18d135f27df551eee96970552324a91e67688e81754cad37c631472bd41dd0fb3

data/lib/sqed/boundary_finder.rb

@@ -130,8 +130,31 @@ class Sqed
 
       image_width = image.send(scan)
       sample_subdivision_size = get_subdivision_size(image_width) if sample_subdivision_size.nil?
-      samples_to_take = (image_width / sample_subdivision_size).to_i - 1
 
+      attempts = 0
+      while attempts < 5 do
+        samples_to_take = (image_width / sample_subdivision_size).to_i - 1
+        border_hits = sample_border(image, boundary_color, samples_to_take, sample_subdivision_size, scan)
+        
+        break if border_hits.select{|k,v| v > 1}.size > 2 || sample_subdivision_size == 1
+
+        sample_subdivision_size = (sample_subdivision_size.to_f / 2.0).to_i
+        attempts += 1
+      end
+
+      return nil if border_hits.length < 2
+
+      if sample_cutoff_factor.nil?
+        cutoff = max_difference(border_hits.values)
+        cutoff = border_hits.values.first - 1 if cutoff == 0 # difference of two identical things is 0
+      else
+        cutoff = (samples_to_take * sample_cutoff_factor).to_i
+      end
+
+      frequency_stats(border_hits, cutoff)
+    end
+
+    def self.sample_border(image, boundary_color, samples_to_take, sample_subdivision_size, scan)
       border_hits = {}
 
       (0..samples_to_take).each do |s|
@@ -160,17 +183,7 @@ class Sqed
         end
       end
 
-      return nil if border_hits.length < 2
-
-      if sample_cutoff_factor.nil?
-        cutoff = max_difference(border_hits.values)
-
-        cutoff = border_hits.values.first - 1 if cutoff == 0 # difference of two identical things is 0
-      else
-        cutoff = (samples_to_take * sample_cutoff_factor).to_i
-      end
-
-      frequency_stats(border_hits, cutoff)
+      border_hits
     end
 
     def self.is_green?(pixel)

data/lib/sqed/boundary_finder/color_line_finder.rb

@@ -30,7 +30,6 @@ class Sqed::BoundaryFinder::ColorLineFinder < Sqed::BoundaryFinder
   def find_bands
     case layout    # boundaries.coordinates are referenced from stage image
 
-    # No specs for this yet
     when :lep_stage
       top_bottom_split = Sqed::BoundaryFinder.color_boundary_finder(image: image, scan: :columns, boundary_color: boundary_color)              # detect vertical division [array]
       left_right_split = Sqed::BoundaryFinder.color_boundary_finder(image: image, sample_subdivision_size: 2, boundary_color: boundary_color)  # detect horizontal division [array]
@@ -48,8 +47,7 @@ class Sqed::BoundaryFinder::ColorLineFinder < Sqed::BoundaryFinder
 
       boundaries.set(0, [0, 0, left_top_split[1], top_bottom_split[0]] ) # keep as 1 for safety
      
-      boundaries.set(1, [left_top_split[2], 0, left_top_image.columns - left_top_split[2], top_bottom_split[0]] ) # <
-
+      boundaries.set(1, [left_top_split[2], 0, left_top_image.columns - left_top_split[2], top_bottom_split[0]] ) 
       boundaries.set(2, [left_right_split[2], 0, image.columns - left_right_split[0], top_bottom_split[0]] )
 
       bottom_right_image =  image.crop(left_right_split[2], top_bottom_split[2], image.columns - left_right_split[2], image.rows - top_bottom_split[2], true)
@@ -92,11 +90,13 @@ class Sqed::BoundaryFinder::ColorLineFinder < Sqed::BoundaryFinder
       right_bottom_image = image.crop(left_right_split[2], top_bottom_split[2], image.columns - left_right_split[2], image.rows - top_bottom_split[2], true)  # sections 3,4,5
 
       right_top_split = ::SqedUtils.corrected_frequency(
-        Sqed::BoundaryFinder.color_boundary_finder(image: right_top_image, boundary_color: boundary_color),
+        Sqed::BoundaryFinder.color_boundary_finder(image: right_top_image, boundary_color: boundary_color, scan: :rows),
         width_factor: 1.8,
         max_width: right_top_image.columns
       ) # vertical line b/w 1 & 2, use "corrected_frequency" to account for color bleed from previous crop
 
+
+
       boundaries.set(1, [left_right_split[2], 0, right_top_split[0], top_bottom_split[0]] )
       boundaries.set(2, [left_right_split[2] + right_top_split[2], 0, right_top_image.columns - right_top_split[2], top_bottom_split[0]])
 

data/lib/sqed/version.rb

@@ -1,3 +1,3 @@
 class Sqed
-  VERSION = '0.4.3'.freeze
+  VERSION = '0.4.4'.freeze
 end

data/lib/sqed_utils.rb

@@ -11,6 +11,9 @@ module SqedUtils
   # @param frequency_stats [Array]
   #   like [1,2,3]
   #
+  # @param width_factor [Float]
+  #    
+  #  
   # @param max_width [Integer]
   #   required, the width of the image in question
   #
@@ -33,9 +36,6 @@ module SqedUtils
     a = (m - v0).abs
     b = (v2 - m).abs
 
-    c = a * width_factor
-    d = b * width_factor
-
     largest = (a > b ? a : b)
 
     l = (m - b / 2) 
@@ -44,17 +44,15 @@ module SqedUtils
     r = (m + a / 2)
     r = max_width if r > max_width
 
-    x = a * width_factor
-    y = b * width_factor
+    c = a * width_factor
+    d = b * width_factor
 
     [
-      x > largest ? l : v0,
+      c > largest ? l : v0,
       m,
-      y > largest ? r : v2
+      d > largest ? r : v2
     ]
 
   end
 
-
-
 end

data/spec/lib/sqed/boundary_finder_spec.rb

@@ -60,10 +60,11 @@ describe Sqed::BoundaryFinder do
         expect(center).to be < 2495 
       end
 
-      specify 'FAILS to find the vertical dividing line a real image, with border still present, with 200x fewer subsamples' do
-        center =  Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.crossy_green_line_specimen, sample_subdivision_size: 2000 )
-        expect(center).to be nil
-      end
+      # This is found now because of increased refinement
+      # specify 'FAILS to find the vertical dividing line a real image, with border still present, with 200x fewer subsamples' do
+      #   center =  Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.crossy_green_line_specimen, sample_subdivision_size: 2000 )
+      #   expect(center).to be nil
+      # end
 
       specify 'finds the vertical dividing line another real image, with border still present' do
         center = Sqed::BoundaryFinder.color_boundary_finder(image: ImageHelpers.greenline_image)[1]

data/spec/lib/stage_handling/seven_slot_spec.rb

@@ -60,5 +60,14 @@ describe 'handling 7 slot stages' do
         end
       end
     end
+  end
+
+  context 'another image' do
+    let(:s) { Sqed.new(image: ImageHelpers.frost_seven_slot, use_thumbnail: true, pattern: :seven_slot, boundary_color: :red, has_border: false ) }
+
+    specify '#result' do
+      expect(s.result).to be_truthy
+    end
   end 
+
 end

data/spec/support/image_helpers.rb

@@ -19,6 +19,10 @@ module ImageHelpers
       get_image 'stage_images/boundary_cross_green.jpg'
     end
 
+    def frost_seven_slot
+      get_image 'stage_images/frost_7_slot.jpg'
+    end
+
     def frost_stage
       get_image 'stage_images/frost_stage.jpg'
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sqed
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Matt Yoder
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-11 00:00:00.000000000 Z
+date: 2018-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -171,6 +171,7 @@ files:
 - spec/support/files/stage_images/boundary_left_t_yellow.jpg
 - spec/support/files/stage_images/boundary_offset_cross_red.jpg
 - spec/support/files/stage_images/boundary_right_t_green.jpg
+- spec/support/files/stage_images/frost_7_slot.jpg
 - spec/support/files/stage_images/frost_stage.jpg
 - spec/support/files/stage_images/frost_stage_medium.jpg
 - spec/support/files/stage_images/frost_stage_thumb.jpg
@@ -244,6 +245,7 @@ test_files:
 - spec/support/files/stage_images/boundary_left_t_yellow.jpg
 - spec/support/files/stage_images/boundary_offset_cross_red.jpg
 - spec/support/files/stage_images/boundary_right_t_green.jpg
+- spec/support/files/stage_images/frost_7_slot.jpg
 - spec/support/files/stage_images/frost_stage.jpg
 - spec/support/files/stage_images/frost_stage_medium.jpg
 - spec/support/files/stage_images/frost_stage_thumb.jpg