Merge branch 'new-master' of github.com:mzuenni/ContestReference into new-master

8 files changed, 6 insertions, 113 deletions

diff --git a/datastructures/dynamicConvexHull.cpp b/datastructures/dynamicConvexHull.cpp
index 18a46d0..d8a1a3b 100644
--- a/datastructures/dynamicConvexHull.cpp
+++ b/datastructures/dynamicConvexHull.cpp
@@ -44,7 +44,7 @@ struct HullDynamic : public multiset<Line> {
 	}
 
 	ll query(ll x) { // Laufzeit: O(log(n)) 
-		auto l = *lower_bound((Line) {x, MIN});
+		auto l = *lower_bound((Line) {x, LLONG_MIN});
 		return l.m * x + l.b;
 	}
 };
diff --git a/geometry/triangle.cpp b/geometry/triangle.cpp
index 3a39302..fedc873 100644
--- a/geometry/triangle.cpp
+++ b/geometry/triangle.cpp
@@ -25,7 +25,7 @@ pt outCenter(pt a, pt b, pt c) {
 // Zentrum des größten Kreises im Dreiecke
 pt inCenter(pt a, pt b, pt c) {
 	double x = abs(a-b), y = abs(b-c), z = abs(a-c);
-	return (y*a + z*b + x*c) / (a+b+c);
+	return (y*a + z*b + x*c) / (x+y+z);
 }
 
 
diff --git a/graph/LCA_sparse.cpp b/graph/LCA_sparse.cpp
index 2a38528..a56dafa 100644
--- a/graph/LCA_sparse.cpp
+++ b/graph/LCA_sparse.cpp
@@ -28,5 +28,5 @@ struct LCA {
 		return visited[st.queryIdempotent(first[a], first[b] + 1)];
 	}
 
-	ll getDepth(int a) {eturn depth[first[a]];}
+	ll getDepth(int a) {return depth[first[a]];}
 };
diff --git a/latexHeaders/listings.tex b/latexHeaders/code.sty
index caac6b1..caac6b1 100644
--- a/latexHeaders/listings.tex
+++ b/latexHeaders/code.sty
diff --git a/latexHeaders/listings.sty b/latexHeaders/listings.sty
deleted file mode 100644
index d1aa5f0..0000000
--- a/latexHeaders/listings.sty
+++ /dev/null
@@ -1,106 +0,0 @@
-% Colors, used for syntax highlighting.
-% To print this document, set all colors to black!
-\usepackage{xcolor}
-\definecolor{safeRed}{HTML}{D7191C}
-\definecolor{safeOrange}{HTML}{FFDE71}
-\definecolor{safeYellow}{HTML}{FFFFBF}
-\definecolor{safeGreen}{HTML}{99CF8F}
-\definecolor{safeBlue}{HTML}{2B83BA}
-
-%try printer friendly colors?
-%\colorlet{keyword}{safeBlue}
-%\colorlet{string}{safeRed}
-%\colorlet{comment}{safeGreen}
-%\colorlet{identifier}{black}
-\definecolor{keyword}{HTML}{2750A0}
-\definecolor{string}{HTML}{7B3294}
-\definecolor{comment}{HTML}{1A9641}
-\definecolor{identifier}{HTML}{000000}
-
-% Source code listings.
-\usepackage[scaled=0.80]{beramono}
-
-\usepackage{listings}
-\lstset{
-	language={C++},
-	numbers=left,
-	stepnumber=1,
-	numbersep=6pt,
-	numberstyle=\small,
-	breaklines=true,
-	breakautoindent=true,
-	breakatwhitespace=false,
-	numberblanklines=true,
-	postbreak=\space,
-	tabsize=2,
-	basicstyle=\ttfamily\normalsize,
-	showspaces=false,
-	showstringspaces=false,
-	extendedchars=true,
-	keywordstyle=\color{keyword}\bfseries,
-	stringstyle=\color{string}\bfseries,
-	commentstyle=\color{comment}\bfseries\itshape,
-	identifierstyle=\color{identifier},
-	frame=trbl,
-	aboveskip=3pt,
-	belowskip=3pt,
-	escapechar=@
-	%moredelim=**[is][{\btHL[fill=green!30,draw=red,dashed,thin]}]{@}{@}	
-}
-
-% Listings doesn't support UTF8. This is just enough for German umlauts.
-\lstset{literate=%
-  {Ö}{{\"O}}1
-  {Ä}{{\"A}}1
-  {Ü}{{\"U}}1
-  {ß}{{\ss}}1
-  {ü}{{\"u}}1
-  {ä}{{\"a}}1
-  {ö}{{\"o}}1
-  {~}{{\textasciitilde}}1
-}
-
-\let\orig@lstnumber=\thelstnumber
-\newcommand\lstresetnumber{\global\let\thelstnumber=\orig@lstnumber}
-\let\orig@placelstnumber=\lst@PlaceNumber
-\gdef\lst@PlaceNumber{\orig@placelstnumber\lstresetnumber}
-\newcommand\lstsettmpnumber[1]{\gdef\thelstnumber{#1}}
-
-\lst@AddToHook{OnEmptyLine}{%
-	\ifnum\value{lstnumber}>99
-		\lstsettmpnumber{\_\_\_}
-	\else\ifnum\value{lstnumber}>9
-		\lstsettmpnumber{\_\_}
-	\else
-		\lstsettmpnumber{\_}
-	\fi\fi
-%	\lstsettmpnumber{\_\_\kern-6pt}%
-	\vspace{-1.75ex}%
-	\addtocounter{lstnumber}{-1}%
-}
-% old: (change numberblanklines=false!)
-%\lst@AddToHook{OnEmptyLine}{%
-%	\vspace{\dimexpr\baselineskip+0.5em}%
-%	\addtocounter{lstnumber}{-1}%
-%}
-
-\newenvironment{btHighlight}[1][]
-{\begingroup\tikzset{bt@Highlight@par/.style={#1}}\begin{lrbox}{\@tempboxa}}
-{\end{lrbox}\bt@HL@box[bt@Highlight@par]{\@tempboxa}\endgroup}
-
-\newcommand\btHL[1][]{%
-	\begin{btHighlight}[#1]\bgroup\aftergroup\bt@HL@endenv%
-	}
-	\def\bt@HL@endenv{%
-	\end{btHighlight}%   
-	\egroup%
-}
-\newcommand{\bt@HL@box}[2][]{%
-	\tikz[#1]{%
-		\pgfpathrectangle{\pgfpoint{1pt}{0pt}}{\pgfpoint{\wd #2}{\ht #2}}%
-		\pgfusepath{use as bounding box}%
-		\node[anchor=base west, fill=orange!30,outer sep=0pt,inner xsep=2.2pt, inner ysep=0pt, rounded corners=3pt, minimum height=\ht\strutbox+1pt,#1]{\raisebox{1pt}{\strut}\strut\usebox{#2}};
-	}%
-}
-
-\newcommand{\hl}[1]{\btHL[fill=safeOrange,draw=black,thin]{#1}}
\ No newline at end of file
diff --git a/other/timed.cpp b/other/timed.cpp
index 20eec70..b3ed4ef 100644
--- a/other/timed.cpp
+++ b/other/timed.cpp
@@ -1,3 +1,3 @@
 int times = clock();
 //run for 900ms
-while (clock()-times < 900) {...}
+while (1000*(clock()-times)/CLOCKS_PER_SEC < 900) {...}
diff --git a/string/ahoCorasick.cpp b/string/ahoCorasick.cpp
index 530490e..bfde5b6 100644
--- a/string/ahoCorasick.cpp
+++ b/string/ahoCorasick.cpp
@@ -1,5 +1,5 @@
 constexpr ll ALPHABET_SIZE = 26;
-constexpr char OFFSET = 26;
+constexpr char OFFSET = 'a';
 struct AhoCorasick {
 	struct vert {
 		int suffix, exit, character, parent;
diff --git a/tcr.tex b/tcr.tex
index 93a3fc9..445f8b6 100644
--- a/tcr.tex
+++ b/tcr.tex
@@ -19,8 +19,7 @@
 % Include headers.
 \usepackage{latexHeaders/layout}
 \usepackage{latexHeaders/math}
-%\usepackage{latexHeaders/listings}
-\input{latexHeaders/listings}
+\usepackage{latexHeaders/code}
 \usepackage{latexHeaders/commands}
 
 % Title and author information.