resolve conflict (b9bdbf84) · Commits · SUMMER2020 / students / proj-2019164

docs/_redirects

+31 −8

Original line number	Diff line number	Diff line
		/intro/non-trad /intro/problems
		/intro/editor/vim /lang/editor/vim
		/intro/editor/emacs /lang/editor/emacs
		/intro/editor/vscode /lang/editor/vscode
		/intro/editor/atom /lang/editor/atom
		/intro/editor/eclipse /lang/editor/eclipse
		/intro/editor/npp /lang/editor/npp
		/intro/editor/devcpp /lang/editor/devcpp
		/intro/oi /contest/oi
		/intro/icpc /contest/icpc
		/intro/roadmap /contest/roadmap
		/intro/resources /contest/resources
		/intro/common-mistakes /contest/common-mistakes
		/intro/common-tricks /contest/common-tricks
		/intro/non-trad /contest/problems
		/intro/judgers /tools/judgers
		/intro/wsl /tools/wsl
		/intro/spj /tools/spj
		/intro/testlib/index /tools/testlib/index
		/intro/testlib/general /tools/testlib/general
		/intro/testlib/generator /tools/testlib/generator
		/intro/testlib/validator /tools/testlib/validator
		/intro/testlib/interactor /tools/testlib/interactor
		/intro/testlib/checker /tools/testlib/checker
		/intro/polygon /tools/polygon
		/intro/oj-tool /tools/oj-tool
		/intro/latex /tools/latex
		/intro/editor/vim /tools/editor/vim
		/intro/editor/emacs /tools/editor/emacs
		/intro/editor/vscode /tools/editor/vscode
		/intro/editor/atom /tools/editor/atom
		/intro/editor/eclipse /tools/editor/eclipse
		/intro/editor/npp /tools/editor/npp
		/intro/editor/devcpp /tools/editor/devcpp
		/intro/editor/geany /tools/editor/geany
		/basic/interaction /contest/interaction
		/topic/cmd /tools/cmd
		/topic/problemsetting /contest/problemsetting
		/misc/io /contest/io
		/math/sign /math/notation
		/graph/tree-misc /graph/tree-centroid
		/graph/bridge /graph/cut

docs/basic/prefix-sum.md

+1 −1

Original line number	Diff line number	Diff line
		@@ -308,7 +308,7 @@ $$
		\begin{aligned}
		&d_s\leftarrow d_s+1\\
		&d_t\leftarrow d_t+1\\
		&d_{lca}\leftarrow d_{lca}-２\\
		&d_{lca}\leftarrow d_{lca}-2\\
		\end{aligned}
		$$

docs/basic/radix-sort.md

+3 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,9 @@ void counting_sort(int p) {
		memset(cnt, 0, sizeof(cnt));
		for (int i = 1; i <= n; ++i) ++cnt[a[i].key[p]];
		for (int i = 1; i <= w[p]; ++i) cnt[i] += cnt[i - 1];
		for (int i = 1; i <= n; ++i) b[cnt[a[i].key[p]]--] = a[i];
		// 为保证排序的稳定性，此处循环i应从n到1
		// 即当两元素关键字的值相同时，原先排在后面的元素在排序后仍应排在后面
		for (int i = n; i >= 1; --i) b[cnt[a[i].key[p]]--] = a[i];
		memcpy(a, b, sizeof(a));
		}

docs/intro/common-mistakes.md→docs/contest/common-mistakes.md

+2 −2

Original line number	Diff line number	Diff line
		author: NachtgeistW
		author: H-J-Granger, orzAtalod, ksyx, Ir1d, Chrogeek, Enter-tainer, yiyangit

		本页面主要列举了一些在竞赛中经常出现的错误。
		本页面主要列举一些竞赛中很多人经常会出现的错误。

		## 会引起 CE 的错误

docs/intro/common-tricks.md→docs/contest/common-tricks.md

+2 −2

Original line number	Diff line number	Diff line
		author: NachtgeistW
		author: H-J-Granger, Ir1d, ChungZH, Marcythm, StudyingFather, billchenchina, Suyun514, Psycho7, greyqz, Xeonacid, partychicken

		本页面主要列举了一些竞赛中的小技巧。
		本页面主要列举一些竞赛中的小技巧。

		## 利用局部性