From ca13948239d7d8074b6202cb3f06a0c29e2f1b27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Sat, 29 May 2021 00:07:11 +0300 Subject: [PATCH] a few more figures --- Makefile | 4 +- osi-logo.pdf | Bin 0 -> 7273 bytes slides-2021-06-02.tex | 141 +++++++++++++++++++++++++++++++++--------- 3 files changed, 116 insertions(+), 29 deletions(-) create mode 100644 osi-logo.pdf diff --git a/Makefile b/Makefile index b81f326..0b2d85f 100644 --- a/Makefile +++ b/Makefile @@ -316,7 +316,9 @@ vars.inc.tex: vars.awk wm.sql Makefile 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 isolated-1-before.pdf isolated-1-after.pdf +slides-2021-06-02.pdf: slides-2021-06-02.tex \ + isolated-1-before.pdf isolated-1-after.pdf \ + $(wilcard *logo.pdf) latexmk -shell-escape -pdf $< dump-debug_wm.sql.xz: diff --git a/osi-logo.pdf b/osi-logo.pdf new file mode 100644 index 0000000000000000000000000000000000000000..860494138c3704429896d04623567c0c71cc6d0e GIT binary patch literal 7273 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 literal 0 HcmV?d00001 diff --git a/slides-2021-06-02.tex b/slides-2021-06-02.tex index b185f3a..82c79c8 100644 --- a/slides-2021-06-02.tex +++ b/slides-2021-06-02.tex @@ -5,12 +5,11 @@ \usepackage{graphics} \usepackage{biblatex} \usepackage{tabularx} -\usepackage[labelformat=empty,justification=centering]{caption} +\usepackage[labelfont={color=vupurple},labelformat=empty,justification=centering]{caption} \usepackage{tikz} \usepackage{minted} -\AtBeginEnvironment{minted}{% - \renewcommand{\fcolorbox}[4][]{#4}} -\usetikzlibrary{shapes.geometric,arrows,positioning} +\usepackage{subcaption} + \definecolor{vulightgrey}{RGB}{220,220,220} \definecolor{vudarkgrey}{RGB}{65,65,65} @@ -26,6 +25,10 @@ \usefonttheme{serif} +\AtBeginEnvironment{minted}{% + \renewcommand{\fcolorbox}[4][]{#4}} +\usetikzlibrary{shapes.geometric,arrows,positioning} + \newcommand{\DP}{Douglas \& Peucker} \newcommand{\VW}{Visvalingam--Whyatt} \newcommand{\WM}{Wang--M{\"u}ller} @@ -202,10 +205,20 @@ \begin{columns}[c] \begin{column}{.3\textwidth} \begin{figure}[ht] - \includegraphics[width=\textwidth]{postgis-logo} - \end{figure} - \begin{figure}[ht] + \begin{subfigure}[b]{\textwidth} + \centering + \includegraphics[width=.7\textwidth]{postgis-logo} + \end{subfigure} + \\[1ex] + \begin{subfigure}[b]{\textwidth} + \centering \includegraphics[width=.5\textwidth]{postgresql-logo} + \end{subfigure} + \\[1ex] + \begin{subfigure}[b]{\textwidth} + \centering + \includegraphics[width=.6\textwidth]{osi-logo} + \end{subfigure} \end{figure} \end{column} \begin{column}{.7\textwidth} @@ -297,29 +310,101 @@ \end{figure} \end{frame} -\begin{frame}{Automatiniai testai} - \tikzset{ - arrow/.style={thick,->,>=stealth}, - } - \begin{figure} - \begin{tikzpicture}[auto] - \onslide<1->{ - \node (before) []{ - \includegraphics[width=.4\textwidth]{isolated-1-before.pdf} - }; - } - \onslide<2->{ - \node(after) [right=2cm of before.east]{ - \includegraphics[width=.4\textwidth]{isolated-1-after.pdf} - }; - } +\begin{frame}{Automatiniai testai padeda tęstinumui} + \tikzset{ + arrow/.style={thick,->,>=stealth}, + } + \begin{figure} + \begin{tikzpicture}[auto] + \onslide<1->{ + \node (before) []{ + \includegraphics[width=.4\textwidth]{isolated-1-before.pdf} + }; + } + \onslide<2->{ + \node(after) [right=2cm of before.east]{ + \includegraphics[width=.4\textwidth]{isolated-1-after.pdf} + }; + } + \onslide<2->{ + \draw[arrow] (before) -- node[anchor=south] {\footnotesize Programa} (after); + } + \end{tikzpicture} + \end{figure} + \onslide<3->{ + \begin{itemize} + \item<3-> Iš duomenų ir rezultato sukuriamas testas. + \item<4-> Testai patikrina, ar programa veikia teisingai. + \item<4-> Išsaugomas tęstinumas ją keičiant. + \end{itemize} + } +\end{frame} - \onslide<3->{ - \draw[arrow] (before) -- node[anchor=south] {\footnotesize Programa} (after); - } - \end{tikzpicture} - \end{figure} +\section{Įgyvendinimas} +\begin{frame}{Pasiruošimas} + \begin{itemize} + \item Klaidų ieškojimas. + \item Upių sujungimas. + \end{itemize} +\end{frame} + +\begin{frame}{Algoritmo etapai} + \begin{itemize} + \item Linkių aptikimas ir sutvarkymas. + \item Linkių keitimo operatoriai: eliminavimas ir didinimas. + \item Jungimas neimplementuotas. + \end{itemize} +\end{frame} + +\section{Rezultatai} + +\begin{frame}{GRPK10 ir {\WM}} + \includegraphics[width=\textwidth]{salvis-wm75--grpk10-1x50k} +\end{frame} + +\begin{frame}{GRPK10, GRPK50 ir {\WM}} + \includegraphics[width=\textwidth]{salvis-wm75-grpk50-grpk10-1x50k} +\end{frame} + +\begin{frame}{GRPK250 ir {\WM}} + \begin{figure}[h!] + \centering + \begin{subfigure}[b]{.49\textwidth} + \includegraphics[width=\textwidth]{salvis-grpk250-2x} + \caption{GRPK250.} + \end{subfigure} + \hfill + \begin{subfigure}[b]{.49\textwidth} + \centering + \includegraphics[width=\textwidth]{salvis-wm220} + \caption{{\WM}.} + \end{subfigure} + \end{figure} +\end{frame} + +\begin{frame}{{\DP}} + \includegraphics[width=\textwidth]{salvis-wm75-dp64-grpk10-1x50k} +\end{frame} + +\begin{frame}{{\DP}+Chaikin} + \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} + \includegraphics[width=.3\textwidth]{openmap-wm-bad.png} + + {\tiny https://dev.openmap.lt/webgl/wm.html} \end{frame} %\begin{frame}{Rekomenduojamas skaitymas}