1.1 --- a/.hgignore	Fri Mar 21 15:36:37 2014 -0400
     1.2 +++ b/.hgignore	Fri Mar 21 15:43:15 2014 -0400
     1.3 @@ -15,7 +15,7 @@
     1.4  libbulletjme.so
     1.5  java/build/*
     1.6  java/dist/*
     1.7 -thesis/thesis.pdf
     1.8 +thesis/*.pdf
     1.9  
    1.10  syntax: regexp
    1.11  ^.*blend\d$

     2.1 --- a/thesis/Makefile	Fri Mar 21 15:36:37 2014 -0400
     2.2 +++ b/thesis/Makefile	Fri Mar 21 15:43:15 2014 -0400
     2.3 @@ -3,7 +3,7 @@
     2.4  INVOKE_LATEX = texi2dvi --shell-escape --pdf -V --batch $(THESIS_NAME).tex;
     2.5  
     2.6  all:
     2.7 -	./weave-thesis.sh $(THESIS_NAME)
     2.8 +	./weave-thesis.sh cortex
     2.9  	rsync -avz --delete /home/r/proj/cortex/thesis "r@aurellem.org:~"
    2.10  	ssh r@aurellem.org cd "~/thesis; $(INVOKE_LATEX) $(INVOKE_LATEX)"
    2.11  	scp "r@aurellem.org:/home/r/thesis/$(THESIS_NAME).pdf" .

     3.1 --- a/thesis/rlm-cortex-meng.tex	Fri Mar 21 15:36:37 2014 -0400
     3.2 +++ b/thesis/rlm-cortex-meng.tex	Fri Mar 21 15:43:15 2014 -0400
     3.3 @@ -1,102 +1,78 @@
     3.4 +% -*- Mode:TeX -*-
     3.5  
     3.6 -\section{Artificial Imagination}
     3.7 -\label{sec-1}
     3.8 +%% IMPORTANT: The official thesis specifications are available at:
     3.9 +%%            http://libraries.mit.edu/archives/thesis-specs/
    3.10 +%%
    3.11 +%%            Please verify your thesis' formatting and copyright
    3.12 +%%            assignment before submission.  If you notice any
    3.13 +%%            discrepancies between these templates and the 
    3.14 +%%            MIT Libraries' specs, please let us know
    3.15 +%%            by e-mailing thesis@mit.edu
    3.16  
    3.17 -Imagine watching a video of someone skateboarding. When you watch
    3.18 -the video, you can imagine yourself skateboarding, and your
    3.19 -knowledge of the human body and its dynamics guides your
    3.20 -interpretation of the scene. For example, even if the skateboarder
    3.21 -is partially occluded, you can infer the positions of his arms and
    3.22 -body from your own knowledge of how your body would be positioned if
    3.23 -you were skateboarding. If the skateboarder suffers an accident, you
    3.24 -wince in sympathy, imagining the pain your own body would experience
    3.25 -if it were in the same situation. This empathy with other people
    3.26 -guides our understanding of whatever they are doing because it is a
    3.27 -powerful constraint on what is probable and possible. In order to
    3.28 -make use of this powerful empathy constraint, I need a system that
    3.29 -can generate and make sense of sensory data from the many different
    3.30 -senses that humans possess. The two key proprieties of such a system
    3.31 -are \emph{embodiment} and \emph{imagination}.
    3.32 +%% The documentclass options along with the pagestyle can be used to generate
    3.33 +%% a technical report, a draft copy, or a regular thesis.  You may need to
    3.34 +%% re-specify the pagestyle after you \include  cover.tex.  For more
    3.35 +%% information, see the first few lines of mitthesis.cls. 
    3.36  
    3.37 -\subsection{What is imagination?}
    3.38 -\label{sec-1-1}
    3.39 +%\documentclass[12pt,vi,twoside]{mitthesis}
    3.40 +%%
    3.41 +%%  If you want your thesis copyright to you instead of MIT, use the
    3.42 +%%  ``vi'' option, as above.
    3.43 +%%
    3.44 +%\documentclass[12pt,twoside,leftblank]{mitthesis}
    3.45 +%%
    3.46 +%% If you want blank pages before new chapters to be labelled ``This
    3.47 +%% Page Intentionally Left Blank'', use the ``leftblank'' option, as
    3.48 +%% above. 
    3.49  
    3.50 -One kind of imagination is \emph{sympathetic} imagination: you imagine
    3.51 -yourself in the position of something/someone you are
    3.52 -observing. This type of imagination comes into play when you follow
    3.53 -along visually when watching someone perform actions, or when you
    3.54 -sympathetically grimace when someone hurts themselves. This type of
    3.55 -imagination uses the constraints you have learned about your own
    3.56 -body to highly constrain the possibilities in whatever you are
    3.57 -seeing. It uses all your senses to including your senses of touch,
    3.58 -proprioception, etc. Humans are flexible when it comes to "putting
    3.59 -themselves in another's shoes," and can sympathetically understand
    3.60 -not only other humans, but entities ranging from animals to cartoon
    3.61 -characters to \href{http://www.youtube.com/watch?v=0jz4HcwTQmU}{single dots} on a screen!
    3.62 +\documentclass[12pt,twoside]{mitthesis}
    3.63 +\usepackage[utf8]{inputenc}
    3.64 +\usepackage[T1]{fontenc}
    3.65 +\usepackage{fixltx2e}
    3.66 +\usepackage{graphicx}
    3.67 +\usepackage{longtable}
    3.68 +\usepackage{float}
    3.69 +\usepackage{wrapfig}
    3.70 +\usepackage{rotating}
    3.71 +\usepackage[normalem]{ulem}
    3.72 +\usepackage{amsmath}
    3.73 +\usepackage{textcomp}
    3.74 +\usepackage{marvosym}
    3.75 +\usepackage{wasysym}
    3.76 +\usepackage{amssymb}
    3.77 +\usepackage{hyperref}
    3.78  
    3.79 +%%%%% better source code display
    3.80 +\usepackage{minted}
    3.81  
    3.82 -\begin{figure}[htb]
    3.83 -\centering
    3.84 -\includegraphics[width=5cm]{./images/cat-drinking.jpg}
    3.85 -\caption{A cat drinking some water. Identifying this action is beyond the state of the art for computers.}
    3.86 -\end{figure}
    3.87 +% \usemintedstyle{friendly}
    3.88 +% \usemintedstyle{perldoc}
    3.89 +%\definecolor{bg}{rgb}{0.95,0.95,0.95}
    3.90 +\definecolor{bg}{rgb}{0.95,0.95,0.95}
    3.91 +\usemintedstyle{default}
    3.92  
    3.93  
    3.94 -This is a basic test for the vision system.  It only tests the
    3.95 -vision-pipeline and does not deal with loading eyes from a blender
    3.96 -file. The code creates two videos of the same rotating cube from
    3.97 -different angles. 
    3.98 +%\newminted{clojure}{fontsize=\scriptsize,bgcolor=bg}
    3.99 +\newminted{clojure}{fontsize=\scriptsize}
   3.100  
   3.101 +%\usepackage{lgrind}
   3.102 +\pagestyle{plain}
   3.103  
   3.104 -\begin{clojurecode}
   3.105 -(in-ns 'cortex.test.vision)
   3.106 +\begin{document}
   3.107  
   3.108 -(defn test-pipeline
   3.109 -  "Testing vision:
   3.110 -   Tests the vision system by creating two views of the same rotating
   3.111 -   object from different angles and displaying both of those views in
   3.112 -   JFrames.
   3.113 +\include{cover}
   3.114 +% Some departments (e.g. 5) require an additional signature page.  See
   3.115 +% signature.tex for more information and uncomment the following line if
   3.116 +% applicable.
   3.117 +% \include{signature}
   3.118 +\pagestyle{plain}
   3.119 +\include{contents}
   3.120 +\include{cortex}
   3.121 +%\include{chap2}
   3.122 +\appendix
   3.123 +\begin{singlespace}
   3.124 +\bibliography{cortex}
   3.125 +\bibliographystyle{plain}
   3.126 +\end{singlespace}
   3.127 +\end{document}
   3.128  
   3.129 -   You should see a rotating cube, and two windows,
   3.130 -   each displaying a different view of the cube."
   3.131 -  ([] (test-pipeline false))
   3.132 -  ([record?]
   3.133 -     (let [candy
   3.134 -           (box 1 1 1 :physical? false :color ColorRGBA/Blue)]
   3.135 -       (world
   3.136 -        (doto (Node.)
   3.137 -          (.attachChild candy))
   3.138 -        {}
   3.139 -        (fn [world]
   3.140 -          (let [cam (.clone (.getCamera world))
   3.141 -                width (.getWidth cam)
   3.142 -                height (.getHeight cam)]
   3.143 -            (add-camera! world cam 
   3.144 -                         (comp
   3.145 -                          (view-image
   3.146 -                           (if record?
   3.147 -                             (File. "/home/r/proj/cortex/render/vision/1")))
   3.148 -                          BufferedImage!))
   3.149 -            (add-camera! world
   3.150 -                         (doto (.clone cam)
   3.151 -                           (.setLocation (Vector3f. -10 0 0))
   3.152 -                           (.lookAt Vector3f/ZERO Vector3f/UNIT_Y))
   3.153 -                         (comp
   3.154 -                          (view-image
   3.155 -                           (if record?
   3.156 -                             (File. "/home/r/proj/cortex/render/vision/2")))
   3.157 -                          BufferedImage!))
   3.158 -            (let [timer (IsoTimer. 60)]
   3.159 -              (.setTimer world timer)
   3.160 -              (display-dilated-time world timer))
   3.161 -            ;; This is here to restore the main view
   3.162 -            ;; after the other views have completed processing
   3.163 -            (add-camera! world (.getCamera world) no-op)))
   3.164 -        (fn [world tpf]
   3.165 -          (.rotate candy (* tpf 0.2) 0 0))))))
   3.166 -\end{clojurecode}
   3.167 -
   3.168 -
   3.169 -\begin{itemize}
   3.170 -\item This is test1 \cite{Tappert77}.
   3.171 -\end{itemize}

     4.1 --- a/thesis/weave-thesis.sh	Fri Mar 21 15:36:37 2014 -0400
     4.2 +++ b/thesis/weave-thesis.sh	Fri Mar 21 15:43:15 2014 -0400
     4.3 @@ -7,9 +7,9 @@
     4.4  --batch \
     4.5  --eval "
     4.6  (progn
     4.7 -  (find-file \"$1\")
     4.8 +  (find-file \"$1.org\")
     4.9    (org-latex-export-to-latex nil nil nil t nil))" \
    4.10  \
    4.11  2>&1 
    4.12  
    4.13 -rm $1~
    4.14 \ No newline at end of file
    4.15 +rm $1.tex~
    4.16 \ No newline at end of file