comparison org/integration.org @ 316:2c7fbcbd5ebb

replaced clojure.contrib.shell-out with clojure.java.shell
author Robert McIntyre <rlm@mit.edu>
date Tue, 28 Feb 2012 13:44:46 -0600
parents 83dd76d9628e
children 4c37d39a3cf6
comparison
equal deleted inserted replaced
315:a48a75e5876c 316:2c7fbcbd5ebb
46 (def output-base (File. "/home/r/proj/cortex/render/hand")) 46 (def output-base (File. "/home/r/proj/cortex/render/hand"))
47 #+end_src 47 #+end_src
48 48
49 For this demonstration I have to manually drive the muscles of the 49 For this demonstration I have to manually drive the muscles of the
50 hand. I do this by creating a little mini-language to describe 50 hand. I do this by creating a little mini-language to describe
51
51 simulated muscle contraction. 52 simulated muscle contraction.
52
53 #+name: integration-2 53 #+name: integration-2
54 #+begin_src clojure 54 #+begin_src clojure
55 (defn motor-control-program 55 (defn motor-control-program
56 "Create a function which will execute the motor script" 56 "Create a function which will execute the motor script"
57 [muscle-positions 57 [muscle-positions
313 313
314 #+name: magick-8 314 #+name: magick-8
315 #+begin_src clojure 315 #+begin_src clojure
316 (ns cortex.video.magick8 316 (ns cortex.video.magick8
317 (:import java.io.File) 317 (:import java.io.File)
318 (:use clojure.contrib.shell-out)) 318 (:use clojure.java.shell))
319 319
320 (comment 320 (comment
321 ;; list of touch targets 321 ;; list of touch targets
322 0 middle-11 322 0 middle-11
323 1 middle-21 323 1 middle-21
585 585
586 (def test-target (File. base "output.png")) 586 (def test-target (File. base "output.png"))
587 587
588 (def background (File. base "background.png")) 588 (def background (File. base "background.png"))
589 589
590 (use 'clojure.contrib.shell-out) 590 (use 'clojure.java.shell)
591 591
592 (defn vision [] 592 (defn vision []
593 (file-groups 593 (file-groups
594 "vision/0" 594 "vision/0"
595 "vision/1" 595 "vision/1"