contrek 1.2.0 → 1.2.2

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

@@ -1,12 +1,11 @@
 module Contrek
   module Concurrent
     class InnerPolyline
-      attr_reader :sequence, :recombined
+      attr_reader :sequence
 
-      def initialize(shape: nil, raw_coordinates: [], sequence: nil, recombined: false)
+      def initialize(shape: nil, raw_coordinates: [], sequence: nil)
         @raw = raw_coordinates if raw_coordinates
         @sequence = sequence if sequence
-        @recombined = recombined
         @shape = shape
       end
 

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

@@ -6,15 +6,17 @@ module Contrek
       TRACKED_OUTER = 1 << 0
 
       attr_reader :raw, :name, :min_y, :max_y
-      attr_accessor :shape, :tile, :any_ancients
+      attr_accessor :shape, :tile, :any_ancients, :inside_inner_polyline
 
-      def initialize(tile:, polygon:, shape: nil, bounds: nil)
+      def initialize(tile:, polygon:, shape: nil, bounds: nil, force_named: nil)
         @tile = tile
         @name = tile.shapes.count
+        @named = force_named
         @raw = polygon
         @shape = shape
         @flags = 0
         @any_ancients = false
+        @inside_inner_polyline = nil
 
         if bounds.nil?
           find_boundary
@@ -31,17 +33,13 @@ module Contrek
       end
 
       def named
-        "[b#{@tile.name} S#{@name} #{"B" if boundary?}]"
+        @named || "t#{@tile.name}s#{@name}#{"B" if boundary?}"
       end
 
       def numpy_raw
         raw.flat_map { |p| [p[:x], p[:y]] }
       end
 
-      def info
-        "w#{@tile.name} S#{@name}"
-      end
-
       def turn_on(flag)
         @flags |= flag
       end

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

@@ -1,8 +1,8 @@
 module Contrek
   module Concurrent
     class Shape
-      attr_accessor :outer_polyline, :inner_polylines, :merged_to_shape, :parent_inner_polyline,
-        :reassociation_skip
+      attr_accessor :outer_polyline, :inner_polylines, :merged_to_shape,
+        :parent_inner_polyline, :fixed
       attr_reader :parent_shape, :children_shapes
 
       def initialize
@@ -10,7 +10,7 @@ module Contrek
         @merged_to_shape = nil
         @parent_inner_polyline = nil
         @children_shapes = []
-        @reassociation_skip = false
+        @fixed = false
       end
 
       def self.init_by(set_outer_polyline, set_inner_polylines)
@@ -24,6 +24,10 @@ module Contrek
         @inner_polylines.clear
       end
 
+      def name
+        outer_polyline.named
+      end
+
       def set_parent_shape(shape)
         @parent_shape&.children_shapes&.delete(self)
         @parent_shape = shape

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

@@ -61,15 +61,15 @@ module Contrek
       end
 
       def compute_treemap
-        @shapes_map = {}
+        shapes_map = {}
         shape_index = 0
 
-        @shapes.map do |shape|
+        shapes.map do |shape|
           next if shape.outer_polyline.empty?
-          @shapes_map[shape] = shape_index
+          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)]
+            [shapes_map[shape.parent_shape], shape.parent_shape.inner_polylines.index(shape.parent_inner_polyline)]
           else
             [-1, -1]
           end
@@ -104,6 +104,7 @@ module Contrek
             if treemap_entry != [-1, -1]
               parent = shapes_map[treemap_entry.first]
               shape.set_parent_shape(parent)
+              shape.fixed = true
               shape.parent_inner_polyline = parent.inner_polylines[treemap_entry.last]
             end
           end

data/lib/contrek/version.rb

@@ -1,3 +1,3 @@
 module Contrek
-  VERSION = "1.2.0"
+  VERSION = "1.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: contrek
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.2
 platform: ruby
 authors:
 - Emanuele Cesaroni
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-05-02 00:00:00.000000000 Z
+date: 2026-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -136,6 +136,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE.md
+- PERFORMANCE.md
 - README.md
 - Rakefile
 - contrek.gemspec
@@ -143,10 +144,6 @@ files:
 - 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
-- ext/cpp_polygon_finder/PolygonFinder/images/sample_10240x10240.png
 - ext/cpp_polygon_finder/PolygonFinder/src/ContrekApi.h
 - ext/cpp_polygon_finder/PolygonFinder/src/Tests.cpp
 - ext/cpp_polygon_finder/PolygonFinder/src/Tests.h

data/ext/cpp_polygon_finder/PolygonFinder/examples/example.cpp

@@ -1,50 +0,0 @@
-/*
- * example.cpp
- *
- * 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.
- */
-
-#include <iostream>
-#include "ContrekApi.h"
-#include "Tests.h"
-
-void run_test() {
-  CpuTimer cpu_timer;
-  Tests test_suite;
-  cpu_timer.start();
-
-  // test_suite.test_a();
-  // test_suite.test_b();
-  // test_suite.test_c();
-  // test_suite.test_d();
-  // test_suite.test_e();
-  // test_suite.test_f();
-  // test_suite.test_g();
-  // test_suite.test_h();
-  // test_suite.test_i();
-  std::cout << "compute time =" << cpu_timer.stop() << std::endl;
-}
-
-int main() {
-  Contrek::Config cfg;
-  cfg.threads = 4;
-  cfg.tiles = 4;
-  cfg.compress_unique = true;
-  // cfg.treemap = true;
-  // cfg.connectivity_mode = Contrek::Connectivity::OMNIDIRECTIONAL;
-
-  CpuTimer cpu_timer;
-  cpu_timer.start();
-  std::cout << "--- Start Native Benchmark ---" << std::endl;
-  // auto result = Contrek::trace("../images/graphs_1024x1024.png", cfg);
-  auto result = Contrek::trace("../images/sample_10240x10240.png", cfg);
-  result->print_info();
-  std::cout << "Found polygons: " << result->groups << std::endl;
-  std::cout << "Time: " << cpu_timer.stop() << " ms" << std::endl;
-
-  // run_test();
-  return 0;
-}