more appropriate images

Makefile

@@ -19,9 +19,10 @@ FIGURES = \
 		  inflection-1-gentle-inflection-after \
 		  fig6-selfcrossing \
 		  selfcrossing-1 \
-		  isolated-1-exaggerated \
+		  isolated-1-exaggerated
-		  isolated-1-before \
+
-		  isolated-1-after
+FIGURES_SLIDES += isolated-1-before \
+				  isolated-1-after
 
 RIVERS = \
 		 salvis-25k \
@@ -39,6 +40,9 @@ RIVERS = \
 		 salvis-wm-overlaid-250k-zoom \
 		 salvis-wm220
 
+RIVERS_SLIDES += salvis-dp64overlaid-2x50k \
+				 salvis-dpchaikin64overlaid-2x50k
+
 ################################################################################
 # FIGURES
 ################################################################################
@@ -112,6 +116,7 @@ isolated-1-after_1SELECT = wm_debug where name='isolated-1' AND stage='afigures'
 isolated-1-after_1COLOR = orange
 isolated-1-after_WIDTHDIV = 2
 
+
 ################################################################################
 # 250K
 ################################################################################
@@ -144,6 +149,8 @@ label_grpk10 = GRPK 1:\numprint{10000}
 label_grpk50 = GRPK 1:\numprint{50000}
 label_vwchaikin64 = $(label_vw64) and Chaikin
 label_dpchaikin64 = $(label_dp64) and Chaikin
+label_vwchaikin64lt = $(label_vw64) ir Chaikin
+label_dpchaikin64lt = $(label_dp64) ir Chaikin
 legend_   = lower left
 legend_tr = lower right
 legend_tl = lower center
@@ -188,6 +195,22 @@ salvis-25k_WIDTHDIV = 1
 salvis-2x50k_1SELECT = wm_visuals where name='salvis-grpk10'
 salvis-2x50k_WIDTHDIV = 2
 
+salvis-dp64overlaid-2x50k_1SELECT = wm_visuals where name='salvis-grpk10'
+salvis-dp64overlaid-2x50k_1LABEL = $(label_grpk10)
+salvis-dp64overlaid-2x50k_2SELECT = wm_visuals where name='salvis-dp64'
+salvis-dp64overlaid-2x50k_2LABEL = $(label_dp64)
+salvis-dp64overlaid-2x50k_2COLOR = orange
+salvis-dp64overlaid-2x50k_QUADRANT = tl
+salvis-dp64overlaid-2x50k_LEGEND = $(legend_tl)
+
+salvis-dpchaikin64overlaid-2x50k_1SELECT = wm_visuals where name='salvis-grpk10'
+salvis-dpchaikin64overlaid-2x50k_1LABEL = $(label_grpk10)
+salvis-dpchaikin64overlaid-2x50k_2SELECT = wm_visuals where name='salvis-dpchaikin64'
+salvis-dpchaikin64overlaid-2x50k_2COLOR = orange
+salvis-dpchaikin64overlaid-2x50k_2LABEL = $(label_dpchaikin64lt)
+salvis-dpchaikin64overlaid-2x50k_QUADRANT = tl
+salvis-dpchaikin64overlaid-2x50k_LEGEND = $(legend_tl)
+
 salvis-dp64-2x50k_1SELECT = wm_visuals where name='salvis-dp64'
 salvis-dp64-2x50k_WIDTHDIV = 2
 
@@ -229,8 +252,10 @@ $(1).pdf: layer2img.py Makefile $(2)
 	)
 endef
 
-$(foreach fig,$(FIGURES),$(eval $(call FIG_template,$(fig),.faux_test)))
+$(foreach fig,$(FIGURES),       $(eval $(call FIG_template,$(fig),.faux_test)))
-$(foreach fig,$(RIVERS), $(eval $(call FIG_template,$(fig),.faux_visuals)))
+$(foreach fig,$(FIGURES_SLIDES),$(eval $(call FIG_template,$(fig),.faux_test)))
+$(foreach fig,$(RIVERS),        $(eval $(call FIG_template,$(fig),.faux_visuals)))
+$(foreach fig,$(RIVERS_SLIDES), $(eval $(call FIG_template,$(fig),.faux_visuals)))
 
 #################################
 # The thesis, publishable version
@@ -317,7 +342,10 @@ slides-2021-03-29.pdf: slides-2021-03-29.txt
 	pandoc -t beamer -i $< -o $@
 
 slides-2021-06-02.pdf: slides-2021-06-02.tex \
+	amalgamate1.png \
 	isolated-1-before.pdf isolated-1-after.pdf \
+	salvis-dp64overlaid-2x50k.pdf \
+	salvis-dpchaikin64overlaid-2x50k.pdf \
 	$(wilcard *logo.pdf)
 	latexmk -shell-escape -pdf $<
 

slides-2021-06-02.tex

@@ -101,8 +101,8 @@
 \begin{frame}{Linijų paprastinimo algoritmų problemos}
   \twocols{
     \begin{figure}[ht]
-      \includegraphics[width=\textwidth]{salvis-dp64-2x50k}
+      \includegraphics[width=\textwidth]{salvis-dp64overlaid-2x50k}
-      \caption{\footnotesize Paprastinta naudojant {\DP}.}
+      \includegraphics[width=\textwidth]{salvis-dpchaikin64overlaid-2x50k}
     \end{figure}
   }{
     \begin{itemize}
@@ -116,10 +116,7 @@
 
 \begin{frame}{Uždaviniai: algoritmų vertinimas}
   \twocols{
-    \begin{figure}[ht]
+    \includegraphics[width=\textwidth]{amalgamate1}
-      \includegraphics[width=\textwidth]{salvis-overlaid-vwchaikin64-2x50k}
-      \caption{\footnotesize GRPK10 ir {\VW}+Chaikin}
-    \end{figure}
   }{
     \begin{itemize}
       \item Įvertinti prieinamus linijų paprastinimo algoritmus.
@@ -377,14 +374,6 @@ END $$ LANGUAGE plpgsql;
   \includegraphics[width=\textwidth]{salvis-wm75-dpchaikin64-grpk10-1x50k}
 \end{frame}
 
-\begin{frame}{{\VW}}
-  \includegraphics[width=\textwidth]{salvis-wm75-vw64-grpk10-1x50k}
-\end{frame}
-
-\begin{frame}{{\VW}+Chaikin}
-  \includegraphics[width=\textwidth]{salvis-wm75-vwchaikin64-grpk10-1x50k}
-\end{frame}
-
 \begin{frame}{Išbandymas internete}
   \centering
   \includegraphics[width=.75\textwidth]{openmap-wm-good.png}
@@ -411,13 +400,19 @@ END $$ LANGUAGE plpgsql;
     \item Realizuotas:
       \href{https://github.com/motiejus/wm}{github.com/motiejus/wm}.
 
-    \item Rezultatai palyginti su klasikiniais algoritmais ir GRPK.
+    \item Šalčia--Visinčia rezultatai palyginti su:
+      \begin{itemize}
+        \item {\VW} (+Chaikin).
+        \item {\DP} (+Chaikin).
+        \item GRPK50.
+        \item GRPK250.
+      \end{itemize}
   \end{itemize}
 \end{frame}
 
 \begin{frame}{Pasiūlymai ateičiai}
   \begin{itemize}
-    \item Sukurti kobinavimo operatorių.
+    \item Implementuoti kobinavimo operatorių.
     \item Rasti ir aprašyti geresnius kriterijus izoliuotiems linkiams.
     \item Pagerinti algoritmo laiko ir atminties sąnaudas.
     \item Pilnesnė kartografinė generalizacija, įskaitant topologiją.