Update substitution-cipher for new problem specification scheme

src/propeller/problems/PSB2/substitution_cipher.cljc

@@ -19,6 +19,8 @@
 ; Source: https://arxiv.org/pdf/2106.06086.pdf
 ; ============================================================
 
+(def train-and-test-data (psb2/fetch-examples "data" "substitution-cipher" 200 2000))
+
 (defn map-vals-input
   "Returns all the input values of a map (specific helper method for substitution-cipher)"
   [i]
@@ -42,11 +44,8 @@
       (list 0 ""))))
 
 (defn error-function
-  ([argmap individual]
+  [argmap data individual]
-   (error-function argmap individual :train))
-  ([argmap individual subset]
   (let [program (genome/plushy->push (:plushy individual) argmap)
-         data (get (get argmap :train-and-test-data) subset)
         inputs (map (fn [i] (map-vals-input i)) data)
         correct-outputs (map (fn [i] (map-vals-output i)) data)
         outputs (map (fn [input]
@@ -74,4 +73,10 @@
       :behaviors parsed-outputs
       :errors errors
       :total-error #?(:clj  (apply +' errors)
-                       :cljs (apply + errors))))))
+                      :cljs (apply + errors)))))
+
+(def arglist
+  {:instructions   instructions
+   :error-function error-function
+   :training-data  (:train train-and-test-data)
+   :testing-data   (:test train-and-test-data)})