diff notes/tex/computation.tex @ 49:72ac27051d7e

fix some more errors; reorganize complete notes
author Markus Kaiser <markus.kaiser@in.tum.de>
date Thu, 11 Jul 2013 23:38:43 +0200
parents 8e79d33bdece
children adcb0ab03ade
line wrap: on
line diff
--- a/notes/tex/computation.tex	Thu Jul 11 23:14:17 2013 +0200
+++ b/notes/tex/computation.tex	Thu Jul 11 23:38:43 2013 +0200
@@ -254,16 +254,16 @@
 
     U.a. diese Programme sind laut Vorlesung oder Übung PR:
     \begin{itemize}
+        \item $pred(x) = \max \left\{ 0, x - 1 \right\}$
         \item \alert{$add(x, y) = x + y$}
+        \item \alert{$x \dot{-} y = \max \left\{ 0, x - y \right\}$}
         \item \alert{$mult(x, y) = x \cdot y$}
-        \item $pred(x) = \max \left\{ 0, x - 1 \right\}$
-        \item \alert{$x \dot{-} y = \max \left\{ 0, x - y \right\}$}
         \item $div(x, y) = x \div y$ (Ganzzahldivision)
-        \item $mod(x, y) = x \mod y$
+        \item Die restliche einfache Arithmetik\ldots
             \vspace{1.5em}
         \item $tower(n) = 2^{2^{2^{\iddots}}}$ mit $tower(4) = 2^{16}$
-        \item $sqr(x) = x^2$
-        \item $twopow(n) = 2^n$
+        \item $sqr(x) = x^2$, $sqrt(x) = \sqrt{x}$
+        \item $c(x), p_1(x), p_2(x)$ (Cantorsche Paarungsfunktion)
         \item $ifthen(n, a, b) = \begin{cases} a & n \neq 0 \\ b & n = 0 \end{cases}$
     \end{itemize}
 \end{frame}