diff --git a/II/Referatas/Makefile b/II/Referatas/Makefile index 2562742..e28dc16 100644 --- a/II/Referatas/Makefile +++ b/II/Referatas/Makefile @@ -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) 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 ./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 $@ -db/.faux_st-simplify-%: db/.faux_ready st-simplify.sql - ./managedb -- --echo-all -v ON_ERROR_STOP=1 -v tolerance=$* -f st-simplify.sql +db/.faux_douglas-%: db/.faux_ready douglas.sql + ./managedb -- --echo-all -v ON_ERROR_STOP=1 -v tolerance=$* -f douglas.sql touch $@ db/.faux_ready: zeimena.gpkg managedb diff --git a/II/Referatas/st-simplify.sql b/II/Referatas/douglas.sql similarity index 100% rename from II/Referatas/st-simplify.sql rename to II/Referatas/douglas.sql diff --git a/II/Referatas/mj-referatas.tex b/II/Referatas/mj-referatas.tex index 5a437fc..b9ab292 100644 --- a/II/Referatas/mj-referatas.tex +++ b/II/Referatas/mj-referatas.tex @@ -12,6 +12,7 @@ \usepackage{subcaption} \usepackage{gensymb} \usepackage{varwidth} +\usepackage{tabularx} \usepackage{tikz} \usetikzlibrary{er,positioning} \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 (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} \centering \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} ~ \begin{subfigure}[b]{0.23\textwidth} - \includegraphics[width=\textwidth]{st-simplify-300} + \includegraphics[width=\textwidth]{douglas-300} \caption{300m} \label{fig:douglas-300} \end{subfigure} ~ \begin{subfigure}[b]{0.23\textwidth} - \includegraphics[width=\textwidth]{st-simplify-500} + \includegraphics[width=\textwidth]{douglas-500} \caption{500m} \label{fig:douglas-500} \end{subfigure} ~ \begin{subfigure}[b]{0.23\textwidth} - \includegraphics[width=\textwidth]{st-simplify-1000} + \includegraphics[width=\textwidth]{douglas-1000} \caption{1000m} \label{fig:douglas-1000} \end{subfigure}