diff options
| author | Carlo Zancanaro <carlo@carlo-laptop> | 2012-10-23 15:16:31 +1100 |
|---|---|---|
| committer | Carlo Zancanaro <carlo@carlo-laptop> | 2012-10-23 15:16:31 +1100 |
| commit | 3002319eb5fd6b3eff0ffa764534bb571536a08c (patch) | |
| tree | c2f79591a54aff370b34717ebf50358f62d4bda4 /tex/thesis/thesis.tex | |
| parent | a1b28d756fe52a53d9d4da4d23853969fd529115 (diff) | |
| parent | 14c0c8bb717a668084cae8cd4b359ffd6fca73b0 (diff) | |
Merge branch 'master' of https://bitbucket.org/czan/honours
Conflicts:
.gitignore
impl/MaxStrategy.hpp
impl/VariableAssignment.hpp
impl/systems/test.eqns
impl/test/7.eqns
Diffstat (limited to 'tex/thesis/thesis.tex')
| -rw-r--r-- | tex/thesis/thesis.tex | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tex/thesis/thesis.tex b/tex/thesis/thesis.tex index 6983d79..8f64c07 100644 --- a/tex/thesis/thesis.tex +++ b/tex/thesis/thesis.tex @@ -37,6 +37,7 @@ \usepackage{xcolor} \usepackage{xspace} \usepackage{stmaryrd,tikz} +\usepackage{tabularx} \usepackage{float} \floatstyle{boxed} @@ -44,6 +45,8 @@ \lstset{language={Python}, literate={<=}{$\le$}{1}}%, frame=tlrb} \usetikzlibrary{arrows} + +\newcommand\D{\mathbb{D}} \newcommand\R{\mathbb{R}} \newcommand\Z{\mathbb{Z}} \newcommand\CZ{\overline{\Z}} @@ -136,6 +139,7 @@ \input{introduction/introduction.tex} \input{litreview/litreview.tex} +\input{contribution/contribution.tex} \input{evaluation/evaluation.tex} \input{experiments/experiments.tex} \input{results/results.tex} @@ -146,7 +150,7 @@ % End % Bibliography -\bibliographystyle{style/mybibstyle} +\bibliographystyle{abbrvnat} %style/mybibstyle} { \setstretch{1.25} \cleardoublepage |