diff --git a/.gitignore b/.gitignore index f76c534..2fac9dd 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,8 @@ __pycache__ *.toc *.lof *.lol +*.nav +*.snm *.gpkg-wal *.gpkg-shm diff --git a/II/Referatas/Makefile b/II/Referatas/Makefile index 97b88d1..3d3c915 100644 --- a/II/Referatas/Makefile +++ b/II/Referatas/Makefile @@ -15,10 +15,17 @@ GEN2 = $(addsuffix .pdf, \ $(addprefix overlaid-sinewave2-douglas-,$(SINEWAVE_TOLERANCES)) \ $(addprefix overlaid-sinewave2-visvalingam-,$(SINEWAVE_TOLERANCES))) +.PHONY: all +all: mj-referatas.pdf mj-prezentacija.pdf + mj-referatas.pdf: mj-referatas.tex version.tex bib.bib zeimena.pdf \ sinewave1.pdf sinewave2.pdf crossing.pdf $(GEN1) $(GEN2) latexmk -shell-escape -g -pdf $< +mj-prezentacija.pdf: mj-presentacija.tex ../../misc/Logo_vilniaus_universitetas.png \ + crossing.pdf $(GEN2) + latexmk -pdf $< + define algo2img db/.faux_$(1)-$(2)-%: $(2).sql db/.faux_ready ./managedb -- --echo-all \ diff --git a/II/Referatas/images/wang1998line.png b/II/Referatas/images/wang1998line.png new file mode 100644 index 0000000..5ad3eef Binary files /dev/null and b/II/Referatas/images/wang1998line.png differ diff --git a/II/Referatas/mj-presentacija.tex b/II/Referatas/mj-presentacija.tex new file mode 100644 index 0000000..a611339 --- /dev/null +++ b/II/Referatas/mj-presentacija.tex @@ -0,0 +1,204 @@ +\documentclass[14pt]{beamer} +\usetheme{default} +\usepackage[L7x,T1]{fontenc} +\usepackage[lithuanian]{babel} +\usepackage{graphics} +\usepackage{array} +\usepackage{verbatim} +\usepackage{hyperref} +\usepackage{biblatex} +\usepackage{tabularx} +\usepackage{soul} +\usepackage{mdframed} +\usepackage{tikz} +\usepackage{adjustbox} +\usepackage{mathtools} +\usepackage{caption} +\usepackage{fancyvrb} +\usepackage{subcaption} +\input{version} +\captionsetup{compatibility=false} +\usetikzlibrary{arrows,decorations.pathmorphing,backgrounds,positioning,fit,petri} +\definecolor{vulightgrey}{RGB}{220,220,220} +\definecolor{vupurple}{RGB}{123,0,63} +\definecolor{darkgreen}{RGB}{32,96,32} +\setbeamercolor{title}{fg=vupurple} +\setbeamercolor{frametitle}{fg=vupurple} +\setbeamercolor{item}{fg=vupurple} +\setbeamercolor{navigation symbols dimmed}{fg=vulightgrey} +\setbeamercolor{navigation symbols}{fg=vulightgrey} + +\hypersetup{linkcolor=} +\hypersetup{urlcolor=vupurple} % Does not apply color to href's +\hypersetup{colorlinks,urlcolor=vupurple} % href's are correct, but navigation links are magenta + +\newcommand{\DP}{Douglas \& Peucker} +\newcommand{\VW}{Visvalingam--Whyatt} +\newcommand{\WM}{Wang--M{\"u}ller} + +\mode{ + \setbeamertemplate{navigation symbols}{ + \insertslidenavigationsymbol + \insertframenavigationsymbol + \hspace{0.2cm} + \begin{minipage}[c]{0.5cm} + \vspace{-0.1cm} + {\strut\insertframenumber{}/\inserttotalframenumber\strut} + \end{minipage} + } +} + +\iffalse +\setbeamertemplate{footline}[text line]{% +\parbox{\linewidth}{ +\vspace*{-8pt}\color{gray} +\textcircled{c}~2016. Uber Technologies Inc. All rights reserved. +}} +\fi + +\newcommand{\twocols}[2] +{ + \begin{columns}[c] + \begin{column}{0.5\textwidth} + #1 + \end{column} + \hspace{0pt} \vrule{} + \begin{column}{0.5\textwidth} + #2 + \end{column} + \end{columns} +} + +\newcommand{\framedgraphic}[2] { + \begin{frame}{#1} + \begin{center} + \includegraphics[width=\textwidth,height=0.8\textheight,keepaspectratio]{#2} + \end{center} + \end{frame} +} + +\newcommand{\withcredits}[3] +{ + \begin{minipage}[t][#1\textheight]{\textwidth} + \vspace{5px} + #2 + \end{minipage} + \vfill + \color{white}{\tiny Šaltinis: #3} +} + +%% ============================================================================= + +\title{ + Kartografinis upių generalizavimas naudojant atvirai prieinamus įrankius +} +\author{Motiejus Jakštys \\ + \includegraphics[height=10em]{../../misc/Logo_vilniaus_universitetas} +} + +\date{ + \vspace{10mm} + Version: \VCDescribe \\ \vspace{4mm} + Generated At: \GeneratedAt +} + +\begin{document} + +\AtBeginSection[] +{ + \begin{frame} + \frametitle{Turinys} + \tableofcontents[currentsection] + \end{frame} +} + +\begin{frame} +\titlepage +\end{frame} + +\section{Problema} + +\begin{frame}{Kas yra kartografinė generalizacija?} + \begin{itemize}[<+->] + \item Mažinant mastelį reikia mažinti detalumą. + \item Detalumo mažinimas yra sudėtinga problema. + \end{itemize} +\end{frame} + +\begin{frame}{Žeimena ir Lakaja} + \twocols + {\includegraphics[width=\textwidth]{zeimena}} + {\includegraphics[width=\textwidth]{crossing}} +\end{frame} + +\begin{frame}{Kas yra prieinama?} + \begin{itemize}[<+->] + \item Atvira ir galima naudoti: + \begin{itemize}[<+->] + \item {\DP} + \item {\VW} + \end{itemize} + \item Komerciniame produkte: + \begin{itemize}[<+->] + \item {\WM} + \end{itemize} + \end{itemize} +\end{frame} + +\begin{frame}{Pritaikant dabartinius algoritmus} + \pause + \begin{tabularx}{\textwidth}{ | X | X | } + Douglas \& Peucker & + Visvalingam-Whyatt \tabularnewline \hline + + \onslide<3->{\center + \includegraphics[width=.75\linewidth]{overlaid-zeimena-douglas-64}} & + \onslide<3->{\center + \includegraphics[width=.75\linewidth]{overlaid-zeimena-visvalingam-64}} \tabularnewline \hline + + \onslide<4->{\center + \includegraphics[width=.75\linewidth]{overlaid-zeimena-douglas-256}} & + \onslide<4->{\center + \includegraphics[width=.75\linewidth]{overlaid-zeimena-visvalingam-256}} \tabularnewline \hline + \end{tabularx} +\end{frame} + +\section{Pasiūlymas} + +\begin{frame}{Algoritmas} + \begin{center} + \fbox{ + \includegraphics[width=\textwidth]{images/wang1998line.png} + } + \end{center} + \pause +\end{frame} + +\begin{frame}{Pagrindiniai privalumai} + Sukurtas pagal tai, kaip kartografai generalizuoja: + \pause + \begin{itemize}[<+->] + \item Išvengia "kampų" ir "dantų". + \item Kelios linijos "prastinamos" į vieną. + \item Vengiama itin tiesių linijų. + \end{itemize} +\end{frame} + +\section{Darbo eiga} + +\begin{frame}{Darbo eiga} + \begin{itemize}[<+->] + \item Parašyti algoritmą. + \item Aprašyti rezultatus. + \end{itemize} +\end{frame} + +\begin{frame}{Technologijos} + Bus daroma viena iš šių technologijų: + \begin{itemize}[<+->] + \item PostGIS. + \item GeoPython. + \end{itemize} +\end{frame} + +\end{document} diff --git a/II/Referatas/mj-referatas.tex b/II/Referatas/mj-referatas.tex index a3513ed..b6a096f 100644 --- a/II/Referatas/mj-referatas.tex +++ b/II/Referatas/mj-referatas.tex @@ -86,7 +86,6 @@ Zeimena extents: [606922,6097557,627230,6126362] \vspace{10mm} Version: \VCDescribe \\ \vspace{4mm} Generated At: \GeneratedAt - } \begin{document} diff --git a/misc/Logo_vilniaus_universitetas.png b/misc/Logo_vilniaus_universitetas.png new file mode 100644 index 0000000..f30994c Binary files /dev/null and b/misc/Logo_vilniaus_universitetas.png differ diff --git a/misc/Logo_vilnius_university.png b/misc/Logo_vilnius_university.png new file mode 100644 index 0000000..19870c3 Binary files /dev/null and b/misc/Logo_vilnius_university.png differ