diff --git a/likelihood/exercises/Makefile b/likelihood/exercises/Makefile index 27691d9..cbfb17a 100644 --- a/likelihood/exercises/Makefile +++ b/likelihood/exercises/Makefile @@ -1,34 +1,3 @@ -TEXFILES=$(wildcard exercises??.tex) -EXERCISES=$(TEXFILES:.tex=.pdf) -SOLUTIONS=$(EXERCISES:exercises%=solutions%) +TEXFILES=$(wildcard likelihood-?.tex) -.PHONY: pdf exercises solutions watch watchexercises watchsolutions clean - -pdf : $(SOLUTIONS) $(EXERCISES) - -exercises : $(EXERCISES) - -solutions : $(SOLUTIONS) - -$(SOLUTIONS) : solutions%.pdf : exercises%.tex instructions.tex - { echo "\\documentclass[answers,12pt,a4paper,pdftex]{exam}"; sed -e '1d' $<; } > $(patsubst %.pdf,%.tex,$@) - pdflatex -interaction=scrollmode $(patsubst %.pdf,%.tex,$@) | tee /dev/stderr | fgrep -q "Rerun to get cross-references right" && pdflatex -interaction=scrollmode $(patsubst %.pdf,%.tex,$@) || true - rm $(patsubst %.pdf,%,$@).[!p]* - -$(EXERCISES) : %.pdf : %.tex instructions.tex - pdflatex -interaction=scrollmode $< | tee /dev/stderr | fgrep -q "Rerun to get cross-references right" && pdflatex -interaction=scrollmode $< || true - -watch : - while true; do ! make -q pdf && make pdf; sleep 0.5; done - -watchexercises : - while true; do ! make -q exercises && make exercises; sleep 0.5; done - -watchsolutions : - while true; do ! make -q solutions && make solutions; sleep 0.5; done - -clean : - rm -f *~ *.aux *.log *.out - -cleanup : clean - rm -f $(SOLUTIONS) $(EXERCISES) +include ../../exercises.mk diff --git a/likelihood/exercises/instructions.tex b/likelihood/exercises/instructions.tex deleted file mode 100644 index 7fe599d..0000000 --- a/likelihood/exercises/instructions.tex +++ /dev/null @@ -1,41 +0,0 @@ -\vspace*{-8ex} -\begin{center} -\textbf{\Large Introduction to scientific computing}\\[1ex] -{\large Jan Grewe, Jan Benda}\\[-3ex] -Neuroethology lab \hfill --- \hfill Institute for Neurobiology \hfill --- \hfill \includegraphics[width=0.28\textwidth]{UT_WBMW_Black_RGB} \\ -\end{center} - -% \ifprintanswers% -% \else - -% % Die folgenden Aufgaben dienen der Wiederholung, \"Ubung und -% % Selbstkontrolle und sollten eigenst\"andig bearbeitet und gel\"ost -% % werden. Die L\"osung soll in Form eines einzelnen Skriptes (m-files) -% % im ILIAS hochgeladen werden. Jede Aufgabe sollte in einer eigenen -% % ``Zelle'' gel\"ost sein. Die Zellen \textbf{m\"ussen} unabh\"angig -% % voneinander ausf\"uhrbar sein. Das Skript sollte nach dem Muster: -% % ``variablen\_datentypen\_\{nachname\}.m'' benannt werden -% % (z.B. variablen\_datentypen\_mueller.m). - -% \begin{itemize} -% \item \"Uberzeuge dich von jeder einzelnen Zeile deines Codes, dass -% sie auch wirklich das macht, was sie machen soll! Teste dies mit -% kleinen Beispielen direkt in der Kommandozeile. -% \item Versuche die L\"osungen der Aufgaben m\"oglichst in -% sinnvolle kleine Funktionen herunterzubrechen. -% Sobald etwas \"ahnliches mehr als einmal berechnet werden soll, -% lohnt es sich eine Funktion daraus zu schreiben! -% \item Teste rechenintensive \code{for} Schleifen, Vektoren, Matrizen -% zuerst mit einer kleinen Anzahl von Wiederholungen oder kleiner -% Gr\"o{\ss}e, und benutze erst am Ende, wenn alles \"uberpr\"uft -% ist, eine gro{\ss}e Anzahl von Wiederholungen oder Elementen, um eine gute -% Statistik zu bekommen. -% \item Benutze die Hilfsfunktion von \code{matlab} (\code{help -% commando} oder \code{doc commando}) und das Internet, um -% herauszufinden, wie bestimmte \code{matlab} Funktionen zu verwenden -% sind und was f\"ur M\"oglichkeiten sie bieten. -% Auch zu inhaltlichen Konzepten bietet das Internet oft viele -% Antworten! -% \end{itemize} - -% \fi diff --git a/likelihood/exercises/exercises01.tex b/likelihood/exercises/likelihood-1.tex similarity index 70% rename from likelihood/exercises/exercises01.tex rename to likelihood/exercises/likelihood-1.tex index 4512e91..28b3946 100644 --- a/likelihood/exercises/exercises01.tex +++ b/likelihood/exercises/likelihood-1.tex @@ -1,90 +1,17 @@ \documentclass[12pt,a4paper,pdftex]{exam} -\usepackage[german]{babel} -\usepackage{pslatex} -\usepackage[mediumspace,mediumqspace,Gray]{SIunits} % \ohm, \micro -\usepackage{xcolor} -\usepackage{graphicx} -\usepackage[breaklinks=true,bookmarks=true,bookmarksopen=true,pdfpagemode=UseNone,pdfstartview=FitH,colorlinks=true,citecolor=blue]{hyperref} - -%%%%% layout %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\usepackage[left=20mm,right=20mm,top=25mm,bottom=25mm]{geometry} -\pagestyle{headandfoot} -\ifprintanswers -\newcommand{\stitle}{: Solutions} -\else -\newcommand{\stitle}{} -\fi -\header{{\bfseries\large Exercise 11\stitle}}{{\bfseries\large Maximum likelihood}}{{\bfseries\large January 7th, 2020}} -\firstpagefooter{Prof. Dr. Jan Benda}{Phone: 29 74573}{Email: -jan.benda@uni-tuebingen.de} -\runningfooter{}{\thepage}{} - -\setlength{\baselineskip}{15pt} -\setlength{\parindent}{0.0cm} -\setlength{\parskip}{0.3cm} -\renewcommand{\baselinestretch}{1.15} - -%%%%% listings %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\usepackage{listings} -\lstset{ - language=Matlab, - basicstyle=\ttfamily\footnotesize, - numbers=left, - numberstyle=\tiny, - title=\lstname, - showstringspaces=false, - commentstyle=\itshape\color{darkgray}, - breaklines=true, - breakautoindent=true, - columns=flexible, - frame=single, - xleftmargin=1em, - xrightmargin=1em, - aboveskip=10pt -} - -%%%%% math stuff: %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\usepackage{amsmath} -\usepackage{amssymb} -\usepackage{bm} -\usepackage{dsfont} -\newcommand{\naZ}{\mathds{N}} -\newcommand{\gaZ}{\mathds{Z}} -\newcommand{\raZ}{\mathds{Q}} -\newcommand{\reZ}{\mathds{R}} -\newcommand{\reZp}{\mathds{R^+}} -\newcommand{\reZpN}{\mathds{R^+_0}} -\newcommand{\koZ}{\mathds{C}} - -%%%%% page breaks %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\newcommand{\continue}{\ifprintanswers% -\else -\vfill\hspace*{\fill}$\rightarrow$\newpage% -\fi} -\newcommand{\continuepage}{\ifprintanswers% -\newpage -\else -\vfill\hspace*{\fill}$\rightarrow$\newpage% -\fi} -\newcommand{\newsolutionpage}{\ifprintanswers% -\newpage% -\else -\fi} - -%%%%% new commands %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -\newcommand{\qt}[1]{\textbf{#1}\\} -\newcommand{\pref}[1]{(\ref{#1})} -\newcommand{\extra}{--- Zusatzaufgabe ---\ \mbox{}} -\newcommand{\code}[1]{\texttt{#1}} +\newcommand{\exercisetopic}{Maximum Likelihood} +\newcommand{\exercisenum}{10} +\newcommand{\exercisedate}{January 12th, 2021} +\input{../../exercisesheader} + +\firstpagefooter{Prof. Dr. Jan Benda}{}{jan.benda@uni-tuebingen.de} -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{document} -\input{instructions} - +\input{../../exercisestitle} \begin{questions} diff --git a/regression/exercises/gradientdescent-1.tex b/regression/exercises/gradientdescent-1.tex index 8275723..7e25b0d 100644 --- a/regression/exercises/gradientdescent-1.tex +++ b/regression/exercises/gradientdescent-1.tex @@ -2,7 +2,7 @@ \newcommand{\exercisetopic}{Resampling} \newcommand{\exercisenum}{9} -\newcommand{\exercisedate}{December 21th, 2020} +\newcommand{\exercisedate}{December 22th, 2020} \input{../../exercisesheader} diff --git a/regression/exercises/instructions.tex b/regression/exercises/instructions.tex deleted file mode 100644 index 3041d3e..0000000 --- a/regression/exercises/instructions.tex +++ /dev/null @@ -1,6 +0,0 @@ -\vspace*{-7.8ex} -\begin{center} -\textbf{\Large Introduction to Scientific Computing}\\[2.3ex] -{\large Jan Grewe, Jan Benda}\\[-3ex] -Neuroethology Lab \hfill --- \hfill Institute for Neurobiology \hfill --- \hfill \includegraphics[width=0.28\textwidth]{UT_WBMW_Black_RGB} \\ -\end{center}