rowan.a.tl/propeller
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rely on :bmx? in argmap to know when using bmx

Browse Source
This commit is contained in:
Lee Spector 2023-12-06 15:01:59 -05:00
parent 85a59cdbe5
commit 27857faf85
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/propeller/genome.cljc
View File

@ -48,8 +48,7 @@ They hold the genetic material for an `individual`. In the initial population, w
(plushy->push plushy {})) (plushy->push plushy {}))
;; call plushy->push-internal with possibly-preprocessed plushy ;; call plushy->push-internal with possibly-preprocessed plushy
([plushy argmap] ([plushy argmap]
(plushy->push-internal (if (or (> (or (:bmx (:variation argmap)) 0) 0) ;; must strip :gap (plushy->push-internal (if (:bmx? argmap)
(> (or (:bmx-umad (:variation argmap)) 0) 0)) ;; must strip :gap
(filter (complement #{:gap}) plushy) (filter (complement #{:gap}) plushy)
plushy) plushy)
argmap))) argmap)))

4
src/propeller/gp.cljc
View File

@ -36,8 +36,7 @@
:behavioral-diversity (float (/ (count (distinct (map :behaviors pop))) (count pop))) :behavioral-diversity (float (/ (count (distinct (map :behaviors pop))) (count pop)))
:average-genome-length (float (/ (reduce + (map count (map :plushy pop))) (count pop))) :average-genome-length (float (/ (reduce + (map count (map :plushy pop))) (count pop)))
:average-total-error (float (/ (reduce + (map :total-error pop)) (count pop)))} :average-total-error (float (/ (reduce + (map :total-error pop)) (count pop)))}
(if (or (> (or (:bmx (:variation argmap)) 0) 0) ; using bmx (if (:bmx? argmap)
(> (or (:bmx-umad (:variation argmap)) 0) 0)) ; using bmx-umad
{:best-gene-count (utils/count-genes (:plushy best)) {:best-gene-count (utils/count-genes (:plushy best))
:average-gene-count (float (/ (reduce + (map utils/count-genes (map :plushy pop))) :average-gene-count (float (/ (reduce + (map utils/count-genes (map :plushy pop)))
(count pop)))} (count pop)))}
@ -173,4 +172,3 @@
(count indexed-training-data))) (count indexed-training-data)))
indexed-training-data) indexed-training-data)
indexed-training-data)))))) indexed-training-data))))))