remove "simplify" to "douglas"

This commit is contained in:
Motiejus Jakštys 2020-05-25 12:32:45 +03:00
parent 48e7af6997
commit fdc2bc043d
3 changed files with 19 additions and 7 deletions

View File

@ -1,4 +1,4 @@
GEN = zeimena.pdf st-simplify-300.pdf st-simplify-500.pdf st-simplify-1000.pdf GEN = zeimena.pdf douglas-300.pdf douglas-500.pdf douglas-1000.pdf
mj-referatas.pdf: mj-referatas.tex version.tex bib.bib zeimena-pretty.pdf $(GEN) mj-referatas.pdf: mj-referatas.tex version.tex bib.bib zeimena-pretty.pdf $(GEN)
latexmk -g -pdf $< latexmk -g -pdf $<
@ -6,11 +6,11 @@ mj-referatas.pdf: mj-referatas.tex version.tex bib.bib zeimena-pretty.pdf $(GEN)
zeimena.pdf: zeimena.gpkg zeimena.pdf: zeimena.gpkg
./layer2img.py --infile=$< --size=74x52 --outfile $@ ./layer2img.py --infile=$< --size=74x52 --outfile $@
st-simplify-%.pdf: db/.faux_st-simplify-% douglas-%.pdf: db/.faux_douglas-%
./layer2img.py --table=douglas_$* --size=74x52 --outfile $@ ./layer2img.py --table=douglas_$* --size=74x52 --outfile $@
db/.faux_st-simplify-%: db/.faux_ready st-simplify.sql db/.faux_douglas-%: db/.faux_ready douglas.sql
./managedb -- --echo-all -v ON_ERROR_STOP=1 -v tolerance=$* -f st-simplify.sql ./managedb -- --echo-all -v ON_ERROR_STOP=1 -v tolerance=$* -f douglas.sql
touch $@ touch $@
db/.faux_ready: zeimena.gpkg managedb db/.faux_ready: zeimena.gpkg managedb

View File

@ -12,6 +12,7 @@
\usepackage{subcaption} \usepackage{subcaption}
\usepackage{gensymb} \usepackage{gensymb}
\usepackage{varwidth} \usepackage{varwidth}
\usepackage{tabularx}
\usepackage{tikz} \usepackage{tikz}
\usetikzlibrary{er,positioning} \usetikzlibrary{er,positioning}
\input{version} \input{version}
@ -135,6 +136,17 @@ As one can observe in figure~\ref{fig:douglas-300}, the Douglas \& Peucker with
300m tolerance preserves most of the shape, and 1000m 300m tolerance preserves most of the shape, and 1000m
(figure~\ref{fig:douglas-1000}) is still recognizeable. (figure~\ref{fig:douglas-1000}) is still recognizeable.
\renewcommand{\tabularxcolumn}[1]{>{\small}m{#1}}
\begin{tabularx}{\textwidth}{ p{1.5cm} | X | X }
Tolerance &
Douglas \& Peucker &
Visvalingam-Whyatt \\ \hline
foo &
\includegraphics[width=\linewidth]{zeimena} &
foo \\ \hline
\end{tabularx}
\begin{figure} \begin{figure}
\centering \centering
\begin{subfigure}[b]{0.23\textwidth} \begin{subfigure}[b]{0.23\textwidth}
@ -144,19 +156,19 @@ As one can observe in figure~\ref{fig:douglas-300}, the Douglas \& Peucker with
\end{subfigure} \end{subfigure}
~ ~
\begin{subfigure}[b]{0.23\textwidth} \begin{subfigure}[b]{0.23\textwidth}
\includegraphics[width=\textwidth]{st-simplify-300} \includegraphics[width=\textwidth]{douglas-300}
\caption{300m} \caption{300m}
\label{fig:douglas-300} \label{fig:douglas-300}
\end{subfigure} \end{subfigure}
~ ~
\begin{subfigure}[b]{0.23\textwidth} \begin{subfigure}[b]{0.23\textwidth}
\includegraphics[width=\textwidth]{st-simplify-500} \includegraphics[width=\textwidth]{douglas-500}
\caption{500m} \caption{500m}
\label{fig:douglas-500} \label{fig:douglas-500}
\end{subfigure} \end{subfigure}
~ ~
\begin{subfigure}[b]{0.23\textwidth} \begin{subfigure}[b]{0.23\textwidth}
\includegraphics[width=\textwidth]{st-simplify-1000} \includegraphics[width=\textwidth]{douglas-1000}
\caption{1000m} \caption{1000m}
\label{fig:douglas-1000} \label{fig:douglas-1000}
\end{subfigure} \end{subfigure}