# HG changeset patch # User Robert McIntyre # Date 1395721201 14400 # Node ID d3c5f9b705742649fde12ebe532eb77cf13a3b21 # Parent eaf8c591372bcdbdac253350f622adcb13a8d8b3 workling on thesis render. diff -r eaf8c591372b -r d3c5f9b70574 assets/Textures/greenGrid.png Binary file assets/Textures/greenGrid.png has changed diff -r eaf8c591372b -r d3c5f9b70574 assets/Textures/greenHexGrid.png Binary file assets/Textures/greenHexGrid.png has changed diff -r eaf8c591372b -r d3c5f9b70574 assets/Textures/squareGrid.png Binary file assets/Textures/squareGrid.png has changed diff -r eaf8c591372b -r d3c5f9b70574 org/worm_learn.clj --- a/org/worm_learn.clj Mon Mar 24 22:43:06 2014 -0400 +++ b/org/worm_learn.clj Tue Mar 25 00:20:01 2014 -0400 @@ -164,7 +164,7 @@ (Math/abs))) (defn resting? - "Is the worm straight?" + "Is the worm resting on the ground?" [experiences] (every? (fn [touch-data] @@ -261,6 +261,8 @@ (defn record-experience! [experiences data] (swap! experiences #(conj % data))) + + (defn worm-world [& {:keys [record motor-control keybindings view experiences worm-model end-frame experience-watch] :as settings}] @@ -277,13 +279,16 @@ muscle-display (view-movement) floor (box 10 1 10 :position (Vector3f. 0 -10 0) - :color ColorRGBA/Gray :mass 0) + :color ColorRGBA/Gray :mass 0 + :texture "Textures/greenGrid.png") timer (IsoTimer. 60)] (world (nodify [worm floor]) (merge standard-debug-controls keybindings) (fn [world] + (.setDisplayStatView world false) + (.setDisplayFps world false) (position-camera world view) (.setTimer world timer) (display-dilated-time world timer) diff -r eaf8c591372b -r d3c5f9b70574 thesis/Makefile --- a/thesis/Makefile Mon Mar 24 22:43:06 2014 -0400 +++ b/thesis/Makefile Tue Mar 25 00:20:01 2014 -0400 @@ -4,7 +4,8 @@ all: ./weave-thesis.sh cortex - rsync -avz --delete /home/r/proj/cortex/thesis "r@aurellem.org:~" + rsync -avz --delete --exclude "video" \ + /home/r/proj/cortex/thesis "r@aurellem.org:~" ssh r@aurellem.org cd "~/thesis; $(INVOKE_LATEX)" scp "r@aurellem.org:/home/r/thesis/$(THESIS_NAME).pdf" . rm cortex.tex abstract.tex user-guide.tex diff -r eaf8c591372b -r d3c5f9b70574 thesis/comp.pl --- a/thesis/comp.pl Mon Mar 24 22:43:06 2014 -0400 +++ b/thesis/comp.pl Tue Mar 25 00:20:01 2014 -0400 @@ -15,3 +15,5 @@ @imagemagick_command = flat("montage", @images, "-geometry", "+2+2", $output); print "@imagemagick_command\n"; + +system(@imagemagick_command); diff -r eaf8c591372b -r d3c5f9b70574 thesis/cortex.org --- a/thesis/cortex.org Mon Mar 24 22:43:06 2014 -0400 +++ b/thesis/cortex.org Tue Mar 25 00:20:01 2014 -0400 @@ -142,7 +142,7 @@ experience. This will include relevant muscle contractions, a close up view of the stream from the cat's perspective, and most importantly, the imagined feeling of water entering the - mouth. The imagined sensory experience can come from both a + mouth. The imagined sensory experience can come from a simulation of the event, but can also be pattern-matched from previous, similar embodied experience. @@ -162,8 +162,8 @@ sensory experience associated with that particular proproceptive feeling. - 4. Retrieve the feeling of your bottom resting on a surface and - your leg muscles relaxed. + 4. Retrieve the feeling of your bottom resting on a surface, your + knees bent, and your leg muscles relaxed. 5. This sensory information is consistent with the =sitting?= sensory predicate, so you (and the entity in the image) must be @@ -181,23 +181,9 @@ #+caption: The worm performs many actions during free play such as #+caption: curling, wiggling, and resting. #+name: worm-intro - #+ATTR_LaTeX: :width 10cm - [[./images/wall-push.png]] + #+ATTR_LaTeX: :width 13cm + [[./images/worm-free-play.png]] - #+caption: This sensory predicate detects when the worm is resting on the - #+caption: ground. - #+name: resting-intro - #+begin_listing clojure - #+begin_src clojure -(defn resting? - "Is the worm resting on the ground?" - [experiences] - (every? - (fn [touch-data] - (< 0.9 (contact worm-segment-bottom touch-data))) - (:touch (peek experiences)))) - #+end_src - #+end_listing #+caption: Body-centerd actions are best expressed in a body-centered #+caption: language. This code detects when the worm has curled into a @@ -218,30 +204,6 @@ #+end_src #+end_listing - #+caption: Even complicated actions such as ``wiggling'' are fairly simple - #+caption: to describe with a rich enough language. - #+name: wiggling-intro - #+begin_listing clojure - #+begin_src clojure -(defn wiggling? - "Is the worm wiggling?" - [experiences] - (let [analysis-interval 0x40] - (when (> (count experiences) analysis-interval) - (let [a-flex 3 - a-ex 2 - muscle-activity - (map :muscle (vector:last-n experiences analysis-interval)) - base-activity - (map #(- (% a-flex) (% a-ex)) muscle-activity)] - (= 2 - (first - (max-indexed - (map #(Math/abs %) - (take 20 (fft base-activity)))))))))) - #+end_src - #+end_listing - #+caption: The actions of a worm in a video can be recognized by #+caption: proprioceptive data and sentory predicates by filling #+caption: in the missing sensory detail with previous experience. @@ -249,7 +211,6 @@ #+ATTR_LaTeX: :width 10cm [[./images/wall-push.png]] - One powerful advantage of empathic problem solving is that it factors the action recognition problem into two easier problems. To diff -r eaf8c591372b -r d3c5f9b70574 thesis/images/worm-free-play.png Binary file thesis/images/worm-free-play.png has changed diff -r eaf8c591372b -r d3c5f9b70574 thesis/rlm-cortex-meng.tex --- a/thesis/rlm-cortex-meng.tex Mon Mar 24 22:43:06 2014 -0400 +++ b/thesis/rlm-cortex-meng.tex Tue Mar 25 00:20:01 2014 -0400 @@ -43,6 +43,8 @@ \usepackage{hyperref} \usepackage{libertine} \usepackage{inconsolata} +\usepackage{float} + \usepackage[backend=bibtex,style=alphabetic]{biblatex} \addbibresource{cortex.bib}