Merge de35704 into 9f3ab40

src/clojush/pushgp/selection/tournament.clj

@@ -11,5 +11,4 @@
                  (:hah :rmse :ifs) :weighted-error
                  (throw (Exception. (str "Unrecognized argument for total-error-method: "
                                          total-error-method))))]
-    (reduce (fn [i1 i2] (if (< (err-fn i1) (err-fn i2)) i1 i2))
-            tournament-set)))
+    (apply min-key err-fn tournament-set)))

src/clojush/pushstate.clj

@@ -60,7 +60,7 @@
   "Returns a copy of the state with the value pushed on the named stack. This is a utility,
    not for use in Push programs."
   [value type state]
-  (assoc state type (cons value (type state))))
+  (update state type conj value))
 
 (defn top-item
   "Returns the top item of the type stack in state. Returns :no-stack-item if called on
@@ -93,7 +93,7 @@
   "Returns a copy of the state with the specified stack popped. This is a utility,
    not for use as an instruction in Push programs."
   [type state]
-  (assoc state type (rest (type state))))
+  (update state type rest))
 
 (defn end-environment
   "Ends the current environment by popping the :environment stack and replacing