contrek 1.0.6 → 1.0.8

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

@@ -27,7 +27,15 @@ module Contrek
       end
 
       def inspect
-        "#{self.class}[b#{@tile.name} S#{@name} #{"B" if boundary?}] (#{raw.count} => #{raw.inspect})"
+        "#{self.class}#{named} (#{raw.count} => #{raw.inspect})"
+      end
+
+      def named
+        "[b#{@tile.name} S#{@name} #{"B" if boundary?}]"
+      end
+
+      def numpy_raw
+        raw.flat_map { |p| [p[:x], p[:y]] }
       end
 
       def info
@@ -46,8 +54,35 @@ module Contrek
         (@flags & flag) != 0
       end
 
+      def reset_tracked_endpoints!
+        @tracked_endpoints = nil
+      end
+
+      # returns for every position of intersection an array composed by the indexes of parts (self,other) involved
+      # es [[1,3],[2,6],...]. The first time the sequence for self is computed is stored.
       def intersection(other)
-        @raw & other.raw
+        if @tracked_endpoints.nil?
+          @tracked_endpoints = {} # memoize found sequence
+          parts.each_with_index do |part, part_index|
+            next if !part.is?(Part::SEAM) && part.trasmuted
+            part.each do |pos|
+              @tracked_endpoints[pos.end_point.object_id] = part_index
+            end
+          end
+        end
+        matching_parts = []
+        other.parts.each_with_index do |part, part_index|
+          next if !part.is?(Part::SEAM) && part.trasmuted
+          part.each do |pos|
+            if (self_index = @tracked_endpoints[pos.end_point.object_id])
+              matching_parts << [self_index, part_index]
+              false
+            else
+              true
+            end
+          end
+        end
+        matching_parts
       end
 
       def empty?
@@ -82,6 +117,13 @@ module Contrek
         !(@max_y < other.min_y || other.max_y < @min_y)
       end
 
+      def get_bounds
+        {min_x: @min_x,
+         max_x: @max_x,
+         min_y: @min_y,
+         max_y: @max_y}
+      end
+
       private
 
       def find_boundary

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

@@ -10,6 +10,16 @@ module Contrek
         @size = 0
       end
 
+      def singleton!
+        if @head&.next
+          @head.next.prev = nil
+          @head.next = nil
+        end
+        @tail = nil
+        @size = 1
+        @iterator = 0
+      end
+
       def rem(node)
         Raise "Not my node" if node.owner != self
 
@@ -84,12 +94,13 @@ module Contrek
         @iterator = 0
       end
 
+      # from yield: false => stop, true => continue
       def each(&block)
         last = nil
         unless @head.nil?
           pointer = @head
           loop do
-            yield(pointer)
+            break unless yield(pointer)
             last = pointer
             break unless (pointer = pointer.next)
           end
@@ -142,25 +153,6 @@ module Contrek
         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

data/lib/contrek/finder/polygon_finder.rb

@@ -43,12 +43,14 @@ module Contrek
 
       # infos
       def process_info
-        {named_sequence: @node_cluster.sequences.map { |list| list.map(&:name).join }.join("-"),
-         groups: @node_cluster.sequences.size,
-         groups_names: @node_cluster.root_nodes.map(&:name).join,
-         polygons: @node_cluster.polygons,
-         benchmarks: format_benchmarks,
-         treemap: (@node_cluster.treemap if @options.has_key?(:treemap))}
+        metadata = {
+          named_sequence: @node_cluster.sequences.map { |list| list.map(&:name).join }.join("-"),
+          groups: @node_cluster.sequences.size,
+          groups_names: @node_cluster.root_nodes.map(&:name).join,
+          benchmarks: format_benchmarks,
+          treemap: (@node_cluster.treemap if @options.has_key?(:treemap))
+        }
+        Result.new(@node_cluster.polygons, metadata)
       end
 
       def get_shapelines

data/lib/contrek/finder/result.rb

@@ -0,0 +1,13 @@
+module Contrek
+  module Finder
+    Result = Struct.new(:polygons, :metadata_hash) do
+      def points
+        polygons
+      end
+
+      def metadata
+        metadata_hash
+      end
+    end
+  end
+end

data/lib/contrek/results/cpp_result.rb

@@ -0,0 +1,21 @@
+module Contrek
+  module Results
+    class CPPFinder::Result
+      def points
+        raw_list = polygons.to_a
+        @to_points ||= raw_list.map do |polygon|
+          {outer: self.class.to_points(polygon[:outer]),
+           inner: polygon[:inner].map { |s| self.class.to_points(s) }}
+        end
+      end
+
+      def total_time
+        metadata[:benchmarks].values.sum
+      end
+
+      def self.to_points(flat_polygon)
+        flat_polygon.each_slice(2).map { |x, y| {x: x, y: y} }
+      end
+    end
+  end
+end

data/lib/contrek/version.rb

@@ -1,3 +1,3 @@
 module Contrek
-  VERSION = "1.0.6"
+  VERSION = "1.0.8"
 end

data/lib/contrek.rb

@@ -5,6 +5,7 @@ require "contrek/bitmaps/chunky_bitmap"
 require "contrek/bitmaps/png_bitmap"
 require "contrek/bitmaps/custom_bitmap"
 require "contrek/bitmaps/rgb_color"
+require "contrek/bitmaps/rgb_cpp_color"
 require "contrek/finder/bounds"
 require "contrek/bitmaps/sample_generator"
 require "contrek/finder/list"
@@ -15,6 +16,7 @@ require "contrek/finder/node"
 require "contrek/finder/node_cluster"
 require "contrek/finder/concurrent/fake_cluster"
 require "contrek/finder/polygon_finder"
+require "contrek/finder/result"
 require "contrek/finder/concurrent/clipped_polygon_finder"
 require "contrek/finder/concurrent/hub"
 require "contrek/finder/concurrent/end_point"
@@ -41,6 +43,7 @@ require "contrek/reducers/uniq_reducer"
 require "contrek/reducers/visvalingam_reducer"
 require "cpp_polygon_finder"
 require "contrek/cpp/cpp_concurrent_finder"
+require "contrek/results/cpp_result"
 
 module Contrek
   class << self
@@ -52,10 +55,10 @@ module Contrek
     private
 
     def compute_cpp(png_file_path, options)
-      color = Bitmaps::RgbColor.new(**options[:color])
+      color = Bitmaps::RgbCppColor.new(**options[:color])
       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)
+      rgb_matcher = rgb_matcher_klass.new(color.raw)
       if options.key?(:number_of_threads) || options[:finder]&.key?(:number_of_tiles)
         Contrek::Cpp::CPPConcurrentFinder.new(
           number_of_threads: options.dig(:number_of_threads) || 0,
@@ -72,7 +75,7 @@ module Contrek
     end
 
     def compute_ruby_pure(png_file_path, options)
-      color = Bitmaps::RgbColor.new(**options[:color])
+      color = Bitmaps::RgbCppColor.new(**options[:color])
       png_bitmap = Bitmaps::PngBitmap.new(png_file_path)
       rgb_matcher = const_get("Contrek::Matchers::" + camelize("value_not_matcher")).new(color.raw)
       if options.key?(:number_of_threads) || options[:finder]&.key?(:number_of_tiles)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contrek
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.8
 platform: ruby
 authors:
 - Emanuele Cesaroni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-01-06 00:00:00.000000000 Z
+date: 2026-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -229,6 +229,7 @@ files:
 - lib/contrek/bitmaps/painting.rb
 - lib/contrek/bitmaps/png_bitmap.rb
 - lib/contrek/bitmaps/rgb_color.rb
+- lib/contrek/bitmaps/rgb_cpp_color.rb
 - lib/contrek/bitmaps/sample_generator.rb
 - lib/contrek/cpp/cpp_concurrent_finder.rb
 - lib/contrek/finder/bounds.rb
@@ -256,6 +257,7 @@ files:
 - lib/contrek/finder/node.rb
 - lib/contrek/finder/node_cluster.rb
 - lib/contrek/finder/polygon_finder.rb
+- lib/contrek/finder/result.rb
 - lib/contrek/map/mercator_projection.rb
 - lib/contrek/matchers/matcher.rb
 - lib/contrek/matchers/matcher_hsb.rb
@@ -264,6 +266,7 @@ files:
 - lib/contrek/reducers/reducer.rb
 - lib/contrek/reducers/uniq_reducer.rb
 - lib/contrek/reducers/visvalingam_reducer.rb
+- lib/contrek/results/cpp_result.rb
 - lib/contrek/version.rb
 homepage: https://github.com/runout77/contrek
 licenses: