Added titlepage and intersection algorithm

lucashc · lucashc · commit 466a79cc3f01 · 2019-10-10T00:46:21.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
 main_mod.tex
 build/*
 main.pdf
+*.pdf
diff --git a/algorithms/intersection_line_segments.cpp b/algorithms/intersection_line_segments.cpp
@@ -0,0 +1,32 @@
+# Intersection of line segments
+## \note Line segments are given by the coordinates of their end points.
+struct Point {
+
+	long long x, y;
+
+};
+
+struct Line {
+	Point p, q;
+};
+
+int sgn(long long x) {
+	return x == 0 ? 0 : (x < 0 ? -1 : 1);
+}
+
+long long det(long long x1, long long y1, long long x2, long long y2) {
+	return x1 * y2 - x2 * y1;
+}
+
+int orientation(Point p, Point q, Point r) {
+	return sgn(det(p.x - r.x, p.y - r.y, q.x - r.x, q.y - r.y));
+}
+
+bool intersect(Line l1, Line l2) {
+	if (max(l1.p.x, l1.q.x) < min(l2.p.x, l2.q.x)) return false;
+	if (max(l2.p.x, l2.q.x) < min(l1.p.x, l1.q.x)) return false;
+	if (max(l1.p.y, l1.q.y) < min(l2.p.y, l2.q.y)) return false;
+	if (max(l2.p.y, l2.q.y) < min(l1.p.y, l1.q.y)) return false;
+	return orientation(l1.q, l2.p, l1.p) * orientation(l1.q, l2.q, l1.p) <= 0
+		&& orientation(l2.q, l1.p, l2.p) * orientation(l2.q, l1.q, l2.p) <= 0;
+}
diff --git a/logo.eps b/logo.eps
diff --git a/logo_rgb.eps b/logo_rgb.eps
diff --git a/main.tex b/main.tex
@@ -1,5 +1,5 @@
 \documentclass[a4paper, twocolumn]{article}
-\usepackage[landscape, a4paper, left=1cm, right=1cm, top=1cm, bottom=2cm]{geometry}
+\usepackage[landscape, a4paper, left=1cm, right=1cm, top=1cm, bottom=4cm]{geometry}
 \usepackage[parfill]{parskip}
 \usepackage{fancyhdr}
 \usepackage{tikz}
@@ -15,7 +15,7 @@
 
 % Team Name
 \newcommand{\teamname}{Crystal Math}
-
+\newcommand{\teammembers}{Gabriëlle Zwaneveld, Sven Holtrop and Lucas Crijns}
 % Useful commands
 \renewcommand{\vec}{\overrightarrow}
 \newcommand{\pageend}{\vfill\newpage}
@@ -24,6 +24,10 @@
 \newcommand{\point}[4]{\draw[fill] (#1,#2) circle (1pt) node[#4] {#3}}
 \newcommand{\note}{\textbf{Note: }}
 
+% Fix Header
+\setlength{\topmargin}{0cm}
+\setlength{\headsep}{0cm}
+\setlength{\columnsep}{1cm}
 % Syntax Highlighting
 \lstset{language=python}
 \input{highlighting.tex}
@@ -38,12 +42,18 @@
 				\fill [SpecialBlue] (0cm, 0cm) rectangle (\paperwidth, 1.5cm);
 			\end{tikzpicture}
 		};
+		\node[yshift=-2cm] at (current page.north west) {
+			\begin{tikzpicture}[remember picture, overlay]
+				\fill [SpecialBlue] (0cm, 0cm) rectangle (\paperwidth, 2cm);
+				\node at (\paperwidth - 2.5cm, 0.7cm) {\includegraphics[height=3cm]{logo.eps}};
+			\end{tikzpicture}
+		};
 	\end{tikzpicture}
 }
 \fancyhead{\mkfoot}
 \fancyfoot{}
 \fancyfoot[L]{\color{white} \large \textbf{\teamname} Cheatsheet}
-\fancyfoot[R]{\color{white} Gabriëlle Zwaneveld, Sven Holtrop en Lucas Crijns \hspace{1.3em} \large \textbf\thepage}
+\fancyfoot[R]{\color{white} \teammembers \hspace{1.3em} \large \textbf\thepage}
 \renewcommand{\headrulewidth}{0cm}
 \renewcommand{\headrulewidth}{0cm}
 
@@ -53,10 +63,23 @@
 
 \begin{document}
 
+% Title page
+\begin{titlepage}
+	\centering
+	~\\
+	\vspace{20px}
+	\resizebox{700px}{!}{\Huge Team Contest Reference}
+	\\ \vspace{40px}
+	\resizebox{400px}{!}{\Huge \textcolor{SpecialBlue}{\textbf{\teamname}}}
+	\\ \vspace{20px}
+	\resizebox{500px}{!}{\LARGE \teammembers}
+	\includegraphics[width=300px]{logo_rgb.eps}
+\end{titlepage}
+
 \section{Modules}
 \subsection{Python}
 \begin{itemize}
-	\item Priority queue \arrow \ms{queue.PriorityQueue}
+	\item Priority queue \arrow \ms{heapq}
 	\item Python base switching \arrow \ms{int(x, base=b)}
 	\item Deque \arrow \ms{collections.deque}
 \end{itemize}
@@ -113,7 +136,6 @@ \subsection*{More Formulas}
 16796\}
 \end{align*}
 \vspace{-1em}
-\newpage
 \subsection*{Fibonacci Numbers}\vspace*{-1em}
 \begin{align*}
 1,1,2,3,5,8,13,21,34,55,89, 144, 233, 377, 610, 987, 1597, 2584
@@ -242,6 +264,9 @@ \subsection{Lagrange polynomials}
 l_j(x) &= \prod_{0 \leq m \leq k, m \neq j} \frac{x-x_m}{x_j-x_m} \\
 \end{align*}
 
+\subsection*{Graphs}
+For a connected planar graph, the number of vertices $V$, edges $E$ and planar faces $F$ obeys: $V-E+f=2$ (this includes the outer face).
+
 \section{Algorithms}
 
 %PLACEHOLDER%
diff --git a/substitute.py b/substitute.py
@@ -1,22 +1,22 @@
 #!/bin/env python
 import sys
 from os import listdir
-from os.path import isfile, join
+from os.path import isfile, join, getsize
 
 # Get files in directory
 algorithm_dir = sys.argv[1]
-filelist = [f for f in listdir(algorithm_dir) if isfile(join(algorithm_dir, f))]
-filelist.sort()
+filelist = [join(algorithm_dir, f) for f in listdir(algorithm_dir) if isfile(join(algorithm_dir, f))]
+filelist.sort(key=lambda x: getsize(x))
 
 def get_lang(f):
-    if f[-3:] == ".py": return "python"
-    elif f[-5:] == ".java": return "java"
-    elif f[-4:] == ".cpp": return "cpp"
+    if f[-3:] == ".py": return "Python"
+    elif f[-5:] == ".java": return "Java"
+    elif f[-4:] == ".cpp": return "C++"
     else: return "java"
 
 inclusion = ""
 for f in filelist:
-    with open(join(algorithm_dir, f)) as file:
+    with open(f) as file:
             data = file.read()
             code = "\n".join([i for i in data.partition('\n')[-1].splitlines() if not i.startswith("##")])
             title = data.splitlines()[0][2:].strip()

-Original file line number
+Diff line change
@@ @@ -1,3 +1,4 @@ @@
 main_mod.tex
 build/*
 main.pdf
 +*.pdf