From 1032895b8f4818dd2182cd8fcc1c6029e7ee1527 Mon Sep 17 00:00:00 2001
From: Lee Spector <lspector@hampshire.edu>
Date: Tue, 13 Jul 2021 22:51:23 -0400
Subject: [PATCH] Update fuel-cost for new problem specification scheme
---
src/propeller/problems/PSB2/fuel_cost.cljc | 57 ++++++++++++----------
1 file changed, 31 insertions(+), 26 deletions(-)
diff --git a/src/propeller/problems/PSB2/fuel_cost.cljc b/src/propeller/problems/PSB2/fuel_cost.cljc
index 27cd2c7..9769fff 100644
--- a/src/propeller/problems/PSB2/fuel_cost.cljc
+++ b/src/propeller/problems/PSB2/fuel_cost.cljc
@@ -18,6 +18,8 @@
; Source: https://arxiv.org/pdf/2106.06086.pdf
; ============================================================
+(def train-and-test-data (psb2/fetch-examples "data" "fuel-cost" 200 2000))
+
; Random integer between -100 and 100 (from smallest)
(defn random-int [] (- (rand-int 201) 100))
@@ -34,30 +36,33 @@
(list random-int 0 1 2 3))))
(defn error-function
- ([argmap 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] (get i :input1)) data)
- correct-outputs (map (fn [i] (get i :output1)) data)
- outputs (map (fn [input]
- (state/peek-stack
- (interpreter/interpret-program
- program
- (assoc state/empty-state :input {:in1 input})
- (:step-limit argmap))
- :integer))
- inputs)
- errors (map (fn [correct-output output]
- (if (= output :no-stack-item)
- 1000000
- (min 1000.0 (math/abs (- correct-output output)))))
- correct-outputs
- outputs)]
- (assoc individual
- :behaviors outputs
- :errors errors
- :total-error #?(:clj (apply +' errors)
- :cljs (apply + errors))))))
+ [argmap data individual]
+ (let [program (genome/plushy->push (:plushy individual) argmap)
+ inputs (map (fn [i] (get i :input1)) data)
+ correct-outputs (map (fn [i] (get i :output1)) data)
+ outputs (map (fn [input]
+ (state/peek-stack
+ (interpreter/interpret-program
+ program
+ (assoc state/empty-state :input {:in1 input})
+ (:step-limit argmap))
+ :integer))
+ inputs)
+ errors (map (fn [correct-output output]
+ (if (= output :no-stack-item)
+ 1000000
+ (min 1000.0 (math/abs (- correct-output output)))))
+ correct-outputs
+ outputs)]
+ (assoc individual
+ :behaviors outputs
+ :errors errors
+ :total-error #?(:clj (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)})