From 79093e766e6e4f850bc1a42f33c8ce8ff2020a1f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Wed, 19 May 2021 22:57:52 +0300 Subject: [PATCH] more consistent figure names --- Makefile | 101 ++++++++++++++++++++------------------------------- layer2img.py | 2 +- mj-msc.tex | 35 +++++++++--------- 3 files changed, 59 insertions(+), 79 deletions(-) diff --git a/Makefile b/Makefile index 2b4dc73..9ca3d6e 100644 --- a/Makefile +++ b/Makefile @@ -43,11 +43,8 @@ RIVERS = \ salvis-overlaid-vwchaikin64-50k \ salvis-wm220-10x \ salvis-wm220-2x \ - salvis-wm-50k \ - salvis-wm-50k-nw \ - salvis-wm-50k-ne \ salvis-wm-overlaid-250k-zoom \ - salvis-wm-grpk50 \ + salvis-wm75-grpk50-grpk10 \ salvis-wm75-grpk50-grpk10ne \ salvis-wm220 @@ -140,6 +137,45 @@ salvis-grpk250-2x_WIDTHDIV = 2 # 50K ################################################################################ +label_wm75 = Wang--Müller +label_vw64 = Visvalingam--Whyatt +label_dp64 = Douglas \& Peucker +label_grpk10 = GRPK 1:\numprint{10000} +label_grpk50 = GRPK 1:\numprint{50000} +label_vw64chaikin = $(label_vw64) and Chaikin +label_dp64chaikin = $(label_dp64) and Chaikin +legend_ = lower left +legend_tr = lower right +legend_tl = lower center + +define wm_vwdp50k +RIVERS += salvis-$(1)-$(2)-$(3)-50k$(4) +salvis-$(1)-$(2)-$(3)-50k$(4)_1SELECT = wm_visuals where name='salvis-$(1)' +salvis-$(1)-$(2)-$(3)-50k$(4)_1COLOR = orange +salvis-$(1)-$(2)-$(3)-50k$(4)_1LABEL = $(label_$(1)) +salvis-$(1)-$(2)-$(3)-50k$(4)_2SELECT = wm_visuals where name='salvis-$(2)' +salvis-$(1)-$(2)-$(3)-50k$(4)_2COLOR = green +salvis-$(1)-$(2)-$(3)-50k$(4)_2LABEL = $(label_$(2)) +$(if $(3), +salvis-$(1)-$(2)-$(3)-50k$(4)_3SELECT = wm_visuals where name='salvis-$(3)' +salvis-$(1)-$(2)-$(3)-50k$(4)_3LINESTYLE = dotted +salvis-$(1)-$(2)-$(3)-50k$(4)_3LABEL = $(label_$(3)) +,) +salvis-$(1)-$(2)-$(3)-50k$(4)_QUADRANT = $(4) +salvis-$(1)-$(2)-$(3)-50k$(4)_LEGEND = $(legend_$(4)) +endef +$(foreach x,vw64 dp64 vwchaikin64 dpchaikin64,\ + $(eval $(call wm_vwdp50k,wm75,$(x),grpk10,)) \ + $(eval $(call wm_vwdp50k,wm75,$(x),grpk10,tl)) \ + $(eval $(call wm_vwdp50k,wm75,$(x),grpk10,tr)) \ +) +$(eval $(call wm_vwdp50k,wm75,grpk50,grpk10)) +$(eval $(call wm_vwdp50k,wm75,grpk50,grpk10,tr)) + +$(eval $(call wm_vwdp50k,wm75,grpk10,,)) +$(eval $(call wm_vwdp50k,wm75,grpk10,,tr)) +$(eval $(call wm_vwdp50k,wm75,grpk10,,tl)) + salvis-25k_1SELECT = wm_visuals where name='salvis-grpk10' salvis-25k_WIDTHDIV = 1 @@ -170,63 +206,9 @@ salvis-overlaid-vwchaikin64-50k_1COLOR = orange salvis-overlaid-vwchaikin64-50k_WIDTHDIV = 2 salvis-overlaid-vwchaikin64-50k_QUADRANT = tl -salvis-wm-50k_1SELECT = wm_visuals where name='salvis-wm75' -salvis-wm-50k_2SELECT = wm_visuals where name='salvis-grpk10' -salvis-wm-50k_1COLOR = orange - -salvis-wm-50k-nw_1SELECT = wm_visuals where name='salvis-wm75' -salvis-wm-50k-nw_2SELECT = wm_visuals where name='salvis-grpk10' -salvis-wm-50k-nw_1COLOR = orange -salvis-wm-50k-nw_QUADRANT = tr - -salvis-wm-50k-ne_1SELECT = wm_visuals where name='salvis-wm75' -salvis-wm-50k-ne_2SELECT = wm_visuals where name='salvis-grpk10' -salvis-wm-50k-ne_1COLOR = orange -salvis-wm-50k-ne_QUADRANT = tl - -salvis-wm-grpk50_1SELECT = wm_visuals where name='salvis-wm75' -salvis-wm-grpk50_2SELECT = wm_visuals where name='salvis-grpk50' -salvis-wm-grpk50_3SELECT = wm_visuals where name='salvis-grpk10' -salvis-wm-grpk50_1COLOR = orange -salvis-wm-grpk50_2COLOR = green -salvis-wm-grpk50_3LINESTYLE = dotted - - salvis-wm220_1SELECT = wm_visuals where name='salvis-wm220' salvis-wm220_WIDTHDIV = 2 -label_wm75 = Wang--Müller -label_vw64 = Visvalingam--Whyatt -label_dp64 = Douglas \& Peucker -label_grpk10 = GRPK 1:\numprint{10000} -label_grpk50 = GRPK 1:\numprint{50000} -label_vw64chaikin = $(label_vw64) and Chaikin -label_dp64chaikin = $(label_dp64) and Chaikin -legend_ = lower left -legend_tr = lower right -legend_tl = lower center - -define wm_vwdp50k -RIVERS += salvis-$(1)-$(2)-$(3)-50k$(4) -salvis-$(1)-$(2)-$(3)-50k$(4)_1SELECT = wm_visuals where name='salvis-$(1)' -salvis-$(1)-$(2)-$(3)-50k$(4)_2SELECT = wm_visuals where name='salvis-$(2)' -salvis-$(1)-$(2)-$(3)-50k$(4)_3SELECT = wm_visuals where name='salvis-$(3)' -salvis-$(1)-$(2)-$(3)-50k$(4)_1COLOR = orange -salvis-$(1)-$(2)-$(3)-50k$(4)_1LABEL = $(label_$(1)) -salvis-$(1)-$(2)-$(3)-50k$(4)_2COLOR = green -salvis-$(1)-$(2)-$(3)-50k$(4)_2LABEL = $(label_$(2)) -salvis-$(1)-$(2)-$(3)-50k$(4)_3LINESTYLE = dotted -salvis-$(1)-$(2)-$(3)-50k$(4)_3LABEL = $(label_$(3)) -salvis-$(1)-$(2)-$(3)-50k$(4)_QUADRANT = $(4) -salvis-$(1)-$(2)-$(3)-50k$(4)_LEGEND = $(legend_$(4)) -endef -$(foreach x,vw64 dp64 vwchaikin64 dpchaikin64,\ - $(eval $(call wm_vwdp50k,wm75,$(x),grpk10,)) \ - $(eval $(call wm_vwdp50k,wm75,$(x),grpk10,tl)) \ - $(eval $(call wm_vwdp50k,wm75,$(x),grpk10,tr)) \ -) -$(eval $(call wm_vwdp50k,wm75,grpk50,grpk10,tr)) - define FIG_template $(1).pdf: layer2img.py Makefile $(2) python3 ./layer2img.py --outfile=$(1).pdf \ @@ -241,7 +223,6 @@ $(1).pdf: layer2img.py Makefile $(2) ) endef - $(foreach fig,$(FIGURES),$(eval $(call FIG_template,$(fig),.faux_test))) $(foreach fig,$(RIVERS), $(eval $(call FIG_template,$(fig),.faux_visuals))) @@ -292,8 +273,6 @@ mj-msc.pdf: mj-msc.tex version.inc.tex vars.inc.tex bib.bib \ .PHONY: allfigs allfigs: $(addsuffix .pdf,$(FIGURES)) $(addsuffix .pdf,$(RIVERS)) - - .faux_db_pre: db init.sql bash db start bash db -f init.sql diff --git a/layer2img.py b/layer2img.py index f5dc2a6..19d6c37 100644 --- a/layer2img.py +++ b/layer2img.py @@ -22,7 +22,7 @@ COLORS = { # see `NOTICE` in the LaTeX document; this is the width of the main text block. TEXTWIDTH_CM = 12.12364 -QUADRANTS = {'tr':1, 'br':2, 'bl':3, 'tl':4} +QUADRANTS = {'tr':1, 'tl':2, 'bl':3, 'br':4} def color(string): return COLORS[string if string else 'black'] diff --git a/mj-msc.tex b/mj-msc.tex index 2df5444..7685c47 100644 --- a/mj-msc.tex +++ b/mj-msc.tex @@ -1394,36 +1394,36 @@ Our generalized results are viewed from the following angles: \begin{figure}[h!] \centering - \includegraphics[width=\textwidth]{salvis-wm-50k} + \includegraphics[width=\textwidth]{salvis-wm75-grpk10--50k} \caption{2x zoomed-in {\WM} for 1:\numprint{50000}.} - \label{fig:salvis-wm-50k} + \label{fig:salvis-wm75-grpk10--50k} \end{figure} -As one can see in Figure~\ref{fig:salvis-wm-50k}, the illustrations deliver +As one can see in Figure~\ref{fig:salvis-wm75-grpk10--50k}, the illustrations deliver what was promised by the algorithm, but with a few caveats. Left side of the figure looks reasonably well simplified: long bends remain slightly curved, small bends are removed or slightly exaggerated. -Figure's~\ref{fig:salvis-wm-50k} left part is clipped to -Figure~\ref{fig:salvis-wm-50k-nw}. As one can see, some bends were well +Figure's~\ref{fig:salvis-wm75-grpk10--50k} left part is clipped to +Figure~\ref{fig:salvis-wm75-grpk10--50ktl}. As one can see, some bends were well exaggerated, and some bends were eliminated. \begin{figure}[h!] \centering - \includegraphics[width=\textwidth]{salvis-wm-50k-nw} - \caption{Left part of Figure~\ref{fig:salvis-wm-50k}.} - \label{fig:salvis-wm-50k-nw} + \includegraphics[width=\textwidth]{salvis-wm75-grpk10--50ktl} + \caption{Left part of Figure~\ref{fig:salvis-wm75-grpk10--50k}.} + \label{fig:salvis-wm75-grpk10--50ktl} \end{figure} -Top--right side (clipped in Figure~\ref{fig:salvis-wm-50k-ne}) some jagged +Top--right side (clipped in Figure~\ref{fig:salvis-wm75-grpk10--50ktl}) some jagged and sharp bends appear. These will become more pronounced in even larger-scale simplification in the next section. \begin{figure}[h!] \centering - \includegraphics[width=\textwidth]{salvis-wm-50k-ne} - \caption{Top--right part of Figure~\ref{fig:salvis-wm-50k}.} - \label{fig:salvis-wm-50k-ne} + \includegraphics[width=\textwidth]{salvis-wm75-grpk10--50ktr} + \caption{Top--right part of Figure~\ref{fig:salvis-wm75-grpk10--50k}.} + \label{fig:salvis-wm75-grpk10--50ktr} \end{figure} To sum up, mid-scale simplification works well for some geometries, but creates @@ -1511,23 +1511,23 @@ compares the resulting {\WM}--generalized rivers to grpk50LT and grpk250LT. \subsubsection{Medium-scale (1:\numprint{50000})} For our research location, the national dataset GDB10LT is almost equivalent to -grpk50LT, with a few nuances. Figure~\ref{fig:salvis-wm-grpk50} illustrates +grpk50LT, with a few nuances. Figure~\ref{fig:salvis-wm75-grpk50-grpk10} illustrates all three shapes: grpk50LT, {\WM}--simplified GDB10LT, and the original GDB10LT. \begin{figure}[h!] \centering - \includegraphics[width=\textwidth]{salvis-wm-grpk50} + \includegraphics[width=\textwidth]{salvis-wm75-grpk50-grpk10} \caption{2x zoomed-in grpk50LT (green), {\WM}--simplified GDB10LT (orange) and original GDB10LT (dotted black).} - \label{fig:salvis-wm-grpk50} + \label{fig:salvis-wm75-grpk50-grpk10} \end{figure} \begin{figure}[h!] \centering \includegraphics[width=\textwidth]{salvis-wm75-grpk50-grpk10-50ktr} - \caption{Top--right side of Figure~\ref{fig:salvis-wm-grpk50}.} + \caption{Top--right side of Figure~\ref{fig:salvis-wm75-grpk50-grpk10}.} \label{fig:salvis-wm75-grpk50-grpk10-50ktr} \end{figure} @@ -1697,7 +1697,8 @@ paper on a warm pre-COVID summer evening. I got intrigued. He was also an early beta-tester of my implementation, and helped me understand where the initial algorithm descriptions were ambiguous. -Many thanks to NŽT for providing the datasets with a very permissive license. +Many thanks to NŽT\cite{nzt} for providing the datasets with a very permissive +license. \printbibliography