contrek 1.4.5 → 1.4.7

data/lib/contrek/finder/node.rb

@@ -6,7 +6,7 @@ module Contrek
       include Listable
 
       attr_reader :min_x, :max_x, :y, :name, :tangs_sequence, :tangs_count, :data_pointer,
-        :upper_start, :upper_end, :lower_start, :lower_end
+        :upper_start, :upper_end, :lower_start, :lower_end, :class_id
       attr_accessor :track, :abs_x_index, :outer_index, :inner_index, :inner_left_index, :inner_right_index
 
       T_UP = -1
@@ -27,8 +27,9 @@ module Contrek
       OUTER = 0
       INNER = 1
 
-      def initialize(cluster, min_x, max_x, y, name, connectivity_offset = 0)
+      def initialize(cluster, min_x, max_x, y, name, connectivity_offset = 0, class_id = 0)
         @name = name
+        @class_id = class_id
         @min_x = min_x
         @max_x = max_x + 1
         @y = y
@@ -37,8 +38,6 @@ module Contrek
         @track = 0
         @abs_x_index = 0
         @data_pointer = cluster.lists.get_data_pointer
-        @up_indexer = 0
-        @down_indexer = 0
         @outer_index = -1
         @inner_index = -1
         @inner_left_index = -1
@@ -81,11 +80,8 @@ module Contrek
       end
 
       def my_next(last, versus, mode)
-        last_node_index = if last.y < y
-          last.abs_x_index + @up_indexer
-        else
-          @down_indexer - last.abs_x_index
-        end
+        virtual_index = (last.y < y) ? -(last.abs_x_index + 1) : last.abs_x_index
+        last_node_index = @tangs_sequence.index(virtual_index)
 
         case mode
         when :outer
@@ -117,13 +113,8 @@ module Contrek
       end
 
       def coords_entering_to(enter_to, enter_mode, tracking)
-        enter_to_index = if enter_to.y < y
-          enter_to.abs_x_index + @up_indexer
-        else
-          @down_indexer - enter_to.abs_x_index
-        end
+        tg_index = (enter_to.y < y) ? -(enter_to.abs_x_index + 1) : enter_to.abs_x_index
 
-        tg_index = @tangs_sequence[enter_to_index]
         if tg_index < 0
           node_up = @cluster.vert_nodes[y + T_UP][-(tg_index + 1)]
           if enter_mode == :a
@@ -166,20 +157,19 @@ module Contrek
 
       def precalc_tangs_sequences(cluster:)
         @tangs_sequence = []
-        @up_indexer = -cluster.vert_nodes[@y + T_UP][@upper_start].abs_x_index if @upper_end >= 0
         if @upper_end >= 0
           (@upper_start..@upper_end).each do |upper_pos|
-            @tangs_sequence << -(upper_pos + 1)
+            if cluster.vert_nodes[@y + T_UP][upper_pos].class_id == class_id
+              @tangs_sequence << -(upper_pos + 1)
+            end
           end
         end
-        if @lower_end >= 0
-          lower_size = (@lower_end >= 0) ? (@lower_end - @lower_start + 1) : 0
-          upper_size = (@upper_end >= 0) ? (@upper_end - @upper_start + 1) : 0
-          @down_indexer = (cluster.vert_nodes[@y + T_DOWN][@lower_start].abs_x_index + lower_size + upper_size - 1)
-        end
+
         if @lower_end >= 0
           @lower_end.downto(@lower_start).each do |lower_pos|
-            @tangs_sequence << lower_pos
+            if cluster.vert_nodes[@y + T_DOWN][lower_pos].class_id == class_id
+              @tangs_sequence << lower_pos
+            end
           end
         end
         @tangs_count = tangs_sequence.size

data/lib/contrek/finder/node_cluster.rb

@@ -57,6 +57,8 @@ module Contrek
         versus = @options[:versus]
         inner_v = VERSUS_INVERTER[versus]
         index_order = 0
+        multiclass = @options[:multiclass]
+
         while @root_nodes.size > 0
           root_node = @root_nodes.shift
 
@@ -110,7 +112,12 @@ module Contrek
           draw_sequence(bitmap, "X") unless bitmap.nil?
 
           if @sequence_coords.any?
-            @polygons << {outer: @sequence_coords, inner: [], bounds: (bounds.to_h if @options[:bounds])}.compact
+            @polygons << {
+              outer: @sequence_coords,
+              inner: [],
+              bounds: (bounds.to_h if @options[:bounds]),
+              class: (root_node.class_id if multiclass)
+            }.compact
             @sequences << @plot_sequence
 
             @count = 0
@@ -332,6 +339,7 @@ module Contrek
       end
 
       def add_node(node, offset)
+        multiclass = options[:multiclass]
         @nodes += 1
         node.abs_x_index = @vert_nodes[node.y].size
 
@@ -348,15 +356,19 @@ module Contrek
               up_node = up_nodes[index]
               if ((up_node.max_x - 1) + offset) >= node.min_x
                 if (up_node.min_x - offset) <= (node.max_x - 1)
-                  node.add_intersection(up_node, index)
-                  up_node.add_intersection(node, node.abs_x_index)
+                  unless multiclass && node.class_id != up_node.class_id
+                    node.add_intersection(up_node, index)
+                    up_node.add_intersection(node, node.abs_x_index)
+                  end
                 end
                 return if (index += 1) == up_nodes_count
                 loop do
                   up_node = up_nodes[index]
                   if (up_node.min_x - offset) <= (node.max_x - 1)
-                    node.add_intersection(up_node, index)
-                    up_node.add_intersection(node, node.abs_x_index)
+                    unless multiclass && node.class_id != up_node.class_id
+                      node.add_intersection(up_node, index)
+                      up_node.add_intersection(node, node.abs_x_index)
+                    end
                   else
                     return
                   end

data/lib/contrek/finder/polygon_finder.rb

@@ -21,7 +21,7 @@ module Contrek
 
         # 1 finds matching blocks
         @reports[:scan] = Benchmark.measure do
-          scan
+          @options[:multiclass] ? multiclass_scan : scan
         end
 
         # 2 builds relational spatially tree map
@@ -129,6 +129,34 @@ module Contrek
         end
       end
 
+      def multiclass_scan
+        offset = (@node_cluster.options[:connectivity] == 8) ? 1 : 0
+        current_color = nil
+        min_x = start_x
+        current_y = nil
+        last_x = end_x - 1
+
+        @source_bitmap.scan(start_x: start_x, end_x: end_x, end_y: @processing_height) do |x, y, color|
+          if current_y != y || (current_color && color != current_color)
+            unless current_color.nil?
+              Contrek::Finder::Node.new(@node_cluster, min_x, ((current_y == y) ? x - 1 : last_x), current_y, current_color, offset, current_color.ord)
+            end
+            min_x = x if current_y == y
+          end
+
+          if current_y != y
+            current_y = y
+            min_x = x
+          end
+
+          current_color = color
+          if x == last_x && current_color
+            Contrek::Finder::Node.new(@node_cluster, min_x, last_x, current_y, current_color, offset, current_color.ord)
+            current_color = nil
+          end
+        end
+      end
+
       def format_benchmarks
         r = {}
         total = 0

data/lib/contrek/version.rb

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

data/lib/contrek.rb

@@ -45,6 +45,7 @@ require "contrek/finder/concurrent/polyline"
 require "contrek/finder/concurrent/cluster"
 require "contrek/finder/concurrent/finder"
 require "contrek/finder/concurrent/merger"
+require "contrek/finder/concurrent/merger_validator"
 require "contrek/finder/concurrent/horizontal_merger"
 require "contrek/finder/concurrent/vertical_merger"
 require "contrek/finder/concurrent/streaming_merger"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contrek
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.7
 platform: ruby
 authors:
 - Emanuele Cesaroni
@@ -215,6 +215,8 @@ files:
 - 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/MergerValidator.cpp
+- ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/MergerValidator.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Part.cpp
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Part.h
 - ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/PartPool.cpp
@@ -305,6 +307,7 @@ files:
 - lib/contrek/finder/concurrent/inner_polyline.rb
 - lib/contrek/finder/concurrent/listable.rb
 - lib/contrek/finder/concurrent/merger.rb
+- lib/contrek/finder/concurrent/merger_validator.rb
 - lib/contrek/finder/concurrent/part.rb
 - lib/contrek/finder/concurrent/partitionable.rb
 - lib/contrek/finder/concurrent/polyline.rb