From 179393cb2d53cf93be6e80a0d5c83569ccb4303f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <desired.mta@gmail.com>
Date: Mon, 25 May 2020 15:12:48 +0300
Subject: [PATCH] shapes and sizes
---
II/Referatas/Makefile | 7 ++---
II/Referatas/mj-referatas.tex | 56 ++++++++++-------------------------
2 files changed, 17 insertions(+), 46 deletions(-)
diff --git a/II/Referatas/Makefile b/II/Referatas/Makefile
index 0d2e509..a2d5184 100644
--- a/II/Referatas/Makefile
+++ b/II/Referatas/Makefile
@@ -1,14 +1,11 @@
-TOLERANCES = 0 500 1000 2000 4000
-GEN = $(addsuffix .pdf,zeimena \
+TOLERANCES = 100 125 250 500 1000 2000 4000
+GEN = $(addsuffix .pdf, \
$(addprefix douglas-,$(TOLERANCES)) \
$(addprefix visvalingam-,$(TOLERANCES)))
mj-referatas.pdf: mj-referatas.tex version.tex bib.bib zeimena-pretty.pdf $(GEN)
latexmk -g -pdf $<
-zeimena.pdf: zeimena.gpkg layer2img.py
- ./layer2img.py --infile=$< --size=74x52 --outfile $@
-
define algo2img
db/.faux_$(1)-$(2): $(1).sql db/.faux_ready
./managedb -- --echo-all -v ON_ERROR_STOP=1 -v tolerance=$(2) -f $(1).sql
diff --git a/II/Referatas/mj-referatas.tex b/II/Referatas/mj-referatas.tex
index c158b38..d68db97 100644
--- a/II/Referatas/mj-referatas.tex
+++ b/II/Referatas/mj-referatas.tex
@@ -143,57 +143,31 @@ As one can observe in figure~\ref{fig:douglas-300}, the Douglas \& Peucker with
Douglas \& Peucker &
Visvalingam-Whyatt \tabularnewline \hline
- Original &
- \multicolumn{2}{ | l | }{
- \includegraphics[width=.84\columnwidth]{douglas-0}
- } \tabularnewline \hline
+ 125 &
+ \includegraphics[width=\linewidth]{douglas-125} &
+ \includegraphics[width=\linewidth]{visvalingam-125} \tabularnewline \hline
+
+ 250 &
+ \includegraphics[width=.5\linewidth]{douglas-250} &
+ \includegraphics[width=.5\linewidth]{visvalingam-250} \tabularnewline \hline
500 &
- \includegraphics[width=\linewidth]{douglas-500} &
- \includegraphics[width=\linewidth]{visvalingam-500} \tabularnewline \hline
+ \includegraphics[width=.25\linewidth]{douglas-500} &
+ \includegraphics[width=.25\linewidth]{visvalingam-500} \tabularnewline \hline
1000 &
- \includegraphics[width=.5\linewidth]{douglas-1000} &
- \includegraphics[width=.5\linewidth]{visvalingam-1000} \tabularnewline \hline
+ \includegraphics[width=.125\linewidth]{douglas-1000} &
+ \includegraphics[width=.125\linewidth]{visvalingam-1000} \tabularnewline \hline
2000 &
- \includegraphics[width=.25\linewidth]{douglas-2000} &
- \includegraphics[width=.25\linewidth]{visvalingam-4000} \tabularnewline \hline
+ \includegraphics[width=.0625\linewidth]{douglas-2000} &
+ \includegraphics[width=.0625\linewidth]{visvalingam-4000} \tabularnewline \hline
4000 &
- \includegraphics[width=.125\linewidth]{douglas-4000} &
- \includegraphics[width=.125\linewidth]{visvalingam-4000} \tabularnewline \hline
+ \includegraphics[width=.0625\linewidth]{douglas-4000} &
+ \includegraphics[width=.0625\linewidth]{visvalingam-4000} \tabularnewline \hline
\end{tabularx}
-\begin{figure}
- \centering
- \begin{subfigure}[b]{0.23\textwidth}
- \includegraphics[width=\textwidth]{zeimena}
- \caption{original}
- \label{fig:zeimena-original}
- \end{subfigure}
- ~
- \begin{subfigure}[b]{0.23\textwidth}
- \includegraphics[width=\textwidth]{douglas-300}
- \caption{300m}
- \label{fig:douglas-300}
- \end{subfigure}
- ~
- \begin{subfigure}[b]{0.23\textwidth}
- \includegraphics[width=\textwidth]{douglas-500}
- \caption{500m}
- \label{fig:douglas-500}
- \end{subfigure}
- ~
- \begin{subfigure}[b]{0.23\textwidth}
- \includegraphics[width=\textwidth]{douglas-1000}
- \caption{1000m}
- \label{fig:douglas-1000}
- \end{subfigure}
- \caption{Douglas \& Peucker line simplifications with different tolerances}
- \label{fig:douglas-peucker}
-\end{figure}
-
\section{Algorithms based on cartographical knowledge}
For further investigation: