contrek 1.3.0 → 1.3.2

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/SubPool.h

@@ -0,0 +1,47 @@
+/*
+ * SubPool.h
+ *
+ * Copyright (c) 2025-2026 Emanuele Cesaroni
+ *
+ * Licensed under the GNU Affero General Public License v3 (AGPLv3).
+ * See the LICENSE file in this directory for the full license text.
+ */
+
+#pragma once
+#include <deque>
+#include <memory>
+#include <utility>
+
+class ShapePool;
+
+template <typename T>
+class SubPool {
+ private:
+  std::unique_ptr<std::deque<T>> storage_;
+  uint32_t active_count_ = 0;
+  ShapePool* macro_pool_ = nullptr;
+
+ public:
+  explicit SubPool(ShapePool* macro_pool) : macro_pool_(macro_pool) {
+    storage_ = std::make_unique<std::deque<T>>();
+  }
+
+  template <typename... Args>
+  T* acquire(Args&&... args) {
+    storage_->emplace_back(std::forward<Args>(args)...);
+    T* ptr = &storage_->back();
+    active_count_++;
+    return ptr;
+  }
+
+  void decrement() {
+    active_count_--;
+    if (active_count_ == 0 && storage_ != nullptr) {
+      storage_.reset();
+    }
+  }
+
+  bool is_released() const {
+    return storage_ == nullptr;
+  }
+};

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/SvgStreamingMerger.h

@@ -0,0 +1,43 @@
+/*
+ * SvgStreamingMerger.h
+ *
+ * Copyright (c) 2025-2026 Emanuele Cesaroni
+ *
+ * Licensed under the GNU Affero General Public License v3 (AGPLv3).
+ * See the LICENSE file in this directory for the full license text.
+ */
+
+#pragma once
+#include <string>
+#include "StreamingMerger.h"
+
+class SvgStreamingMerger : public StreamingMerger {
+ private:
+  std::string svg_css() {
+      return ".out{fill:none;stroke:red;stroke-width:1;}.in{fill:none;stroke:green;stroke-width:1;}.out:hover{stroke:yellow;}";
+  }
+
+ protected:
+  void write_header() override {
+    *stream << "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"" << total_width
+            << "\" height=\"" << total_height << "\"><style>" << svg_css() << "</style>";
+  }
+  void write_footer() override {
+    *stream << "</svg>";
+  }
+  void write_outer_polygon_start() override {
+    *stream << "<polygon points=\"";
+  }
+  void write_outer_polygon_end() override {
+    *stream << "\" class=\"out\"/>";
+  }
+  void write_inner_polygon_start() override {
+    *stream << "<polygon points=\"";
+  }
+  void write_inner_polygon_end() override {
+    *stream << "\" class=\"in\"/>";
+  }
+
+ public:
+  using StreamingMerger::StreamingMerger;
+};

data/ext/cpp_polygon_finder/cpp_polygon_finder.cpp

@@ -96,6 +96,7 @@
 #include "PolygonFinder/src/polygon/finder/concurrent/VerticalMerger.cpp"
 #include "PolygonFinder/src/polygon/finder/concurrent/StreamingMerger.h"
 #include "PolygonFinder/src/polygon/finder/concurrent/StreamingMerger.cpp"
+#include "PolygonFinder/src/polygon/finder/concurrent/SvgStreamingMerger.h"
 #include "PolygonFinder/src/polygon/finder/concurrent/ShapePool.h"
 #include "PolygonFinder/src/polygon/finder/concurrent/ShapePool.cpp"
 extern "C" {
@@ -315,7 +316,7 @@ StreamingMerger* create_streaming_merger(Object self,
                                          int total_width,
                                          int total_height) {
   OfstreamWrapper* wrapper = Rice::detail::From_Ruby<OfstreamWrapper*>().convert(stream_obj.value());
-  return new StreamingMerger(number_of_threads, options, &wrapper->get_stream(), total_width, total_height);
+  return new SvgStreamingMerger(number_of_threads, options, &wrapper->get_stream(), total_width, total_height);
 }
 
 OfstreamWrapper* create_ofstream(Object self, std::string path) {

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

@@ -5,7 +5,7 @@ module Contrek
     class Cluster
       attr_reader :tiles, :hub, :finder
 
-      def initialize(finder:, height:, start_x:, end_x:)
+      def initialize(finder:, height:)
         @finder = finder
         @tiles = []
         @hub = Hub.new(height:)
@@ -57,23 +57,24 @@ module Contrek
               new_inners = shape.inner_polylines
               new_inner_polylines = []
               tot_inner += Benchmark.measure do
-                new_inner_polylines = cursor.join_inners!(new_outer, treemap)
+                new_inner_polylines = cursor.join_inners!(treemap)
                 new_inners += new_inner_polylines
                 if treemap
                   new_inner_polylines.each do |inner_polyline|
-                    inner_polyline.sequence.compute_vertical_bounds!
+                    inner_polyline.compute_vertical_bounds!
                     all_new_inner_polylines += new_inner_polylines
                   end
                 end
                 new_inners += cursor.orphan_inners
               end.real
+              shape.clear_inner!
 
               polyline = Polyline.new(tile: tile, polygon: new_outer.to_a)
               inserting_new_shape = Shape.init_by(polyline, new_inners)
               new_shapes << inserting_new_shape
               polyline.shape = inserting_new_shape
 
-              new_inner_polylines.each { |inner_polyline| inner_polyline.sequence.shape = inserting_new_shape }
+              new_inner_polylines.each { |inner_polyline| inner_polyline.shape = inserting_new_shape }
 
               if treemap
                 cursor.shapes_sequence.each do |merged_shape|
@@ -115,7 +116,7 @@ module Contrek
       private
 
       def assign_ancestry(shape, inner_polyline)
-        shape.set_parent_shape(inner_polyline.sequence.shape)
+        shape.set_parent_shape(inner_polyline.shape)
         shape.parent_inner_polyline = inner_polyline
         shape.fixed = true
       end

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

@@ -40,7 +40,7 @@ module Contrek
         outer_joined_polyline
       end
 
-      def join_inners!(outer_seq, treemap)
+      def join_inners!(treemap)
         return_inner_polylines = []
         shape_index = 0
 
@@ -102,9 +102,6 @@ module Contrek
         if act_part.is?(Part::EXCLUSIVE)
           return if act_part.size == 0
           while (position = act_part.next_position)
-            return if outer_joined_polyline.size > 1 &&
-              outer_joined_polyline.head.payload == position.payload &&
-              act_part == all_parts.first
             outer_joined_polyline.add(position)
           end
         else
@@ -177,6 +174,7 @@ module Contrek
                   if !dest_part.polyline.on?(Polyline::TRACKED_OUTER)
                     @shapes_sequence << shape
                     @orphan_inners += shape.inner_polylines
+                    shape.clear_inner!
                   end
                   dest_part.polyline.turn_on(Polyline::TRACKED_OUTER)
                   if !dest_part.touched

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

@@ -114,18 +114,7 @@ module Contrek
             return
           end
           if (twin_tile = arriving_tiles.find { |b| (b.start_x == (tile.end_x - 1)) || ((b.end_x - 1) == tile.start_x) })
-
-            if twin_tile.start_x == (tile.end_x - 1)
-              start_x = tile.start_x
-              end_x = twin_tile.end_x
-            else
-              start_x = twin_tile.start_x
-              end_x = tile.end_x
-            end
-
-            # puts "start = #{start_x} end = #{end_x}"
-
-            cluster = Cluster.new(finder: self, height: height, start_x:, end_x:)
+            cluster = Cluster.new(finder: self, height: height)
             if twin_tile.start_x == (tile.end_x - 1)
               cluster.add(tile)
               cluster.add(twin_tile)

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

@@ -3,37 +3,20 @@
 module Contrek
   module Concurrent
     class InnerPolyline
-      attr_reader :sequence
+      attr_reader :raw, :vertical_bounds
+      attr_accessor :shape
 
       def initialize(shape: nil, raw_coordinates: [], sequence: nil)
-        @raw = raw_coordinates if raw_coordinates
-        @sequence = sequence if sequence
-        @shape = shape
-      end
-
-      def raw
-        @sequence ? @sequence.to_a : @raw
-      end
-
-      def vertical_bounds
-        if @sequence
-          @sequence.vertical_bounds
+        if sequence
+          @shape = sequence.shape
+          @raw = sequence.to_a
         else
-          raw_vertical_bounds
+          @shape = shape
+          @raw = raw_coordinates
         end
       end
 
-      def shape
-        if @sequence
-          @sequence.shape
-        else
-          @shape
-        end
-      end
-
-      private
-
-      def raw_vertical_bounds
+      def compute_vertical_bounds!
         @vertical_bounds ||= begin
           min_y = Float::INFINITY
           max_y = 0

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

@@ -10,11 +10,13 @@ module Contrek
       ADDED = 2
 
       attr_reader :polyline, :touched
-      attr_accessor :next, :circular_next, :prev, :type, :dead_end, :inverts, :trasmuted, :versus, :mirror
+      attr_accessor :next, :circular_next, :prev, :type, :dead_end, :inverts,
+        :trasmuted, :versus, :mirror, :next_seam, :transmutation_skip
       def initialize(type, polyline)
         @type = type
         @polyline = polyline
         @next = nil
+        @next_seam = nil
         @circular_next = nil
         @prev = nil
         @dead_end = false
@@ -23,6 +25,7 @@ module Contrek
         @trasmuted = false
         @versus = 0
         @mirror = false
+        @transmutation_skip = false
       end
 
       def is?(type)
@@ -80,6 +83,27 @@ module Contrek
         end
       end
 
+      def try_transmutation!
+        head_queues = head.end_point.queues
+        return if head_queues.size == 1
+        other_head_part = head_queues.find { |part| part.polyline.tile == polyline.tile && part != self }
+        if other_head_part
+          tail_queues = tail.end_point.queues
+          if tail_queues.find { |part| part == other_head_part }
+            if (other_head_part.tail.payload[:y] == tail.payload[:y] && other_head_part.head.payload[:y] == head.payload[:y]) ||
+                (other_head_part.tail.payload[:y] == head.payload[:y] && other_head_part.head.payload[:y] == tail.payload[:y])
+              if self.next.nil? && other_head_part.prev.nil?
+                self.mirror = true
+              end
+            else
+              self.type = Part::EXCLUSIVE
+              self.trasmuted = true
+              other_head_part.transmutation_skip = true
+            end
+          end
+        end
+      end
+
       def within?(other)
         self_min, self_max = [head.payload[:y], tail.payload[:y]].minmax
         other_min, other_max = [other.head.payload[:y], other.tail.payload[:y]].minmax

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

@@ -8,6 +8,8 @@ module Contrek
       def initialize(*args, **kwargs, &block)
         super
         @parts = []
+        @first_seam = nil
+        @last_seam = nil
       end
 
       def add_part(new_part)
@@ -16,8 +18,14 @@ module Contrek
         last.next = last.circular_next = new_part if last
         new_part.circular_next = @parts.first
         new_part.prev = last
-
-        new_part.orient! if new_part.is?(Part::SEAM)
+        if new_part.is?(Part::SEAM)
+          @first_seam ||= new_part
+          if !@last_seam.nil?
+            @last_seam.next_seam = new_part
+          end
+          @last_seam = new_part
+          new_part.orient!
+        end
       end
 
       def inspect_parts
@@ -27,6 +35,8 @@ module Contrek
       def partition!
         current_part = nil
         @parts = []
+        @first_seam = nil
+        @last_seam = nil
 
         @raw.each_with_index do |position, n|
           if @tile.tg_border?(position)
@@ -49,7 +59,7 @@ module Contrek
         end
         add_part(current_part)
 
-        trasmute_parts!
+        transmute_parts!
       end
 
       private
@@ -57,42 +67,37 @@ module Contrek
       # If there are SEAM parts and one is canceled out by another within the same polyline,
       # meaning that all its points are repeated in another, longer sequence,
       # then the shorter one is converted to EXCLUSIVE and marked as transmuted
-      def trasmute_parts!
+      def transmute_parts!
         transpose = tile.cluster.finder.transpose?
-
-        @parts.each do |inside|
-          next unless inside.is?(Part::SEAM)
-          @parts.each do |inside_compare|
-            next if inside == inside_compare
-            next unless inside_compare.is?(Part::SEAM)
-
+        if (current_seam = @first_seam)
+          loop do
             if transpose
-              if inside.within?(inside_compare)
-                if !inside.same_length?(inside_compare)
-                  inside.type = Part::EXCLUSIVE
-                  inside.trasmuted = true
-                  inside.head.end_point.queues.delete(inside)
-                  inside.tail.end_point.queues.delete(inside)
-                  break
-                end
-              end
-            else
-              count = 0
-              inside.each do |position|
-                inclusion = position.end_point.queues.include?(inside_compare)
-                count += 1 if inclusion
-              end
-              if count == inside.size
-                if count < inside_compare.size
-                  inside.type = Part::EXCLUSIVE
-                  inside.trasmuted = true
-                  break
-                end
-                if count == inside_compare.size && inside.next.nil? && inside_compare.prev.nil?
-                  inside.mirror = true
+              transmute_transposed_part(current_seam)
+            elsif !current_seam.transmutation_skip
+              current_seam.try_transmutation!
+            end
+            current_seam = current_seam.next_seam
+            break if current_seam.nil?
+          end
+        end
+      end
+
+      def transmute_transposed_part(part)
+        if (current_seam = @first_seam)
+          loop do
+            if current_seam != part
+              if part.within?(current_seam)
+                if !part.same_length?(current_seam)
+                  part.type = Part::EXCLUSIVE
+                  part.trasmuted = true
+                  part.head.end_point.queues.delete(part)
+                  part.tail.end_point.queues.delete(part)
+                  return
                 end
               end
             end
+            current_seam = current_seam.next_seam
+            break if current_seam.nil?
           end
         end
       end

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

@@ -3,13 +3,9 @@
 module Contrek
   module Concurrent
     class Sequence
-      attr_accessor :vertical_bounds, :shape
+      attr_accessor :shape
       prepend Queueable
 
-      def initialize
-        @vertical_bounds = nil
-      end
-
       def is_not_vertical
         return false if size < 2
         x0 = head.payload[:x]
@@ -21,18 +17,6 @@ module Contrek
         false
       end
 
-      def compute_vertical_bounds!
-        return if size == 0
-        min_y = Float::INFINITY
-        max_y = 0
-        get_vector_cache.each do |pos|
-          y = pos[:y]
-          min_y = y if y < min_y
-          max_y = y if y > max_y
-        end
-        @vertical_bounds = {min: min_y, max: max_y}
-      end
-
       def get_vector_cache
         @vector_cache ||= to_a
       end

data/lib/contrek/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Contrek
-  VERSION = "1.3.0"
+  VERSION = "1.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contrek
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.2
 platform: ruby
 authors:
 - Emanuele Cesaroni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-06-17 00:00:00.000000000 Z
+date: 2026-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -188,6 +188,7 @@ files:
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/FakeCluster.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Finder.cpp
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Finder.h
+- ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/GeoJsonStreamingMerger.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/HorizontalMerger.cpp
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/HorizontalMerger.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Hub.cpp
@@ -218,6 +219,8 @@ files:
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/ShapePool.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/StreamingMerger.cpp
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/StreamingMerger.h
+- ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/SubPool.h
+- ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/SvgStreamingMerger.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