# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1396191193 14400
# Node ID 58fa1ffd481e20d47e198b3eb5ada58cbd11edac
# Parent  447c3c8405a25c26a1e0c2c520ab0a08dd93bb47
accept/reject changes

diff -r 447c3c8405a2 -r 58fa1ffd481e thesis/cortex.org
--- a/thesis/cortex.org	Sun Mar 30 10:50:05 2014 -0400
+++ b/thesis/cortex.org	Sun Mar 30 10:53:13 2014 -0400
@@ -501,7 +501,7 @@
    world and dealing with pale facilimilies of them in a simulation
    \cite{brooks-representation}. What are the advantages and
    disadvantages of a simulation vs. reality?
-
+   
 *** Simulation
 
     The advantages of virtual reality are that when everything is a
@@ -553,7 +553,7 @@
     limitations of the character's programming. In terms of cost,
     doing everything in software is far cheaper than building custom
     real-time hardware. All you need is a laptop and some patience.
-
+    
 ** Simulated time enables rapid prototyping and complex scenes 
 
    I envision =CORTEX= being used to support rapid prototyping and
@@ -2558,8 +2558,7 @@
         hard control problems without worrying about physics or
         senses.
 
-* =EMPATH=: the simulated worm experiment
-# Empathy in a simulated worm
+* =EMPATH=: action recognition in a simulated worm
 
   Here I develop a computational model of empathy, using =CORTEX= as a
   base. Empathy in this context is the ability to observe another
@@ -2851,7 +2850,7 @@
    provided by an experience vector and reliably infering the rest of
    the senses.
 
-** ``Empathy'' requires retracing steps though \Phi-space 
+** Empathy is the process of tracing though \Phi-space 
 
    Here is the core of a basic empathy algorithm, starting with an
    experience vector:
diff -r 447c3c8405a2 -r 58fa1ffd481e thesis/dylan-cortex-diff.diff
--- a/thesis/dylan-cortex-diff.diff	Sun Mar 30 10:50:05 2014 -0400
+++ b/thesis/dylan-cortex-diff.diff	Sun Mar 30 10:53:13 2014 -0400
@@ -294,22 +294,3 @@
  
     I envision =CORTEX= being used to support rapid prototyping and
     iteration of ideas. Even if I could put together a well constructed
-@@ -2440,7 +2558,8 @@
-         hard control problems without worrying about physics or
-         senses.
- 
--* Empathy in a simulated worm
-+* =EMPATH=: the simulated worm experiment
-+# Empathy in a simulated worm
- 
-   Here I develop a computational model of empathy, using =CORTEX= as a
-   base. Empathy in this context is the ability to observe another
-@@ -2732,7 +2851,7 @@
-    provided by an experience vector and reliably infering the rest of
-    the senses.
- 
--** Empathy is the process of tracing though \Phi-space 
-+** ``Empathy'' requires retracing steps though \Phi-space 
- 
-    Here is the core of a basic empathy algorithm, starting with an
-    experience vector:
diff -r 447c3c8405a2 -r 58fa1ffd481e thesis/dylan-reject.diff
--- a/thesis/dylan-reject.diff	Sun Mar 30 10:50:05 2014 -0400
+++ b/thesis/dylan-reject.diff	Sun Mar 30 10:53:13 2014 -0400
@@ -9,3 +9,23 @@
  
  # An anatomical joke:
  # - Training
+
+@@ -2732,7 +2851,7 @@
+    provided by an experience vector and reliably infering the rest of
+    the senses.
+ 
+-** Empathy is the process of tracing though \Phi-space 
++** ``Empathy'' requires retracing steps though \Phi-space 
+ 
+    Here is the core of a basic empathy algorithm, starting with an
+    experience vector:
+@@ -2440,7 +2558,8 @@
+         hard control problems without worrying about physics or
+         senses.
+ 
+-* Empathy in a simulated worm
++* =EMPATH=: the simulated worm experiment
++# Empathy in a simulated worm
+ 
+   Here I develop a computational model of empathy, using =CORTEX= as a
+   base. Empathy in this context is the ability to observe another