diff --git a/src/propeller/session.cljc b/src/propeller/session.cljc index 732a838..541728a 100755 --- a/src/propeller/session.cljc +++ b/src/propeller/session.cljc @@ -16,7 +16,10 @@ [propeller.variation :as variation] [propeller.push.instructions :as instructions] [propeller.push.interpreter :as interpreter] - [propeller.push.state :as state])) + [propeller.push.state :as state] + [propeller.problems.regression.integer-regression :as regression] + [propeller.downsample :as downsample] + )) ;; Interpreting a simple Push program: @@ -31,9 +34,10 @@ ;; A program with a conditional: #_(interpreter/interpret-program - '(3 3 :integer_eq :exec_if (1 "yes") (2 "no")) - state/empty-state - 1000) + '(3 3 :integer_eq :exec_if (1 "yes") (2 "no")) + ;;(assoc state/empty-state :keep-history true) + state/empty-state + 1000) ;; A program using an input instruction: @@ -66,14 +70,14 @@ ;; items defined for the problem. Depending on your IDE and setup, you may ;; also have to open the problem's file and evaluate its contents. -#_(require '[propeller.problems.simple-regression :as regression]) +;;#_(require '[propeller.problems.simple-regression :as regression]) #_(gp/gp {:instructions regression/instructions :error-function regression/error-function :training-data (:train regression/train-and-test-data) :testing-data (:test regression/train-and-test-data) - :max-generations 500 - :population-size 500 + :max-generations 5 + :population-size 50 :max-initial-plushy-size 100 :step-limit 200 :parent-selection :tournament @@ -111,3 +115,5 @@ #_(require '[propeller.problems.simple-regression :as regression]) #_(regression/-main :population-size 100 :variation {:umad 1.0}) +;; Analyze how downsample indicies are assigned +#_(downsample/assign-indices-to-data (:train regression/train-and-test-data) regression/integer-argmap) \ No newline at end of file