1.1 --- a/org/lpsolve.org	Wed Nov 02 07:35:57 2011 -0700
     1.2 +++ b/org/lpsolve.org	Wed Nov 02 08:02:11 2011 -0700
     1.3 @@ -1,4 +1,4 @@
     1.4 -#+title: Discovering Effective Pokemon Types Using Linear Optimization
     1.5 +#+title: Discovering Effective Pok\eacute{}mon Types Using Linear Optimization
     1.6  #+author: Robert McIntyre & Dylan Holmes
     1.7  #+EMAIL:     rlm@mit.edu
     1.8  #+SETUPFILE: ../../aurellem/org/setup.org
     1.9 @@ -11,7 +11,7 @@
    1.10  locate the most effective Pok\eacute{}mon type
    1.11  combinations. Afterwards, we realized that we could transform this
    1.12  search problem into a /linear optimization problem/.  This conversion
    1.13 -offered several advantages: first, search algorithms are comparatively
    1.14 +offeres several advantages: first, search algorithms are comparatively
    1.15  slow, whereas linear optimization algorithms are extremely fast;
    1.16  second, it is difficult to determine whether a search problem has any
    1.17  solution, whereas it is straightforward to determine whether a linear
    1.18 @@ -28,7 +28,7 @@
    1.19        Clojure access to the linear programming C library, =lp_solve=.
    1.20   - Find effective Pokemon types using linear programming :: Building
    1.21        on our earlier code, (...)
    1.22 -- Present our results :: (!)
    1.23 +- Present our results :: 
    1.24   
    1.25  #which can be represented and solved as a system of linear equations.
    1.26    
    1.27 @@ -84,7 +84,7 @@
    1.28  
    1.29  ** The Farmer's Problem
    1.30  
    1.31 -Let's solve the Farmer's Problem, a typical linear programming problem
    1.32 +Let's solve the Farmer's Problem, an example linear programming problem
    1.33  borrowed from http://lpsolve.sourceforge.net/5.5/formulate.htm.
    1.34  
    1.35  
    1.36 @@ -139,7 +139,6 @@
    1.37  #1\end{bmatrix}\;\begin{bmatrix}w\\b\end{bmatrix}
    1.38  #\leq \begin{bmatrix}\$15000\\4000\text{ bushels}\\75\text{ acres}\end{bmatrix}\)
    1.39  
    1.40 -
    1.41  ** Solution using LP Solve
    1.42  #(LP solve is available at http://www.example.com.)
    1.43  In a new file,  =farmer.lp=, we list the variables and constraints 

     2.1 --- a/org/types.org	Wed Nov 02 07:35:57 2011 -0700
     2.2 +++ b/org/types.org	Wed Nov 02 08:02:11 2011 -0700
     2.3 @@ -2,6 +2,7 @@
     2.4  #+AUTHOR:    Robert McIntyre & Dylan Holmes
     2.5  #+EMAIL:     rlm@mit.edu
     2.6  #+description: Finding interesting pokemon type combinations through Best-First search in clojure.
     2.7 +#+keywords: Pokemon, clojure, best-first search, optimization
     2.8  #+SETUPFILE: ../../aurellem/org/setup.org
     2.9  #+INCLUDE:   ../../aurellem/org/level-0.org
    2.10  
    2.11 @@ -23,17 +24,17 @@
    2.12  high susceptibility, average susceptibility, particularly low
    2.13  susceptibility, and no susceptibility (immunity).
    2.14  
    2.15 - - The suceptability of Flying types /against/ Ground is 0, because Ground
    2.16 + - The susceptibility of Flying types /against/ Ground is 0, because Ground
    2.17     attacks cannot hurt Flying pok\eacute{}mon at all. The damage that
    2.18     a Ground type attack normally does is  /multiplied/ by 0 when it is
    2.19 -   uesd against a Flying type pok\eacute{}mon.
    2.20 +   used against a Flying type pok\eacute{}mon.
    2.21  
    2.22 - - The susceptability of Fire types against Water attacks
    2.23 + - The susceptibility of Fire types against Water attacks
    2.24     is 2, because Water type attacks are strong against Fire type
    2.25     Pok\eacute{}mon. The damage that a Water type attack normally does
    2.26     is doubled when it is used against a Fire type pok\eacute{}mon.
    2.27  
    2.28 - - The susceptability of Water types against Water attacks is
    2.29 + - The susceptibility of Water types against Water attacks is
    2.30     $\frac{1}{2}$, because Water type attacks are strong against Water
    2.31     type Pok\eacute{}mon. The damage that a Water type attack normally
    2.32     does is halved when it is used against a Water type
    2.33 @@ -116,7 +117,7 @@
    2.34     pok\eacute{}mon are the best way to defeat Psychic pok\eacute{}mon,
    2.35     and the Red, Blue, and Yellow games each have a character who
    2.36     states "The only thing Psychic pok\eacute{}mon fear are Bugs and
    2.37 -   Ghosts!" This is considered to be a programning glitch. Ghost is
    2.38 +   Ghosts!" This is considered to be a programming glitch. Ghost is
    2.39     super-effective against Psychic in Generation II.
    2.40  
    2.41  * Representing the Data
    2.42 @@ -238,11 +239,11 @@
    2.43  types at the same time.  For example, [[http://bulbapedia.bulbagarden.net/wiki/Zapdos][Zapdos]], the fearsome legendary
    2.44  bird that can control lightning, has both the Electric and Flying
    2.45  types. A pok\eacute{}mon with more than one type gains the advantages
    2.46 -and disadvanteags of both types.  The suceptibilitys of each type are
    2.47 +and disadvantages of both types.  The susceptibilities of each type are
    2.48  multiplied together to produce the hybrid type's susceptibilities. For
    2.49  example, Electric is weak to Ground (susceptibility of 2), but Flying
    2.50 -is immune to Ground (suceptibility of 0). [[http://bulbapedia.bulbagarden.net/wiki/Zapdos][Zapdos']] type,
    2.51 -Electrig/Flying, is immune to Ground because $2 \times 0 = 0$.
    2.52 +is immune to Ground (susceptibility of 0). [[http://bulbapedia.bulbagarden.net/wiki/Zapdos][Zapdos']] type,
    2.53 +Electric/Flying, is immune to Ground because $2 \times 0 = 0$.
    2.54  
    2.55  #+srcname: types
    2.56  #+begin_src clojure :results silent
    2.57 @@ -272,7 +273,7 @@
    2.58    (reduce + (map #(expt % 2) (vals (susceptibility types)))))
    2.59  #+end_src
    2.60  
    2.61 -Now we can work out the suceptability of [[http://bulbapedia.bulbagarden.net/wiki/Zapdos][Zapdos]] automatically.
    2.62 +Now we can work out the susceptibility of [[http://bulbapedia.bulbagarden.net/wiki/Zapdos][Zapdos]] automatically.
    2.63  
    2.64  Electric is weak to Ground.
    2.65  #+begin_src clojure :exports both
    2.66 @@ -380,7 +381,7 @@
    2.67  #+begin_src clojure :results silent
    2.68  (in-ns 'pokemon.types)
    2.69  (defvar type-compare (comparatize susceptance)
    2.70 -  "compare two type combinations wrt their susceptibilities")
    2.71 +  "compare two type combinations W.R.T. their susceptibilities")
    2.72  
    2.73  (defn type-successors
    2.74    "Return the set of types that can be made by appending a single type