Separate plushy pre-processing from plushy to push translation

This commit is contained in:
Lee Spector 2023-11-08 19:09:43 -05:00
parent 25e8efe255
commit 3ccd5542ea

View File

@ -9,45 +9,47 @@ They hold the genetic material for an `individual`. In the initial population, w
"Creates and returns a new plushy made of random instructions and of a maximum size of max-initial-plushy-size." "Creates and returns a new plushy made of random instructions and of a maximum size of max-initial-plushy-size."
[instructions max-initial-plushy-size] [instructions max-initial-plushy-size]
(repeatedly (repeatedly
(rand-int max-initial-plushy-size) (rand-int max-initial-plushy-size)
#(utils/random-instruction instructions))) #(utils/random-instruction instructions)))
(defn plushy->push-internal
[plushy argmap]
(let [opener? #(and (vector? %) (= (first %) 'open))] ;; [open <n>] marks opens
(loop [push () ;; iteratively build the Push program from the plushy
plushy (mapcat #(let [n (get instructions/opens %)]
(if (and n
(> n 0))
[% ['open n]]
[%]))
plushy)]
(if (empty? plushy) ;; maybe we're done?
(if (some opener? push) ;; done with plushy, but unclosed open
(recur push '(close)) ;; recur with one more close
push) ;; otherwise, really done, return push
(let [i (first plushy)]
(if (= i 'close)
(if (some opener? push) ;; process a close when there's an open
(recur (let [post-open (reverse (take-while (comp not opener?)
(reverse push)))
open-index (- (count push) (count post-open) 1)
num-open (second (nth push open-index))
pre-open (take open-index push)]
(if (= 1 num-open)
(concat pre-open [post-open])
(concat pre-open [post-open ['open (dec num-open)]])))
(rest plushy))
(recur push (rest plushy))) ;; unmatched close, ignore
(recur (concat push [i]) (rest plushy)))))))) ;; anything else
(defn plushy->push (defn plushy->push
"Returns the Push program expressed by the given plushy representation. "Returns the Push program expressed by the given plushy representation."
;; use an empty argmap if none provided
The function takes in a plushy representation as input and converts it into a Push program by iteratively processing ([plushy]
the plushy elements and adding instructions to the push program. (plushy->push plushy {}))
It also handles the case where there are open instructions that need to be closed before the end of the program. ;; call plushy->push-internal with possibly-preprocessed plushy
"
([plushy] (plushy->push plushy {}))
([plushy argmap] ([plushy argmap]
(let [plushy (if (or (> (or (:ah-umad (:variation argmap)) 0) 0) ;; must strip :vary and :protect (plushy->push-internal (if (or (> (or (:ah-umad (:variation argmap)) 0) 0) ;; must strip :vary and :protect
(> (or (:autoconstructive-crossover (:variation argmap)) 0) 0)) ;; must strip :gene (> (or (:autoconstructive-crossover (:variation argmap)) 0) 0)) ;; must strip :gene
(filter (complement #{:vary :protect :gene}) plushy) (filter (complement #{:vary :protect :gene}) plushy)
plushy) plushy)
opener? #(and (vector? %) (= (first %) 'open))] ;; [open <n>] marks opens argmap)))
(loop [push () ;; iteratively build the Push program from the plushy
plushy (mapcat #(let [n (get instructions/opens %)]
(if (and n
(> n 0))
[% ['open n]]
[%]))
plushy)]
(if (empty? plushy) ;; maybe we're done?
(if (some opener? push) ;; done with plushy, but unclosed open
(recur push '(close)) ;; recur with one more close
push) ;; otherwise, really done, return push
(let [i (first plushy)]
(if (= i 'close)
(if (some opener? push) ;; process a close when there's an open
(recur (let [post-open (reverse (take-while (comp not opener?)
(reverse push)))
open-index (- (count push) (count post-open) 1)
num-open (second (nth push open-index))
pre-open (take open-index push)]
(if (= 1 num-open)
(concat pre-open [post-open])
(concat pre-open [post-open ['open (dec num-open)]])))
(rest plushy))
(recur push (rest plushy))) ;; unmatched close, ignore
(recur (concat push [i]) (rest plushy))))))))) ;; anything else