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

Clean up movement of opens ; add :closes argument

Browse Source
This commit is contained in:
Lee Spector 2024-01-12 15:24:13 -05:00
parent 131be83328
commit ddb788ad84
4 changed files with 28 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -23,6 +23,7 @@ notes
/temp /temp
*~ *~
q q
scratch.clj
# Clojure Script # Clojure Script
.shadow-cljs/ .shadow-cljs/

1
src/propeller/gp.cljc
View File

@ -61,6 +61,7 @@
:bmx-complementary? false ; for bmx, whether mates selected using reverse case sequence of first parent :bmx-complementary? false ; for bmx, whether mates selected using reverse case sequence of first parent
:bmx-maximum-distance 1000000 ; for bmx, don't exchange if distance is greater than this :bmx-maximum-distance 1000000 ; for bmx, don't exchange if distance is greater than this
:bmx-same-gene-count false ; for bmx, only allow exchanges between individuals with same number of genes :bmx-same-gene-count false ; for bmx, only allow exchanges between individuals with same number of genes
:closes :specified ; :pecified, :balanced, :none
:custom-report false ; if provided, should be a function that takes an argmap :custom-report false ; if provided, should be a function that takes an argmap
:dont-end false ; if true, keep running until limit regardless of success :dont-end false ; if true, keep running until limit regardless of success
:downsample? true ; wether to use downsampling :downsample? true ; wether to use downsampling

33
src/propeller/push/instructions.cljc
View File

@ -12,39 +12,6 @@
can be either constant literals or functions that take and return a Push state" can be either constant literals or functions that take and return a Push state"
(atom (hash-map))) (atom (hash-map)))
;; Number of blocks opened by instructions (default = 0)
(def opens
"Number of blocks opened by instructions. The default is 0."
{:exec_dup 1
:exec_dup_times 1
:exec_dup_items 0 ; explicitly set to 0 to make it clear that this is intended
:exec_eq 0 ; explicitly set to 0 to make it clear that this is intended
:exec_pop 1
:exec_rot 3
:exec_shove 1
:exec_swap 2
:exec_yank 0 ; explicitly set to 0 to make it clear that this is intended
:exec_yank_dup 0 ; explicitly set to 0 to make it clear that this is intended
:exec_deep_dup 0 ; explicitly set to 0 to make it clear that this is intended
:exec_print 1
:exec_if 2
:exec_when 1
:exec_while 1
:exec_do_while 1
:exec_do_range 1
:exec_do_count 1
:exec_do_times 1
:exec_k 2
:exec_s 3
:exec_y 1
:string_iterate 1
:vector_boolean_iterate 1
:vector_string_iterate 1
:vector_integer_iterate 1
:vector_float_iterate 1
})
#?(:clj #?(:clj
(def ^{:no-doc true} cls->type (def ^{:no-doc true} cls->type
{Boolean :boolean {Boolean :boolean

53
src/propeller/push/instructions/parentheses.cljc
View File

@ -4,30 +4,29 @@
(def opens (def opens
"Number of blocks opened by instructions. The default is 0." "Number of blocks opened by instructions. The default is 0."
{:exec_dup 1 {:exec_dup 1
:exec_dup_times 1 :exec_dup_times 1
:exec_dup_items 0 ; explicitly set to 0 to make it clear that this is intended :exec_dup_items 0 ; explicitly set to 0 to make it clear that this is intended
:exec_eq 0 ; explicitly set to 0 to make it clear that this is intended :exec_eq 0 ; explicitly set to 0 to make it clear that this is intended
:exec_pop 1 :exec_pop 1
:exec_rot 3 :exec_rot 3
:exec_shove 1 :exec_shove 1
:exec_swap 2 :exec_swap 2
:exec_yank 0 ; explicitly set to 0 to make it clear that this is intended :exec_yank 0 ; explicitly set to 0 to make it clear that this is intended
:exec_yank_dup 0 ; explicitly set to 0 to make it clear that this is intended :exec_yank_dup 0 ; explicitly set to 0 to make it clear that this is intended
:exec_deep_dup 0 ; explicitly set to 0 to make it clear that this is intended :exec_deep_dup 0 ; explicitly set to 0 to make it clear that this is intended
:exec_print 1 :exec_print 1
:exec_if 2 :exec_if 2
:exec_when 1 :exec_when 1
:exec_while 1 :exec_while 1
:exec_do_while 1 :exec_do_while 1
:exec_do_range 1 :exec_do_range 1
:exec_do_count 1 :exec_do_count 1
:exec_do_times 1 :exec_do_times 1
:exec_k 2 :exec_k 2
:exec_s 3 :exec_s 3
:exec_y 1 :exec_y 1
:string_iterate 1 :string_iterate 1
:vector_boolean_iterate 1 :vector_boolean_iterate 1
:vector_string_iterate 1 :vector_string_iterate 1
:vector_integer_iterate 1 :vector_integer_iterate 1
:vector_float_iterate 1 :vector_float_iterate 1})
})