From e9926c2b15883297641ebdaf6cfec2f9ae4c8fbc Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Fri, 27 Mar 2015 16:45:22 +0100 Subject: [PATCH] updated images and makefile --- thesis2/1.introduction.tex | 10 ++--- thesis2/2.requirementsanddesign.tex | 6 +-- thesis2/3.methods.tex | 8 ++-- thesis2/Makefile | 50 +++++++++++++++---------- thesis2/{ => img}/appoverview.dot | 0 thesis2/{ => img}/backend.dot | 0 thesis2/{ => img}/crawlerpattern.png | Bin thesis2/{ => img}/dagexample.dot | 0 thesis2/{ => img}/dawgexample.dot | 0 thesis2/{ => img}/feedbackloop.dot | 0 thesis2/{ => img}/frontendfront.png | Bin thesis2/{ => img}/graphexample.dot | 0 thesis2/{ => img}/inccons.dot | 0 thesis2/{ => img}/informationflow.dot | 0 thesis2/{ => img}/nddawg.dot | 0 thesis2/{ => img}/nodelistexample.dot | 0 thesis2/preamble.tex | 51 ++++++++++++++++++++++++++ thesis2/thesis.tex | 51 +------------------------- 18 files changed, 95 insertions(+), 81 deletions(-) rename thesis2/{ => img}/appoverview.dot (100%) rename thesis2/{ => img}/backend.dot (100%) rename thesis2/{ => img}/crawlerpattern.png (100%) rename thesis2/{ => img}/dagexample.dot (100%) rename thesis2/{ => img}/dawgexample.dot (100%) rename thesis2/{ => img}/feedbackloop.dot (100%) rename thesis2/{ => img}/frontendfront.png (100%) rename thesis2/{ => img}/graphexample.dot (100%) rename thesis2/{ => img}/inccons.dot (100%) rename thesis2/{ => img}/informationflow.dot (100%) rename thesis2/{ => img}/nddawg.dot (100%) rename thesis2/{ => img}/nodelistexample.dot (100%) create mode 100644 thesis2/preamble.tex diff --git a/thesis2/1.introduction.tex b/thesis2/1.introduction.tex index ac6e9c5..f87a63d 100644 --- a/thesis2/1.introduction.tex +++ b/thesis2/1.introduction.tex @@ -79,7 +79,7 @@ flow. \begin{figure}[H] \label{informationflow} \centering - \includegraphics[scale=0.7]{informationflow.eps} + \includegraphics[scale=0.7]{informationflow.pdf} \strut\\ \strut\\ \caption{Information flow Hyperleap database} @@ -204,7 +204,7 @@ current feedback loop for crawlers. \begin{figure}[H] \label{feedbackloop} \centering - \includegraphics[width=0.8\linewidth]{feedbackloop.eps} + \includegraphics[width=0.8\linewidth]{feedbackloop.pdf} \strut\\\strut\\ \caption{Feedback loop for malfunctioning crawlers} \end{figure} @@ -315,7 +315,7 @@ $$G=(\{n1, n2, n3, n4\}, \{(n1, n2), (n2, n1), (n2, n3), (n3, n4), (n1, n4)\}$$ \begin{figure}[H] \label{graphexample} \centering - \includegraphics[scale=0.7]{graphexample.eps} + \includegraphics[scale=0.7]{graphexample.pdf} \strut\\\strut\\ \caption{Example DG} \end{figure} @@ -339,7 +339,7 @@ $\mathcal{O}(L)$ where $L$ is the length of the path. \begin{figure}[H] \label{dagexample} \centering - \includegraphics[scale=0.7]{dagexample.eps} + \includegraphics[scale=0.7]{dagexample.pdf} \strut\\\strut\\ \caption{Example DAG} \end{figure} @@ -376,7 +376,7 @@ This means that it grows linearly with the length of the word. \begin{figure}[H] \label{exampledawg} \centering - \includegraphics[scale=0.7]{dawgexample.eps} + \includegraphics[scale=0.7]{dawgexample.pdf} \strut\\\strut\\ \caption{Example DAWG} \end{figure} diff --git a/thesis2/2.requirementsanddesign.tex b/thesis2/2.requirementsanddesign.tex index 6f30211..2ba84fc 100644 --- a/thesis2/2.requirementsanddesign.tex +++ b/thesis2/2.requirementsanddesign.tex @@ -124,7 +124,7 @@ information flow or movement between nodes. \begin{figure}[H] \label{appoverview} \centering - \includegraphics[width=\linewidth]{appoverview.eps} + \includegraphics[width=\linewidth]{appoverview.pdf} \strut\\ \caption{Overview of the application} \end{figure} @@ -144,7 +144,7 @@ backend to process it. \begin{figure}[H] \label{frontendfront} - \includegraphics[width=\linewidth]{frontendfront.eps} + \includegraphics[width=\linewidth]{frontendfront.pdf} \caption{The landing page of the frontend} \end{figure} @@ -185,7 +185,7 @@ detail in Figure~\ref{appinternals} together with the text. \begin{figure}[H] \label{frontendfront} \centering - \includegraphics[width=\linewidth]{crawlerpattern.eps} + \includegraphics[width=\linewidth]{crawlerpattern.pdf} \caption{A view of the interface for specifying the pattern. Two % entries are already marked.} \end{figure} diff --git a/thesis2/3.methods.tex b/thesis2/3.methods.tex index 54b1d65..2d47484 100644 --- a/thesis2/3.methods.tex +++ b/thesis2/3.methods.tex @@ -9,7 +9,7 @@ between these steps. The Figure is a detailed explanation of the \begin{figure}[H] \label{appinternals} \centering - \includegraphics[width=\linewidth]{backend.eps} + \includegraphics[width=\linewidth]{backend.pdf} \strut\\ \caption{Main module internals} \end{figure} @@ -69,7 +69,7 @@ regenerating the data. \begin{figure}[H] \label{nodelistexample} \centering - \includegraphics[width=\linewidth]{nodelistexample.eps} + \includegraphics[width=\linewidth]{nodelistexample.pdf} \caption{Node list example} \end{figure} @@ -214,7 +214,7 @@ Figure}~\ref{dawg1} that builds a DAWG with the following entries: \begin{figure}[H] \label{dawg1} \centering - \includegraphics[width=0.8\linewidth]{inccons.eps} + \includegraphics[width=0.8\linewidth]{inccons.pdf} \strut\\\strut\\ \caption{Incrementally constructing a DAWG} \end{figure} @@ -242,7 +242,7 @@ choice. \begin{figure}[H] \label{nddawg} \centering - \includegraphics[width=\linewidth]{nddawg.eps} + \includegraphics[width=\linewidth]{nddawg.pdf} \strut\\ \caption{Example non determinism} \end{figure} diff --git a/thesis2/Makefile b/thesis2/Makefile index e3d9fa4..ba6cf1a 100644 --- a/thesis2/Makefile +++ b/thesis2/Makefile @@ -1,24 +1,36 @@ SHELL:=/bin/bash -VERSION:=1.0RC1 -SOURCES:=$(shell ls *.tex) scheme.xsd exrss.xml -GRAPHS:=$(addsuffix .eps,$(basename $(shell ls *.{dot,png}))) -.PHONY: clobber graphs release - all: graphs thesis.pdf -%.eps: %.png +VERSION:=1.0 +OUTPUT:=thesis.pdf +LATEX=pdflatex +VPATH=./img/ + +SOURCES:=$(filter-out preamble.tex,$(shell ls *.{tex,xsd,xml})) +GRAPHS:=$(addsuffix .pdf,$(basename $(shell ls img/*.{dot,png}))) + +.SECONDARY: $(addsuffix .fmt,$(basename $(OUTPUT))) +.PHONY: clobber graphs + +all: graphs thesis.pdf + +%.pdf: %.png convert $< $@ -%.eps: %.dot - dot -Teps < $< > $@ -%.pdf: %.dvi - dvipdfm $< -%.dvi: $(SOURCES) - latex $(basename $@) + +%.pdf: %.dot + dot -Tpdf < $< > $@ + +%.pdf: $(SOURCES) %.fmt + $(LATEX) $(basename $@) bibtex $(basename $@) - latex $(basename $@) - latex $(basename $@) + $(LATEX) $(basename $@) + $(LATEX) $(basename $@) + +%.fmt: preamble.tex + $(LATEX) -ini -jobname="$(basename $@)" "&$(LATEX) $<\dump" + graphs: $(GRAPHS) - clean: - $(RM) -v *.{eps,aux,bbl,blg,dvi,log,out,toc} + +clean: + $(RM) -v {,./img/}*.{fmt,eps,aux,bbl,blg,dvi,log,out,toc} + clobber: clean - $(RM) -v *.pdf -release: all clean - mv thesis.pdf thesis_$(VERSION).pdf + $(RM) -v {,./img/}*.pdf diff --git a/thesis2/appoverview.dot b/thesis2/img/appoverview.dot similarity index 100% rename from thesis2/appoverview.dot rename to thesis2/img/appoverview.dot diff --git a/thesis2/backend.dot b/thesis2/img/backend.dot similarity index 100% rename from thesis2/backend.dot rename to thesis2/img/backend.dot diff --git a/thesis2/crawlerpattern.png b/thesis2/img/crawlerpattern.png similarity index 100% rename from thesis2/crawlerpattern.png rename to thesis2/img/crawlerpattern.png diff --git a/thesis2/dagexample.dot b/thesis2/img/dagexample.dot similarity index 100% rename from thesis2/dagexample.dot rename to thesis2/img/dagexample.dot diff --git a/thesis2/dawgexample.dot b/thesis2/img/dawgexample.dot similarity index 100% rename from thesis2/dawgexample.dot rename to thesis2/img/dawgexample.dot diff --git a/thesis2/feedbackloop.dot b/thesis2/img/feedbackloop.dot similarity index 100% rename from thesis2/feedbackloop.dot rename to thesis2/img/feedbackloop.dot diff --git a/thesis2/frontendfront.png b/thesis2/img/frontendfront.png similarity index 100% rename from thesis2/frontendfront.png rename to thesis2/img/frontendfront.png diff --git a/thesis2/graphexample.dot b/thesis2/img/graphexample.dot similarity index 100% rename from thesis2/graphexample.dot rename to thesis2/img/graphexample.dot diff --git a/thesis2/inccons.dot b/thesis2/img/inccons.dot similarity index 100% rename from thesis2/inccons.dot rename to thesis2/img/inccons.dot diff --git a/thesis2/informationflow.dot b/thesis2/img/informationflow.dot similarity index 100% rename from thesis2/informationflow.dot rename to thesis2/img/informationflow.dot diff --git a/thesis2/nddawg.dot b/thesis2/img/nddawg.dot similarity index 100% rename from thesis2/nddawg.dot rename to thesis2/img/nddawg.dot diff --git a/thesis2/nodelistexample.dot b/thesis2/img/nodelistexample.dot similarity index 100% rename from thesis2/nodelistexample.dot rename to thesis2/img/nodelistexample.dot diff --git a/thesis2/preamble.tex b/thesis2/preamble.tex new file mode 100644 index 0000000..887cf47 --- /dev/null +++ b/thesis2/preamble.tex @@ -0,0 +1,51 @@ +\documentclass[twopage,titlepage]{book} + +\usepackage{algorithm2e} % Pseudocode +\usepackage{a4wide} % Paper size +\usepackage{graphicx} % Eps inclusion +\usepackage{float} % Floating placement of figures +\usepackage{listings} % Source code formatting +\usepackage{setspace} % Line spacing abstract +\usepackage{hyperref} % Hyperlinks +\usepackage{amssymb} % nexists and much more +\usepackage{amsmath} % Rightarrow and much more +\usepackage{marvosym} % For euro sign + +\lstset{% + basicstyle=\footnotesize, + numbers=left, + numberstyle=\tiny, + breaklines=true, + showspaces=false, + showstringspaces=false, + tabsize=2, +} + +\graphicspath{ {./img/} } + +\newcommand{\cvartitle}{Adaptable crawler specification generation system for % +leisure activity RSS feeds} + +% Setup hyperlink formatting +\hypersetup{ + pdftitle={\cvartitle}, + pdfauthor={Mart Lubbers}, + pdfsubject={Artificial Intelligence}, + hidelinks +} + +% Describe the frontpage +\author{ + Mart Lubbers\\ + s4109053\\ + Radboud University Nijmegen\\ + \strut\\ + Alessandro Paula\footnote{External supervisor}\\ + Hyperleap, Nijmegen\\ + \strut\\ + Franc Grootjen\footnote{Internal supervisor}\\ + Artificial Intelligence, Nijmegen\\ + Radboud University Nijmegen +} +\title{\cvartitle} +\date{\today} diff --git a/thesis2/thesis.tex b/thesis2/thesis.tex index e4074ee..a5f4ca5 100644 --- a/thesis2/thesis.tex +++ b/thesis2/thesis.tex @@ -1,53 +1,4 @@ -\documentclass[twopage,titlepage]{book} - -\usepackage{algorithm2e} % Pseudocode -\usepackage{a4wide} % Paper size -\usepackage{graphicx} % Eps inclusion -\usepackage{float} % Floating placement of figures -\usepackage{listings} % Source code formatting -\usepackage{setspace} % Line spacing abstract -\usepackage[dvipdfmx]{hyperref} % Hyperlinks -\usepackage{amssymb} % nexists and much more -\usepackage{amsmath} % Rightarrow and much more -\usepackage{marvosym} % For euro sign - -\lstset{% - basicstyle=\footnotesize, - numbers=left, - numberstyle=\tiny, - breaklines=true, - showspaces=false, - showstringspaces=false, - tabsize=2, -} - -\newcommand{\cvartitle}{Adaptable crawler specification generation system for % -leisure activity RSS feeds} - -% Setup hyperlink formatting -\hypersetup{ - pdftitle={\cvartitle}, - pdfauthor={Mart Lubbers}, - pdfsubject={Artificial Intelligence}, - hidelinks -} - -% Describe the frontpage -\author{ - Mart Lubbers\\ - s4109053\\ - Radboud University Nijmegen\\ - \strut\\ - Alessandro Paula\footnote{External supervisor}\\ - Hyperleap, Nijmegen\\ - \strut\\ - Franc Grootjen\footnote{Internal supervisor}\\ - Artificial Intelligence, Nijmegen\\ - Radboud University Nijmegen -} -\title{\cvartitle} -\date{\today} - +%&thesis \begin{document} \maketitle \tableofcontents -- 2.20.1