Mercurial > cortex
changeset 443:d3c5f9b70574
workling on thesis render.
| author | Robert McIntyre <rlm@mit.edu> |
|---|---|
| date | Tue, 25 Mar 2014 00:20:01 -0400 |
| parents | eaf8c591372b |
| children | ea0bcd47d55b |
| files | assets/Textures/greenGrid.png assets/Textures/greenHexGrid.png assets/Textures/squareGrid.png org/worm_learn.clj thesis/Makefile thesis/comp.pl thesis/cortex.org thesis/images/worm-free-play.png thesis/rlm-cortex-meng.tex |
| diffstat | 9 files changed, 18 insertions(+), 47 deletions(-) [+] |
line wrap: on
line diff
1.1 Binary file assets/Textures/greenGrid.png has changed
2.1 Binary file assets/Textures/greenHexGrid.png has changed
3.1 Binary file assets/Textures/squareGrid.png has changed
4.1 --- a/org/worm_learn.clj Mon Mar 24 22:43:06 2014 -0400 4.2 +++ b/org/worm_learn.clj Tue Mar 25 00:20:01 2014 -0400 4.3 @@ -164,7 +164,7 @@ 4.4 (Math/abs))) 4.5 4.6 (defn resting? 4.7 - "Is the worm straight?" 4.8 + "Is the worm resting on the ground?" 4.9 [experiences] 4.10 (every? 4.11 (fn [touch-data] 4.12 @@ -261,6 +261,8 @@ 4.13 (defn record-experience! [experiences data] 4.14 (swap! experiences #(conj % data))) 4.15 4.16 + 4.17 + 4.18 (defn worm-world 4.19 [& {:keys [record motor-control keybindings view experiences 4.20 worm-model end-frame experience-watch] :as settings}] 4.21 @@ -277,13 +279,16 @@ 4.22 muscle-display (view-movement) 4.23 4.24 floor (box 10 1 10 :position (Vector3f. 0 -10 0) 4.25 - :color ColorRGBA/Gray :mass 0) 4.26 + :color ColorRGBA/Gray :mass 0 4.27 + :texture "Textures/greenGrid.png") 4.28 timer (IsoTimer. 60)] 4.29 4.30 (world 4.31 (nodify [worm floor]) 4.32 (merge standard-debug-controls keybindings) 4.33 (fn [world] 4.34 + (.setDisplayStatView world false) 4.35 + (.setDisplayFps world false) 4.36 (position-camera world view) 4.37 (.setTimer world timer) 4.38 (display-dilated-time world timer)
5.1 --- a/thesis/Makefile Mon Mar 24 22:43:06 2014 -0400 5.2 +++ b/thesis/Makefile Tue Mar 25 00:20:01 2014 -0400 5.3 @@ -4,7 +4,8 @@ 5.4 5.5 all: 5.6 ./weave-thesis.sh cortex 5.7 - rsync -avz --delete /home/r/proj/cortex/thesis "r@aurellem.org:~" 5.8 + rsync -avz --delete --exclude "video" \ 5.9 + /home/r/proj/cortex/thesis "r@aurellem.org:~" 5.10 ssh r@aurellem.org cd "~/thesis; $(INVOKE_LATEX)" 5.11 scp "r@aurellem.org:/home/r/thesis/$(THESIS_NAME).pdf" . 5.12 rm cortex.tex abstract.tex user-guide.tex
6.1 --- a/thesis/comp.pl Mon Mar 24 22:43:06 2014 -0400 6.2 +++ b/thesis/comp.pl Tue Mar 25 00:20:01 2014 -0400 6.3 @@ -15,3 +15,5 @@ 6.4 @imagemagick_command = flat("montage", @images, "-geometry", "+2+2", $output); 6.5 6.6 print "@imagemagick_command\n"; 6.7 + 6.8 +system(@imagemagick_command);
7.1 --- a/thesis/cortex.org Mon Mar 24 22:43:06 2014 -0400 7.2 +++ b/thesis/cortex.org Tue Mar 25 00:20:01 2014 -0400 7.3 @@ -142,7 +142,7 @@ 7.4 experience. This will include relevant muscle contractions, a 7.5 close up view of the stream from the cat's perspective, and most 7.6 importantly, the imagined feeling of water entering the 7.7 - mouth. The imagined sensory experience can come from both a 7.8 + mouth. The imagined sensory experience can come from a 7.9 simulation of the event, but can also be pattern-matched from 7.10 previous, similar embodied experience. 7.11 7.12 @@ -162,8 +162,8 @@ 7.13 sensory experience associated with that particular proproceptive 7.14 feeling. 7.15 7.16 - 4. Retrieve the feeling of your bottom resting on a surface and 7.17 - your leg muscles relaxed. 7.18 + 4. Retrieve the feeling of your bottom resting on a surface, your 7.19 + knees bent, and your leg muscles relaxed. 7.20 7.21 5. This sensory information is consistent with the =sitting?= 7.22 sensory predicate, so you (and the entity in the image) must be 7.23 @@ -181,23 +181,9 @@ 7.24 #+caption: The worm performs many actions during free play such as 7.25 #+caption: curling, wiggling, and resting. 7.26 #+name: worm-intro 7.27 - #+ATTR_LaTeX: :width 10cm 7.28 - [[./images/wall-push.png]] 7.29 + #+ATTR_LaTeX: :width 13cm 7.30 + [[./images/worm-free-play.png]] 7.31 7.32 - #+caption: This sensory predicate detects when the worm is resting on the 7.33 - #+caption: ground. 7.34 - #+name: resting-intro 7.35 - #+begin_listing clojure 7.36 - #+begin_src clojure 7.37 -(defn resting? 7.38 - "Is the worm resting on the ground?" 7.39 - [experiences] 7.40 - (every? 7.41 - (fn [touch-data] 7.42 - (< 0.9 (contact worm-segment-bottom touch-data))) 7.43 - (:touch (peek experiences)))) 7.44 - #+end_src 7.45 - #+end_listing 7.46 7.47 #+caption: Body-centerd actions are best expressed in a body-centered 7.48 #+caption: language. This code detects when the worm has curled into a 7.49 @@ -218,30 +204,6 @@ 7.50 #+end_src 7.51 #+end_listing 7.52 7.53 - #+caption: Even complicated actions such as ``wiggling'' are fairly simple 7.54 - #+caption: to describe with a rich enough language. 7.55 - #+name: wiggling-intro 7.56 - #+begin_listing clojure 7.57 - #+begin_src clojure 7.58 -(defn wiggling? 7.59 - "Is the worm wiggling?" 7.60 - [experiences] 7.61 - (let [analysis-interval 0x40] 7.62 - (when (> (count experiences) analysis-interval) 7.63 - (let [a-flex 3 7.64 - a-ex 2 7.65 - muscle-activity 7.66 - (map :muscle (vector:last-n experiences analysis-interval)) 7.67 - base-activity 7.68 - (map #(- (% a-flex) (% a-ex)) muscle-activity)] 7.69 - (= 2 7.70 - (first 7.71 - (max-indexed 7.72 - (map #(Math/abs %) 7.73 - (take 20 (fft base-activity)))))))))) 7.74 - #+end_src 7.75 - #+end_listing 7.76 - 7.77 #+caption: The actions of a worm in a video can be recognized by 7.78 #+caption: proprioceptive data and sentory predicates by filling 7.79 #+caption: in the missing sensory detail with previous experience. 7.80 @@ -249,7 +211,6 @@ 7.81 #+ATTR_LaTeX: :width 10cm 7.82 [[./images/wall-push.png]] 7.83 7.84 - 7.85 7.86 One powerful advantage of empathic problem solving is that it 7.87 factors the action recognition problem into two easier problems. To
8.1 Binary file thesis/images/worm-free-play.png has changed
9.1 --- a/thesis/rlm-cortex-meng.tex Mon Mar 24 22:43:06 2014 -0400 9.2 +++ b/thesis/rlm-cortex-meng.tex Tue Mar 25 00:20:01 2014 -0400 9.3 @@ -43,6 +43,8 @@ 9.4 \usepackage{hyperref} 9.5 \usepackage{libertine} 9.6 \usepackage{inconsolata} 9.7 +\usepackage{float} 9.8 + 9.9 9.10 \usepackage[backend=bibtex,style=alphabetic]{biblatex} 9.11 \addbibresource{cortex.bib}