# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1398060689 14400
# Node ID 01934317b25bc2b7b1401dc2085c814f2b1ef4da
# Parent  90b236381642d04eb38c8065f00a4106c687551a
changes from conference.

diff -r 90b236381642 -r 01934317b25b org/self_organizing_touch.clj
--- a/org/self_organizing_touch.clj	Thu Apr 03 20:48:09 2014 -0400
+++ b/org/self_organizing_touch.clj	Mon Apr 21 02:11:29 2014 -0400
@@ -125,7 +125,9 @@
                worm-world
                (assoc (worm-segment-defaults)
                  :experiences experiences
-                 :record (File. "/home/r/proj/cortex/thesis/video/touch-learn-2/")))]
+                 :record false
+                 ;;(File. "/home/r/proj/cortex/thesis/video/touch-learn-2/")
+                 ))]
     (run-world world)
     (->>
      @experiences
diff -r 90b236381642 -r 01934317b25b org/util.org
--- a/org/util.org	Thu Apr 03 20:48:09 2014 -0400
+++ b/org/util.org	Mon Apr 21 02:11:29 2014 -0400
@@ -58,8 +58,8 @@
 (defn mega-import-jme3
   "Import ALL the jme classes. For REPL use."
   []
+  (import com.aurellem.capture.IsoTimer)
   (dorun
-   (import com.aurellem.capture.IsoTimer)
    (map (comp permissive-import symbol) (jme-class-names))))
 #+end_src  
 
diff -r 90b236381642 -r 01934317b25b org/worm_learn.clj
--- a/org/worm_learn.clj	Thu Apr 03 20:48:09 2014 -0400
+++ b/org/worm_learn.clj	Mon Apr 21 02:11:29 2014 -0400
@@ -525,7 +525,12 @@
 
           (println-repl experience-matches-empathy)
           (swap! accuracy #(conj % experience-matches-empathy)))))))
-              
+
+(defn empathy-experiment-2 []
+  (.start (worm-world :experience-watch (compare-empathy-with-baseline
+                                          (atom []))
+                      :record false :worm worm*)))
+
 (defn accuracy [v]
   (float (/ (count (filter true? v)) (count v))))
 
diff -r 90b236381642 -r 01934317b25b thesis/org/roadmap.org
--- a/thesis/org/roadmap.org	Thu Apr 03 20:48:09 2014 -0400
+++ b/thesis/org/roadmap.org	Mon Apr 21 02:11:29 2014 -0400
@@ -210,7 +210,6 @@
     CLOCK: [2014-03-19 Wed 19:32]--[2014-03-19 Wed 22:04] =>  2:32
 *** DONE make proprioception reference phi-space indexes
     CLOSED: [2014-03-19 Wed 22:47] SCHEDULED: <2014-03-19 Wed>
-    CLOCK: [2014-03-19 Wed 22:07]
 
 
 *** DONE create test videos, also record positions of worm segments