   [[(list "t"
           "f"
           "f&f"
+          "f&t"
+          "t&f"
           "t&t"
-          "f&t"
+          "f|f"
+          "f|t"
           "t|f"
-          ) 6 0]
-   [(fn [] (solve-boolean-input (inc (lrand-int 20)))) 194 2000]
+          "t|t") 10 0]
+   [(fn [] (solve-boolean-input (+ 2 (lrand-int 19)))) 190 2000]
    ])
+
 
 ;;Can make Solve Boolean test data like this:
 ; (map sort (test-and-train-data-from-domains solve-boolean-data-domains))


; Atom generators
(def solve-boolean-atom-generators
  (concat (list
            true
            false
            "t"
            "f"
            "&"
            "|"
            ;;; end constants
            ;;; end ERCs
            (tag-instruction-erc [:integer :boolean :exec] 1000)
            (tagged-instruction-erc 1000)
            ;;; end tag ERCs
            'in1
            ;;; end input instructions
            )
          (registered-for-stacks [:integer :boolean :exec :string :char])))

(defn solve-boolean-input
  [terms]

; Define the argmap
(def argmap
  {:error-function (make-solve-boolean-error-function-from-cases (first solve-boolean-train-and-test-cases)
                                                                 (second solve-boolean-train-and-test-cases))
   :atom-generators solve-boolean-atom-generators
   :max-points 2000
   :max-genome-size-in-initial-program 250
