contrek 1.1.6 → 1.1.8

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

@@ -28,7 +28,7 @@ module Contrek
 
       def initial_process!(finder)
         result = finder.process_info
-        assign_raw_polygons!(result[:polygons])
+        assign_raw_polygons!(result[:polygons], result.metadata[:treemap])
       end
 
       def boundary_shapes
@@ -49,7 +49,9 @@ module Contrek
       end
 
       def assign_shapes!(shapes)
-        shapes.each { |s| s.outer_polyline.tile = self }
+        shapes.each do |s|
+          s.outer_polyline.tile = self
+        end
         @shapes = shapes
       end
 
@@ -57,7 +59,23 @@ module Contrek
         @shapes.filter_map do |shape|
           unless shape.outer_polyline.empty?
             {outer: shape.outer_polyline.raw,
-             inner: shape.inner_polylines}
+             inner: shape.inner_polylines.map(&:raw)}
+          end
+        end
+      end
+
+      def compute_treemap
+        @shapes_map = {}
+        shape_index = 0
+
+        @shapes.map do |shape|
+          next if shape.outer_polyline.empty?
+          @shapes_map[shape] = shape_index
+          shape_index += 1
+          if shape.parent_shape
+            [@shapes_map[shape.parent_shape], shape.parent_shape.inner_polylines.index(shape.parent_inner_polyline)]
+          else
+            [-1, -1]
           end
         end
       end
@@ -74,13 +92,24 @@ module Contrek
         "#{self.class}[#{@name}]"
       end
 
-      def assign_raw_polygons!(raw_polylines)
+      def assign_raw_polygons!(raw_polylines, treemap = nil)
         @shapes = []
-        raw_polylines.each do |raw_polyline|
+        shapes_map = {}
+        raw_polylines.each_with_index do |raw_polyline, polyline_index|
           next if raw_polyline[:bounds][:max_x] - raw_polyline[:bounds][:min_x] == 0
-          @shapes << Shape.new.tap do |shape|
+          shape = Shape.new.tap do |shape|
             shape.outer_polyline = Polyline.new(tile: self, polygon: raw_polyline[:outer], shape: shape, bounds: raw_polyline[:bounds])
-            shape.inner_polylines = raw_polyline[:inner]
+            shape.inner_polylines = raw_polyline[:inner].map { |raw| InnerPolyline.new(shape: shape, raw_coordinates: raw) }
+          end
+          @shapes << shape
+
+          if treemap && (treemap_entry = treemap[polyline_index])
+            shapes_map[polyline_index] = shape
+            if treemap_entry != [-1, -1]
+              parent = shapes_map[treemap_entry.first]
+              shape.set_parent_shape(parent)
+              shape.parent_inner_polyline = parent.inner_polylines[treemap_entry.last]
+            end
           end
         end
       end

data/lib/contrek/finder/node.rb

@@ -5,7 +5,7 @@ module Contrek
 
       attr_reader :min_x, :max_x, :y, :name, :tangs_sequence, :tangs_count, :data_pointer,
         :upper_start, :upper_end, :lower_start, :lower_end, :start_point, :end_point
-      attr_accessor :track, :abs_x_index, :outer_index, :inner_index
+      attr_accessor :track, :abs_x_index, :outer_index, :inner_index, :inner_left_index, :inner_right_index
 
       T_UP = -1
       T_DOWN = 1
@@ -39,6 +39,8 @@ module Contrek
         @down_indexer = 0
         @outer_index = -1
         @inner_index = -1
+        @inner_left_index = -1
+        @inner_right_index = -1
         @upper_start = Float::INFINITY
         @upper_end = -1
         @lower_start = Float::INFINITY

data/lib/contrek/finder/node_cluster.rb

@@ -6,7 +6,7 @@ module Contrek
 
       def initialize(h, options)
         @options = options
-        @vert_nodes = Array.new(h) { [] }      # per y immetto i nodi
+        @vert_nodes = Array.new(h) { [] }
         @sequences = []
         @polygons = []
         @treemap = []
@@ -76,57 +76,60 @@ module Contrek
           plot_node(next_node, root_node, bounds, versus, @options[:strict_bounds]) if @nodes > 0 && !next_node.nil?
 
           draw_sequence(bitmap, "X") unless bitmap.nil?
-          @polygons << {outer: @sequence_coords, inner: [], bounds: (bounds.to_h if @options[:bounds])}.compact if @sequence_coords.size >= 2
-          @sequences << @plot_sequence
-
-          @count = 0
-          index_inner = 0
-          while @inner_plot.size > 0
-            @plot_sequence = []
-            @sequence_coords = []
-            # mia test
-            first = @inner_plot.find { |x| x.tangs_count <= 2 } || @inner_plot.first
-
-            @plot_sequence << first
-            @inner_plot.delete(first)
-            @root_nodes.delete(first)
-
-            first.inner_index = index_inner
-
-            # @count += 1
-            # if @count > 10000
-            #  puts "Houston, we have a problem!"
-            #  break
-            # end
-
-            next_node = if (first.track & Contrek::Finder::Node::OMAX) != 0
-              if inner_v == :a
-                vert_nodes[first.y + Node::T_UP][first.upper_start]
+
+          if @sequence_coords.size >= 2
+            @polygons << {outer: @sequence_coords, inner: [], bounds: (bounds.to_h if @options[:bounds])}.compact
+            @sequences << @plot_sequence
+
+            @count = 0
+            index_inner = 0
+            while @inner_plot.size > 0
+              @plot_sequence = []
+              @sequence_coords = []
+              # mia test
+              first = @inner_plot.find { |x| x.tangs_count <= 2 } || @inner_plot.first
+
+              @plot_sequence << first
+              @inner_plot.delete(first)
+              @root_nodes.delete(first)
+
+              first.inner_index = index_inner
+
+              # @count += 1
+              # if @count > 10000
+              #  puts "Houston, we have a problem!"
+              #  break
+              # end
+
+              next_node = if (first.track & Contrek::Finder::Node::OMAX) != 0
+                if inner_v == :a
+                  vert_nodes[first.y + Node::T_UP][first.upper_start]
+                else
+                  vert_nodes[first.y + Node::T_DOWN][first.lower_start]
+                end
+              elsif inner_v == :a
+                vert_nodes[first.y + Node::T_DOWN][first.lower_end]
               else
-                vert_nodes[first.y + Node::T_DOWN][first.lower_start]
+                vert_nodes[first.y + Node::T_UP][first.upper_end]
               end
-            elsif inner_v == :a
-              vert_nodes[first.y + Node::T_DOWN][first.lower_end]
-            else
-              vert_nodes[first.y + Node::T_UP][first.upper_end]
-            end
 
-            if !next_node.nil?
-              @sequence_coords << next_node.coords_entering_to(first, inner_v, Contrek::Finder::Node::INNER)
-            end
+              if !next_node.nil?
+                @sequence_coords << next_node.coords_entering_to(first, inner_v, Contrek::Finder::Node::INNER)
+              end
 
-            plot_inner_node(next_node, inner_v, first, root_node, options[:strict_bounds]) if !next_node.nil?
+              plot_inner_node(next_node, inner_v, first, root_node, options[:strict_bounds]) if !next_node.nil?
 
-            draw_sequence(bitmap, "+") unless bitmap.nil?
+              draw_sequence(bitmap, "+") unless bitmap.nil?
 
-            @polygons.last[:inner] << @sequence_coords
+              @polygons.last[:inner] << @sequence_coords
 
-            @inner_plot.grab(@inner_new)
-            index_inner += 1
+              @inner_plot.grab(@inner_new)
+              index_inner += 1
+            end
+            # tree
+            @treemap << ((versus == :a) ? test_in_hole_a(root_node) : test_in_hole_o(root_node)) if @options.has_key?(:treemap)
+            index_order += 1
           end
-          # tree
-          @treemap << ((versus == :a) ? test_in_hole_a(root_node) : test_in_hole_o(root_node)) if @options.has_key?(:treemap)
-          index_order += 1
         end
       end
 
@@ -141,7 +144,7 @@ module Contrek
                 tnext = @vert_nodes[node.y][start_right]
                 if tnext.outer_index == cindex
                   if (tnext.track & Contrek::Finder::Node::IMIN) != 0
-                    return [cindex, prev.inner_index]
+                    return [cindex, (prev.inner_right_index == -1) ? prev.inner_left_index : prev.inner_right_index]
                   else
                     return [-1, -1]
                   end
@@ -165,7 +168,7 @@ module Contrek
                 tnext = @vert_nodes[node.y][start_right]
                 if tnext.outer_index == cindex
                   if (tnext.track & Contrek::Finder::Node::IMAX) != 0
-                    return [cindex, prev.inner_index]
+                    return [cindex, (prev.inner_left_index == -1) ? prev.inner_right_index : prev.inner_left_index]
                   else
                     return [-1, -1]
                   end
@@ -191,13 +194,19 @@ module Contrek
       # coordinates in @sequence_coords
       def plot_inner_node(node, versus, stop_at, start_node, strict_bounds = false)
         node.outer_index = start_node.outer_index
-        node.inner_index = stop_at.inner_index
         @root_nodes.delete(node)
         @inner_plot.delete(node)
         last_node = @plot_sequence.last
         next_node = node.my_next(last_node, versus, :inner)
         @plot_sequence << node
 
+        first_is_max = ((node.y > last_node.y) == (versus == :a))
+        if first_is_max
+          node.inner_right_index = stop_at.inner_index if node.inner_right_index == -1
+        elsif node.inner_left_index == -1
+          node.inner_left_index = stop_at.inner_index
+        end
+
         plot = true
         if next_node.y == last_node.y
           virtual_index = node.tangs_sequence.send((versus == :a) ? :first : :last)
@@ -211,7 +220,6 @@ module Contrek
             end
           end
         elsif strict_bounds
-          first_is_max = ((node.y > last_node.y) == (versus == :a))
           @sequence_coords << {y: node.y, x: (first_is_max ? last_node.max_x : last_node.min_x)}
           @sequence_coords << {y: node.y, x: (first_is_max ? next_node.min_x : next_node.max_x)}
         end

data/lib/contrek/version.rb

@@ -1,3 +1,3 @@
 module Contrek
-  VERSION = "1.1.6"
+  VERSION = "1.1.8"
 end

data/lib/contrek.rb

@@ -29,6 +29,7 @@ require "contrek/finder/concurrent/position"
 require "contrek/finder/concurrent/sequence"
 require "contrek/finder/concurrent/shape"
 require "contrek/finder/concurrent/tile"
+require "contrek/finder/concurrent/inner_polyline"
 require "contrek/finder/concurrent/polyline"
 require "contrek/finder/concurrent/cluster"
 require "contrek/finder/concurrent/finder"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contrek
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.8
 platform: ruby
 authors:
 - Emanuele Cesaroni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-03-21 00:00:00.000000000 Z
+date: 2026-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -141,15 +141,9 @@ files:
 - Rakefile
 - contrek.gemspec
 - contrek.png
-- docs/images/strict_bounds_off.png
-- docs/images/strict_bounds_on.png
-- docs/images/stripes/whole.png
-- docs/images/stripes/whole_0.png
-- docs/images/stripes/whole_256.png
-- docs/images/stripes/whole_512.png
-- docs/images/stripes/whole_768.png
 - ext/cpp_polygon_finder/PolygonFinder/CMakeLists.txt
 - ext/cpp_polygon_finder/PolygonFinder/LICENSE_AGPL.txt
+- ext/cpp_polygon_finder/PolygonFinder/clean.sh
 - ext/cpp_polygon_finder/PolygonFinder/examples/example.cpp
 - ext/cpp_polygon_finder/PolygonFinder/images/graphs_1024x1024.png
 - ext/cpp_polygon_finder/PolygonFinder/images/labyrinth.png
@@ -183,6 +177,7 @@ files:
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/Polygon.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/PolygonFinder.cpp
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/PolygonFinder.h
+- ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/Primitives.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/RectBounds.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/ClippedPolygonFinder.cpp
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/ClippedPolygonFinder.h
@@ -200,6 +195,8 @@ files:
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/HorizontalMerger.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Hub.cpp
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Hub.h
+- ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/InnerPolyline.cpp
+- ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/InnerPolyline.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Merger.cpp
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Merger.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Part.cpp
@@ -220,6 +217,8 @@ files:
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Sequence.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Shape.cpp
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Shape.h
+- ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/ShapePool.cpp
+- ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/ShapePool.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Tile.cpp
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Tile.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/VerticalMerger.cpp
@@ -266,6 +265,7 @@ files:
 - lib/contrek/finder/concurrent/finder.rb
 - lib/contrek/finder/concurrent/horizontal_merger.rb
 - lib/contrek/finder/concurrent/hub.rb
+- lib/contrek/finder/concurrent/inner_polyline.rb
 - lib/contrek/finder/concurrent/listable.rb
 - lib/contrek/finder/concurrent/merger.rb
 - lib/contrek/finder/concurrent/part.rb