1.1 --- a/org/lpsolve.org	Wed Nov 02 10:31:25 2011 -0700
     1.2 +++ b/org/lpsolve.org	Sun Feb 05 11:11:07 2012 -0700
     1.3 @@ -58,7 +58,7 @@
     1.4   
     1.5  
     1.6  ** Immortal Types
     1.7 -
     1.8 +   
     1.9  In the game, pok\eacute{}mon can have either one type or two types. If
    1.10  this restriction is lifted, is there any combination of types that is
    1.11  resistant to all types?  I call such a combination an /Immortal Type/,
    1.12 @@ -158,7 +158,8 @@
    1.13    (:use [clojure.contrib def set [seq :only [indexed]] pprint])
    1.14    (:import lpsolve.LpSolve)
    1.15    (:require pokemon.types)
    1.16 -  (:require incanter.core))
    1.17 +  (:require incanter.core trans)
    1.18 +  (:require rlm.map-utils))
    1.19  #+end_src
    1.20  
    1.21  The =lp_solve= Java interface is available from the same site as
    1.22 @@ -321,7 +322,7 @@
    1.23  (defn-memo constant-map
    1.24    "Takes a class and creates a map of the static constant integer
    1.25    fields with their names.  This helps with C wrappers where they have
    1.26 -  just defined a bunch of integer constants instead of enums"
    1.27 +  just defined a bunch of integer constants instead of enums."
    1.28    [class]
    1.29       (let [integer-fields (integer-constants class)]
    1.30         (into (sorted-map)
    1.31 @@ -534,7 +535,7 @@
    1.32  #+end_example
    1.33  
    1.34  
    1.35 -So, for example, Water is /resistant/ (x0.5) against Fire, which is
    1.36 +So, for example, Water is resistant (x0.5) against Fire, which is
    1.37  the second element in the list.
    1.38  
    1.39  To combine types, these sorts of vectors are multiplied together
    1.40 @@ -1166,8 +1167,8 @@
    1.41  
    1.42  Can you see the final step?
    1.43  
    1.44 -It's adding the Water type, which is weak against Water and Dragon and
    1.45 -strong against Rock and Fire.
    1.46 +It's adding the Water type, which is weak against Water, Dragon, and
    1.47 +Grass and strong against Rock and Fire.
    1.48  
    1.49  #+begin_src clojure :results output :exports both
    1.50  (clojure.pprint/pprint

     2.1 --- a/org/types.org	Wed Nov 02 10:31:25 2011 -0700
     2.2 +++ b/org/types.org	Sun Feb 05 11:11:07 2012 -0700
     2.3 @@ -139,7 +139,8 @@
     2.4    (:use clojure.contrib.combinatorics)
     2.5    (:use clojure.contrib.math)
     2.6    (:use clojure.contrib.def)
     2.7 -  (:use rlm.rlm-commands))
     2.8 +  (:use rlm.rlm-commands)
     2.9 +  (:require rlm.map-utils))
    2.10  #+end_src
    2.11  
    2.12  #+srcname: data