motiejus/wm
1
Fork 0
Code Releases Activity

add some evals to Makefile

Browse Source
This commit is contained in:
Motiejus Jakštys 2021-05-19 22:57:47 +03:00 committed by Motiejus Jakštys
parent 9f7a9c338e
commit 26edf195aa
2 changed files with 53 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

111
Makefile
View File

@ -5,13 +5,15 @@ SLIDES = slides-2021-03-29.pdf
NON_ARCHIVABLES = notes.txt referatui.txt slides-2021-03-29.txt NON_ARCHIVABLES = notes.txt referatui.txt slides-2021-03-29.txt
ARCHIVABLES = $(filter-out $(NON_ARCHIVABLES),$(shell git ls-files .)) ARCHIVABLES = $(filter-out $(NON_ARCHIVABLES),$(shell git ls-files .))
FIGURES = fig8-definition-of-a-bend.pdf \
fig5-gentle-inflection-before.pdf \ FIGURES = test-figures \
fig5-gentle-inflection-after.pdf \ fig6-self-crossing-before \
inflection-1-gentle-inflection-before.pdf \ fig6-self-crossing-after \
inflection-1-gentle-inflection-after.pdf \ fig8-definition-of-a-bend \
fig6-self-crossing-before.pdf \ fig5-gentle-inflection-before \
fig6-self-crossing-after.pdf fig5-gentle-inflection-after \
inflection-1-gentle-inflection-before \
inflection-1-gentle-inflection-after
.PHONY: test .PHONY: test
test: .faux_test test: .faux_test
@ -25,10 +27,10 @@ clean:
-./db stop -./db stop
-rm -r .faux_test .faux_filter-rivers .faux_import-osm .faux_db \ -rm -r .faux_test .faux_filter-rivers .faux_import-osm .faux_db \
version.inc.tex vars.inc.tex version.aux version.fdb_latexmk \ version.inc.tex vars.inc.tex version.aux version.fdb_latexmk \
test-figures.pdf _minted-mj-msc \ minted-mj-msc \
$(shell git ls-files -o mj-msc*) \ $(shell git ls-files -o mj-msc*) \
$(SLIDES) \ $(addsuffix .pdf,$(FIGURES)) \
$(FIGURES) $(SLIDES)
.PHONY: clean-tables .PHONY: clean-tables
clean-tables: clean-tables:
@ -40,7 +42,7 @@ clean-tables:
.PHONY: slides .PHONY: slides
slides: $(SLIDES) slides: $(SLIDES)
mj-msc.pdf: mj-msc.tex test-figures.pdf version.inc.tex vars.inc.tex bib.bib $(FIGURES) mj-msc.pdf: mj-msc.tex version.inc.tex vars.inc.tex bib.bib $(addsuffix .pdf,$(FIGURES))
latexmk -shell-escape -g -pdf $< latexmk -shell-escape -g -pdf $<
mj-msc-gray.pdf: mj-msc.pdf mj-msc-gray.pdf: mj-msc.pdf
@ -63,61 +65,52 @@ mj-msc-full.pdf: mj-msc.pdf version.inc.tex $(ARCHIVABLES)
done done
mv .tmp-$@ $@ mv .tmp-$@ $@
test-figures.pdf: layer2img.py .faux_test define FIG_template
python ./layer2img.py --group1-select=wm_figures --outfile=$@ $(1).pdf: layer2img.py Makefile .faux_test
fig8-definition-of-a-bend.pdf: layer2img.py Makefile .faux_test
python ./layer2img.py \ python ./layer2img.py \
--group1-select="wm_debug where name='fig8' AND stage='bbends' AND gen=1" \ --outfile=$(1).pdf \
--group2-cmap=1 \ $$(if $$($(1)_WIDTHDIV),--widthdiv=$$($(1)_WIDTHDIV)) \
--group2-select="wm_debug where name='fig8' AND stage='bbends-polygon' AND gen=1" \ $$(foreach i,1 2 3, \
--outfile=$@ $$(if $$($(1)_CMAP$$(i)),--group$$(i)-cmap="$$($(1)_CMAP$$(i))") \
$$(if $$($(1)_SELECT$$(i)),--group$$(i)-select="$$($(1)_SELECT$$(i))") \
$$(if $$($(1)_LINESTYLE$$(i)),--group$$(i)-linestyle="$$($(1)_LINESTYLE$$(i))") \
)
endef
fig5-gentle-inflection-before.pdf: layer2img.py Makefile .faux_test $(foreach fig,$(FIGURES),$(eval $(call FIG_template,$(fig))))
python ./layer2img.py \
--widthdiv=2 \
--group1-select="wm_debug where name='fig5' AND stage='bbends' AND gen=1" \
--group2-cmap=1 \
--group2-select="wm_debug where name='fig5' AND stage='bbends-polygon' AND gen=1" \
--outfile=$@
fig5-gentle-inflection-after.pdf: layer2img.py Makefile .faux_test test-figures_SELECT1 = wm_figures
python ./layer2img.py \
--widthdiv=2 \
--group1-select="wm_debug where name='fig5' AND stage='cinflections' AND gen=1" \
--group2-select="wm_debug where name='fig5' AND stage='cinflections-polygon' AND gen=1" \
--group2-cmap=1 \
--outfile=$@
inflection-1-gentle-inflection-before.pdf: layer2img.py Makefile .faux_test fig8-definition-of-a-bend_SELECT1 = wm_debug where name='fig8' AND stage='bbends' AND gen=1
python ./layer2img.py \ fig8-definition-of-a-bend_CMAP2 = 1
--widthdiv=2 \ fig8-definition-of-a-bend_SELECT2 = wm_debug where name='fig8' AND stage='bbends-polygon' AND gen=1
--group1-select="wm_debug where name='inflection-1' AND stage='bbends' AND gen=1" \
--group2-select="wm_debug where name='inflection-1' AND stage='bbends-polygon' AND gen=1" \
--group2-cmap=1 \
--outfile=$@
inflection-1-gentle-inflection-after.pdf: layer2img.py Makefile .faux_test fig5-gentle-inflection-before_WITHDIV = 2
python ./layer2img.py \ fig5-gentle-inflection-before_SELECT1 = wm_debug where name='fig5' AND stage='bbends' AND gen=1
--widthdiv=2 \ fig5-gentle-inflection-before_CMAP2 = 1
--group1-select="wm_debug where name='inflection-1' AND stage='cinflections' AND gen=1" \ fig5-gentle-inflection-before_SELECT2 = wm_debug where name='fig5' AND stage='bbends-polygon' AND gen=1
--group2-select="wm_debug where name='inflection-1' AND stage='cinflections-polygon' AND gen=1" \ fig5-gentle-inflection-after_WITHDIV = 2
--group2-cmap=1 \ fig5-gentle-inflection-after_SELECT1 = wm_debug where name='fig5' AND stage='cinflections' AND gen=1
--outfile=$@ fig5-gentle-inflection-after_SELECT2 = wm_debug where name='fig5' AND stage='cinflections-polygon' AND gen=1
fig5-gentle-inflection-after_CMAP2 = 1
fig6-self-crossing-before.pdf: layer2img.py Makefile .faux_test inflection-1-gentle-inflection-before_WIDTHDIV = 2
python ./layer2img.py \ inflection-1-gentle-inflection-before_SELECT1 = wm_debug where name='inflection-1' AND stage='bbends' AND gen=1
--widthdiv=4 \ inflection-1-gentle-inflection-before_SELECT2 = wm_debug where name='inflection-1' AND stage='bbends-polygon' AND gen=1
--group1-select="wm_debug where name='fig6' AND stage='bbends' AND gen=1" \ inflection-1-gentle-inflection-before_CMAP2 = 1
--group2-select="wm_visuals where name='fig6-baseline'" --group2-linestyle=dashed \ inflection-1-gentle-inflection-after_WIDTHDIV = 2
--group3-select="wm_visuals where name='fig6-newline'" --group3-linestyle=dashed \ inflection-1-gentle-inflection-after_SELECT1 = wm_debug where name='inflection-1' AND stage='cinflections' AND gen=1
--outfile=$@ inflection-1-gentle-inflection-after_SELECT2 = wm_debug where name='inflection-1' AND stage='cinflections-polygon' AND gen=1
inflection-1-gentle-inflection-after_CMAP2 = 1
fig6-self-crossing-after.pdf: layer2img.py Makefile .faux_test fig6-self-crossing-before_WIDTHDIV = 4
python ./layer2img.py \ fig6-self-crossing-before_SELECT1 = wm_debug where name='fig6' AND stage='bbends' AND gen=1
--widthdiv=3 \ fig6-self-crossing-before_SELECT2 = wm_visuals where name='fig6-baseline'
--group1-select="wm_debug where name='fig6' AND stage='dcrossings' AND gen=1" \ fig6-self-crossing-before_SELECT3 = wm_visuals where name='fig6-newline'
--outfile=$@ fig6-self-crossing-before_LINESTYLE2 = dashed
fig6-self-crossing-before_LINESTYLE3 = dashed
fig6-self-crossing-after_WIDTHDIV = 4
fig6-self-crossing-after_SELECT1 = wm_debug where name='fig6' AND stage='dcrossings' AND gen=1
.faux_test: tests.sql wm.sql .faux_db .faux_test: tests.sql wm.sql .faux_db
./db -f tests.sql ./db -f tests.sql

2
mj-msc.tex
View File

@ -497,7 +497,7 @@ We strongly believe in the ability to reproduce the results is critical for any
This was tested on Linux Debian 11 with upstream packages only. This was tested on Linux Debian 11 with upstream packages only.
\subsection{Algorithm code listings} \subsection{Algorithm code listings}
\inputminted[fontsize=\small]{plpgsql}{wm.sql} \inputminted[fontsize=\small]{postgresql}{wm.sql}
\end{appendices} \end{appendices}
\end{document} \end{document}