# HG changeset patch # User Robert McIntyre # Date 1395449816 14400 # Node ID b5d0f0adf19fc0e45079762e0848d5259b84ea64 # Parent d53a31969a513cf733a297931d6b097d15252192 improvements by Dylan! diff -r d53a31969a51 -r b5d0f0adf19f thesis/Makefile --- a/thesis/Makefile Fri Mar 21 15:43:15 2014 -0400 +++ b/thesis/Makefile Fri Mar 21 20:56:56 2014 -0400 @@ -5,7 +5,7 @@ all: ./weave-thesis.sh cortex rsync -avz --delete /home/r/proj/cortex/thesis "r@aurellem.org:~" - ssh r@aurellem.org cd "~/thesis; $(INVOKE_LATEX) $(INVOKE_LATEX)" + ssh r@aurellem.org cd "~/thesis; $(INVOKE_LATEX)" scp "r@aurellem.org:/home/r/thesis/$(THESIS_NAME).pdf" . diff -r d53a31969a51 -r b5d0f0adf19f thesis/aux/org/first-chapter.org --- a/thesis/aux/org/first-chapter.org Fri Mar 21 15:43:15 2014 -0400 +++ b/thesis/aux/org/first-chapter.org Fri Mar 21 20:56:56 2014 -0400 @@ -9,7 +9,6 @@ #+OPTIONS: toc:nil, num:nil * Artificial Imagination - Imagine watching a video of someone skateboarding. When you watch the video, you can imagine yourself skateboarding, and your knowledge of the human body and its dynamics guides your @@ -41,6 +40,10 @@ not only other humans, but entities ranging from animals to cartoon characters to [[http://www.youtube.com/watch?v=0jz4HcwTQmU][single dots]] on a screen! +# and can infer intention from the actions of not only other humans, +# but also animals, cartoon characters, and even abstract moving dots +# on a screen! + Another kind of imagination is /predictive/ imagination: you construct scenes in your mind that are not entirely related to whatever you are observing, but instead are predictions of the diff -r d53a31969a51 -r b5d0f0adf19f thesis/cortex.bib --- a/thesis/cortex.bib Fri Mar 21 15:43:15 2014 -0400 +++ b/thesis/cortex.bib Fri Mar 21 20:56:56 2014 -0400 @@ -8,4 +8,23 @@ ADDRESS = {Berlin}, YEAR = {1977}, MRCLASS = {76.41 (86.41)}, +NOTE = {\why{This is a cool paper that really helped me out. It's + related to the thesis because they talk about + manifolds and other types of pure, unrefined + bullshit.}} } +@incollection {Tappert78, +AUTHOR = {Tappert, Fred D.}, +TITLE = {The parabolic approximation method}, +BOOKTITLE = {Wave propagation and underwater acoustics ({W}orkshop, + {M}ystic, {C}onn., 1974)}, +PAGES = {224--287. Lecture Notes in Phys., Vol. 70}, +PUBLISHER = {Springer}, +ADDRESS = {Berlin}, +YEAR = {1977}, +MRCLASS = {76.41 (86.41)}, +NOTE = {\why{This is a cool paper that really helped me out. It's + related to the thesis because they talk about + manifolds and other types of pure, unrefined + bullshit.}} +} diff -r d53a31969a51 -r b5d0f0adf19f thesis/cortex.org --- a/thesis/cortex.org Fri Mar 21 15:43:15 2014 -0400 +++ b/thesis/cortex.org Fri Mar 21 20:56:56 2014 -0400 @@ -43,16 +43,10 @@ [[./images/cat-drinking.jpg]] -This is a basic test for the vision system. It only tests the -vision-pipeline and does not deal with loading eyes from a blender -file. The code creates two videos of the same rotating cube from -different angles. - - +#+begin_listing +\caption{This is a basic test for the vision system. It only tests the vision-pipeline and does not deal with loading eyes from a blender file. The code creates two videos of the same rotating cube from different angles.} #+name: test-1 #+begin_src clojure -(in-ns 'cortex.test.vision) - (defn test-pipeline "Testing vision: Tests the vision system by creating two views of the same rotating @@ -97,6 +91,10 @@ (fn [world tpf] (.rotate candy (* tpf 0.2) 0 0)))))) #+end_src +#+end_listing +- This is test1 \cite{Tappert77}. -- This is test1 \cite{Tappert77}. \ No newline at end of file +\cite{Tappert77} +lol +\citet{Tappert77} \ No newline at end of file diff -r d53a31969a51 -r b5d0f0adf19f thesis/cortex.tex --- a/thesis/cortex.tex Fri Mar 21 15:43:15 2014 -0400 +++ b/thesis/cortex.tex Fri Mar 21 20:56:56 2014 -0400 @@ -42,15 +42,9 @@ \end{figure} -This is a basic test for the vision system. It only tests the -vision-pipeline and does not deal with loading eyes from a blender -file. The code creates two videos of the same rotating cube from -different angles. - - +\begin{listing} +\caption{This is a basic test for the vision system. It only tests the vision-pipeline and does not deal with loading eyes from a blender file. The code creates two videos of the same rotating cube from different angles.} \begin{clojurecode} -(in-ns 'cortex.test.vision) - (defn test-pipeline "Testing vision: Tests the vision system by creating two views of the same rotating @@ -95,8 +89,12 @@ (fn [world tpf] (.rotate candy (* tpf 0.2) 0 0)))))) \end{clojurecode} - +\end{listing} \begin{itemize} \item This is test1 \cite{Tappert77}. \end{itemize} + +\cite{Tappert77} +lol +\citet{Tappert77} diff -r d53a31969a51 -r b5d0f0adf19f thesis/cover.tex --- a/thesis/cover.tex Fri Mar 21 15:43:15 2014 -0400 +++ b/thesis/cover.tex Fri Mar 21 20:56:56 2014 -0400 @@ -46,8 +46,11 @@ % layout of your title page with your thesis advisor and/or the MIT % Libraries before printing your final copy. \title{CORTEX : A Virtual World for Sensate AI} +\author{Robert Louis M\raisebox{\depth}{\small \underline{\underline{c}}}Intyre} +%\author{Robert McIntyre} -\author{Robert McIntyre} + + % If you wish to list your previous degrees on the cover page, use the % previous degrees command: % \prevdegrees{A.A., Harvard University (1985)} @@ -124,12 +127,12 @@ % \input{abstract} % \end{abstractpage} -\cleardoublepage +%% \cleardoublepage -\section*{Acknowledgments} +%% \section*{Acknowledgments} -This is the acknowledgements section. You should replace this with your -own acknowledgements. +%% This is the acknowledgements section. You should replace this with your +%% own acknowledgements. %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % -*-latex-*- diff -r d53a31969a51 -r b5d0f0adf19f thesis/rlm-cortex-meng.tex --- a/thesis/rlm-cortex-meng.tex Fri Mar 21 15:43:15 2014 -0400 +++ b/thesis/rlm-cortex-meng.tex Fri Mar 21 20:56:56 2014 -0400 @@ -25,7 +25,7 @@ %% Page Intentionally Left Blank'', use the ``leftblank'' option, as %% above. -\documentclass[12pt,twoside]{mitthesis} +\documentclass[12pt,twoside,singlespace]{mitthesis} \usepackage[utf8]{inputenc} \usepackage[T1]{fontenc} \usepackage{fixltx2e} @@ -41,19 +41,29 @@ \usepackage{wasysym} \usepackage{amssymb} \usepackage{hyperref} +\usepackage{natbib} +\usepackage{libertine} +\usepackage{inconsolata} + +\renewcommand{\thesection}{\arabic{section}} %%%%% better source code display \usepackage{minted} +%% dyl fonts + % \usemintedstyle{friendly} % \usemintedstyle{perldoc} %\definecolor{bg}{rgb}{0.95,0.95,0.95} -\definecolor{bg}{rgb}{0.95,0.95,0.95} +\definecolor{bg}{rgb}{0.625,0,0} \usemintedstyle{default} +\newcommand{\why}[1]{\\ \par{\footnotesize #1}} +%\setmonofont[Scale=0.9,BoldFont={Inconsolata Bold}]{Inconsolata} - -%\newminted{clojure}{fontsize=\scriptsize,bgcolor=bg} -\newminted{clojure}{fontsize=\scriptsize} +%\usepackage[gray]{xcolor} +\newminted{clojure}{fontsize=\footnotesize} +%\newminted{clojure}{fontsize=\footnotesize,bgcolor=bg} +%\newminted{clojure}{fontsize=\scriptsize} %\usepackage{lgrind} \pagestyle{plain} @@ -66,13 +76,20 @@ % applicable. % \include{signature} \pagestyle{plain} -\include{contents} +\tableofcontents +%\newpage +%\listoffigures +%\newpage +%\listoftables \include{cortex} +\nocite{*} %\include{chap2} \appendix \begin{singlespace} \bibliography{cortex} -\bibliographystyle{plain} +%\bibliographystyle{agsm} +%\bibliographystyle{apa} +\bibliographystyle{plainnat} \end{singlespace} \end{document}