diff --git a/.gitignore b/.gitignore index b70ae2e..20157f7 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ notes /temp *~ q +scratch.clj # Clojure Script .shadow-cljs/ diff --git a/src/propeller/gp.cljc b/src/propeller/gp.cljc index 2f63c9d..98e6ca7 100644 --- a/src/propeller/gp.cljc +++ b/src/propeller/gp.cljc @@ -61,6 +61,7 @@ :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-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 :dont-end false ; if true, keep running until limit regardless of success :downsample? true ; wether to use downsampling diff --git a/src/propeller/push/instructions.cljc b/src/propeller/push/instructions.cljc index 4f65c3c..9e7094d 100644 --- a/src/propeller/push/instructions.cljc +++ b/src/propeller/push/instructions.cljc @@ -12,39 +12,6 @@ can be either constant literals or functions that take and return a Push state" (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 (def ^{:no-doc true} cls->type {Boolean :boolean diff --git a/src/propeller/push/instructions/parentheses.cljc b/src/propeller/push/instructions/parentheses.cljc index 8f40fd3..fb77cce 100644 --- a/src/propeller/push/instructions/parentheses.cljc +++ b/src/propeller/push/instructions/parentheses.cljc @@ -4,30 +4,29 @@ (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 - }) \ No newline at end of file + :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})