From d49f9e4bf081a3db3c0c073a09017694633a57ed Mon Sep 17 00:00:00 2001
From: Lee Spector <lspector@hampshire.edu>
Date: Tue, 8 Dec 2020 12:12:23 -0500
Subject: [PATCH] Remove extraneous argmap argument; experiment with valiant

---
 .DS_Store                           | Bin 6148 -> 8196 bytes
 src/.DS_Store                       | Bin 6148 -> 6148 bytes
 src/propeller/.DS_Store             | Bin 6148 -> 6148 bytes
 src/propeller/problems/valiant.cljc |  11 ++++---
 src/propeller/session.cljc          |  46 +++++++++++++++++++++++++---
 src/propeller/variation.cljc        |   2 +-
 6 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index feca8613504bcd7430524202412f605a970dd548..4c8696c854640d8b1087a87465a54826e6211a0c 100644
GIT binary patch
literal 8196
zcmeHMJ%|%Q6n>LGcTq8gaB0Lvusby=jCX|+V-zfegNPRAakra<WVs|8vKxaJBPrx6
zJ3&wcTeTI%POwu!xaz<{YYRIIOW*utGm~ttRme=3d6W6x+wZ-PVK=h@08;E#a{w6t
zFtAgbK8!;|qd4s|Ehbh@p(Pj(&3dj}@mif3PraZO&<bb;v;tZIt-$}H06w#6Gv++^
zIjTpkfL3536`=PA3p=$1VMpAuTL%v82!J+$%dFu%O($qAVGF{JxJ3jT;h|`GC=o{t
z!ozXh5`G0?N8IvoAmZ>r1TzsQ6vEi?`WABsQs7pPS^=%VtOE4xo`ADZ2Nwe6{GK!)
z$ym!Pm7J#M;F_`Y`|HWw4<9e9c=bTM(~#Z`oUkwylE~{q6>4BB%<%cUipt#Qo_x9V
zi*rlyEpNge?V<3;)+m1pZ1C|@g8+Or19(4;%Q>9+vAw_ZmesFZL(XEJkCF$!*~L)<
z4=Pg`Y-0ujk-5L^y?pol8siSpN$s;}1fL0Atl3A-9?mLsKE+MdiSUy1czpiVIFCrr
zNlpiQs`*i3tlFn}Ieot)cHAeY({%kHo82d|cp{lPWSE9w95pt|4X<Ag?4ait?e04L
zwq^$nN6c?}UNfBA&Mmjr-%KCB;<W?YZP&Ui*sa#k<<4!lUG@4!uh*{n>^fx*n1*SZ
zo9WD8kjv&TEL-`N;j%SY$>MZ1zd9V6#?tBB#p_$Gdpm>s!v{}U0YJo43Xbvb;rMJ)
zo+3H<`C@{|GVlEfx0;Ye-ej|=B4^y9#3Jr)x!Z1f?K-Z|>{7VtZIroAx4)7L9NC@5
z<%}NQSl@Uv-u%)v<h<tjDA_?4Y4GL~u+2D?1H6_onSYQDH(nSkb4TGSulR{T*>%$j
zEUW@?UU`O||F6z}|G%*M=)$!Ei=Y5Wl**+dRyzLGGF@~G7cA^s*lDAFBW_s;4%CIN
iv*S40@DD?rTLLQxJK`1*Z2#azfPVfn<@K=03j77KVL@*I

delta 143
zcmZp1XfcprU|?W$DortDU=RQ@Ie-{MGpJ5X6gFlAGME{P8HyN^Q;L&wlJfI&KyqNf
z1f@Z0fLMS5BEK<l8T)1y4rUHPW{3g-ZXoRn#Ht$;zcWwfmr-P7oNOwi%>y(5WE;o<
L44dP5<}d>Qx3LtN

diff --git a/src/.DS_Store b/src/.DS_Store
index bf7db11ae7cdca67181c347f9cc33b772a663d38..059041468db135bd0d2cc7fe59bb35aa6d395f07 100644
GIT binary patch
delta 268
zcmZoMXfc@J&&akhU^gQp+hiUlMbVQ<1v#0;B?bo98JU<_SlQS)I5{{bJ29o{b8vEU
z#tTSPR~s6bnd>N+S=8z%R9hGTnU-djwY8ia;;M$Wo(Z{?Rn;}Mbu%YlWs<L-#lXP8
z$xy&h#E=gpQyFrAFqNSwC*3eOIX|}mD9gaWcyTs%Rk`^tE=f80NkCbSlL6AUZ}%T^
e#HBI?t4c*os|zxatY&7|EX-WUvYDOZFFyblSVE@&

delta 138
zcmZoMXfc@J&&a$nU^gQp^W;KiF@>b^;)0}{{3HejhT};EIhn;J1_sv|nV4Bv+1NQa
zIJhS}F{SBpa&mCS3y4)$8=L7Um|529C{&x98|WyQ7@O7Ba&m~P8rpg$<W^Qy*VNWc
npM0H3o^b}qaL$zC<ea4Z{2T@lZ}VE_D3*y0&70Xd{_+C=AP*;s

diff --git a/src/propeller/.DS_Store b/src/propeller/.DS_Store
index ed2fbb1e0c5d3c89c3b893c5b3ec6d5dc5199ec4..a19382269acf6b4531519f866c878f6dca85fd8f 100644
GIT binary patch
delta 379
zcmZoMXfc=|#>B)qu~2NHo}wrV0|Nsi1A_nqLk>eKLoP#cQh9N~#)Hcl>p?Oc3<V5D
z4EYR6$g)W}`AI;zlSu_RnZ+dr2G<#xm|0la*f}^kI5>DYVuLgC%Y#c2OG=BK5{sfi
zynw`#j3g*KBtJg~&Q44U%S<hg7Z7pI&nrpH%u6i-YtBqbO{z~UiV4rmOUW;H$}i1J
zDFz!943bGK;^g4u<ct@PsIE3NFf-RtFte!DQK+^s05UDjENg2yImA^BZ9NlmE32w&
zYU^eKT?+(^K!1V(Ka_@1vw#c?pH5uBBa0ze7F?8<lb@Fk)WEoL<yDr=>>T_Yz`)#i
e@H_Klei2;}kdYv38Xz>-#?2uj8<;0HumAwE{$D5n

delta 94
zcmZoMXfc=|#>CJzu~2NHo}wrd0|Nsi1A_nqLk>eKLoP#cN^x?|#6tDS1|lqze=x~z
vHf6rVvN?gdlW8+M2R{c;<K{r-@640=MRYlV`WOxXF~ejV9_h_7B1@P7N!Awa

diff --git a/src/propeller/problems/valiant.cljc b/src/propeller/problems/valiant.cljc
index d47fd86..e43d899 100644
--- a/src/propeller/problems/valiant.cljc
+++ b/src/propeller/problems/valiant.cljc
@@ -25,11 +25,12 @@
 (def instructions
   (vec (concat (for [i (range num-inputs)] (keyword (str "in" i)))
                (take num-inputs
-                     (cycle [:boolean_and
-                             :boolean_or
-                             :boolean_not
-                             :exec_if
-                             'close])))))
+                     (cycle [:boolean_xor
+                             ;:boolean_or
+                             ;:boolean_not
+                             ;:exec_if
+                             ;'close
+                             ])))))
 
 (defn error-function
   ([argmap individual]
diff --git a/src/propeller/session.cljc b/src/propeller/session.cljc
index 73bdf24..9f83bd4 100755
--- a/src/propeller/session.cljc
+++ b/src/propeller/session.cljc
@@ -156,19 +156,55 @@
 ;          :diploid                 true})
 
 
+;(gp/gp {:instructions            propeller.problems.valiant/instructions
+;        :error-function          propeller.problems.valiant/error-function
+;        :max-generations         500
+;        :population-size         50
+;        :max-initial-plushy-size 1000
+;        :step-limit              2000
+;        :parent-selection        :tournament
+;        :tournament-size         10
+;        :umad-rate               0.01
+;        :diploid-flip-rate       0.01
+;        :variation               {:umad         0.9
+;                                  :diploid-flip 0.1
+;                                  }
+;        :elitism                 false
+;        :diploid                 true})
+
+;(gp/gp {:instructions            propeller.problems.valiant/instructions
+;        :error-function          propeller.problems.valiant/error-function
+;        :max-generations         500
+;        :population-size         100
+;        :max-initial-plushy-size 1000
+;        :step-limit              2000
+;        :parent-selection        :tournament
+;        :tournament-size         10
+;        :umad-rate               0.01
+;        :diploid-flip-rate       0.01
+;        :variation               {:umad         0.9
+;                                  :diploid-flip 0.1
+;                                  }
+;        :elitism                 false
+;        :diploid                 true})
+
+;;; below is when I switched to just xor
+
 (gp/gp {:instructions            propeller.problems.valiant/instructions
         :error-function          propeller.problems.valiant/error-function
         :max-generations         500
         :population-size         500
-        :max-initial-plushy-size 1000
+        :max-initial-plushy-size 50
         :step-limit              2000
         :parent-selection        :lexicase
-        :tournament-size         5
-        :umad-rate               0.001
-        :diploid-flip-rate       0.001
+        :tournament-size         2
+        :umad-rate               0.01
+        :diploid-flip-rate       0.01
         :variation               {:umad         0.5
-                                  :diploid-flip 0.5
+                                  :crossover    0.25
+                                  :diploid-flip 0.25
                                   }
         :elitism                 false
         :diploid                 true})
 
+
diff --git a/src/propeller/variation.cljc b/src/propeller/variation.cljc
index 7c2acd3..1c01464 100755
--- a/src/propeller/variation.cljc
+++ b/src/propeller/variation.cljc
@@ -18,7 +18,7 @@
 
 (defn diploid-crossover
   "Crosses over two individuals using uniform crossover. Pads shorter one."
-  [plushy-a plushy-b argmap]
+  [plushy-a plushy-b]
   (let [plushy-a (partition 2 plushy-a)
         plushy-b (partition 2 plushy-b)
         shorter (min-key count plushy-a plushy-b)