# HG changeset patch # User Robert McIntyre # Date 1373699099 14400 # Node ID 20f9b0e79ccee68efbb8f4251f3ec816099c82c5 # Parent 50eaf30eceec357e8455c130da366c21ff113957 resolved mess. diff -r 50eaf30eceec -r 20f9b0e79cce org/index.org --- a/org/index.org Sat Jul 13 08:03:56 2013 +0100 +++ b/org/index.org Sat Jul 13 03:04:59 2013 -0400 @@ -8,14 +8,9 @@ #+OPTIONS: toc:nil, num:nil ** Adventures in coding -<<<<<<< local -- [[../abomination/html/no_parens.html][Calling it quits without parentheses]] -- [[../cortex/html/capture-video.html][Capture live video feeds from JMonkeyEngine]] -======= - [[../abomination/html/no_parens.html][Calling it quits without parentheses]] - [[../cortex/html/capture-video.html][Capture live video feeds from JMonkeyEngine]] ->>>>>>> other ** Academic - [[../dylan/html/quandary.html][Bugs in quantum mechanics]] - [[../dylan/html/visualizing-reason.html][A category-theoretic view of inductive reasoning]] @@ -23,27 +18,6 @@ - [[../cortex/html/ai-journal-review.html][Interesting Articles from /Artificial Intelligence/]] ** Cortex: a virtual world for sensate AI -<<<<<<< local -1. [[../cortex/html/intro.html][Intro: Choosing between Virtual and Real Time]] -2. [[../cortex/html/setup.html][Installing jMonkeyEngine3, a 3D Game Engine]] -3. [[../cortex/html/world.html][Creating a Virtual World]] -4. [[../cortex/html/util.html][Utilities that Integrate jMonkeyEngine3 into Clojure ]] -5. [[../cortex/html/games.html][ Showing off: Games and Examples]] -6. *Sensors and effectors* - 1. [[../cortex/html/sense.html][Preamble: auxillary functions]] - 2. [[../cortex/html/body.html][Building a Body]] - 3. [[../cortex/html/vision.html][Vision]] - 4. [[../cortex/html/hearing.html][Hearing]] - 5. [[../cortex/html/touch.html][Touch]] - 6. [[../cortex/html/proprioception.html][Proprioception]] - 7. [[../cortex/html/movement.html][Movement]] - 8. [[../cortex/html/integration.html][Integration]] -7. [[../cortex/html/gabor.html][Gabor Filters]] - -** Quantitative design -- [[../dylan/resolution.svg][Display resolutions, simplified.]] Intended to become a replacement - for [[http://en.wikipedia.org/wiki/File:Vector_Video_Standards4.svg][this Wikipedia graphic]]. -======= 1. [[../cortex/html/intro.html][Intro: Choosing between Virtual and Real Time]] 2. [[../cortex/html/setup.html][Installing jMonkeyEngine3, a 3D Game Engine]] 3. [[../cortex/html/world.html][Creating a Virtual World]] @@ -59,8 +33,11 @@ 7. [[../cortex/html/movement.html][Movement]] 8. [[../cortex/html/integration.html][Integration]] 7. [[../cortex/html/gabor.html][Gabor Filters]] - ->>>>>>> other + +** Quantitative design + - [[../dylan/resolution.svg][Display resolutions, simplified.]] Intended to become a replacement + for [[http://en.wikipedia.org/wiki/File:Vector_Video_Standards4.svg][this Wikipedia graphic]]. + ** Pok\eacute{}mon - [[../pokemon-types/html/types.html][Best-first search for effective Pok\eacute{}mon types]] - [[../pokemon-types/html/lpsolve.html][Discovering effective Pok\eacute{}mon types using linear optimization.]] @@ -70,16 +47,11 @@ - [[./vba-clojure/html/total-control.html][Pok\eacute{}mon Yellow Total Control Hack]] ** Thoughts -<<<<<<< local -- [[../dylan/html/science.html][Science Minus Science]] -- [[../thoughts/html/man-years.html][A Universe of Human Experience]] -- [[../thoughts/html/emacs-password.html][Emacs Password Security]] -- [[../server/html/server.html][The Server Culture]] -- [[../thoughts/html/patents.html][Thoughts on Patents]] -======= - [[../dylan/html/science.html][Science Minus Science]] - [[../thoughts/html/man-years.html][A Universe of Human Experience]] - [[../thoughts/html/emacs-password.html][Emacs Password Security]] - [[../server/html/server.html][The Server Culture]] - [[../thoughts/html/patents.html][Thoughts on Patents]] - - [[../thoughts/html/ideas.html][Ideas]]>>>>>>> other + - [[../thoughts/html/ideas.html][Ideas]] + + diff -r 50eaf30eceec -r 20f9b0e79cce org/index.org.orig --- a/org/index.org.orig Sat Jul 13 08:03:56 2013 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,52 +0,0 @@ -#+title: Our Blog Entries -#+author: Robert McIntyre & Dylan Holmes -#+email: rlm@mit.edu -#+description: A Blog on AI, quantum mechanics, philosophy, and all sorts of coding goodies in clojure, java, C and more! -#+keywords: AI, clojure, quantum mechanics -#+SETUPFILE: ../../aurellem/org/setup.org -#+INCLUDE: ../../aurellem/org/level-0.org -#+OPTIONS: toc:nil, num:nil - -** Adventures in coding -- [[../abomination/html/no_parens.html][Calling it quits without parentheses]] -- [[../cortex/html/capture-video.html][Capture live video feeds from JMonkeyEngine]] -** Academic -- [[../dylan/html/quandary.html][Bugs in quantum mechanics]] -- [[../dylan/html/visualizing-reason.html][A category-theoretic view of inductive reasoning]] -- [[../jaynes/html/stat-mech.html][Jaynes' /Statistical Mechanics/]] -- [[../cortex/html/ai-journal-review.html][Interesting Articles from /Artificial Intelligence/]] - -** Cortex: a virtual world for sensate AI -1. [[../cortex/html/intro.html][Intro: Choosing between Virtual and Real Time]] -2. [[../cortex/html/setup.html][Installing jMonkeyEngine3, a 3D Game Engine]] -3. [[../cortex/html/world.html][Creating a Virtual World]] -4. [[../cortex/html/util.html][Utilities that Integrate jMonkeyEngine3 into Clojure ]] -5. [[../cortex/html/games.html][ Showing off: Games and Examples]] -6. *Sensors and effectors* - 1. [[../cortex/html/sense.html][Preamble: auxillary functions]] - 2. [[../cortex/html/body.html][Building a Body]] - 3. [[../cortex/html/vision.html][Vision]] - 4. [[../cortex/html/hearing.html][Hearing]] - 5. [[../cortex/html/touch.html][Touch]] - 6. [[../cortex/html/proprioception.html][Proprioception]] - 7. [[../cortex/html/movement.html][Movement]] - 8. [[../cortex/html/integration.html][Integration]] -7. [[../cortex/html/gabor.html][Gabor Filters]] - -** Quantitative design -- [[../dylan/resolution.svg][Display resolutions, simplified.]] Intended to become a replacement - for [[http://en.wikipedia.org/wiki/File:Vector_Video_Standards4.svg][this Wikipedia graphic]]. -** Pok\eacute{}mon - - [[../pokemon-types/html/types.html][Best-first search for effective Pok\eacute{}mon types]] - - [[../pokemon-types/html/lpsolve.html][Discovering effective Pok\eacute{}mon types using linear optimization.]] - - [[../vba-clojure/html/rom.html][Notes on deconstructing Pok\eacute{}mon Yellow]] - - [[http://web.mit.edu/dxh/www/guess/][9 Questions with Pok\eacute{}mon]] (watch this space!) - - [[http://aurellem.org/pokeclass/html/idtree.html][How /9 Questions with Pok\eacute{}mon/ was made.]] (in progress) - - [[./vba-clojure/html/total-control.html][Pok\eacute{}mon Yellow Total Control Hack]] - -** Thoughts -- [[../dylan/html/science.html][Science Minus Science]] -- [[../thoughts/html/man-years.html][A Universe of Human Experience]] -- [[../thoughts/html/emacs-password.html][Emacs Password Security]] -- [[../server/html/server.html][The Server Culture]] -- [[../thoughts/html/patents.html][Thoughts on Patents]]