diff --git a/bootstrap/lecture/bootstrap.tex b/bootstrap/lecture/bootstrap.tex index deeb0de..dcc7e2a 100644 --- a/bootstrap/lecture/bootstrap.tex +++ b/bootstrap/lecture/bootstrap.tex @@ -1,8 +1,10 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\chapter{\tr{Bootstrap Methods}{Bootstrap Methoden}} +\chapter{\tr{Bootstrap methods}{Bootstrap Methoden}} \label{bootstrapchapter} +\selectlanguage{ngerman} + Beim \determ{Bootstrap} erzeugt man sich die Verteilung von Statistiken durch Resampling aus der Stichprobe. Das hat mehrere Vorteile: \begin{itemize} diff --git a/debugging/lecture/debugging.tex b/debugging/lecture/debugging.tex index d0af656..c8167e2 100644 --- a/debugging/lecture/debugging.tex +++ b/debugging/lecture/debugging.tex @@ -149,7 +149,8 @@ be surprising. The last operation in listing\,\ref{dimensionmismatch} does not throw an error but the result is something else than the expected elementwise multiplication. -\begin{lstlisting}[label=dimensionmismatch, caption={Some arithmetic operations make size constraints, violating them leads to dimension mismatch errors.}] +% XXX Some arithmetic operations make size constraints, violating them leads to dimension mismatch errors. +\begin{lstlisting}[label=dimensionmismatch, caption={Dimension mismatch errors.}] >> a = randn(100, 1); >> b = randn(10, 1); >> a + b @@ -232,7 +233,8 @@ is much easier in the second case. The first version is perfectly fine but it requires a deep understanding of the applied functions and also the task at hand. -\begin{lstlisting}[label=easyvscomplicated, caption={Converting a series of spike times into the firing rate as a function of time. Many tasks can be solved with a single line of code. But is this readable?}] +% XXX Converting a series of spike times into the firing rate as a function of time. Many tasks can be solved with a single line of code. But is this readable? +\begin{lstlisting}[label=easyvscomplicated, caption={One-liner versus readable code.}] % the one-liner rate = conv(full(sparse(1, round(spike_times/dt), 1, 1, length(time))), kernel, 'same'); @@ -283,8 +285,8 @@ written that test the features of the program. We will follow the example given in the \matlab{} help and assume that there is a function \code{rightTriangle} (listing\,\ref{trianglelisting}). - -\begin{lstlisting}[label=trianglelisting, caption={Slightly more readable version of the example given in the \matlab{} help system. Note: The variable name for the angles have been capitalized in order to not override the matlab defined functions \code{alpha, beta,} and \code{gamma}.}] +% XXX Slightly more readable version of the example given in the \matlab{} help system. Note: The variable name for the angles have been capitalized in order to not override the matlab defined functions \code{alpha, beta,} and \code{gamma}. +\begin{lstlisting}[label=trianglelisting, caption={Example function for unit testing.}] function angles = rightTriangle(length_a, length_b) ALPHA = atand(length_a / length_b); BETA = atand(length_a / length_b); @@ -460,14 +462,15 @@ debug mode (listing\,\ref{debuggerlisting}). \begin{figure} \centering \includegraphics[width=\linewidth]{editor_debugger.png} - \caption{Screenshot of the \matlab{} m-file editor. Once a file is - saved and passes the syntax check (the indicator in the top-right - corner of the editor window turns green or orange), a breakpoint - can be set. Breakpoints can be set either using the dropdown menu - on top or by clicking the line number on the left margin. An - active breakpoint is indicated by a red dot. The line at which the - program execution was stopped is indicated by the green - arrow.}\label{editor_debugger} + \titlecaption{\label{editor_debugger} Setting + breakpoints.}{Screenshot of the \matlab{} m-file editor. Once a + file is saved and passes the syntax check (the indicator in the + top-right corner of the editor window turns green or orange), a + breakpoint can be set. Breakpoints can be set either using the + dropdown menu on top or by clicking the line number on the left + margin. An active breakpoint is indicated by a red dot. The line + at which the program execution was stopped is indicated by the + green arrow.} \end{figure} diff --git a/designpattern/lecture/designpattern-chapter.tex b/designpattern/lecture/designpattern-chapter.tex index 4bb7291..aa790eb 100644 --- a/designpattern/lecture/designpattern-chapter.tex +++ b/designpattern/lecture/designpattern-chapter.tex @@ -16,4 +16,11 @@ \input{designpattern} +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\section{Sortieren von Vektoren} + +\subsection{Sortieren eines Vektors} + +\subsection{Sortieren zweier abh\"angiger Vektoren} + \end{document} diff --git a/designpattern/lecture/designpattern.tex b/designpattern/lecture/designpattern.tex index 807c93f..df2a0b3 100644 --- a/designpattern/lecture/designpattern.tex +++ b/designpattern/lecture/designpattern.tex @@ -1,6 +1,8 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\chapter{Design Pattern} +\chapter{Design pattern} + +\selectlanguage{ngerman} Beim Programmieren sind sich viel Codes in ihrer Grundstruktur sehr \"ahnlich. Viele Konstrukte kommen in den verschiedensten Kontexten @@ -161,12 +163,3 @@ x = randi(6, 100, 1); % irgendwelche integer Daten h = h/sum(h); % normieren zu Wahrscheinlichkeiten bar(b, h); % und plotten. \end{lstlisting} - - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\section{Sortieren von Vektoren} - - -\subsection{Sortieren eines Vektors} - -\subsection{Sortieren zweier abhängiger Vektoren} diff --git a/header.tex b/header.tex index b881eb5..ec7e822 100644 --- a/header.tex +++ b/header.tex @@ -8,7 +8,8 @@ % \newcommand{\tr}[2]{#1} % en % \usepackage[english]{babel} \newcommand{\tr}[2]{#1} % en -\usepackage[ngerman, english]{babel} +\usepackage[english, ngerman]{babel} +\selectlanguage{english} %%%% encoding %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \usepackage[T1]{fontenc} @@ -314,7 +315,7 @@ % The cooler programming language. \DeclareFloatingEnvironment[ fileext=lob, - listname={\tr{Info and Important Boxes}{Info- und Merk-Boxen}}, + listname={\tr{Info boxes and topics}{Info- und Merk-Boxen}}, name={Info-Box}, placement=t ]{iboxf} diff --git a/likelihood/lecture/likelihood.tex b/likelihood/lecture/likelihood.tex index 07d9e71..ffc3afb 100644 --- a/likelihood/lecture/likelihood.tex +++ b/likelihood/lecture/likelihood.tex @@ -4,6 +4,8 @@ \chapter{\tr{Maximum likelihood estimation}{Maximum-Likelihood-Sch\"atzer}} \label{maximumlikelihoodchapter} +\selectlanguage{ngerman} + In vielen Situationen wollen wir einen oder mehrere Parameter $\theta$ einer Wahrscheinlichkeitsverteilung sch\"atzen, so dass die Verteilung die Daten $x_1, x_2, \ldots x_n$ am besten beschreibt. diff --git a/plotting/lecture/plotting-chapter.tex b/plotting/lecture/plotting-chapter.tex index 64c5743..022eaf1 100644 --- a/plotting/lecture/plotting-chapter.tex +++ b/plotting/lecture/plotting-chapter.tex @@ -16,6 +16,20 @@ \input{plotting} +\subsection{Error bars and error areas} + +\subsection{Scatter plot} + +\subsection{Histograms} + +\subsection{Heatmaps} + +\subsection{3-D plot} + +\subsection{Polar plot} + +\subsection{Movies and animations} + \section{TODO} \begin{itemize} \item Beispiele schlechter plots sollten mehr Bezug zu den Typen von diff --git a/plotting/lecture/plotting.tex b/plotting/lecture/plotting.tex index 9cc2570..4199def 100644 --- a/plotting/lecture/plotting.tex +++ b/plotting/lecture/plotting.tex @@ -1,4 +1,4 @@ -\chapter{Graphical Representation of Scientific Data} +\chapter{Graphical representation of scientific data} We may count the ability of adequately presenting scientific data to the core competences needed to do science. We need to present data in @@ -541,19 +541,6 @@ documentation. that should be drawn between two subplots? \end{important} -\subsection{Error bars and error areas} - -\subsection{Scatter plot} - -\subsection{Histograms} - -\subsection{Heatmaps} - -\subsection{3-D plot} - -\subsection{Polar plot} - -\subsection{Movies and animations} \section{Summary} A good plot of scientific data displays the data completely and diff --git a/pointprocesses/lecture/pointprocesses.tex b/pointprocesses/lecture/pointprocesses.tex index 2ed57e0..8f14f81 100644 --- a/pointprocesses/lecture/pointprocesses.tex +++ b/pointprocesses/lecture/pointprocesses.tex @@ -2,6 +2,8 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \chapter{Analyse von Spiketrains} +\selectlanguage{ngerman} + \determ[Aktionspotential]{Aktionspotentiale} (\enterm{spikes}) sind die Tr\"ager der Information in Nervensystemen. Dabei ist in erster Linie nur der Zeitpunkt des Auftretens eines Aktionspotentials von Bedeutung. Die diff --git a/programmingstyle/lecture/programmingstyle.tex b/programmingstyle/lecture/programmingstyle.tex index 8d973ed..9f6ed60 100644 --- a/programmingstyle/lecture/programmingstyle.tex +++ b/programmingstyle/lecture/programmingstyle.tex @@ -4,6 +4,8 @@ more months might as well have been written by someone else.}{Eagleson's law} +\selectlanguage{ngerman} + Guter Programmierstil ist keine Frage des guten Geschmacks sondern des Verst\"andnisses von Programmcode und ein Baustein in dem Bestreben wissenschaftlichen Erkenntnisgewinn reproduzierbar zu diff --git a/regression/lecture/regression.tex b/regression/lecture/regression.tex index cdfeb8c..0bc95a1 100644 --- a/regression/lecture/regression.tex +++ b/regression/lecture/regression.tex @@ -1,4 +1,6 @@ -\chapter{\tr{Optimization and Gradient Descent}{Optimierung und Gradientenabstieg}} +\chapter{\tr{Optimization and gradient descent}{Optimierung und Gradientenabstieg}} + +\selectlanguage{ngerman} Ein sehr h\"aufiges Problem ist, dass die Abh\"angigkeit von Messwerten von einer Eingangsgr\"o{\ss}e durch ein Modell erkl\"art diff --git a/scientificcomputing-script.tex b/scientificcomputing-script.tex index 325dbe8..a71a5ad 100644 --- a/scientificcomputing-script.tex +++ b/scientificcomputing-script.tex @@ -24,7 +24,7 @@ \mainmatter %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\part{The Basics} +\part{Programming basics} \graphicspath{{programming/lecture/}{programming/images/}} \lstset{inputpath=programming/code} @@ -32,19 +32,21 @@ \graphicspath{{debugging/lecture/}{debugging/lecture/figures/}} \lstset{inputpath=debugging/code} -%\selectlanguage{english} \include{debugging/lecture/debugging} -\selectlanguage{ngerman} \graphicspath{{plotting/lecture/}{plotting/lecture/images/}} \lstset{inputpath=plotting/code/} \include{plotting/lecture/plotting} - \graphicspath{{programmingstyle/lecture/}{programmingstyle/lecture/figures/}} \lstset{inputpath=programmingstyle/code/} \include{programmingstyle/lecture/programmingstyle} +\graphicspath{{designpattern/lecture/}{designpattern/lecture/figures/}} +\lstset{inputpath=designpattern/code} +\include{designpattern/lecture/designpattern} + + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \part{Data analysis} @@ -72,18 +74,21 @@ \graphicspath{{spectral/lecture/}{spectral/lecture/figures/}} \lstset{inputpath=spectral/code/} \renewcommand{\texinputpath}{spectral/lecture/} -\include{spectral/lecture/spectral} +%\include{spectral/lecture/spectral} %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%\part{Data handling, data annotation, version control} +%\part{Tools} +% Latex +% markdown +% Makefile +% version control (git and github) only put source files into repository! +% distributed computing (ssh and grid engines) +% data handling (structure, data bases, storage (rsync), backup) +% data annotation, meta data %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\part{Appendix} - -\graphicspath{{designpattern/lecture/}{designpattern/lecture/figures/}} -\lstset{inputpath=designpattern/code} -\include{designpattern/lecture/designpattern} +%\part{Appendix} %\chapter{Cheat-Sheet} diff --git a/spectral/lecture/spectral.tex b/spectral/lecture/spectral.tex index 517e7aa..d69a400 100644 --- a/spectral/lecture/spectral.tex +++ b/spectral/lecture/spectral.tex @@ -1,4 +1,4 @@ -\chapter{Spectral analyses} +\chapter{Spectral analysis} This is a stub that should be filled :)