Mercurial > 13ws.ds

changeset 32:b5094b3e3111

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reorganize units; fix spacing in calculus rules; fix small old errors
author Markus Kaiser <markus.kaiser@in.tum.de>
date Mon, 02 Dec 2013 23:35:26 +0100
parents cedc6884dd46
children f4b50c94431d
files notes/tex/intro.tex notes/tex/logic.tex notes/tex/ue05_notes.tex notes/tex/ue06_notes.tex
diffstat 4 files changed, 13 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/notes/tex/intro.tex	Mon Dec 02 11:04:23 2013 +0100
+++ b/notes/tex/intro.tex	Mon Dec 02 23:35:26 2013 +0100
@@ -39,7 +39,7 @@
                 \item Geheftet, Handschriftlich, Deckblatt
                 \item \structure{Teams aus 3 oder 4 Stundenten}
                 \item Teams nicht änderbar, nicht gruppenübergreifend
-                \item Üblicherweise etwa so schwer wie Klausuraufgaben
+                \item Üblicherweise schwerer als Klausurstoff
             \end{itemize}
             \vspace{0.5em}
         \item Notenbonus
--- a/notes/tex/logic.tex	Mon Dec 02 11:04:23 2013 +0100
+++ b/notes/tex/logic.tex	Mon Dec 02 23:35:26 2013 +0100
@@ -183,7 +183,7 @@
         Für $F \defeq a \rightarrow b$ und $G \defeq \neg a \vee b$ gilt $F \equiv G$.
         \begin{center}
             \begin{tabu} to .4\textwidth {cc|[1.2pt]XcX||Xccc}
-                a & b & & $a \Rightarrow b$ & & & $\neg a$ & $\vee$ & $b$ \\ \tabucline[1.2pt]{-}
+                a & b & & $a \rightarrow b$ & & & $\neg a$ & $\vee$ & $b$ \\ \tabucline[1.2pt]{-}
                 0 & 0 & & \structure{1} & & & 1 & \structure{1} \\
                 0 & 1 & & \structure{1} & & & 1 & \structure{1} \\
                 1 & 0 & & \structure{0} & & & 0 & \structure{0} \\
@@ -540,7 +540,7 @@
 \end{frame}
 }
 
-\defineUnit{natuerlichesschliessen}{%
+\defineUnit{kalkuele}{%
 \begin{frame}
     \frametitle{Kalküle}
     \setbeamercovered{dynamic}
@@ -585,7 +585,9 @@
         \item Deshalb sind nicht alle Sätze der Mathematik beweisbar
     \end{itemize}
 \end{frame}
+}
 
+\defineUnit{natuerlichesschliessen}{%
 {
     \newcommand{\F}{\tau}
     \newcommand{\G}{\varphi}
@@ -604,16 +606,16 @@
         \bottomAlignProof
         \DisplayProof
     }
+    \newcommand{\capt}[1]{\vspace{-1em}##1}
 
     \begin{frame}
         \frametitle{Natürliches Schließen}
         \setbeamercovered{dynamic}
 
-        \vspace{-4pt}
         \tabulinesep=4pt
         \begin{tabu} to \textwidth {X[c,m,.5]|[1pt]X[c,b,5]X[c,b,5]}
             & \structure{Introduktion} & \structure{Elimination}\\\tabucline[1pt]{-}
-            $\wedge$ &
+            \capt{$\wedge$} &
                 \topproof{
                     \AxiomC{$\F$}
                     \AxiomC{$\G$}
@@ -633,7 +635,7 @@
                     \UnaryInfC{$\G$}
                 }
             \\
-            $\vee$ &
+            \capt{$\vee$} &
                 \topproof{
                     \AxiomC{$\F$}
                     \RightLabel{\scriptsize $+\vee_1$}
@@ -654,7 +656,7 @@
                     \TrinaryInfC{$\K$\vphantom{$\F\G$}}
                 }
             \\
-            $\rightarrow$ &
+            \capt{$\rightarrow$} &
                 \topproof{
                     \AxiomC{\subproof{$\F$}{$\G$}}
                     \RightLabel{\scriptsize $+\rightarrow$}
@@ -668,7 +670,7 @@
                     \BinaryInfC{$\G$}
                 }
             \\
-            $\neg$ &
+            \capt{$\neg$} &
                 \topproof{
                     \AxiomC{\subproof{$\F$}{$\bot$}}
                     \RightLabel{\scriptsize $+\neg$}
@@ -688,11 +690,10 @@
         \frametitle{Natürliches Schließen}
         \setbeamercovered{dynamic}
 
-        \vspace{-4pt}
         \tabulinesep=4pt
         \begin{tabu} to \textwidth {X[c,m,.5]|[1pt]X[c,b,5]X[c,b,5]}
             & \structure{Introduktion} & \structure{Elimination}\\\tabucline[1pt]{-}
-            $\bot$ &
+            \capt{$\bot$} &
             &
                 \topproof{
                     \AxiomC{$\bot$}
@@ -700,7 +701,7 @@
                     \UnaryInfC{$\F$}
                 }
             \\
-            $\neg\neg$ &
+            \capt{$\neg\neg$} &
                 \topproof{
                     \AxiomC{$\F$}
                     \RightLabel{\scriptsize $+\neg\neg$}
--- a/notes/tex/ue05_notes.tex	Mon Dec 02 11:04:23 2013 +0100
+++ b/notes/tex/ue05_notes.tex	Mon Dec 02 23:35:26 2013 +0100
@@ -8,5 +8,6 @@
 \begin{document}
 \showUnit{titel}
 \showUnit{resolution}
+\showUnit{kalkuele}
 \showUnit{natuerlichesschliessen}
 \end{document}
--- a/notes/tex/ue06_notes.tex	Mon Dec 02 11:04:23 2013 +0100
+++ b/notes/tex/ue06_notes.tex	Mon Dec 02 23:35:26 2013 +0100
@@ -9,5 +9,4 @@
 \showUnit{titel}
 \showUnit{praedikatenlogiksyntax}
 \showUnit{praedikatenlogikstruktur}
-\showUnit{relationeneigenschaften}
 \end{document}