From 8f0a7cd420b326ab3dff67093d53395d6a92f249 Mon Sep 17 00:00:00 2001 From: Jan Benda Date: Mon, 2 Nov 2015 11:07:23 +0100 Subject: [PATCH] Fixed structure of regression files --- regression/lecture/Makefile | 4 ++-- regression/lecture/linear_regression.tex | 3 --- regression/lecture/regression-chapter.tex | 16 ++++++++++++++++ ...gression-slides.tex => regression-slides.tex} | 0 regression/lecture/regression.tex | 3 +++ scientificcomputing-script.tex | 2 +- 6 files changed, 22 insertions(+), 6 deletions(-) delete mode 100644 regression/lecture/linear_regression.tex create mode 100644 regression/lecture/regression-chapter.tex rename regression/lecture/{linear_regression-slides.tex => regression-slides.tex} (100%) create mode 100644 regression/lecture/regression.tex diff --git a/regression/lecture/Makefile b/regression/lecture/Makefile index 4486638..71741c9 100644 --- a/regression/lecture/Makefile +++ b/regression/lecture/Makefile @@ -1,10 +1,10 @@ -BASENAME=linear_regression +BASENAME=regression PYFILES=$(wildcard *.py) PYPDFFILES=$(PYFILES:.py=.pdf) pdf : $(BASENAME).pdf $(PYPDFFILES) -$(BASENAME).pdf : $(BASENAME).tex +$(BASENAME).pdf : $(BASENAME)-chapter.tex pdflatex -interaction=scrollmode $< | tee /dev/stderr | fgrep -q "Rerun to get cross-references right" && pdflatex -interaction=scrollmode $< || true $(PYPDFFILES) : %.pdf : %.py diff --git a/regression/lecture/linear_regression.tex b/regression/lecture/linear_regression.tex deleted file mode 100644 index 46e3b95..0000000 --- a/regression/lecture/linear_regression.tex +++ /dev/null @@ -1,3 +0,0 @@ -\chapter{\tr{Optimization and Gradient Descent}{Parameteroptimierung und Gradientenabstiegsverfahren}} - - diff --git a/regression/lecture/regression-chapter.tex b/regression/lecture/regression-chapter.tex new file mode 100644 index 0000000..8cbba06 --- /dev/null +++ b/regression/lecture/regression-chapter.tex @@ -0,0 +1,16 @@ +\documentclass[12pt]{report} + +\input{../../header} + +\lstset{inputpath=../code} + +\graphicspath{{figures/}} + + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +\begin{document} + +\include{regression} + +\end{document} diff --git a/regression/lecture/linear_regression-slides.tex b/regression/lecture/regression-slides.tex similarity index 100% rename from regression/lecture/linear_regression-slides.tex rename to regression/lecture/regression-slides.tex diff --git a/regression/lecture/regression.tex b/regression/lecture/regression.tex new file mode 100644 index 0000000..a0beed2 --- /dev/null +++ b/regression/lecture/regression.tex @@ -0,0 +1,3 @@ +\chapter{\tr{Optimization and Gradient Descent}{Optimierung und Gradientenabstiegsverfahren}} + + diff --git a/scientificcomputing-script.tex b/scientificcomputing-script.tex index 8193aca..891303c 100644 --- a/scientificcomputing-script.tex +++ b/scientificcomputing-script.tex @@ -26,7 +26,7 @@ \graphicspath{{regression/lecture/}{regression/lecture/figures/}} \lstset{inputpath=regression/code} -\include{regression/lecture/linear_regression} +%\include{regression/lecture/linear_regression} \graphicspath{{likelihood/lecture/}{likelihood/lecture/figures/}} \lstset{inputpath=likelihood/code}