From f92e9b22b6e37921146afc542fcb0398ac407c47 Mon Sep 17 00:00:00 2001 From: Paul Jungeblut Date: Sat, 23 Jan 2016 12:30:38 +0100 Subject: Removes section about sorting in linear time. --- sonstiges/bucketSort.cpp | 16 ---------------- sonstiges/radixSort.cpp | 24 ------------------------ sonstiges/sonstiges.tex | 9 --------- tcr.pdf | Bin 241818 -> 238272 bytes 4 files changed, 49 deletions(-) delete mode 100644 sonstiges/bucketSort.cpp delete mode 100644 sonstiges/radixSort.cpp diff --git a/sonstiges/bucketSort.cpp b/sonstiges/bucketSort.cpp deleted file mode 100644 index 90533e1..0000000 --- a/sonstiges/bucketSort.cpp +++ /dev/null @@ -1,16 +0,0 @@ -vector res; -void bucketSort(vector &a) { //stores result in global vector res - int c[BUCKETS] = {0}; - for (int i = 0; i < (int)a.size(); i++) c[a[i]]++; - int C = 0; - for (int i = 0; i < BUCKETS; i++) { - int tmp = C; - C += c[i]; - c[i] = tmp; - } - res.resize(a.size()); - for (int i = 0; i < (int)a.size(); i++) { - res[c[a[i]]] = a[i]; - c[a[i]]++; - } -} \ No newline at end of file diff --git a/sonstiges/radixSort.cpp b/sonstiges/radixSort.cpp deleted file mode 100644 index 7ca51f6..0000000 --- a/sonstiges/radixSort.cpp +++ /dev/null @@ -1,24 +0,0 @@ -//Comparable with sort from in a range from 0 to 5000, for values greater than 5000 use sort -const int p[10] = {1,10,100,1000,10000,100000,1000000,10000000,100000000,1000000000}; - -int getLongestNumber(vector &a) { - int res = 0; - for (int i = 0; i < (int)a.size(); i++) res = max(res, (int)ceil(log10(a[i]) + 1)); - return res; -} - -int getIthDigit(int digit, int i) { - return (digit / p[i]) % 10; -} - -void radixSort(vector &a) { - int digits = getLongestNumber(a); - for (int d = 0; d < digits; d++) { - vector bucket[10]; - for(int i = 0; i < (int)a.size(); i++) - bucket[getIthDigit(a[i],d)].push_back(a[i]); - a.clear(); - for(int i = 0; i < 10; i++) - copy(bucket[i].begin(), bucket[i].end(), back_inserter(a)); - } -} diff --git a/sonstiges/sonstiges.tex b/sonstiges/sonstiges.tex index 1f111bc..b2d9009 100644 --- a/sonstiges/sonstiges.tex +++ b/sonstiges/sonstiges.tex @@ -8,15 +8,6 @@ \item Genau dann lösbar, wenn keine Variable mit ihrer Negation in einer SCC liegt. \end{enumerate} -\subsection{Sortieren in Linearzeit} -Wenn die Eingabe aus einem kleinen Intervall $\left[0, n\right)$ stammt ist Bucketsort schneller. - -\subsubsection{Bucketsort} -\lstinputlisting{sonstiges/bucketSort.cpp} - -\subsubsection{LSD-Radixsort} -\lstinputlisting{sonstiges/radixSort.cpp} - \subsection{Bit Operations} \lstinputlisting{sonstiges/bitOps.cpp} diff --git a/tcr.pdf b/tcr.pdf index c7b00d9..ada2786 100644 Binary files a/tcr.pdf and b/tcr.pdf differ -- cgit v1.2.3