From 35c413b8c479e3545b7c1949f19590ef998640e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Wed, 19 May 2021 22:57:50 +0300 Subject: [PATCH] wm_elimination visuals --- Makefile | 11 +++++++++++ mj-msc.tex | 27 +++++++++++++++++++++++---- 2 files changed, 34 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index a609946..d6630d6 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,9 @@ LISTINGS = aggregate-rivers.sql wm.sql extract-and-generate FIGURES = \ test-figures \ fig8-definition-of-a-bend \ + fig8-elimination-gen1 \ + fig8-elimination-gen2 \ + fig8-elimination-gen3 \ fig5-gentle-inflection-before \ fig5-gentle-inflection-after \ inflection-1-gentle-inflection-before \ @@ -97,6 +100,13 @@ test-figures_1SELECT = wm_figures fig8-definition-of-a-bend_1SELECT = wm_debug where name='fig8' AND stage='bbends' AND gen=1 fig8-definition-of-a-bend_2SELECT = wm_debug where name='fig8' AND stage='bbends-polygon' AND gen=1 +fig8-elimination-gen1_1SELECT = wm_debug where name='fig8' AND stage='bbends' AND gen=1 +fig8-elimination-gen1_2SELECT = wm_debug where name='fig8' AND stage='bbends-polygon' AND gen=1 +fig8-elimination-gen2_1SELECT = wm_debug where name='fig8' AND stage='bbends' AND gen=2 +fig8-elimination-gen2_2SELECT = wm_debug where name='fig8' AND stage='bbends-polygon' AND gen=2 +fig8-elimination-gen3_1SELECT = wm_debug where name='fig8' AND stage='bbends' AND gen=3 +fig8-elimination-gen3_2SELECT = wm_debug where name='fig8' AND stage='bbends-polygon' AND gen=3 + fig5-gentle-inflection-before_WITHDIV = 2 fig5-gentle-inflection-before_1SELECT = wm_debug where name='fig5' AND stage='bbends' AND gen=1 fig5-gentle-inflection-before_2SELECT = wm_debug where name='fig5' AND stage='bbends-polygon' AND gen=1 @@ -129,6 +139,7 @@ selfcrossing-1-after_1SELECT = wm_debug where name='selfcrossing-1' AND stage='d selfcrossing-1-after_2SELECT = wm_debug where name='selfcrossing-1' AND stage='bbends' AND gen=1 selfcrossing-1-after_2LINESTYLE = invisible + salvis-25k_1SELECT = wm_visuals where name='salvis' salvis-25k_WIDTHDIV = 1 diff --git a/mj-msc.tex b/mj-msc.tex index 077e295..2bb9599 100644 --- a/mj-msc.tex +++ b/mj-msc.tex @@ -1049,9 +1049,9 @@ Two conditions must be true to claim that a bend is isolated: To find out whether two bends are similar, they are compared by 3 components: \begin{enumerate} - \item \textsc{adjusted size} $A_{adj}$ - \item \textsc{compactness index} $c$ - \item \textsc{baseline length} $l$ + \item \textsc{adjusted size} $A_{adj}$. + \item \textsc{compactness index} $c$. + \item \textsc{baseline length} $l$. \end{enumerate} Components 1, 2 and 3 represent a point in a 3-dimensional space, and Euclidean @@ -1068,7 +1068,26 @@ The smaller the distance $d$, the more similar the bends are. \subsection{Elimination Operator} -NOTE: implemented, explain. +Elimination was explained reasonably well in the original paper. Figure X +illustrates steps of Figure 8 from the original paper. + +\begin{figure}[ht] + \centering + \begin{subfigure}[b]{.7\textwidth} + \includegraphics[width=\textwidth]{fig8-elimination-gen1} + \caption{Original} + \end{subfigure} + \begin{subfigure}[b]{.7\textwidth} + \includegraphics[width=\textwidth]{fig8-elimination-gen2} + \caption{Iteration 1} + \end{subfigure} + \begin{subfigure}[b]{.7\textwidth} + \includegraphics[width=\textwidth]{fig8-elimination-gen3} + \caption{Iteration 2 (result)} + \end{subfigure} + \caption{Bend elimination through iterations.} + \label{fig:elimination-through-iterations} +\end{figure} \subsection{Combination Operator}