Merge branch 'another-try' of github.com:programming-team-code/programming_team_code into another-try

Author: lrvideckis

.verify-helper/timestamps.remote.json

@@ -25,7 +25,6 @@
 "tests/library_checker_aizu_tests/data_structures/implicit_seg_tree.test.cpp": "2026-01-18 11:15:41 +0000",
 "tests/library_checker_aizu_tests/data_structures/kruskal_tree_aizu.test.cpp": "2026-01-18 02:20:40 +0000",
 "tests/library_checker_aizu_tests/data_structures/kth_smallest_pst.test.cpp": "2026-01-18 11:15:41 +0000",
-"tests/library_checker_aizu_tests/data_structures/kth_smallest_wavelet_matrix.test.cpp": "2026-01-18 02:20:40 +0000",
 "tests/library_checker_aizu_tests/data_structures/lazy_segment_tree.test.cpp": "2026-01-18 04:18:37 -0700",
 "tests/library_checker_aizu_tests/data_structures/lazy_segment_tree_constructor.test.cpp": "2026-01-18 04:18:37 -0700",
 "tests/library_checker_aizu_tests/data_structures/lazy_segment_tree_inc.test.cpp": "2026-01-18 11:04:58 +0000",
@@ -75,7 +74,6 @@
 "tests/library_checker_aizu_tests/handmade_tests/functional_graph.test.cpp": "2025-08-06 16:18:37 -0600",
 "tests/library_checker_aizu_tests/handmade_tests/hilbert_mos.test.cpp": "2026-01-18 02:20:40 +0000",
 "tests/library_checker_aizu_tests/handmade_tests/manacher.test.cpp": "2026-01-18 11:15:41 +0000",
-"tests/library_checker_aizu_tests/handmade_tests/merge_st_and_wavelet.test.cpp": "2026-01-18 11:04:58 +0000",
 "tests/library_checker_aizu_tests/handmade_tests/mobius.test.cpp": "2025-02-10 14:50:36 -0700",
 "tests/library_checker_aizu_tests/handmade_tests/mod_division.test.cpp": "2025-09-07 16:12:35 -0600",
 "tests/library_checker_aizu_tests/handmade_tests/n_choose_k.test.cpp": "2025-08-28 13:19:16 -0600",

library/data_structures_[l,r)/seg_tree_uncommon/wavelet_matrix.hpp

@@ -11,11 +11,23 @@
 struct wavelet_matrix {
   int n;
   vector<bit_vec> bv;
+<<<<<<< HEAD
   wavelet_matrix(vector<ll> a, int lg):
     n(sz(a)), bv(lg, {{}}) {
     for (int h = sz(bv); h--;) {
       vector<bool> b(n);
       rep(i, 0, n) b[i] = (~a[i] >> h) & 1;
+=======
+  wavelet_matrix(const vector<ull>& a, ull max_val):
+    n(sz(a)), bv(bit_width(max_val), {{}}) {
+    vi idx(n);
+    iota(all(idx), 0);
+    for (int h = sz(bv); h--;) {
+      vector<bool> b(n);
+      rep(i, 0, n) b[i] = (~a[idx[i]] >> h) & 1;
+      ranges::stable_partition(idx,
+        [&](int i) { return b[i]; });
+>>>>>>> d33c8d6ad7b529d498b855449a3b9d57f04e402c
       bv[h] = b;
       ranges::stable_partition(a,
         [&](ll x) { return (~x >> h) & 1; });