# HG changeset patch
# User Robert McIntyre <rlm@mit.edu>
# Date 1328465467 25200
# Node ID e1b7ef479bd11bdc4d5c6dd18e756eea4142190f
# Parent  89462678a932187ff3c5e040b847094ee78ea5dc
minor edits

diff -r 89462678a932 -r e1b7ef479bd1 org/lpsolve.org
--- a/org/lpsolve.org	Wed Nov 02 10:31:25 2011 -0700
+++ b/org/lpsolve.org	Sun Feb 05 11:11:07 2012 -0700
@@ -58,7 +58,7 @@
  
 
 ** Immortal Types
-
+   
 In the game, pok\eacute{}mon can have either one type or two types. If
 this restriction is lifted, is there any combination of types that is
 resistant to all types?  I call such a combination an /Immortal Type/,
@@ -158,7 +158,8 @@
   (:use [clojure.contrib def set [seq :only [indexed]] pprint])
   (:import lpsolve.LpSolve)
   (:require pokemon.types)
-  (:require incanter.core))
+  (:require incanter.core trans)
+  (:require rlm.map-utils))
 #+end_src
 
 The =lp_solve= Java interface is available from the same site as
@@ -321,7 +322,7 @@
 (defn-memo constant-map
   "Takes a class and creates a map of the static constant integer
   fields with their names.  This helps with C wrappers where they have
-  just defined a bunch of integer constants instead of enums"
+  just defined a bunch of integer constants instead of enums."
   [class]
      (let [integer-fields (integer-constants class)]
        (into (sorted-map)
@@ -534,7 +535,7 @@
 #+end_example
 
 
-So, for example, Water is /resistant/ (x0.5) against Fire, which is
+So, for example, Water is resistant (x0.5) against Fire, which is
 the second element in the list.
 
 To combine types, these sorts of vectors are multiplied together
@@ -1166,8 +1167,8 @@
 
 Can you see the final step?
 
-It's adding the Water type, which is weak against Water and Dragon and
-strong against Rock and Fire.
+It's adding the Water type, which is weak against Water, Dragon, and
+Grass and strong against Rock and Fire.
 
 #+begin_src clojure :results output :exports both
 (clojure.pprint/pprint
diff -r 89462678a932 -r e1b7ef479bd1 org/types.org
--- a/org/types.org	Wed Nov 02 10:31:25 2011 -0700
+++ b/org/types.org	Sun Feb 05 11:11:07 2012 -0700
@@ -139,7 +139,8 @@
   (:use clojure.contrib.combinatorics)
   (:use clojure.contrib.math)
   (:use clojure.contrib.def)
-  (:use rlm.rlm-commands))
+  (:use rlm.rlm-commands)
+  (:require rlm.map-utils))
 #+end_src
 
 #+srcname: data