Update session.cljc to specify training/testing data among other things

This commit is contained in:
Lee Spector 2022-03-28 12:29:04 -04:00
parent 0412f4015b
commit a1252c5c0a

View File

@ -3,8 +3,6 @@
[propeller.gp :as gp] [propeller.gp :as gp]
[propeller.selection :as selection] [propeller.selection :as selection]
[propeller.variation :as variation] [propeller.variation :as variation]
[propeller.problems.simple-regression :as regression]
[propeller.problems.string-classification :as string-classif]
[propeller.push.instructions :as instructions] [propeller.push.instructions :as instructions]
[propeller.push.interpreter :as interpreter] [propeller.push.interpreter :as interpreter]
[propeller.push.state :as state])) [propeller.push.state :as state]))
@ -15,143 +13,58 @@
#_(interpreter/interpret-program #_(interpreter/interpret-program
'(1 2 :integer_add) (assoc state/empty-state :keep-history true) 1000) '(1 2 :integer_add) (assoc state/empty-state :keep-history true) 1000)
;#_(interpreter/interpret-program #_(interpreter/interpret-program
; '(3 3 :integer_eq :exec_if (1 "yes") (2 "no")) '(3 3 :integer_eq :exec_if (1 "yes") (2 "no"))
; state/empty-state state/empty-state
; 1000) 1000)
;
;#_(interpreter/interpret-program #_(interpreter/interpret-program
; '(:in1 :string_reverse 1 :string_take "?" :string_eq :exec_if '(:in1 :string_reverse 1 :string_take "?" :string_eq :exec_if
; (:in1 " I am asking." :string_concat) (:in1 " I am asking." :string_concat)
; (:in1 " I am saying." :string_concat)) (:in1 " I am saying." :string_concat))
; (assoc state/empty-state :input {:in1 "Can you hear me?"}) (assoc state/empty-state :input {:in1 "Can you hear me?"})
; 1000) 1000)
;
;#_(interpreter/interpret-program #_(interpreter/interpret-program
; '(:in1 :string_reverse 1 :string_take "?" :string_eq :exec_if '(:in1 :string_reverse 1 :string_take "?" :string_eq :exec_if
; (:in1 " I am asking." :string_concat) (:in1 " I am asking." :string_concat)
; (:in1 " I am saying." :string_concat)) (:in1 " I am saying." :string_concat))
; (assoc state/empty-state :input {:in1 "I can hear you."}) (assoc state/empty-state :input {:in1 "I can hear you."})
; 1000) 1000)
;
;#_(genome/plushy->push #_(genome/plushy->push
; (genome/make-random-plushy (instructions/get-stack-instructions #{:float :integer :exec :boolean}) 20)) (genome/make-random-plushy (instructions/get-stack-instructions #{:float :integer :exec :boolean}) 20))
;
;#_(gp/gp {:instructions propeller.problems.software.number-io/instructions #_(require '[propeller.problems.simple-regression :as regression])
; :error-function propeller.problems.software.number-io/error-function
; :max-generations 500 #_(gp/gp {:instructions regression/instructions
; :population-size 500 :error-function regression/error-function
; :max-initial-plushy-size 100 :training-data (:train regression/train-and-test-data)
; :step-limit 200 :testing-data (:test regression/train-and-test-data)
; :parent-selection :lexicase :max-generations 500
; :tournament-size 5 :population-size 500
; :umad-rate 0.1 :max-initial-plushy-size 100
; :variation {:umad 0.5 :crossover 0.5} :step-limit 200
; :elitism false}) :parent-selection :tournament
; :tournament-size 5
;#_(gp/gp {:instructions propeller.problems.simple-regression/instructions :umad-rate 0.01
; :error-function propeller.problems.simple-regression/error-function :variation {:umad 1.0
; :max-generations 500 :crossover 0.0}
; :population-size 500 :elitism false})
; :max-initial-plushy-size 100
; :step-limit 200 #_(require '[propeller.problems.string-classification :as sc])
; :parent-selection :tournament
; :tournament-size 5 #_(gp/gp {:instructions sc/instructions
; :umad-rate 0.01 :error-function sc/error-function
; :variation {:umad 1.0 :training-data (:train sc/train-and-test-data)
; :crossover 0.0} :testing-data (:test sc/train-and-test-data)
; :elitism false}) :max-generations 500
; :population-size 500
;#_(gp/gp {:instructions propeller.problems.simple-regression/instructions :max-initial-plushy-size 100
; :error-function propeller.problems.simple-regression/error-function :step-limit 200
; :max-generations 500 :parent-selection :lexicase
; :population-size 500 :tournament-size 5
; :max-initial-plushy-size 100 :umad-rate 0.1
; :step-limit 200 :variation {:umad 0.5 :crossover 0.5}
; :parent-selection :tournament :elitism false})
; :tournament-size 5
; :umad-rate 0.1
; :variation {:umad 1.0
; :crossover 0.0}
; :elitism false})
;
;
;#_(gp/gp {:instructions propeller.problems.simple-regression/instructions
; :error-function propeller.problems.simple-regression/error-function
; :max-generations 500
; :population-size 500
; :max-initial-plushy-size 100
; :step-limit 200
; :parent-selection :lexicase
; :tournament-size 5
; :umad-rate 0.1
; :variation {:umad 1.0
; :crossover 0.0}
; :elitism false})
;
;#_(gp/gp {:instructions propeller.problems.simple-regression/instructions
; :error-function propeller.problems.simple-regression/error-function
; :max-generations 500
; :population-size 500
; :max-initial-plushy-size 100
; :step-limit 200
; :parent-selection :lexicase
; :tournament-size 5
; :umad-rate 0.1
; :diploid-flip-rate 0.1
; :variation {:umad 0.8
; :diploid-flip 0.2}
; :elitism false
; :diploid true})
;
;
;#_(gp/gp {:instructions propeller.problems.software.smallest/instructions
; :error-function propeller.problems.software.smallest/error-function
; :max-generations 500
; :population-size 500
; :max-initial-plushy-size 100
; :step-limit 200
; :parent-selection :lexicase
; :tournament-size 5
; :umad-rate 0.1
; :diploid-flip-rate 0.1
; :variation {;:umad 0.8
; ;:diploid-flip 0.2
; :umad 1
; }
; :elitism false
; :diploid false})
;
;#_(gp/gp {:instructions propeller.problems.software.smallest/instructions
; :error-function propeller.problems.software.smallest/error-function
; :max-generations 500
; :population-size 500
; :max-initial-plushy-size 200 ;100
; :step-limit 200
; :parent-selection :lexicase
; :tournament-size 5
; :umad-rate 0.1
; :diploid-flip-rate 0.1
; :variation {:umad 0.8
; :diploid-flip 0.2
; ;:umad 1
; }
; :elitism false
; :diploid true})
;
;
;(gp/gp {:instructions propeller.problems.string-classification/instructions
; :error-function propeller.problems.string-classification/error-function
; :max-generations 500
; :population-size 500
; :max-initial-plushy-size 100
; :step-limit 200
; :parent-selection :lexicase
; :tournament-size 5
; :umad-rate 0.1
; :diploid-flip-rate 0.1
; :variation {:umad 0.8
; :diploid-flip 0.2
; }
; :elitism false
; :diploid true})