diff --git a/IV/Makefile b/IV/Makefile index 3403716..a52d0e4 100644 --- a/IV/Makefile +++ b/IV/Makefile @@ -205,6 +205,7 @@ salvis-wm220_WIDTHDIV = 2 label_wm75 = Wang--Müller label_vw64 = Visvalingam--Whyatt label_dp64 = Douglas \& Peucker +label_grpk10 = GRPK 1:\numprint{10000} label_vw64chaikin = $(label_vw64) and Chaikin label_dp64chaikin = $(label_dp64) and Chaikin legend_ = lower left @@ -212,23 +213,23 @@ legend_tr = lower right legend_tl = lower right define wm_vwdp50k -RIVERS += salvis-$(1)-$(2)-50k$(3) -salvis-$(1)-$(2)-50k$(3)_1SELECT = wm_visuals where name='salvis-$(1)' -salvis-$(1)-$(2)-50k$(3)_2SELECT = wm_visuals where name='salvis-$(2)' -salvis-$(1)-$(2)-50k$(3)_3SELECT = wm_visuals where name='salvis-grpk10' -salvis-$(1)-$(2)-50k$(3)_1COLOR = orange -salvis-$(1)-$(2)-50k$(3)_1LABEL = $(label_$(2)) -salvis-$(1)-$(2)-50k$(3)_2COLOR = green -salvis-$(1)-$(2)-50k$(3)_2LABEL = $(label_$(1)) -salvis-$(1)-$(2)-50k$(3)_3LINESTYLE = dotted -salvis-$(1)-$(2)-50k$(3)_3LABEL = GRPK 1:\numprint{10000} -salvis-$(1)-$(2)-50k$(3)_QUADRANT = $(3) -salvis-$(1)-$(2)-50k$(3)_LEGEND = $(legend_$(3)) +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),)) \ - $(eval $(call wm_vwdp50k,wm75,$(x),tl)) \ - $(eval $(call wm_vwdp50k,wm75,$(x),tr)) \ + $(eval $(call wm_vwdp50k,wm75,$(x),grpk10,)) \ + $(eval $(call wm_vwdp50k,wm75,$(x),grpk10,tl)) \ + $(eval $(call wm_vwdp50k,wm75,$(x),grpk10,tr)) \ ) define FIG_template diff --git a/IV/mj-msc.tex b/IV/mj-msc.tex index cfbc7a1..a54cb5b 100644 --- a/IV/mj-msc.tex +++ b/IV/mj-msc.tex @@ -1571,41 +1571,41 @@ needed for small-scale maps (1:\numprint{250000}), we will limit the comparison in this section to 1:\numprint{50000}. \begin{figure}[h!] - \includegraphics[width=\textwidth]{salvis-wm75-dp64-50k} + \includegraphics[width=\textwidth]{salvis-wm75-dp64-grpk10-50k} \caption{{\DP} (green), {\WM} (orange) and original (black dotted) at 1:\numprint{50000}.} - \label{fig:salvis-wm75-dp64-50k} + \label{fig:salvis-wm75-dp64-grpk10-50k} \end{figure} \begin{figure}[h!] - \includegraphics[width=\textwidth]{salvis-wm75-dpchaikin64-50k} + \includegraphics[width=\textwidth]{salvis-wm75-dpchaikin64-grpk10-50k} \caption{Chaikin--smoothened {\DP} (green), {\WM} (orange) and original (black dotted) at 1:\numprint{50000}.} - \label{fig:salvis-wm75-dpchaikin64-50k} + \label{fig:salvis-wm75-dpchaikin64-grpk10-50k} \end{figure} \begin{figure}[h!] - \includegraphics[width=\textwidth]{salvis-wm75-vw64-50k} + \includegraphics[width=\textwidth]{salvis-wm75-vw64-grpk10-50k} \caption{{\VW} (green), {\WM} (orange) and original (black dotted) at 1:\numprint{50000}.} - \label{fig:salvis-wm75-vw64-50k} + \label{fig:salvis-wm75-vw64-grpk10-50k} \end{figure} \begin{figure}[h!] - \includegraphics[width=\textwidth]{salvis-wm75-vwchaikin64-50k} + \includegraphics[width=\textwidth]{salvis-wm75-vwchaikin64-grpk10-50k} \caption{Chaikin--smoothened {\VW} (green), {\WM} (orange) and original (black dotted) at 1:\numprint{50000}.} - \label{fig:salvis-wm75-vwchaikin64-50k} + \label{fig:salvis-wm75-vwchaikin64-grpk10-50k} \end{figure}