From 0fddb49a8cd50514b21e2fa0374e312f3f582ad1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= <desired.mta@gmail.com>
Date: Thu, 18 Jun 2020 10:46:42 +0300
Subject: [PATCH] explain chaikin(3)

---
 II/Referatas/Makefile         |  7 ++++---
 II/Referatas/mj-referatas.tex | 18 +++++++++---------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/II/Referatas/Makefile b/II/Referatas/Makefile
index 8f5a8a0..78bcfe4 100644
--- a/II/Referatas/Makefile
+++ b/II/Referatas/Makefile
@@ -48,17 +48,18 @@ db/.chaikin_$(1)_$(2)_%: db/.faux_$(1)_$(2)_% chaikin.sql
 $(1)_$(2)_%.pdf: layer2img.py db/.faux_$(1)_$(2)_%
 	./layer2img.py --group2-table=$(1)_$(2)_$$* --size=$(3) --outfile $$@
 endef
+
 define algo2overlay
 overlaid_$(1)_$(2)_%.pdf: layer2img.py db/.faux_$(1)_$(2)_%
 	./layer2img.py $(3) --group1-table=$(1) --group2-table=$(1)_$(2)_$$* \
 		--outfile $$@
-chaikin_overlaid_$(1)_$(2)_$(3)_%.pdf: layer2img.py db/.chaikin_$(1)_$(2)_%
+overlaid_chaikin_$(1)_$(2)_%.pdf: layer2img.py db/.chaikin_$(1)_$(2)_%
 	./layer2img.py $(3) \
 		--group1-table=$(1) \
-		--group2-table=$(1)_$(2)_$$* \
-		--group3-table=chaikin_$(1)_$(2)_$$* \
+		--group2-table=chaikin_$(1)_$(2)_$$* \
 		--outfile $$@
 endef
+
 define gpkg2pdf
 $(1): $(2) ./layer2img.py
 	./layer2img.py $(3) --group1-infile=$$< --outfile $(1)
diff --git a/II/Referatas/mj-referatas.tex b/II/Referatas/mj-referatas.tex
index 9c512e1..b2a0c89 100644
--- a/II/Referatas/mj-referatas.tex
+++ b/II/Referatas/mj-referatas.tex
@@ -287,24 +287,24 @@ table~\ref{tab:comparison-crossing} on page~\pageref{tab:comparison-crossing}.
 \end{figure}
 
 As the reader may observe, the output lines, especially with higher tolerances,
-are jaggy. Higher-tolerance jaggy outputs from {\VW} and {\DP}, passed through Chaikin,
-are displayed in table~\ref{tab:chaikin-crossing} on
-page~\page{tab:chaikin-crossing}.
+are jaggy. Higher-tolerance jaggy outputs from {\VW} and {\DP}, passed through
+Chaikin with 3 iterations, are displayed in table~\ref{tab:chaikin-crossing} on
+page~\pageref{tab:chaikin-crossing}.
 
 \begin{figure}[h]
     \renewcommand{\tabularxcolumn}[1]{>{\center\small}m{#1}}
     \begin{tabularx}{\textwidth}{ p{2.1cm} | X | X | }
         Tolerance DP/VW                                                              &
-        Douglas \& Peucker                                                           &
-        Visvalingam-Whyatt                                                           \tabularnewline \hline
+        Douglas \& Peucker + Chaikin(3)                                              &
+        Visvalingam-Whyatt + Chaikin(3)                                              \tabularnewline \hline
 
         128/16384                                                                    &
-        \includegraphics[width=\linewidth]{chaikin_overlaid_zeimena_douglas_128}     &
-        \includegraphics[width=\linewidth]{chaikin_overlaid_zeimena_visvalingam_128} \tabularnewline \hline
+        \includegraphics[width=\linewidth]{overlaid_chaikin_zeimena_douglas_128}     &
+        \includegraphics[width=\linewidth]{overlaid_chaikin_zeimena_visvalingam_128} \tabularnewline \hline
 
         256/65536                                                                    &
-        \includegraphics[width=\linewidth]{chaikin_overlaid_zeimena_douglas_256}     &
-        \includegraphics[width=\linewidth]{chaikin_overlaid_zeimena_visvalingam_256} \tabularnewline \hline
+        \includegraphics[width=\linewidth]{overlaid_chaikin_zeimena_douglas_256}     &
+        \includegraphics[width=\linewidth]{overlaid_chaikin_zeimena_visvalingam_256} \tabularnewline \hline
 
     \end{tabularx}
     \caption{Chaikin-smoothened {\DP} and {\VW} on river crossing area}