From 0729ef863bf5be38c47da374c89512dd12d0c188 Mon Sep 17 00:00:00 2001 From: Sheppy Date: Wed, 7 Oct 2015 21:09:34 +0200 Subject: [PATCH] lots of renaming gitignore updated again SystemF continued --- Public/thprog/.gitignore => .gitignore | 2 ++ Public/{m4 => MatheC4}/MaC4Cheatsheet.tex | 0 Public/{m4 => MatheC4}/Makefile | 0 Public/{m4 => MatheC4}/graph.png | Bin .../Koinduktion_reduktion.tex | 0 Public/{thprog => ThProg}/Konfluenz.tex | 0 Public/{thprog => ThProg}/Makefile | 0 Public/{thprog => ThProg}/Polynomordnung.tex | 0 .../{thprog => ThProg}/SS14_Spickzettel.pdf | Bin .../Strukturelle_Induktion.tex | 0 Public/{thprog => ThProg}/SystemF.tex | 33 ++++++++++++------ Public/m4/.gitignore | 8 ----- 12 files changed, 25 insertions(+), 18 deletions(-) rename Public/thprog/.gitignore => .gitignore (82%) rename Public/{m4 => MatheC4}/MaC4Cheatsheet.tex (100%) rename Public/{m4 => MatheC4}/Makefile (100%) rename Public/{m4 => MatheC4}/graph.png (100%) rename Public/{thprog => ThProg}/Koinduktion_reduktion.tex (100%) rename Public/{thprog => ThProg}/Konfluenz.tex (100%) rename Public/{thprog => ThProg}/Makefile (100%) rename Public/{thprog => ThProg}/Polynomordnung.tex (100%) rename Public/{thprog => ThProg}/SS14_Spickzettel.pdf (100%) rename Public/{thprog => ThProg}/Strukturelle_Induktion.tex (100%) rename Public/{thprog => ThProg}/SystemF.tex (85%) delete mode 100644 Public/m4/.gitignore diff --git a/Public/thprog/.gitignore b/.gitignore similarity index 82% rename from Public/thprog/.gitignore rename to .gitignore index c2ef30e..d670dcf 100644 --- a/Public/thprog/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ .*.swp *id_rsa* *.gz +build +test.tex diff --git a/Public/m4/MaC4Cheatsheet.tex b/Public/MatheC4/MaC4Cheatsheet.tex similarity index 100% rename from Public/m4/MaC4Cheatsheet.tex rename to Public/MatheC4/MaC4Cheatsheet.tex diff --git a/Public/m4/Makefile b/Public/MatheC4/Makefile similarity index 100% rename from Public/m4/Makefile rename to Public/MatheC4/Makefile diff --git a/Public/m4/graph.png b/Public/MatheC4/graph.png similarity index 100% rename from Public/m4/graph.png rename to Public/MatheC4/graph.png diff --git a/Public/thprog/Koinduktion_reduktion.tex b/Public/ThProg/Koinduktion_reduktion.tex similarity index 100% rename from Public/thprog/Koinduktion_reduktion.tex rename to Public/ThProg/Koinduktion_reduktion.tex diff --git a/Public/thprog/Konfluenz.tex b/Public/ThProg/Konfluenz.tex similarity index 100% rename from Public/thprog/Konfluenz.tex rename to Public/ThProg/Konfluenz.tex diff --git a/Public/thprog/Makefile b/Public/ThProg/Makefile similarity index 100% rename from Public/thprog/Makefile rename to Public/ThProg/Makefile diff --git a/Public/thprog/Polynomordnung.tex b/Public/ThProg/Polynomordnung.tex similarity index 100% rename from Public/thprog/Polynomordnung.tex rename to Public/ThProg/Polynomordnung.tex diff --git a/Public/thprog/SS14_Spickzettel.pdf b/Public/ThProg/SS14_Spickzettel.pdf similarity index 100% rename from Public/thprog/SS14_Spickzettel.pdf rename to Public/ThProg/SS14_Spickzettel.pdf diff --git a/Public/thprog/Strukturelle_Induktion.tex b/Public/ThProg/Strukturelle_Induktion.tex similarity index 100% rename from Public/thprog/Strukturelle_Induktion.tex rename to Public/ThProg/Strukturelle_Induktion.tex diff --git a/Public/thprog/SystemF.tex b/Public/ThProg/SystemF.tex similarity index 85% rename from Public/thprog/SystemF.tex rename to Public/ThProg/SystemF.tex index 1ed656c..477a951 100644 --- a/Public/thprog/SystemF.tex +++ b/Public/ThProg/SystemF.tex @@ -1,6 +1,8 @@ \documentclass{article} \usepackage{amsmath} \usepackage{nccmath} + %\usepackage{bussproofs} + %dieses Paket koennte man fuer die typherleitung verwenden wenn man wollte \DeclareMathSizes{10}{10}{10}{10} \setlength{\parindent}{0pt} \title{System F und Reduktionsreihenfolge} @@ -45,7 +47,7 @@ &=\; \lambda a\, .\, (mult\;two)\,((mult\;two)\,((mult\;two)\;a\,)\;one\\ &=\; (mult\;two)\,((mult\;two)\,((mult\;two)\;one\,) \end{align*} - \subsubsection*{b) Apllikativer Reihenfolge} + \subsubsection*{b) Aplikativer Reihenfolge} \begin{align*} pow2\;three\; &=\; pow2\; (\, \lambda f\,a\, .\,f\,(\,f\,(\,f\;a\,) \,)\\ &=\; (\, \lambda f\,a\, .\,f\,(\,f\,(\,f\;a\,) \,)(mult\;two)\;one\\ @@ -63,6 +65,23 @@ (beim zweiten g\"abe es gerade auch gar nichts mehr zu machen) \subsection*{2) Typherleitung} + + + $ + \{ + + \} + $ + \\ + %Zeile 1 + $ + \{ + \,mult\;:\; + \mathrm{N}\rightarrow\mathrm{N}\rightarrow\mathrm{N}\rightarrow , + one\; : \; \mathrm{N},\,two\;\mathrm{N}\, + \} + \vdash \; \lambda n.\,n\,(\, mult \; two\,)\;one\,:\mathrm{N}\rightarrow\mathrm{N} + $ @@ -74,14 +93,8 @@ - - - - - - - - \begin{tiny} + +\begin{tiny} \copyright\ Joint-Troll-Expert-Group (JTEG) 2015 - \end{tiny} +\end{tiny} \end{document} \ No newline at end of file diff --git a/Public/m4/.gitignore b/Public/m4/.gitignore deleted file mode 100644 index 279ab99..0000000 --- a/Public/m4/.gitignore +++ /dev/null @@ -1,8 +0,0 @@ -*.aux -*.toc -*.out -*.pdf -*.log -*.fls -*.fdb_latexmk -.*.swp