Mercurial > aurellem

comparison org/index.org @ 42:50eaf30eceec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolving mess.
author Robert McIntyre <rlm@mit.edu>
date Sat, 13 Jul 2013 08:03:56 +0100
parents b63a1bdb1d06
children 20f9b0e79cce
comparison
equal deleted inserted replaced
41:b63a1bdb1d06 42:50eaf30eceec
6 #+SETUPFILE: ../../aurellem/org/setup.org 6 #+SETUPFILE: ../../aurellem/org/setup.org
7 #+INCLUDE: ../../aurellem/org/level-0.org 7 #+INCLUDE: ../../aurellem/org/level-0.org
8 #+OPTIONS: toc:nil, num:nil 8 #+OPTIONS: toc:nil, num:nil
9 9
10 ** Adventures in coding 10 ** Adventures in coding
11 <<<<<<< local
12 - [[../abomination/html/no_parens.html][Calling it quits without parentheses]]
13 - [[../cortex/html/capture-video.html][Capture live video feeds from JMonkeyEngine]]
14 =======
11 - [[../abomination/html/no_parens.html][Calling it quits without parentheses]] 15 - [[../abomination/html/no_parens.html][Calling it quits without parentheses]]
12 - [[../cortex/html/capture-video.html][Capture live video feeds from JMonkeyEngine]] 16 - [[../cortex/html/capture-video.html][Capture live video feeds from JMonkeyEngine]]
13 17
18 >>>>>>> other
14 ** Academic 19 ** Academic
15 - [[../dylan/html/quandary.html][Bugs in quantum mechanics]] 20 - [[../dylan/html/quandary.html][Bugs in quantum mechanics]]
16 - [[../dylan/html/visualizing-reason.html][A category-theoretic view of inductive reasoning]] 21 - [[../dylan/html/visualizing-reason.html][A category-theoretic view of inductive reasoning]]
17 - [[../jaynes/html/stat-mech.html][Jaynes' /Statistical Mechanics/]] 22 - [[../jaynes/html/stat-mech.html][Jaynes' /Statistical Mechanics/]]
18 - [[../cortex/html/ai-journal-review.html][Interesting Articles from /Artificial Intelligence/]] 23 - [[../cortex/html/ai-journal-review.html][Interesting Articles from /Artificial Intelligence/]]
19 24
20 ** Cortex: a virtual world for sensate AI 25 ** Cortex: a virtual world for sensate AI
26 <<<<<<< local
27 1. [[../cortex/html/intro.html][Intro: Choosing between Virtual and Real Time]]
28 2. [[../cortex/html/setup.html][Installing jMonkeyEngine3, a 3D Game Engine]]
29 3. [[../cortex/html/world.html][Creating a Virtual World]]
30 4. [[../cortex/html/util.html][Utilities that Integrate jMonkeyEngine3 into Clojure ]]
31 5. [[../cortex/html/games.html][ Showing off: Games and Examples]]
32 6. *Sensors and effectors*
33 1. [[../cortex/html/sense.html][Preamble: auxillary functions]]
34 2. [[../cortex/html/body.html][Building a Body]]
35 3. [[../cortex/html/vision.html][Vision]]
36 4. [[../cortex/html/hearing.html][Hearing]]
37 5. [[../cortex/html/touch.html][Touch]]
38 6. [[../cortex/html/proprioception.html][Proprioception]]
39 7. [[../cortex/html/movement.html][Movement]]
40 8. [[../cortex/html/integration.html][Integration]]
41 7. [[../cortex/html/gabor.html][Gabor Filters]]
42
43 ** Quantitative design
44 - [[../dylan/resolution.svg][Display resolutions, simplified.]] Intended to become a replacement
45 for [[http://en.wikipedia.org/wiki/File:Vector_Video_Standards4.svg][this Wikipedia graphic]].
46 =======
21 1. [[../cortex/html/intro.html][Intro: Choosing between Virtual and Real Time]] 47 1. [[../cortex/html/intro.html][Intro: Choosing between Virtual and Real Time]]
22 2. [[../cortex/html/setup.html][Installing jMonkeyEngine3, a 3D Game Engine]] 48 2. [[../cortex/html/setup.html][Installing jMonkeyEngine3, a 3D Game Engine]]
23 3. [[../cortex/html/world.html][Creating a Virtual World]] 49 3. [[../cortex/html/world.html][Creating a Virtual World]]
24 4. [[../cortex/html/util.html][Utilities that Integrate jMonkeyEngine3 into Clojure ]] 50 4. [[../cortex/html/util.html][Utilities that Integrate jMonkeyEngine3 into Clojure ]]
25 5. [[../cortex/html/games.html][ Showing off: Games and Examples]] 51 5. [[../cortex/html/games.html][ Showing off: Games and Examples]]
32 6. [[../cortex/html/proprioception.html][Proprioception]] 58 6. [[../cortex/html/proprioception.html][Proprioception]]
33 7. [[../cortex/html/movement.html][Movement]] 59 7. [[../cortex/html/movement.html][Movement]]
34 8. [[../cortex/html/integration.html][Integration]] 60 8. [[../cortex/html/integration.html][Integration]]
35 7. [[../cortex/html/gabor.html][Gabor Filters]] 61 7. [[../cortex/html/gabor.html][Gabor Filters]]
36 62
63 >>>>>>> other
37 ** Pok\eacute{}mon 64 ** Pok\eacute{}mon
38 - [[../pokemon-types/html/types.html][Best-first search for effective Pok\eacute{}mon types]] 65 - [[../pokemon-types/html/types.html][Best-first search for effective Pok\eacute{}mon types]]
39 - [[../pokemon-types/html/lpsolve.html][Discovering effective Pok\eacute{}mon types using linear optimization.]] 66 - [[../pokemon-types/html/lpsolve.html][Discovering effective Pok\eacute{}mon types using linear optimization.]]
40 - [[../vba-clojure/html/rom.html][Notes on deconstructing Pok\eacute{}mon Yellow]] 67 - [[../vba-clojure/html/rom.html][Notes on deconstructing Pok\eacute{}mon Yellow]]
41 - [[http://web.mit.edu/dxh/www/guess/][9 Questions with Pok\eacute{}mon]] 68 - [[http://web.mit.edu/dxh/www/guess/][9 Questions with Pok\eacute{}mon]]
42 - [[http://aurellem.org/pokeclass/html/idtree.html][How /9 Questions with Pok\eacute{}mon/ was made.]] 69 - [[http://aurellem.org/pokeclass/html/idtree.html][How /9 Questions with Pok\eacute{}mon/ was made.]]
43 - [[./vba-clojure/html/total-control.html][Pok\eacute{}mon Yellow Total Control Hack]] 70 - [[./vba-clojure/html/total-control.html][Pok\eacute{}mon Yellow Total Control Hack]]
44 71
45 ** Thoughts 72 ** Thoughts
73 <<<<<<< local
74 - [[../dylan/html/science.html][Science Minus Science]]
75 - [[../thoughts/html/man-years.html][A Universe of Human Experience]]
76 - [[../thoughts/html/emacs-password.html][Emacs Password Security]]
77 - [[../server/html/server.html][The Server Culture]]
78 - [[../thoughts/html/patents.html][Thoughts on Patents]]
79 =======
46 - [[../dylan/html/science.html][Science Minus Science]] 80 - [[../dylan/html/science.html][Science Minus Science]]
47 - [[../thoughts/html/man-years.html][A Universe of Human Experience]] 81 - [[../thoughts/html/man-years.html][A Universe of Human Experience]]
48 - [[../thoughts/html/emacs-password.html][Emacs Password Security]] 82 - [[../thoughts/html/emacs-password.html][Emacs Password Security]]
49 - [[../server/html/server.html][The Server Culture]] 83 - [[../server/html/server.html][The Server Culture]]
50 - [[../thoughts/html/patents.html][Thoughts on Patents]] 84 - [[../thoughts/html/patents.html][Thoughts on Patents]]
51 - [[../thoughts/html/ideas.html][Ideas]] 85 - [[../thoughts/html/ideas.html][Ideas]]>>>>>>> other