contrek 1.0.2 → 1.0.4

data/lib/contrek/finder/concurrent/queueable.rb

@@ -0,0 +1,204 @@
+module Contrek
+  module Concurrent
+    module Queueable
+      attr_reader :head, :tail, :size
+      def initialize(*args, **kwargs, &block)
+        super
+        @head = nil
+        @tail = nil
+        @iterator = 0
+        @size = 0
+      end
+
+      def rem(node)
+        Raise "Not my node" if node.owner != self
+
+        node.before_rem(self)
+
+        node.prev&.next = node.next
+        node.next&.prev = node.prev
+
+        @head = node.next if node == @head
+        @tail = node.prev if node == @tail
+
+        node.next = node.prev = node.owner = nil
+        @size -= 1
+
+        node
+      end
+
+      def add(node)
+        node.owner&.rem(node)  # verifies owner presence
+
+        if @tail
+          @tail.next = node
+          node.prev = @tail
+        else
+          @head = node
+          node.prev = nil
+        end
+        @tail = node
+        node.next = nil
+        node.owner = self
+        @size += 1
+
+        node.after_add(self)
+      end
+
+      def replace!(queueable)
+        reset!
+        append(queueable)
+      end
+
+      def append(queueable)
+        return if queueable.size.zero?
+        queueable.each do |node|
+          node.before_rem(queueable)
+          node.owner = self
+        end
+        if @tail
+          @tail.next = queueable.head
+          queueable.head.prev = @tail
+        else
+          @head = queueable.head
+        end
+        @tail = queueable.tail
+        @size += queueable.size
+        queueable.reset!
+
+        each { |node| node.after_add(self) }
+      end
+
+      def move_from(queueable, &block)
+        queueable.rewind!
+        while (node = queueable.iterator)
+          queueable.forward!
+          add(node) if yield(node)
+        end
+      end
+
+      def reset!
+        @head = nil
+        @tail = nil
+        @size = 0
+        @iterator = 0
+      end
+
+      def each(&block)
+        last = nil
+        unless @head.nil?
+          pointer = @head
+          loop do
+            yield(pointer)
+            last = pointer
+            break unless (pointer = pointer.next)
+          end
+        end
+        last
+      end
+
+      def map(&block)
+        ret_array = []
+        each { |node| ret_array << yield(node) }
+        ret_array
+      end
+
+      def reverse_each(&block)
+        last = nil
+        unless @tail.nil?
+          pointer = @tail
+          loop do
+            yield(pointer)
+            last = pointer
+            break unless (pointer = pointer.prev)
+          end
+        end
+        last
+      end
+
+      def to_a
+        map(&:payload)
+      end
+
+      def forward!
+        @iterator = iterator.next unless iterator.nil?
+      end
+
+      def iterator
+        (@iterator == 0) ? @head : @iterator
+      end
+
+      def rewind!
+        @iterator = 0
+      end
+
+      def next_of!(node)
+        raise "nil node" if node.nil?
+        raise "wrong node" if node.owner != self
+        @iterator = node.next
+      end
+
+      def pop!
+        rem(@tail)
+      end
+
+      def intersection_with(queueable)
+        int = []
+        each do |node|
+          int += queueable.map do |e|
+            break [e.payload] if e.payload == node.payload
+          end.compact
+        end
+        int
+      end
+
+      def intersection_with_array?(array)
+        each { |node| return true if array.index(node.payload) }
+        false
+      end
+
+      def intersect_with?(queueable)
+        intersection_with(queueable).any?
+      end
+
+      def remove_adjacent_pairs(array = nil)
+        array = to_a if array.nil?
+        n = array.size
+        (0...(n - 1)).each do |i|
+          if array[i] == array[i + 1]
+            # Remove the pair and call recursively
+            new_array = array[0...i] + array[(i + 2)..]
+            return remove_adjacent_pairs(new_array)
+          end
+        end
+        array
+      end
+
+      def remove_adjacent_pairs!
+        unless @tail.nil?
+          pointer = @tail
+          loop do
+            break if pointer == @head
+            if pointer.payload == pointer.prev&.payload
+              later = pointer.next
+              rem pointer.prev
+              rem pointer
+              pointer = later.nil? ? @tail : later
+              redo
+            end
+            break unless (pointer = pointer.prev)
+          end
+        end
+      end
+
+      #       def index(node)
+      #         index = 0
+      #         each do |loop_node|
+      #           return index if node == loop_node
+      #           index += 1
+      #         end
+      #         -1
+      #       end
+    end
+  end
+end

data/lib/contrek/finder/concurrent/sequence.rb

@@ -0,0 +1,7 @@
+module Contrek
+  module Concurrent
+    class Sequence
+      prepend Queueable
+    end
+  end
+end

data/lib/contrek/finder/concurrent/shape.rb

@@ -0,0 +1,11 @@
+module Contrek
+  module Concurrent
+    class Shape
+      attr_accessor :outer_polyline, :inner_polylines
+
+      def clear_inner!
+        @inner_polylines = []
+      end
+    end
+  end
+end

data/lib/contrek/finder/concurrent/tile.rb

@@ -0,0 +1,91 @@
+module Contrek
+  module Concurrent
+    class Tile
+      attr_reader :start_x, :end_x, :benchmarks, :shapes, :name
+      attr_accessor :prev, :next, :circular_next, :cluster
+
+      def initialize(finder:, start_x:, end_x:, name:, benchmarks: {})
+        @finder = finder
+        @start_x = start_x
+        @end_x = end_x
+        @name = name
+        @prev = nil
+        @next = nil
+        @benchmarks = {outer: 0, inner: 0}.merge(benchmarks)
+      end
+
+      def whole?
+        @start_x == 0 && @end_x == @finder.maximum_width
+      end
+
+      def left?
+        @start_x == 0
+      end
+
+      def right?
+        @end_x == @finder.maximum_width
+      end
+
+      def initial_process!(finder)
+        result = finder.process_info
+        assign_raw_polygons!(result[:polygons])
+      end
+
+      def boundary_shapes
+        @bbs ||= shapes.select { |s| s.outer_polyline.boundary? }
+      end
+
+      def iterate
+        @shapes.each do |shape|
+          shape.outer_polyline.raw.each do |position|
+            yield(position, "O")
+          end
+          shape.inner_polylines.each do |inner|
+            inner.each do |position|
+              yield(position, "I")
+            end
+          end
+        end
+      end
+
+      def assign_shapes!(shapes)
+        shapes.each { |s| s.outer_polyline.tile = self }
+        @shapes = shapes
+      end
+
+      def to_raw_polygons
+        @shapes.filter_map do |shape|
+          unless shape.outer_polyline.empty?
+            {outer: shape.outer_polyline.raw,
+             inner: shape.inner_polylines}
+          end
+        end
+      end
+
+      def info
+        {name: @name, start_x: @start_x, end_x: @end_x}
+      end
+
+      def tg_border?(coord)
+        coord[:x] == (@next.nil? ? @start_x : (@end_x - 1))
+      end
+
+      def inspect
+        "#{self.class}[#{@name}]"
+      end
+
+      private
+
+      def assign_raw_polygons!(raw_polylines)
+        @shapes = []
+        raw_polylines.each do |raw_polyline|
+          @shapes << Shape.new.tap do |shape|
+            shape.outer_polyline = Polyline.new(tile: self, polygon: raw_polyline[:outer], shape: shape)
+            shape.inner_polylines = raw_polyline[:inner]
+          end.then { _1.outer_polyline.width.zero? ? nil : _1 }
+          @shapes.compact!
+        end
+      end
+    end
+  end
+end

data/lib/contrek/finder/node.rb

@@ -2,6 +2,7 @@ module Contrek
   module Finder
     class Node
       include Listable
+
       attr_reader :min_x, :max_x, :y, :name, :tangs, :tangs_sequence, :tangs_count, :data_pointer
       attr_accessor :track, :abs_x_index, :outer_index, :inner_index
 

data/lib/contrek/finder/polygon_finder.rb

@@ -76,20 +76,33 @@ module Contrek
         end
       end
 
+      def inspect
+        ""
+      end
+
+      def start_x
+        0
+      end
+
+      def end_x
+        @source_bitmap.w
+      end
+
       private
 
       # image scan
       def scan
         last_color = nil
         matching = false
-        min_x = 0
-        max_x = 0
-        @source_bitmap.scan do |x, y, color|
+        min_x = start_x
+        max_x = start_x
+        @source_bitmap.scan(start_x: start_x, end_x: end_x) do |x, y, color|
+          # puts "#{x} #{y}"
           if @matcher.match?(color) && matching == false
             min_x = x
             last_color = color
             matching = true
-            if x == (@source_bitmap.w - 1)
+            if x == (end_x - 1)
               max_x = x
               Contrek::Finder::Node.new(@node_cluster, min_x, max_x, y, last_color)
               matching = false
@@ -98,7 +111,7 @@ module Contrek
             max_x = x - 1
             Contrek::Finder::Node.new(@node_cluster, min_x, max_x, y, last_color)
             matching = false
-          elsif x == (@source_bitmap.w - 1) && matching == true
+          elsif x == (end_x - 1) && matching == true
             max_x = x
             Contrek::Finder::Node.new(@node_cluster, min_x, max_x, y, last_color)
             matching = false

data/lib/contrek/version.rb

@@ -1,3 +1,3 @@
 module Contrek
-  VERSION = "1.0.2"
+  VERSION = "1.0.4"
 end

data/lib/contrek.rb

@@ -3,6 +3,7 @@ require "contrek/bitmaps/painting"
 require "contrek/bitmaps/bitmap"
 require "contrek/bitmaps/chunky_bitmap"
 require "contrek/bitmaps/png_bitmap"
+require "contrek/bitmaps/custom_bitmap"
 require "contrek/bitmaps/rgb_color"
 require "contrek/finder/list"
 require "contrek/finder/list_entry"
@@ -10,7 +11,24 @@ require "contrek/finder/listable"
 require "contrek/finder/lists"
 require "contrek/finder/node"
 require "contrek/finder/node_cluster"
+require "contrek/finder/concurrent/fake_cluster"
 require "contrek/finder/polygon_finder"
+require "contrek/finder/concurrent/clipped_polygon_finder"
+require "contrek/finder/concurrent/hub"
+require "contrek/finder/concurrent/end_point"
+require "contrek/finder/concurrent/queueable"
+require "contrek/finder/concurrent/part"
+require "contrek/finder/concurrent/partitionable"
+require "contrek/finder/concurrent/listable"
+require "contrek/finder/concurrent/poolable"
+require "contrek/finder/concurrent/position"
+require "contrek/finder/concurrent/sequence"
+require "contrek/finder/concurrent/shape"
+require "contrek/finder/concurrent/tile"
+require "contrek/finder/concurrent/polyline"
+require "contrek/finder/concurrent/cluster"
+require "contrek/finder/concurrent/finder"
+require "contrek/finder/concurrent/cursor"
 require "contrek/map/mercator_projection"
 require "contrek/matchers/matcher"
 require "contrek/matchers/matcher_hsb"
@@ -35,20 +53,33 @@ module Contrek
       png_bitmap = CPPPngBitMap.new(png_file_path)
       rgb_matcher_klass = (options[:class] == "value_not_matcher") ? CPPRGBNotMatcher : CPPRGBMatcher
       rgb_matcher = rgb_matcher_klass.new(color.to_rgb_raw)
-      CPPPolygonFinder.new(png_bitmap,
-        rgb_matcher,
-        nil,
-        {versus: :a, compress: {uniq: true, linear: true}}).process_info
+      if options.key?(:number_of_threads) || options[:finder]&.key?(:number_of_tiles)
+        raise "Multithreading on native cpp code is not supported yet. Will be ASAP!"
+      else
+        CPPPolygonFinder.new(png_bitmap,
+          rgb_matcher,
+          nil,
+          {versus: :a}.merge(options[:finder] || {})).process_info
+      end
     end
 
     def compute_ruby_pure(png_file_path, options)
       color = Bitmaps::RgbColor.new(**options[:color])
       png_bitmap = Bitmaps::PngBitmap.new(png_file_path)
       rgb_matcher = const_get("Contrek::Matchers::" + camelize("value_not_matcher")).new(color.raw)
-      Contrek::Finder::PolygonFinder.new(png_bitmap,
-        rgb_matcher,
-        nil,
-        {versus: :a, compress: {uniq: true, linear: true}}).process_info
+      if options.key?(:number_of_threads) || options[:finder]&.key?(:number_of_tiles)
+        Contrek::Concurrent::Finder.new(
+          number_of_threads: options.key?(:threads),
+          bitmap: png_bitmap,
+          matcher: rgb_matcher,
+          options: {versus: :a}.merge(options[:finder] || {})
+        ).process_info
+      else
+        Contrek::Finder::PolygonFinder.new(png_bitmap,
+          rgb_matcher,
+          nil,
+          {versus: :a}.merge(options[:finder] || {})).process_info
+      end
     end
 
     def camelize(str)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contrek
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Emanuele Cesaroni
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-05-19 00:00:00.000000000 Z
+date: 2025-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -16,28 +16,68 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.10'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.49'
+        version: '1.51'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.49'
+        version: '1.51'
+- !ruby/object:Gem::Dependency
+  name: curses
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.5'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.5.3
+- !ruby/object:Gem::Dependency
+  name: ruby-prof
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.7'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.7.2
 - !ruby/object:Gem::Dependency
   name: chunky_png
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +92,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.5
 - !ruby/object:Gem::Dependency
   name: rice
   requirement: !ruby/object:Gem::Requirement
@@ -130,9 +184,27 @@ files:
 - lib/contrek.rb
 - lib/contrek/bitmaps/bitmap.rb
 - lib/contrek/bitmaps/chunky_bitmap.rb
+- lib/contrek/bitmaps/custom_bitmap.rb
 - lib/contrek/bitmaps/painting.rb
 - lib/contrek/bitmaps/png_bitmap.rb
 - lib/contrek/bitmaps/rgb_color.rb
+- lib/contrek/finder/concurrent/clipped_polygon_finder.rb
+- lib/contrek/finder/concurrent/cluster.rb
+- lib/contrek/finder/concurrent/cursor.rb
+- lib/contrek/finder/concurrent/end_point.rb
+- lib/contrek/finder/concurrent/fake_cluster.rb
+- lib/contrek/finder/concurrent/finder.rb
+- lib/contrek/finder/concurrent/hub.rb
+- lib/contrek/finder/concurrent/listable.rb
+- lib/contrek/finder/concurrent/part.rb
+- lib/contrek/finder/concurrent/partitionable.rb
+- lib/contrek/finder/concurrent/polyline.rb
+- lib/contrek/finder/concurrent/poolable.rb
+- lib/contrek/finder/concurrent/position.rb
+- lib/contrek/finder/concurrent/queueable.rb
+- lib/contrek/finder/concurrent/sequence.rb
+- lib/contrek/finder/concurrent/shape.rb
+- lib/contrek/finder/concurrent/tile.rb
 - lib/contrek/finder/list.rb
 - lib/contrek/finder/list_entry.rb
 - lib/contrek/finder/listable.rb
@@ -154,7 +226,7 @@ licenses:
 - MIT
 metadata:
   homepage_uri: https://github.com/runout77/contrek
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -170,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.5.22
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Png image shapes contour finder
 test_files: []