From 6ee111e09a76e74ba5d55492df62702a364216fd Mon Sep 17 00:00:00 2001 From: Mart Lubbers Date: Wed, 8 Feb 2017 18:43:38 +0100 Subject: [PATCH] add glossary, appendix and specify protocol --- .gitignore | 7 ++ Makefile | 3 +- abstract.tex | 9 ++ appendix-protocol.tex | 206 +++++++++++++++++++++++++----------------- thesis.pre | 8 +- thesis.tex | 7 ++ 6 files changed, 155 insertions(+), 85 deletions(-) create mode 100644 abstract.tex diff --git a/.gitignore b/.gitignore index 5ab9eed..54a782b 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,10 @@ *.blg *.tdo *.toc +*.acn +*.acr +*.alg +*.glg +*.glo +*.gls +*.xdy diff --git a/Makefile b/Makefile index 45d3600..a352d3a 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,8 @@ all: $(addsuffix .pdf,$(DOCS)) %.mlog: %.tex %.fmt $(wildcard *.bib) $(wildcard *.tex) $(LATEX) $(LATEXFLAGS) $< grep -q '^\\bibdata{' $(basename $<).aux && $(BIBTEX) $(BIBTEXFLAGS) $(basename $<) || true + grep -q '\@istfilename' $(basename $<).aux && makeglossaries $(basename $<) $(LATEX) $(LATEXFLAGS) $< | tee $@ clean: - $(RM) $(foreach DOC,$(DOCS),$(addprefix $(DOC).,aux log fmt toc bbl blg run.xml out pdf snm nav snm vrb)) + $(RM) $(foreach DOC,$(DOCS),$(addprefix $(DOC).,aux log fmt toc bbl blg run.xml out pdf snm nav snm vrb glo tdo alg acn acr glg gls xdy)) diff --git a/abstract.tex b/abstract.tex new file mode 100644 index 0000000..c8e6ed7 --- /dev/null +++ b/abstract.tex @@ -0,0 +1,9 @@ +\chapter*{\centering Abstract} +\begin{quotation} + \centering\it\noindent + Okay. + + hallo + + hoi +\end{quotation} diff --git a/appendix-protocol.tex b/appendix-protocol.tex index d20f6c8..4330283 100644 --- a/appendix-protocol.tex +++ b/appendix-protocol.tex @@ -1,90 +1,132 @@ -\section{Server to Client} +\section{General message format} Messages are delimited by newlines to make processing by line based devices -more easy. -\todo{Handshake} -\begin{table}[ht] - \centering - \begin{tabular}{ll} - \toprule - byte & value\\ - \midrule - 1 & \texttt{'t'}\\ - 2,3 & interval\\ - 4,5 & length (\texttt{n})\\ - 6 to n+6 & bytecode\\ - \bottomrule - \end{tabular} - \caption{Send a task} -\end{table} +more easy. Message exchanges have a \emph{Request} and \emph{Response} header. +The \emph{Request} header means that the server is sending to the client. The +\emph{Response} header means that the client is sending to the server. In some +cases either the \emph{Request} or \emph{Response} is empty. This means that +the message is not acknowledged or responded upon. -\begin{table}[ht] - \centering - \begin{tabular}{ll} - \toprule - byte & meaning\\ - \midrule - 1 & \texttt{'d'}\\ - 2,3 & task id\\ - \bottomrule - \end{tabular} - \caption{Delete a task} -\end{table} +\section{Handshake} +\todo{Handshake, here the client tells the server what they can do} -\begin{table}[ht] +\newpage +\section{mTasks} +\begin{table}[!ht] \centering - \begin{tabular}{ll} - \toprule - byte & meaning\\ - \midrule - 1 & \texttt{'s'}\\ - 2,3 & identifier\\ - 4,5 & value\\ - \bottomrule - \end{tabular} - \caption{Send an SDS specification} + \begin{subfigure}[t]{.48\textwidth} + \begin{tabular}{ll} + \toprule + \multicolumn{2}{c}{Request}\\ + byte & value\\ + \midrule + 1 & \texttt{'t'}\\ + 2,3 & interval\\ + 4,5 & length (\texttt{n})\\ + 6 to n+6 & bytecode\\ + \midrule\midrule + \multicolumn{2}{c}{Response}\\ + byte & value\\ + \midrule + 1 & \texttt{'t'}\\ + 2,3 & task id\\ + \bottomrule + \end{tabular} + \caption{Send a task} + \end{subfigure} + \quad% + \begin{subfigure}[t]{.48\textwidth} + \begin{tabular}{ll} + \toprule + \multicolumn{2}{c}{Request}\\ + byte & meaning\\ + \midrule + 1 & \texttt{'d'}\\ + 2,3 & task id\\ + \midrule\midrule + \multicolumn{2}{c}{Response}\\ + byte & value\\ + \midrule + 1 & \texttt{'d'}\\ + 2,3 & task id\\ + \bottomrule + \end{tabular} + \caption{Delete a task} + \end{subfigure} + \caption{Message protocol for exchanging tasks} \end{table} -\begin{table}[ht] +\section{SDSs} +\begin{table}[!ht] \centering - \begin{tabular}{ll} - \toprule - byte & meaning\\ - \midrule - 1 & \texttt{'u'}\\ - 2,3 & sdsid\\ - 4,5 & value\\ - \bottomrule - \end{tabular} - \caption{SDS update} + \begin{subfigure}[t]{.2\textwidth} + \begin{tabular}{ll} + \toprule + \multicolumn{2}{c}{Request}\\ + byte & meaning\\ + \midrule + 1 & \texttt{'s'}\\ + 2,3 & identifier\\ + 4,5 & value\\ + \midrule\midrule + \multicolumn{2}{c}{Response}\\ + byte & meaning\\ + \midrule + 1 & \texttt{'s'}\\ + 2,3 & identifier\\ + \bottomrule + \end{tabular} + \caption{Send an SDS specification} + \end{subfigure} + \quad% + \begin{subfigure}[t]{.2\textwidth} + \begin{tabular}{ll} + \toprule + \multicolumn{2}{c}{Response}\\ + byte & value\\ + \midrule + 1 & \texttt{'a'}\\ + 2,3 & SDS id\\ + \midrule\midrule + \multicolumn{2}{c}{Request}\\ + byte & value\\ + \midrule + 1 & \texttt{'a'}\\ + 2,3 & SDS id\\ + \bottomrule + \end{tabular} + \caption{Delete a SDS} + \end{subfigure} + \quad% + \begin{subfigure}[t]{.2\textwidth} + \begin{tabular}{ll} + \toprule + \multicolumn{2}{c}{Request}\\ + byte & meaning\\ + \midrule + 1 & \texttt{'u'}\\ + 2,3 & sdsid\\ + 4,5 & value\\ + \midrule\midrule + \multicolumn{2}{c}{Response}\\ + \bottomrule + \end{tabular} + \caption{SDS update} + \end{subfigure} + \quad% + \begin{subfigure}[t]{.2\textwidth} + \begin{tabular}{ll} + \toprule + \multicolumn{2}{c}{Response}\\ + \midrule\midrule + \multicolumn{2}{c}{Request}\\ + byte & value\\ + \midrule + 1 & \texttt{'p'}\\ + 2,3 & SDS id\\ + 4,5 & value\\ + \bottomrule + \end{tabular} + \caption{SDS publish} + \end{subfigure} + \caption{Message protocol for exchanging SDSs} \end{table} - -\section{Client to Server} -\todo{Handshake reply} -\begin{table}[ht] - \centering - \begin{tabular}{ll} - \toprule - byte & value\\ - \midrule - 1 & \texttt{'t'}\\ - 2,3 & task id\\ - \bottomrule - \end{tabular} - \caption{Task acknowledgement} -\end{table} - -\begin{table}[ht] - \centering - \begin{tabular}{ll} - \toprule - byte & value\\ - \midrule - 1 & \texttt{'u'}\\ - 2,3 & SDS id\\ - 4,5 & value\\ - \bottomrule - \end{tabular} - \caption{SDS publish} -\end{table} - -\todo{SDS acknowledgement} diff --git a/thesis.pre b/thesis.pre index 89effc2..fbecc6c 100644 --- a/thesis.pre +++ b/thesis.pre @@ -1,12 +1,15 @@ \documentclass[a4paper]{book} +\usepackage[british]{babel} + \usepackage{geometry} % Papersize \usepackage[titletoc]{appendix} % Appendices \usepackage{rutitlepage/rutitlepage} % Titlepage \usepackage{hyperref} % Hyperlinks -\usepackage{float} % Better table positioning \usepackage{booktabs} % Better looking tables \usepackage{todonotes} % Todo's +\usepackage{caption} % Captions +\usepackage{subcaption} % Subcaptions \urlstyle{same} \hypersetup{% @@ -20,5 +23,6 @@ } \title{iTasks and the Internet of Things} -\author{Mart Lubbers BSc.\\{\small\url{mart@martlubbers.net}}} +\author{Mart Lubbers BSc.\\ + {\small\href{mailto:mart@martlubbers.net}{mart@martlubbers.net}}} \date{\today} diff --git a/thesis.tex b/thesis.tex index af0bc87..2123c65 100644 --- a/thesis.tex +++ b/thesis.tex @@ -1,4 +1,7 @@ %&thesis +\usepackage[xindy={codepage=utf-8},nonumberlist,acronyms]{glossaries} % Acronyms +\makeglossaries% +\newacronym{sds}{SDS}{Shared Data Source} \begin{document} \maketitleru[ course={Master Thesis}, @@ -7,8 +10,12 @@ righttextheader={Supervisors:}, righttext={prof.~dr.~dr.h.c.~ir.~M.J.~Plasmeijer\\dr.~P.W.M.~Koopman}] \listoftodos[Todo] + +\input{abstract.tex} + \tableofcontents +\printglossaries% \chapter{Introduction} \chapter{Methods} \chapter{Results} -- 2.20.1