more changes

Author: lrvideckis

library/data_structures_inclusive_inclusive/lazy_seg_tree.hpp

@@ -1,16 +1,16 @@
 #pragma once
-#include "lazy_seg_tree_inc_midpoint.hpp"
-ll op_inc(ll vl, ll vr) { return vl + vr; }
-struct seg_tree_inc {
+#include "seg_tree_midpoint.hpp"
+ll op(ll vl, ll vr) { return vl + vr; }
+struct seg_tree {
   int n;
   vector<ll> tree, lazy;
-  seg_tree_inc(int n): n(n), tree(2 * n), lazy(n) {}
-  seg_tree_inc(const vi& a):
+  seg_tree(int n): n(n), tree(2 * n), lazy(n) {}
+  seg_tree(const vi& a):
     n(sz(a)), tree(2 * n), lazy(n) {
     int pw2 = bit_ceil(size(a));
     rep(i, 0, n) tree[(i + pw2) % n + n] = a[i];
     for (int i = n - 1; i >= 1; i--)
-      tree[i] = op_inc(tree[2 * i], tree[2 * i + 1]);
+      tree[i] = op(tree[2 * i], tree[2 * i + 1]);
   }
   void apply(ll change, int tl, int tr, int v) {
     tree[v] += (tr - tl + 1) * change;
@@ -31,21 +31,21 @@ struct seg_tree_inc {
     if (r < tl || tr < l) return;
     if (l <= tl && tr <= r)
       return apply(change, tl, tr, v);
-    int tm = split_inc(tl, tr);
+    int tm = split(tl, tr);
     push(tl, tm, tr, v);
     update_impl(l, r, change, tl, tm, 2 * v);
     update_impl(l, r, change, tm + 1, tr, 2 * v + 1);
-    tree[v] = op_inc(tree[2 * v], tree[2 * v + 1]);
+    tree[v] = op(tree[2 * v], tree[2 * v + 1]);
   }
   ll query(int l, int r) { // [l, r]
     return query_impl(l, r, 0, n - 1, 1);
   }
   ll query_impl(int l, int r, int tl, int tr, int v) {
     if (r < tl || tr < l) return 0;
     if (l <= tl && tr <= r) return tree[v];
-    int tm = split_inc(tl, tr);
+    int tm = split(tl, tr);
     push(tl, tm, tr, v);
-    return op_inc(query_impl(l, r, tl, tm, 2 * v),
+    return op(query_impl(l, r, tl, tm, 2 * v),
       query_impl(l, r, tm + 1, tr, 2 * v + 1));
   }
 };

library/data_structures_inclusive_inclusive/rmq.hpp

@@ -1,19 +1,20 @@
 #pragma once
 //! @code
-//!   rmq_inc rmq1(a, ranges::min);
-//!   rmq_inc rmq2(a, [&](auto& x, auto& y) {
+//!   RMQ rmq1(a, ranges::min);
+//!   RMQ rmq2(a, [&](auto& x, auto& y) {
 //!     return min(x, y);
 //!   });
-//!   vector<rmq_inc<int, function<int(int, int)>>>
+//!   vector<RMQ<int, function<int(int, int)>>>
 //!     rmqs(3, {{}, NULL});
 //!   rmqs[1] = {a, ranges::min};
 //! @endcode
 //! @time O(nlogn + q)
 //! @space O(nlogn)
-template<class T, class F> struct rmq_inc {
+// NOLINTNEXTLINE(readability-identifier-naming)
+template<class T, class F> struct RMQ {
   vector<vector<T>> dp;
   F op;
-  rmq_inc(const vector<T>& a, F op): dp(1, a), op(op) {
+  RMQ(const vector<T>& a, F op): dp(1, a), op(op) {
     for (int i = 0; (2 << i) <= sz(a); i++) {
       dp.emplace_back(sz(a) - (2 << i) + 1);
       ranges::transform(dp[i], dp[i] | views::drop(1 << i),

library/data_structures_inclusive_inclusive/seg_tree.hpp

@@ -2,11 +2,11 @@
 //! https://codeforces.com/blog/entry/118682
 //! @code
 //!   {
-//!     tree_inc st(n, pii{}, [&](pii& l, pii& r) {
+//!     tree st(n, pii{}, [&](pii& l, pii& r) {
 //!       return min(l, r);
 //!     });
 //!   }
-//!   tree_inc st(n, int{}, ranges::min);
+//!   tree st(n, int{}, ranges::min);
 //!   rep(i, 0, n) st.update(i, a[i]);
 //! @endcode
 //! @time O(n + q log n)
@@ -15,11 +15,11 @@ int nxt(int& l, int r) {
   int lg = __lg(min(l & -l, r - l + 1));
   return exchange(l, l + (1 << lg)) >> lg;
 }
-template<class T, class F> struct tree_inc {
+template<class T, class F> struct tree {
   int n;
   F op;
   vector<T> s;
-  tree_inc(int n, T, F op): n(n), op(op), s(2 * n) {}
+  tree(int n, T, F op): n(n), op(op), s(2 * n) {}
   void update(int i, T val) {
     for (s[i += n] = val; i /= 2;)
       s[i] = op(s[2 * i], s[2 * i + 1]);

library/data_structures_inclusive_inclusive/seg_tree_midpoint.hpp

@@ -1,10 +1,10 @@
 #pragma once
 //! https://codeforces.com/blog/entry/112755
 //! @code
-//!   int tm = split_inc(tl, tr);
+//!   int tm = split(tl, tr);
 //!   // [tl,tr] splits into [tl,tm] and [tm+1,tr]
 //! @endcode
-int split_inc(int tl, int tr) {
+int split(int tl, int tr) {
   int pw2 = 1 << __lg(tr - tl + 1);
   return min(tl + pw2 - 1, tr - pw2 / 2);
 }