changeset 515:58fa1ffd481e

accept/reject changes
author Robert McIntyre <rlm@mit.edu>
date Sun, 30 Mar 2014 10:53:13 -0400
parents 447c3c8405a2
children ced955c3c84f
files thesis/cortex.org thesis/dylan-cortex-diff.diff thesis/dylan-reject.diff
diffstat 3 files changed, 24 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
     1.1 --- a/thesis/cortex.org	Sun Mar 30 10:50:05 2014 -0400
     1.2 +++ b/thesis/cortex.org	Sun Mar 30 10:53:13 2014 -0400
     1.3 @@ -501,7 +501,7 @@
     1.4     world and dealing with pale facilimilies of them in a simulation
     1.5     \cite{brooks-representation}. What are the advantages and
     1.6     disadvantages of a simulation vs. reality?
     1.7 -
     1.8 +   
     1.9  *** Simulation
    1.10  
    1.11      The advantages of virtual reality are that when everything is a
    1.12 @@ -553,7 +553,7 @@
    1.13      limitations of the character's programming. In terms of cost,
    1.14      doing everything in software is far cheaper than building custom
    1.15      real-time hardware. All you need is a laptop and some patience.
    1.16 -
    1.17 +    
    1.18  ** Simulated time enables rapid prototyping and complex scenes 
    1.19  
    1.20     I envision =CORTEX= being used to support rapid prototyping and
    1.21 @@ -2558,8 +2558,7 @@
    1.22          hard control problems without worrying about physics or
    1.23          senses.
    1.24  
    1.25 -* =EMPATH=: the simulated worm experiment
    1.26 -# Empathy in a simulated worm
    1.27 +* =EMPATH=: action recognition in a simulated worm
    1.28  
    1.29    Here I develop a computational model of empathy, using =CORTEX= as a
    1.30    base. Empathy in this context is the ability to observe another
    1.31 @@ -2851,7 +2850,7 @@
    1.32     provided by an experience vector and reliably infering the rest of
    1.33     the senses.
    1.34  
    1.35 -** ``Empathy'' requires retracing steps though \Phi-space 
    1.36 +** Empathy is the process of tracing though \Phi-space 
    1.37  
    1.38     Here is the core of a basic empathy algorithm, starting with an
    1.39     experience vector:
     2.1 --- a/thesis/dylan-cortex-diff.diff	Sun Mar 30 10:50:05 2014 -0400
     2.2 +++ b/thesis/dylan-cortex-diff.diff	Sun Mar 30 10:53:13 2014 -0400
     2.3 @@ -294,22 +294,3 @@
     2.4   
     2.5      I envision =CORTEX= being used to support rapid prototyping and
     2.6      iteration of ideas. Even if I could put together a well constructed
     2.7 -@@ -2440,7 +2558,8 @@
     2.8 -         hard control problems without worrying about physics or
     2.9 -         senses.
    2.10 - 
    2.11 --* Empathy in a simulated worm
    2.12 -+* =EMPATH=: the simulated worm experiment
    2.13 -+# Empathy in a simulated worm
    2.14 - 
    2.15 -   Here I develop a computational model of empathy, using =CORTEX= as a
    2.16 -   base. Empathy in this context is the ability to observe another
    2.17 -@@ -2732,7 +2851,7 @@
    2.18 -    provided by an experience vector and reliably infering the rest of
    2.19 -    the senses.
    2.20 - 
    2.21 --** Empathy is the process of tracing though \Phi-space 
    2.22 -+** ``Empathy'' requires retracing steps though \Phi-space 
    2.23 - 
    2.24 -    Here is the core of a basic empathy algorithm, starting with an
    2.25 -    experience vector:
     3.1 --- a/thesis/dylan-reject.diff	Sun Mar 30 10:50:05 2014 -0400
     3.2 +++ b/thesis/dylan-reject.diff	Sun Mar 30 10:53:13 2014 -0400
     3.3 @@ -9,3 +9,23 @@
     3.4   
     3.5   # An anatomical joke:
     3.6   # - Training
     3.7 +
     3.8 +@@ -2732,7 +2851,7 @@
     3.9 +    provided by an experience vector and reliably infering the rest of
    3.10 +    the senses.
    3.11 + 
    3.12 +-** Empathy is the process of tracing though \Phi-space 
    3.13 ++** ``Empathy'' requires retracing steps though \Phi-space 
    3.14 + 
    3.15 +    Here is the core of a basic empathy algorithm, starting with an
    3.16 +    experience vector:
    3.17 +@@ -2440,7 +2558,8 @@
    3.18 +         hard control problems without worrying about physics or
    3.19 +         senses.
    3.20 + 
    3.21 +-* Empathy in a simulated worm
    3.22 ++* =EMPATH=: the simulated worm experiment
    3.23 ++# Empathy in a simulated worm
    3.24 + 
    3.25 +   Here I develop a computational model of empathy, using =CORTEX= as a
    3.26 +   base. Empathy in this context is the ability to observe another