diff --git a/Makefile b/Makefile index eb38e46..a5054d5 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ BASENAME=scientificcomputing-script -SUBDIRS=programming debugging plotting programmingstyle statistics bootstrap regression likelihood pointprocesses designpattern +SUBDIRS=programming debugging plotting codestyle statistics bootstrap regression likelihood pointprocesses designpattern SUBTEXS=$(foreach subd, $(SUBDIRS), $(subd)/lecture/$(subd).tex) all : script chapters diff --git a/README.fonts b/README.fonts index 83bece0..ab7a941 100644 --- a/README.fonts +++ b/README.fonts @@ -17,7 +17,9 @@ Then we need to plot something to recreate the matplotlib font cache: make cleanplots make plots ``` -To give back the fonts to lyx we reinstall them + +You should better NOT reinstall ``` sudo apt-get install fonts-lyx ``` +to give back the fonts to lyx. \ No newline at end of file diff --git a/chapter.mk b/chapter.mk index d28642d..cd6fe56 100644 --- a/chapter.mk +++ b/chapter.mk @@ -44,8 +44,8 @@ watchchapter : cleantex: rm -f *~ - rm -f $(BASENAME).aux $(BASENAME).log - rm -f $(BASENAME)-chapter.aux $(BASENAME)-chapter.log $(BASENAME)-chapter.out $(BASENAME)-chapter.idx $(BASENAME)-solutions.tex $(BASENAME)-solutions.tex + rm -f $(BASENAME).aux $(BASENAME).log *.idx + rm -f $(BASENAME)-chapter.aux $(BASENAME)-chapter.log $(BASENAME)-chapter.out $(BASENAME)-chapter.idx $(BASENAME)-chapter-solutions.tex $(BASENAME)-solutions.tex cleanplots: cleanpythonplots cleangnuplots diff --git a/programmingstyle/code/calculateSines.m b/codestyle/code/calculateSines.m similarity index 100% rename from programmingstyle/code/calculateSines.m rename to codestyle/code/calculateSines.m diff --git a/programmingstyle/lecture/Makefile b/codestyle/lecture/Makefile similarity index 60% rename from programmingstyle/lecture/Makefile rename to codestyle/lecture/Makefile index 4c7aa7c..ef3704d 100644 --- a/programmingstyle/lecture/Makefile +++ b/codestyle/lecture/Makefile @@ -1,4 +1,4 @@ -BASENAME=programmingstyle +BASENAME=codestyle all : pdf @@ -9,4 +9,4 @@ pdf : chapter clean : cleanchapter -cleanall : clean cleanchapter +cleanall : cleanallchapter diff --git a/programmingstyle/lecture/beamercolorthemetuebingen.sty b/codestyle/lecture/beamercolorthemetuebingen.sty similarity index 100% rename from programmingstyle/lecture/beamercolorthemetuebingen.sty rename to codestyle/lecture/beamercolorthemetuebingen.sty diff --git a/programmingstyle/lecture/programmingstyle-chapter.tex b/codestyle/lecture/codestyle-chapter.tex similarity index 94% rename from programmingstyle/lecture/programmingstyle-chapter.tex rename to codestyle/lecture/codestyle-chapter.tex index 78243a6..87e2eac 100644 --- a/programmingstyle/lecture/programmingstyle-chapter.tex +++ b/codestyle/lecture/codestyle-chapter.tex @@ -14,7 +14,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \begin{document} -\include{programmingstyle} +\include{codestyle} \end{document} diff --git a/programmingstyle/lecture/programmingstyle.tex b/codestyle/lecture/codestyle.tex similarity index 99% rename from programmingstyle/lecture/programmingstyle.tex rename to codestyle/lecture/codestyle.tex index bb24709..9811d2f 100644 --- a/programmingstyle/lecture/programmingstyle.tex +++ b/codestyle/lecture/codestyle.tex @@ -411,7 +411,6 @@ not of more global interest across projects consider to define it as \codeterm[function!local]{local function} or \codeterm[function!nested]{nested function}. Taking care to increase readability and comprehensibility pays off, even to the author! - \footnote{Reading tip: Robert C. Martin: \textit{Clean Code: A Handbook of Agile Software Craftmanship}, Prentice Hall} diff --git a/programmingstyle/lecture/programmingstyle_de.tex b/codestyle/lecture/codestyle_de.tex similarity index 100% rename from programmingstyle/lecture/programmingstyle_de.tex rename to codestyle/lecture/codestyle_de.tex diff --git a/programmingstyle/lecture/figures/program_organization.png b/codestyle/lecture/figures/program_organization.png similarity index 100% rename from programmingstyle/lecture/figures/program_organization.png rename to codestyle/lecture/figures/program_organization.png diff --git a/programmingstyle/lecture/figures/search_path.png b/codestyle/lecture/figures/search_path.png similarity index 100% rename from programmingstyle/lecture/figures/search_path.png rename to codestyle/lecture/figures/search_path.png diff --git a/debugging/lecture/Makefile b/debugging/lecture/Makefile index 8c88530..9ce003b 100644 --- a/debugging/lecture/Makefile +++ b/debugging/lecture/Makefile @@ -9,4 +9,4 @@ pdf : chapter clean : cleanchapter -cleanall : clean cleanchapter +cleanall : cleanallchapter diff --git a/designpattern/lecture/Makefile b/designpattern/lecture/Makefile index e7312a5..bb1416b 100644 --- a/designpattern/lecture/Makefile +++ b/designpattern/lecture/Makefile @@ -9,5 +9,5 @@ pdf : chapter clean : cleanchapter -cleanall : clean cleanchapter +cleanall : cleanallchapter diff --git a/likelihood/lecture/Makefile b/likelihood/lecture/Makefile index 17f92ae..d35f11b 100644 --- a/likelihood/lecture/Makefile +++ b/likelihood/lecture/Makefile @@ -9,4 +9,4 @@ pdf : chapter clean : cleanchapter -cleanall : clean cleanchapter +cleanall : cleanallchapter diff --git a/pointprocesses/lecture/Makefile b/pointprocesses/lecture/Makefile index e53a65d..07fda48 100644 --- a/pointprocesses/lecture/Makefile +++ b/pointprocesses/lecture/Makefile @@ -29,8 +29,8 @@ watchslides : clean : cleanchapter rm -f $(BASENAME)-slides.aux $(BASENAME)-slides.log $(BASENAME)-slides.out $(BASENAME)-slides.toc $(BASENAME)-slides.nav $(BASENAME)-slides.snm $(BASENAME)-slides.vrb -cleanall : clean cleanchapter - $(BASENAME)-slides.pdf $(BASENAME)-handout.pdf +cleanall : clean cleanallchapter + rm -f $(BASENAME)-slides.pdf $(BASENAME)-handout.pdf help : diff --git a/pointprocesses/lecture/pointprocessscetchA.eps b/pointprocesses/lecture/pointprocessscetchA.eps index 30d6da4..f2cc576 100644 --- a/pointprocesses/lecture/pointprocessscetchA.eps +++ b/pointprocesses/lecture/pointprocessscetchA.eps @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-2.0 %%Title: pointprocessscetchA.tex %%Creator: gnuplot 4.6 patchlevel 4 -%%CreationDate: Tue Dec 3 08:08:50 2019 +%%CreationDate: Fri Dec 6 23:29:10 2019 %%DocumentFonts: %%BoundingBox: 50 50 373 135 %%EndComments @@ -433,7 +433,7 @@ SDict begin [ /Author (jan) % /Producer (gnuplot) % /Keywords () - /CreationDate (Tue Dec 3 08:08:50 2019) + /CreationDate (Fri Dec 6 23:29:10 2019) /DOCINFO pdfmark end } ifelse diff --git a/pointprocesses/lecture/pointprocessscetchA.pdf b/pointprocesses/lecture/pointprocessscetchA.pdf index d064a3a..3210a19 100644 Binary files a/pointprocesses/lecture/pointprocessscetchA.pdf and b/pointprocesses/lecture/pointprocessscetchA.pdf differ diff --git a/pointprocesses/lecture/pointprocessscetchB.eps b/pointprocesses/lecture/pointprocessscetchB.eps index 1905250..5dd2316 100644 --- a/pointprocesses/lecture/pointprocessscetchB.eps +++ b/pointprocesses/lecture/pointprocessscetchB.eps @@ -1,7 +1,7 @@ %!PS-Adobe-2.0 EPSF-2.0 %%Title: pointprocessscetchB.tex %%Creator: gnuplot 4.6 patchlevel 4 -%%CreationDate: Tue Dec 3 08:08:50 2019 +%%CreationDate: Fri Dec 6 23:29:10 2019 %%DocumentFonts: %%BoundingBox: 50 50 373 237 %%EndComments @@ -433,7 +433,7 @@ SDict begin [ /Author (jan) % /Producer (gnuplot) % /Keywords () - /CreationDate (Tue Dec 3 08:08:50 2019) + /CreationDate (Fri Dec 6 23:29:10 2019) /DOCINFO pdfmark end } ifelse diff --git a/pointprocesses/lecture/pointprocessscetchB.pdf b/pointprocesses/lecture/pointprocessscetchB.pdf index b5f3985..cb77c74 100644 Binary files a/pointprocesses/lecture/pointprocessscetchB.pdf and b/pointprocesses/lecture/pointprocessscetchB.pdf differ diff --git a/programming/lecture/Makefile b/programming/lecture/Makefile index 41ff3c5..1c0f293 100644 --- a/programming/lecture/Makefile +++ b/programming/lecture/Makefile @@ -1,7 +1,5 @@ BASENAME=programming -#TEXFILES=boolean_logical_indexing.tex control_structures.tex data_structures.tex plotting.tex programming_basics.tex scripts_functions.tex sta_stc.tex variables_datatypes.tex vectors_matrices.tex - all : pdf include ../../chapter.mk @@ -11,4 +9,4 @@ pdf : chapter clean : cleanchapter -cleanall : clean cleanchapter +cleanall : cleanallchapter diff --git a/regression/lecture/Makefile b/regression/lecture/Makefile index 0347e31..371c85c 100644 --- a/regression/lecture/Makefile +++ b/regression/lecture/Makefile @@ -9,4 +9,4 @@ pdf : chapter clean : cleanchapter -cleanall : clean cleanchapter +cleanall : cleanallchapter diff --git a/scientificcomputing-script.tex b/scientificcomputing-script.tex index ce46b60..35d78fc 100644 --- a/scientificcomputing-script.tex +++ b/scientificcomputing-script.tex @@ -48,7 +48,7 @@ \includechapter{plotting} -\includechapter{programmingstyle} +\includechapter{codestyle} \includechapter{designpattern} diff --git a/statistics/lecture/Makefile b/statistics/lecture/Makefile index ab88f11..432de1b 100644 --- a/statistics/lecture/Makefile +++ b/statistics/lecture/Makefile @@ -9,4 +9,4 @@ pdf : chapter clean : cleanchapter -cleanall : clean cleanchapter +cleanall : cleanallchapter