From be3402dae2e9ecf0f86aa1cea6da8ad99f758619 Mon Sep 17 00:00:00 2001 From: Ryan Boldi Date: Sat, 26 Feb 2022 21:14:16 -0500 Subject: [PATCH] Revert "autosimplification implementation complete" This reverts commit af22f9793b70339b9c90cfa2b99c327426840471. --- .gitignore | 1 - src/propeller/problems/PSB2/fuel_cost.cljc | 14 -------------- src/propeller/problems/simple_regression.cljc | 0 3 files changed, 15 deletions(-) mode change 100644 => 100755 src/propeller/problems/simple_regression.cljc diff --git a/.gitignore b/.gitignore index 0fc1327..df3fb06 100644 --- a/.gitignore +++ b/.gitignore @@ -33,4 +33,3 @@ node_modules/ # https://github.com/thelmuth/program-synthesis-benchmark-datasets /data **/.DS_Store -.shadow-cljs/classpath.edn diff --git a/src/propeller/problems/PSB2/fuel_cost.cljc b/src/propeller/problems/PSB2/fuel_cost.cljc index 9462ebe..9d45455 100644 --- a/src/propeller/problems/PSB2/fuel_cost.cljc +++ b/src/propeller/problems/PSB2/fuel_cost.cljc @@ -1,7 +1,6 @@ (ns propeller.problems.PSB2.fuel-cost (:require [psb2.core :as psb2] [propeller.genome :as genome] - [propeller.simplification :as simplification] [propeller.push.interpreter :as interpreter] [propeller.utils :as utils] [propeller.push.instructions :refer [get-stack-instructions]] @@ -82,16 +81,3 @@ :elitism false} (apply hash-map (map #(if (string? %) (read-string %) %) args)))) (#?(:clj shutdown-agents))) - - -(defn fuel-cost-autosimplify - [plushy] - (simplification/auto-simplify-plushy {:instructions instructions - :error-function error-function - :training-data (:train train-and-test-data) - :testing-data (:test train-and-test-data) - :max-generations 300 - :population-size 1000 - :max-initial-plushy-size 250 - :step-limit 2000} plushy 5000 error-function (:train train-and-test-data) 5 true)) - diff --git a/src/propeller/problems/simple_regression.cljc b/src/propeller/problems/simple_regression.cljc old mode 100644 new mode 100755