more fixes

Author: lrvideckis

library/data_structures_[l,r)/uncommon/permutation_tree.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include "linear_rmq.hpp"
+#include "../../data_structures_[l,r]/linear_rmq.hpp"
 //! https://codeforces.com/blog/entry/78898
 //! @code
 //!   auto [p, root, ch] = perm_tree(a);

library/dsu/range_parallel_dsu.hpp

@@ -1,13 +1,13 @@
 #pragma once
-#include "../../../kactl/content/data-structures/UnionFind.h"
+#include "dsu.hpp"
 //! Given l1,l2,len; joins (l1,l2), (l1+1,l2+1),
 //!   ..., (l1+len-1,l2+len-1)
 //! `f` is called at most n-1 times
 //! @time O(n*log(n)*\alpha(n) + q)
 //! @space O(n log n)
 struct rp_dsu {
-  vector<UF> ufs;
-  rp_dsu(int n): ufs(bit_width(unsigned(n)), UF(n)) {}
+  vector<DSU> dsus;
+  rp_dsu(int n): dsus(bit_width(unsigned(n)), DSU(n)) {}
   void join(int l1, int l2, int len, const auto& f) {
     if (len == 0) return;
     int lg = __lg(len);
@@ -17,13 +17,13 @@ struct rp_dsu {
   }
   void join_impl(int lvl, int u, int v, const auto& f) {
     if (lvl == 0) {
-      u = ufs[0].find(u);
-      v = ufs[0].find(v);
-      if (!ufs[0].join(v, u)) return;
-      int w = ufs[0].find(u);
+      u = dsus[0].f(u);
+      v = dsus[0].f(v);
+      if (!dsus[0].join(v, u)) return;
+      int w = dsus[0].f(u);
       return f(w, u ^ v ^ w);
     }
-    if (!ufs[lvl].join(u, v)) return;
+    if (!dsus[lvl].join(u, v)) return;
     join_impl(lvl - 1, u, v, f);
     join_impl(lvl - 1, u + (1 << (lvl - 1)),
       v + (1 << (lvl - 1)), f);

library/dsu/range_parallel_equivalence_classes.hpp

@@ -1,17 +1,17 @@
 #pragma once
-#include "../../../kactl/content/data-structures/UnionFind.h"
+#include "dsu.hpp"
 //! Given triplets (l1,l2,len); joins (l1,l2),
 //!   (l1+1,l2+1), ..., (l1+len-1,l2+len-1)
 //! @time O((n + q) * \alpha(n))
 //! @space O(n + q)
-UF get_rp_dsu(const vector<array<int, 3>>& rests, int n) {
+DSU get_rp_dsu(const vector<array<int, 3>>& rests, int n) {
   vector<vector<pii>> rests_by_len(n + 1);
   for (auto [l1, l2, len] : rests)
     rests_by_len[len].emplace_back(l1, l2);
-  UF uf(n);
+  DSU dsu(n);
   for (int len = n; len > 0; len--)
     for (auto [l1, l2] : rests_by_len[len])
-      if (uf.join(l1, l2))
+      if (dsu.join(l1, l2))
         rests_by_len[len - 1].emplace_back(l1 + 1, l2 + 1);
-  return uf;
+  return dsu;
 }

library/graphs/bcc_callback.hpp

@@ -3,7 +3,7 @@
 //! @code
 //!   {
 //!     vector<vi> adj(n);
-//!     UF uf(n);
+//!     DSU dsu(n);
 //!     vector<bool> seen(n);
 //!     bcc(adj, [&](const vi& nodes) {
 //!       int count_edges = 0;
@@ -18,13 +18,13 @@
 //!         // nodes[0] <=> nodes[1] is a bridge
 //!         return;
 //!       }
-//!       for (int u : nodes) uf.join(u, nodes[0]);
+//!       for (int u : nodes) dsu.join(u, nodes[0]);
 //!     });
 //!     vector<basic_string<int>> bridge_tree(n);
 //!     rep (i, 0, n)
 //!       for (int u : adj[i])
-//!         if (!uf.sameSet(i, u))
-//!           bridge_tree[uf.find(i)] += uf.find(u);
+//!         if (dsu.f(i) != dsu.f(u))
+//!           bridge_tree[dsu.f(i)] += dsu.f(u);
 //!   }
 //!
 //!   vector<basic_string<int>> adj(n);

tests/library_checker_aizu_tests/handmade_tests/seg_tree_find_small.test.cpp

@@ -2,7 +2,7 @@
   "https://judge.u-aizu.ac.jp/onlinejudge/description.jsp?id=ITP1_1_A"
 #include "../template.hpp"
 #include "../../../library/contest/random.hpp"
-#include "../../../library/data_structures/lazy_seg_tree.hpp"
+#include "../../../library/data_structures_[l,r)/lazy_seg_tree.hpp"
 int main() {
   cin.tie(0)->sync_with_stdio(0);
   for (int iters = 0; iters < 100; ++iters) {