Skip to content

Commit fb98ef6

Browse files
committed
Merge branch 'feat/240412'
2 parents f174521 + 57cf7c4 commit fb98ef6

File tree

12 files changed

+768
-102
lines changed

12 files changed

+768
-102
lines changed

.vscode/settings.json

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,9 @@
1616
"colback",
1717
"CSIE",
1818
"currenvir",
19+
"Dasyue",
1920
"datetime",
21+
"Erdős",
2022
"Eulerian",
2123
"extsizes",
2224
"graphicx",
@@ -25,6 +27,7 @@
2527
"indegree",
2628
"injective",
2729
"Königsberg",
30+
"Kuang",
2831
"labelformat",
2932
"Leonhard",
3033
"libfontconfig",
@@ -34,6 +37,7 @@
3437
"multigraphs",
3538
"NCKU",
3639
"NCTU",
40+
"nonneighbor",
3741
"nonstopmode",
3842
"noto",
3943
"outdegree",
@@ -42,6 +46,7 @@
4246
"parbox",
4347
"Pregel",
4448
"princ",
49+
"Prüfer",
4550
"restatable",
4651
"Sarada",
4752
"subfigure",
@@ -58,5 +63,12 @@
5863
],
5964
"latex-workshop.message.latexlog.exclude": [
6065
"Unknown CJK family"
66+
],
67+
"latex-workshop.latexindent.args": [
68+
"-c",
69+
"%DIR%/",
70+
"%TMPFILE%",
71+
"-y=defaultIndent: '%INDENT%'",
72+
"-l=%WORKSPACE_FOLDER%/src/handouts/indentconfig.yaml"
6173
]
6274
}

src/build-handouts/env-image/patch-missing-fonts.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ make_tex_pk_font() {
1111

1212
# DPI FONT
1313
FONT_LIST="
14+
600 matha6
1415
600 matha8
1516
600 matha12
1617
657 matha10
20.5 KB
Loading
14.5 KB
Loading
15.9 KB
Loading

src/handouts/indentconfig.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# defaultIndent: " " # set by LaTeX Workshop. uncomment this for pure latexindet.pl
2+
indentRules:
3+
item: " "

src/handouts/main.tex

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@
3636
\newcommand{\transpose}[1]{\ensuremath{#1^\mathsf{T}}}%
3737
\newcommand{\isomorphicto}{\ensuremath{\cong}}%
3838
\newcommand{\composition}{\circ}%
39+
\DeclareMathOperator*{\diam}{diam}%
40+
\DeclareMathOperator*{\rad}{rad}%
3941
% shorter \implies and \iff arrow
4042
\renewcommand{\implies}{\ensuremath{\Rightarrow}}%
4143
\renewcommand{\iff}{\ensuremath{\Leftrightarrow}}%
@@ -53,6 +55,13 @@
5355
% utilities
5456
\newcommand{\func}[3]{\ensuremath{#1:\, #2 \to #3}}%
5557
\newcommand{\defaultfunc}{\func{f}{A}{B}}%
58+
\newcommand{\combination}[2]{\ensuremath{%
59+
\left( \begin{array}{c}%
60+
#1 \\ %
61+
#2 %
62+
\end{array} \right)%
63+
}}%
64+
\newcommand{\C}[2]{\combination{#1}{#2}}%
5665

5766
% author affiliations
5867
\usepackage{authblk}
@@ -196,14 +205,15 @@
196205
% ref: https://tex.stackexchange.com/a/467146
197206
\newtcbtheorem[#1, Crefname={#6.}{#6s.}]{#2}{#3}{#4}{#5}%
198207
}
199-
\newthm{theorem} {Theorem} {yellow_bg}{thm} {Thm}%
208+
\newthm{algorithm} {Algorithm} {white_bg} {alg} {Algorithm}%
209+
\newthm{corollary} {Corollary} {blue_bg} {cor} {Cor}%
210+
\newthm{definition} {Definition} {green_bg} {def} {Def}%
200211
\newthm{example} {Example} {white_bg} {ex} {Ex}%
212+
\newthm{lemma} {Lemma} {yellow_bg}{lem} {Lem}%
201213
\newthm{proposition} {Proposition}{red_bg} {prop} {Prop}%
202214
\newthm{principle} {Principle} {yellow_bg}{princ}{Princ}%
203-
\newthm{lemma} {Lemma} {yellow_bg}{lem} {Lem}%
204-
\newthm{definition} {Definition} {green_bg} {def} {Def}%
205-
\newthm{corollary} {Corollary} {blue_bg} {cor} {Cor}%
206215
\newthm{remark} {Remark} {gray_bg} {rem} {Rem}%
216+
\newthm{theorem} {Theorem} {yellow_bg}{thm} {Thm}%
207217

208218
% recall any theorems above, but it gives "there were multiply-defined labels" warning.
209219
% reference for \recall: https://tex.stackexchange.com/a/660914

src/handouts/sections/fundamental-concepts.tex

Lines changed: 68 additions & 67 deletions
Large diffs are not rendered by default.

src/handouts/sections/introduction.tex

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -301,20 +301,20 @@ \subsubsection{More Examples of Predicate Logic}
301301
Express "Andy and Paul have the same biological maternal grandmother" in logic.
302302
\begin{enumerate}
303303
\item Let $M(x, y)$ denote that $x$ is $y$'s mother. Consider
304-
$$
305-
\forall x \forall y \forall u \forall v(M(x, y) \land M(y, \text{Andy}) \land M(u, v) \land M(v, \text{Paul}) \implies x = u)
306-
$$
307-
Do you find out something weird?
308-
\begin{enumerate}
309-
\item First, not all $x,\, y,\, u,\, v$ satisfy the logical expression above.
310-
\item Secondly, without specifying $x$ and $u$ in the precondition, you cannot make $x$ and $y$ identical.
311-
\item Lastly, $y,\, \text{Andy},\, v,\, \text{Paul}$ have many mothers in the logical expression.
312-
\end{enumerate}
304+
$$
305+
\forall x \forall y \forall u \forall v(M(x, y) \land M(y, \text{Andy}) \land M(u, v) \land M(v, \text{Paul}) \implies x = u)
306+
$$
307+
Do you find out something weird?
308+
\begin{enumerate}
309+
\item First, not all $x,\, y,\, u,\, v$ satisfy the logical expression above.
310+
\item Secondly, without specifying $x$ and $u$ in the precondition, you cannot make $x$ and $y$ identical.
311+
\item Lastly, $y,\, \text{Andy},\, v,\, \text{Paul}$ have many mothers in the logical expression.
312+
\end{enumerate}
313313
\item Let $m(x)$ denote $x$'s biological mother. The following logical expression matches the English version.
314-
$$
315-
m(m(\text{Andy}))=m(m(\text{Paul})).
316-
$$
317-
Since everyone has exactly one biological mother, we introduce a function $m(x)$ to denote this fact. This is a unction to capture a single object.
314+
$$
315+
m(m(\text{Andy}))=m(m(\text{Paul})).
316+
$$
317+
Since everyone has exactly one biological mother, we introduce a function $m(x)$ to denote this fact. This is a unction to capture a single object.
318318
\end{enumerate}
319319

320320
\subsubsection{Direct, Contrapositive and Contradiction Method}
@@ -355,7 +355,7 @@ \subsection{Lemma, Theorem, Proposition and Corollary}
355355
\item \textbf{Lemma}: It's a premise. It is a lesser statement, and is usually proven to help prove the other statements.
356356
\item \textbf{Theorem}: It's a thesis to be proven. Thus, theorem is a major result requiring some efforts.
357357
\item \textbf{Proposition}: It's something proposed to be proven (true or false), and typically it takes less effort than a theorem.
358-
\item \textbf{Corollary}: It means \textit{gift} in Latin, and it follows easily from a theorem or proposition without much additional work.
358+
\item \textbf{Corollary}: It means \textit{gift} in Latin, and it follows easily from a theorem or proposition without much additional work. Corollary is a sub-theorem.
359359
\end{enumerate}
360360

361361
Although these words come before some graphs or paragraphs, it doesn't mean that you need to memorize them, but they are commonly used or crucial in the later paragraphs or subsections.
@@ -601,6 +601,18 @@ \subsection{Counting and Binomial Coefficients (Skipped)}
601601

602602
This part is covered in senior high schools.
603603

604+
"$n$ choose $k$" (A.42 Theorem in text):
605+
\begin{equation}
606+
\left(\begin{array}{c} n \\ k \end{array}\right) = C^n_k = \frac{n!}{k! (n - k)!}
607+
\label{eq:intro-combination}
608+
\end{equation}
609+
610+
Pascal's formula/rule (A.48 Lemma in text):
611+
\begin{equation}
612+
\text{If } n \geq 1 \text{, then } \C{n}{k} = \C{n - 1}{k} + \C{n - 1}{k - 1}
613+
\label{eq:intro-pascal}
614+
\end{equation}
615+
604616
\subsection{Relations}
605617

606618
Given two objects $s$ and $t$, not necessarily of the same type, we may ask whether they satisfy a given \textbf{relationship}.

0 commit comments

Comments
 (0)