more fixes

Author: lrvideckis

tests/library_checker_aizu_tests/handmade_tests/count_paths.test.cpp

@@ -2,9 +2,9 @@
   "https://judge.u-aizu.ac.jp/onlinejudge/description.jsp?id=ITP1_1_A"
 #include "../template.hpp"
 #include "../../../library/contest/random.hpp"
-#include "../../../library/trees/centroid_decomp_uncommon/count_paths_per_node.hpp"
-#include "../../../library/trees/lca_rmq/lca_rmq.hpp"
-#include "../../../library/trees/centroid_decomp_uncommon/count_paths_per_length.hpp"
+#include "../../../library/trees/uncommon/count_paths_per_node.hpp"
+#include "../../../library/trees/lca_rmq.hpp"
+#include "../../../library/trees/uncommon/count_paths_per_length.hpp"
 #include "../cd_asserts.hpp"
 vector<vector<ll>> naive(const vector<vi>& adj) {
   LCA lc(adj);

tests/library_checker_aizu_tests/trees/kth_path_tree_lift.test.cpp

@@ -2,8 +2,8 @@
   "https://judge.yosupo.jp/problem/jump_on_tree"
 #include "../template.hpp"
 #include "../../../library/contest/random.hpp"
-#include "../../../library/trees/tree_lift/tree_lift.hpp"
-#include "../../../library/trees/lca_rmq/lca_rmq.hpp"
+#include "../../../library/trees/tree_lift.hpp"
+#include "../../../library/trees/lca_rmq.hpp"
 int main() {
   cin.tie(0)->sync_with_stdio(0);
   int n, q;

tests/library_checker_aizu_tests/trees/lca_all_methods_aizu.test.cpp

@@ -2,9 +2,9 @@
   "https://judge.u-aizu.ac.jp/onlinejudge/description.jsp?id=GRL_5_C"
 #include "../template.hpp"
 #include "../../../library/monotonic_stack/monotonic_stack.hpp"
-#include "../../../library/trees/tree_lift/tree_lift.hpp"
+#include "../../../library/trees/tree_lift.hpp"
 #include "../../../library/trees/linear_lca.hpp"
-#include "../../../library/trees/lca_rmq/lca_rmq.hpp"
+#include "../../../library/trees/lca_rmq.hpp"
 #include "../compress_tree_asserts.hpp"
 int main() {
   cin.tie(0)->sync_with_stdio(0);
@@ -25,8 +25,8 @@ int main() {
     assert(tl.lca(i, i) == i);
     assert(lc.lca(i, i) == i);
     assert(lin_lca.lca(i, i) == i);
-    assert(lc.in[lc.rmq.dp[0][i]] == i &&
-      lc.rmq.dp[0][lc.in[i]] == i);
+    assert(lc.tin[lc.rmq.dp[0][i]] == i &&
+      lc.rmq.dp[0][lc.tin[i]] == i);
   }
   int q;
   cin >> q;

tests/library_checker_aizu_tests/trees/subtree_isomorphism.test.cpp

@@ -3,7 +3,7 @@
 // as std::map insert takes O(n) time in debug mode
 #undef _GLIBCXX_DEBUG
 #include "../template.hpp"
-#include "../../../library/trees/subtree_isomorphism.hpp"
+#include "../../../library/trees/uncommon/subtree_isomorphism.hpp"
 int main() {
   cin.tie(0)->sync_with_stdio(0);
   int n;