contrek 1.2.8 → 1.2.9

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/Polyline.cpp

@@ -21,7 +21,7 @@ Polyline::Polyline(Tile* tile, const std::vector<Point*>& polygon, const std::op
   tile(tile)
 { if (bounds.has_value()) {
     min_x =  bounds->min_x;
-    max_x = bounds->max_x;
+    max_x_ = bounds->max_x;
     min_y_ =  bounds->min_y;
     max_y_ = bounds->max_y;
   } else {
@@ -32,17 +32,17 @@ Polyline::Polyline(Tile* tile, const std::vector<Point*>& polygon, const std::op
 
 int Polyline::width() {
   if (raw_.empty()) return 0;
-  return(max_x - min_x);
+  return(max_x_ - min_x);
 }
 
 bool Polyline::boundary() {
-  return( tile->tg_border(Point{min_x, 0}) || tile->tg_border(Point{max_x, 0}));
+  return( tile->tg_border(Point{min_x, 0}) || tile->tg_border(Point{max_x_, 0}));
 }
 
 void Polyline::find_boundary() {
   if (raw_.empty()) return;
   min_x =  std::numeric_limits<int>::max();
-  max_x = -std::numeric_limits<int>::max();
+  max_x_ = -std::numeric_limits<int>::max();
   min_y_ =  std::numeric_limits<int>::max();
   max_y_ = -std::numeric_limits<int>::max();
   for (Point* p : raw_) {
@@ -50,7 +50,7 @@ void Polyline::find_boundary() {
     int x = p->x;
     int y = p->y;
     if (x < min_x) min_x = x;
-    if (x > max_x) max_x = x;
+    if (x > max_x_) max_x_ = x;
     if (y < min_y_) min_y_ = y;
     if (y > max_y_) max_y_ = y;
   }
@@ -98,7 +98,7 @@ std::string Polyline::named() {
 
 void Polyline::fill_bounds(RectBounds& target_bounds) const {
   target_bounds.min_x = this->min_x;
-  target_bounds.max_x = this->max_x;
+  target_bounds.max_x = this->max_x_;
   target_bounds.min_y = this->min_y_;
   target_bounds.max_y = this->max_y_;
 }

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

@@ -40,10 +40,11 @@ class Polyline : public Partitionable {
   int width();
   Tile *tile = nullptr;
   Shape* shape = nullptr;
-  std::vector<Point*> raw() const { return raw_; }
+  const std::vector<Point*>& raw() const { return raw_; }
   const std::vector<Part*>& parts() const { return parts_; }
   const int max_y() const { return max_y_; }
   const int min_y() const { return min_y_; }
+  const int max_x() const { return max_x_; }
   void clear();
   bool is_empty();
   bool any_ancients = false;
@@ -56,7 +57,7 @@ class Polyline : public Partitionable {
 
  private:
   std::vector<Point*> raw_;
-  int min_x, max_x, min_y_, max_y_;
+  int min_x, max_x_, min_y_, max_y_;
   void find_boundary();
   uint32_t flags_ = 0;
   std::string named_;

data/ext/cpp_polygon_finder/PolygonFinder/src/polygon/finder/concurrent/StreamingMerger.cpp

@@ -0,0 +1,114 @@
+/*
+ * StreamingMerger.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 "StreamingMerger.h"
+#include <sstream>
+#include <algorithm>
+#include <vector>
+#include <string>
+
+StreamingMerger::StreamingMerger(int number_of_threads,
+                                 std::vector<std::string>* options,
+                                 std::ofstream* stream_to,
+                                 int total_width, int total_height)
+  : VerticalMerger(number_of_threads, options), stream(stream_to), total_width(total_width), total_height(total_height) {
+  if (!stream) {
+    throw std::invalid_argument("Streaming requires a valid destination output. stream_to cannot be null.");
+  }
+  if (total_width <= 0 || total_height <= 0) {
+    throw std::invalid_argument("Streaming requires valid canvas dimensions (width and height must be > 0).");
+  }
+}
+
+void StreamingMerger::add_tile(ProcessResult& result, bool flush)
+{ VerticalMerger::add_tile(result);
+  if (tiles_.size() == 2) {
+    this->process_tiles();
+    this->tiles_.queue_push(this->whole_tile);
+    this->stream_polygons(this->whole_tile, flush);
+  }
+}
+
+ProcessResult* StreamingMerger::process_info() {
+  ProcessResult *pr = VerticalMerger::process_info();
+  pr->groups =  this->moved;
+  return(pr);
+}
+
+void StreamingMerger::stream_polygons(Tile* tile, bool flush) {
+  ensure_header();
+  if (int tile_end_x = tile->end_x(); true) {
+    tile->shapes().erase(
+      std::remove_if(tile->shapes().begin(), tile->shapes().end(), [this, flush, tile_end_x](const Shape* shape) {
+        if (flush || shape->outer_polyline->max_x() < (tile_end_x - 1)) {
+          this->moved++;
+          this->stream_raw_polygon(shape);
+          return true;
+        }
+        return false;
+      }),
+      tile->shapes().end());
+  }
+  if (flush) {
+    ensure_footer();
+  }
+}
+
+void StreamingMerger::stream_raw_polygon(const Shape* shape) {
+  std::ostringstream outer_oss;
+  const std::vector<Point*> points = shape->outer_polyline->raw();
+  for (size_t i = 0; i < points.size(); ++i) {
+    outer_oss << points[i]->y << "," << points[i]->x;
+    if (i < points.size() - 1) outer_oss << " ";
+  }
+  *stream << svg_outer_polygon_string(outer_oss.str());
+
+  for (const auto& inner_polyline : shape->inner_polylines) {
+    std::ostringstream inner_oss;
+    const std::vector<Point*> inner_points = inner_polyline->raw();
+    for (size_t i = 0; i < inner_points.size(); ++i) {
+      inner_oss << inner_points[i]->y << "," << inner_points[i]->x;
+      if (i < inner_points.size() - 1) inner_oss << " ";
+    }
+    *stream << svg_inner_polygon_string(inner_oss.str());
+  }
+}
+
+void StreamingMerger::ensure_header() {
+  if (stream && stream->tellp() == 0) {
+    *stream << svg_header_string();
+  }
+}
+
+void StreamingMerger::ensure_footer() {
+  if (stream) {
+    *stream << svg_footer_string();
+  }
+}
+
+std::string StreamingMerger::svg_css() {
+  return ".out{fill:none;stroke:red;stroke-width:1;}.in{fill:none;stroke:green;stroke-width:1;}.out:hover{stroke:yellow;}";
+}
+
+std::string StreamingMerger::svg_header_string() {
+  return "<svg xmlns=\"http://www.w3.org/2000/svg\" width=\"" + std::to_string(total_width) +
+         "\" height=\"" + std::to_string(total_height) + "\"><style>" + svg_css() + "</style>";
+}
+
+std::string StreamingMerger::svg_footer_string() {
+  return "</svg>";
+}
+
+std::string StreamingMerger::svg_outer_polygon_string(std::string_view points) {
+  return "<polygon points=\"" + std::string(points) + "\" class=\"out\"/>";
+}
+
+std::string StreamingMerger::svg_inner_polygon_string(std::string_view points) {
+  return "<polygon points=\"" + std::string(points) + "\" class=\"in\"/>";
+}

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

@@ -0,0 +1,41 @@
+/*
+ * StreamingMerger.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 "VerticalMerger.h"
+#include <fstream>
+#include <string>
+#include <string_view>
+#include <stdexcept>
+#include <vector>
+
+class StreamingMerger : public VerticalMerger {
+ private:
+  std::ofstream* stream;
+  int total_width;
+  int total_height;
+  int moved = 0;
+  void ensure_header();
+  void ensure_footer();
+  void stream_polygons(Tile* tile, bool flush = false);
+  void stream_raw_polygon(const Shape* shape);
+  virtual std::string svg_css();
+  virtual std::string svg_header_string();
+  virtual std::string svg_footer_string();
+  virtual std::string svg_outer_polygon_string(std::string_view points);
+  virtual std::string svg_inner_polygon_string(std::string_view points);
+
+ public:
+  StreamingMerger(int number_of_threads,
+                  std::vector<std::string>* options,
+                  std::ofstream* stream_to,
+                  int total_width, int total_height);
+  void add_tile(ProcessResult& result, bool flush = false);
+  ProcessResult* process_info() override;
+};

data/ext/cpp_polygon_finder/cpp_polygon_finder.cpp

@@ -96,6 +96,8 @@
 #include "PolygonFinder/src/polygon/finder/concurrent/HorizontalMerger.cpp"
 #include "PolygonFinder/src/polygon/finder/concurrent/VerticalMerger.h"
 #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/ShapePool.h"
 #include "PolygonFinder/src/polygon/finder/concurrent/ShapePool.cpp"
 extern "C" {
@@ -290,6 +292,36 @@ ProcessResult ruby_result_to_process_result(Rice::Object rb_result) {
 
 }  // namespace Rice::detail
 
+struct OfstreamWrapper {
+  std::string path;
+  std::ofstream stream;
+  OfstreamWrapper(std::string p) : path(p), stream(p, std::ios::out) {}
+  void close() { stream.close(); }
+  bool closed() { return !stream.is_open(); }
+  void rewind() { /* noop */ }
+  std::string read() {
+    stream.flush();
+    std::ifstream in(path);
+    return std::string((std::istreambuf_iterator<char>(in)),
+                        std::istreambuf_iterator<char>());
+  }
+  std::ofstream& get_stream() { return stream; }
+};
+
+StreamingMerger* create_streaming_merger(Object self,
+                                         int number_of_threads,
+                                         std::vector<std::string>* options,
+                                         Object stream_obj,
+                                         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);
+}
+
+OfstreamWrapper* create_ofstream(Object self, std::string path) {
+  return new OfstreamWrapper(path);
+}
+
 extern "C"
 void Init_cpp_polygon_finder() {
   #ifdef HAVE_TCMALLOC
@@ -384,9 +416,27 @@ void Init_cpp_polygon_finder() {
     define_class<HorizontalMerger, Merger>("CPPHorizontalMerger")
     .define_constructor(Constructor<HorizontalMerger, int, std::vector<std::string>*>(), Arg("number_of_threads"), Arg("options") = nullptr, Arg("yield_gvl") = true);
 
-    Data_Type<VerticalMerger> rb_cVerticalMerger =
+  Data_Type<VerticalMerger> rb_cVerticalMerger =
     define_class<VerticalMerger, Merger>("CPPVerticalMerger")
-    .define_constructor(Constructor<VerticalMerger, int, std::vector<std::string>*>(), Arg("number_of_threads"), Arg("options") = nullptr, Arg("yield_gvl") = true);
+    .define_constructor(Constructor<VerticalMerger, int, std::vector<std::string>*>(), Arg("number_of_threads"), Arg("options") = nullptr, Arg("yield_gvl") = true)
+    .define_method("add_tile", [](VerticalMerger& self, Object rb_result) {
+      ProcessResult pr = Rice::detail::ruby_result_to_process_result(rb_result);
+      self.add_tile(pr);
+        });
+
+  Data_Type<OfstreamWrapper> rb_cstd_ofstream = define_class<OfstreamWrapper>("CPPOfstream");
+    rb_cstd_ofstream.define_singleton_method("new", &create_ofstream);
+    rb_cstd_ofstream.define_method("close",   [](OfstreamWrapper& self) { self.close(); });
+    rb_cstd_ofstream.define_method("closed?", [](OfstreamWrapper& self) { return self.closed(); });
+    rb_cstd_ofstream.define_method("rewind",  [](OfstreamWrapper& self) { self.rewind(); });
+    rb_cstd_ofstream.define_method("read",    [](OfstreamWrapper& self) { return self.read(); });
+
+  Data_Type<StreamingMerger> rb_cstreaming_merger = define_class<StreamingMerger, VerticalMerger>("CPPStreamingMerger");
+    rb_cstreaming_merger.define_method("add_tile", [](StreamingMerger& self, Object rb_result, bool flush) {
+      ProcessResult pr = Rice::detail::ruby_result_to_process_result(rb_result);
+      self.add_tile(pr, flush);
+    });
+    rb_cstreaming_merger.define_singleton_method("new", &create_streaming_merger);
 
   Module mContrek = define_module("Contrek");
   Module mCpp = define_module_under(mContrek, "Cpp");

data/ext/cpp_polygon_finder/extconf.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "mkmf-rice"
 
 has_tcmalloc = find_library("tcmalloc", "malloc")

data/lib/contrek/bitmaps/bitmap.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Bitmaps
     class Bitmap

data/lib/contrek/bitmaps/chunky_bitmap.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Bitmaps
     class ChunkyBitmap < Bitmap

data/lib/contrek/bitmaps/painting.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Bitmaps
     module Painting

data/lib/contrek/bitmaps/png_bitmap.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "chunky_png"
 
 module Contrek

data/lib/contrek/bitmaps/raw_bitmap.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Bitmaps
     class RawBitmap < PngBitmap

data/lib/contrek/bitmaps/rgb_color.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Bitmaps
     class RgbColor

data/lib/contrek/bitmaps/rgb_cpp_color.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Bitmaps
     class RgbCppColor

data/lib/contrek/bitmaps/sample_generator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Bitmaps
     class SampleGenerator

data/lib/contrek/cpp/cpp_concurrent_finder.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Cpp
     class CPPConcurrentFinder < CPPFinder

data/lib/contrek/cpp/cpp_concurrent_horizontal_merger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Cpp
     class CPPConcurrentHorizontalMerger < CPPHorizontalMerger

data/lib/contrek/cpp/cpp_concurrent_merger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Cpp
     class CPPConcurrentMerger < CPPMerger

data/lib/contrek/cpp/cpp_concurrent_streaming_merger.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module Contrek
+  module Cpp
+    class CPPConcurrentStreamingMerger < CPPStreamingMerger
+      def self.new(stream_to:, total_width:, total_height:, number_of_threads: 0, options: nil)
+        super(number_of_threads, options, stream_to, total_width, total_height)
+      end
+    end
+  end
+end

data/lib/contrek/cpp/cpp_concurrent_vertical_merger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Cpp
     class CPPConcurrentVerticalMerger < CPPVerticalMerger

data/lib/contrek/cpp/cpp_result.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Cpp
     class CPPResult

data/lib/contrek/cpp/cpp_tempfile.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+module Contrek
+  module Cpp
+    class CPPTempfile < CPPOfstream
+      def self.new(name)
+        require "tempfile"
+        tempfile = Tempfile.new(name)
+        instance = super(tempfile.path)
+        instance.instance_variable_set(:@tempfile, tempfile)
+        instance
+      end
+
+      def path
+        @tempfile.path
+      end
+
+      def close
+        super
+        @tempfile.close
+      end
+
+      def unlink
+        @tempfile.unlink
+      end
+    end
+  end
+end

data/lib/contrek/finder/bounds.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Bounds = Struct.new(:min_x, :max_x, :min_y, :max_y) do
   def self.empty
     new(Float::INFINITY, -Float::INFINITY, Float::INFINITY, -Float::INFINITY)

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Concurrent
     class ClippedPolygonFinder < Finder::PolygonFinder

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Concurrent
     class Cluster

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Concurrent
     class Cursor

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Concurrent
     class EndPoint

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Concurrent
     class FakeCluster < Finder::NodeCluster

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Concurrent
     class Finder

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Concurrent
     class HorizontalMerger < Merger

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Concurrent
     class Hub

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Concurrent
     class InnerPolyline

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Concurrent
     module Listable

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

@@ -1,6 +1,9 @@
+# frozen_string_literal: true
+
 module Contrek
   module Concurrent
     class Merger < Finder
+      attr_reader :tiles
       prepend Poolable
 
       def initialize(options: {})

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Concurrent
     class Part

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Concurrent
     module Partitionable

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Concurrent
     class Polyline

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "concurrent-ruby"
 
 module Contrek

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Concurrent
     class Position

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Concurrent
     module Queueable

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Concurrent
     class Sequence

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Contrek
   module Concurrent
     class Shape