Mercurial > cortex

changeset 526:01934317b25b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
changes from conference.
author Robert McIntyre <rlm@mit.edu>
date Mon, 21 Apr 2014 02:11:29 -0400
parents 90b236381642
children ac747fa0a678
files org/self_organizing_touch.clj org/util.org org/worm_learn.clj thesis/org/roadmap.org
diffstat 4 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
     1.1 --- a/org/self_organizing_touch.clj	Thu Apr 03 20:48:09 2014 -0400
     1.2 +++ b/org/self_organizing_touch.clj	Mon Apr 21 02:11:29 2014 -0400
     1.3 @@ -125,7 +125,9 @@
     1.4                 worm-world
     1.5                 (assoc (worm-segment-defaults)
     1.6                   :experiences experiences
     1.7 -                 :record (File. "/home/r/proj/cortex/thesis/video/touch-learn-2/")))]
     1.8 +                 :record false
     1.9 +                 ;;(File. "/home/r/proj/cortex/thesis/video/touch-learn-2/")
    1.10 +                 ))]
    1.11      (run-world world)
    1.12      (->>
    1.13       @experiences

     2.1 --- a/org/util.org	Thu Apr 03 20:48:09 2014 -0400
     2.2 +++ b/org/util.org	Mon Apr 21 02:11:29 2014 -0400
     2.3 @@ -58,8 +58,8 @@
     2.4  (defn mega-import-jme3
     2.5    "Import ALL the jme classes. For REPL use."
     2.6    []
     2.7 +  (import com.aurellem.capture.IsoTimer)
     2.8    (dorun
     2.9 -   (import com.aurellem.capture.IsoTimer)
    2.10     (map (comp permissive-import symbol) (jme-class-names))))
    2.11  #+end_src  
    2.12  

     3.1 --- a/org/worm_learn.clj	Thu Apr 03 20:48:09 2014 -0400
     3.2 +++ b/org/worm_learn.clj	Mon Apr 21 02:11:29 2014 -0400
     3.3 @@ -525,7 +525,12 @@
     3.4  
     3.5            (println-repl experience-matches-empathy)
     3.6            (swap! accuracy #(conj % experience-matches-empathy)))))))
     3.7 -              
     3.8 +
     3.9 +(defn empathy-experiment-2 []
    3.10 +  (.start (worm-world :experience-watch (compare-empathy-with-baseline
    3.11 +                                          (atom []))
    3.12 +                      :record false :worm worm*)))
    3.13 +
    3.14  (defn accuracy [v]
    3.15    (float (/ (count (filter true? v)) (count v))))
    3.16  

     4.1 --- a/thesis/org/roadmap.org	Thu Apr 03 20:48:09 2014 -0400
     4.2 +++ b/thesis/org/roadmap.org	Mon Apr 21 02:11:29 2014 -0400
     4.3 @@ -210,7 +210,6 @@
     4.4      CLOCK: [2014-03-19 Wed 19:32]--[2014-03-19 Wed 22:04] =>  2:32
     4.5  *** DONE make proprioception reference phi-space indexes
     4.6      CLOSED: [2014-03-19 Wed 22:47] SCHEDULED: <2014-03-19 Wed>
     4.7 -    CLOCK: [2014-03-19 Wed 22:07]
     4.8  
     4.9  
    4.10  *** DONE create test videos, also record positions of worm segments