1 files changed, 17 insertions, 18 deletions

diff --git a/datastructures/segmentTree.cpp b/datastructures/segmentTree.cpp
index eb59d00..7b97f57 100644
--- a/datastructures/segmentTree.cpp
+++ b/datastructures/segmentTree.cpp
@@ -1,25 +1,24 @@
 vector<ll> tree;
-constexpr ll query_default = 0;
+constexpr ll neutral = 0; // Neutral element for combine
 
 ll combine(ll a, ll b) {
 	return a + b;
 }
 
-void init(vector<ll>& values) {
-	tree.assign(sz(values)*2, 0);
-	copy(all(values), tree.begin() + sz(values));
-	for (int i = sz(tree)/2 - 1; i > 0; --i) {
-		tree[i] = combine(tree[2*i], tree[2*i+1]);
+void init(vector<ll>& a) {
+	tree.assign(2 * sz(a), 0);
+	copy(all(a), tree.begin() + sz(a));
+	for (int i = sz(tree)/2 - 1; i > 0; i--) {
+		tree[i] = combine(tree[2 * i], tree[2 * i + 1]);
 }}
 
-void update(int p, ll value) {
-	for (tree[p += sz(tree)/2] = value, p /= 2; p > 0; p /= 2) {
-		tree[p] = combine(tree[2*p], tree[2*p+1]);
+void update(int i, ll val) {
+	for (tree[i += sz(tree)/2] = val; i /= 2; ) {
+		tree[i] = combine(tree[2 * i], tree[2 * i + 1]);
 }}
 
 ll query(int l, int r) {
-	ll resL = query_default;
-	ll resR = query_default;
+	ll resL = neutral, resR = neutral;
 	for (l += sz(tree)/2, r += sz(tree)/2; l < r; l /= 2, r /= 2) {
 		if (l&1) resL = combine(resL, tree[l++]);
 		if (r&1) resR = combine(tree[--r], resR);
@@ -28,16 +27,16 @@ ll query(int l, int r) {
 }
 
 // Oder: Intervall-Modifikation, Punkt-Query:
-void modify(int l, int r, ll value) {
+void modify(int l, int r, ll val) {
 	for (l += sz(tree)/2, r += sz(tree)/2; l < r; l /= 2, r /= 2) {
-		if (l&1) {tree[l] = combine(tree[l], value); l++;};
-		if (r&1) {--r; tree[r] = combine(value, tree[r]);};
+		if (l&1) {tree[l] = combine(tree[l], val); l++;};
+		if (r&1) {--r; tree[r] = combine(tree[r], val);};
 }}
 
-ll query(int p) {
-	ll res = query_default;
-	for (p += sz(tree)/2; p > 0; p = p/2) {
-		res = combine(res, tree[p]);
+ll query(int i) {
+	ll res = neutral;
+	for (i += sz(tree)/2; i > 0; i /= 2) {
+		res = combine(res, tree[i]);
 	}
 	return res;
 }