     {:train (subvec fitness-cases-shuffled 0 train-num)
      :test (subvec fitness-cases-shuffled train-num)}))
 
-;; Define the fitness cases. Do this once per run, so that train and test
-;; subsets stay the same throughout a run.
-(def bioavailability-fitness-cases (define-fitness-cases))
 
-;; Helper functions to get specific train and test cases
-;(defn train-fitness-case
-;  "Returns train fitness case number n for this run."
-;  [n]
-;  (nth (:train bioavailability-fitness-cases) n))
-;
-;(defn test-fitness-case
-;  "Returns test fitness case number n for this run."
-;  [n]
-;  (nth (:test bioavailability-fitness-cases) n))
-
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Define instructions and fitness cases
 
 ;; I want x0 through x240 to be instructions that, when executed, push
 ;; the float from that column onto the float stack.
 (doseq [[numb symb] (map #(vector % (symbol (str "x" %))) (range 241))]
   (eval `(define-registered ~symb (fn [state#] (push-item (stack-ref :auxiliary ~numb state#) :float state#)))))
-  
-;(sort (map str (vec @registered-instructions)))
 
+;; Define the fitness cases. Do this once per run, so that train and test
+;; subsets stay the same throughout a run.
+(def bioavailability-fitness-cases (define-fitness-cases))
+
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; Main functions to pass to pushgp
 
 ;; This definition of atom-generators makes it so that choosing a terminal
 ;; has equivalent probability of choosing one of the operators. This is

        [clojush.random]
        [clojush.util]
        [local-file]
        ;[clojush.evaluate] ;;remove later
        ;[clojush.individual] ;;remove later
        [clojure.math.numeric-tower])
  (:require [clojure.string :as string]
            [clojure-csv.core :as csv]))

(defn read-data []
  "Reads data from data/bioavailability.txt into a sequence of sequences."

;; prediction. In Proceedings of the 11th Annual conference on
;; Genetic and evolutionary computation (GECCO '09). ACM,
;; New York, NY, USA, 1115-1122. DOI=10.1145/1569901.1570051
;; http://doi.acm.org/10.1145/1569901.1570051
;;
;; Data available from:
;;  http://personal.disco.unimib.it/Vanneschi/bioavailability.txt
