23a: prettier proposal generators

diff --git a/23/23a.bqn b/23/23a.bqn
index 93eb07ceceb99b2bdbd44296fc210324f48f1520..b26080e669f0db32dcb0bf3c1fb5828586f79434 100644 (file)
--- a/23/23a.bqn
+++ b/23/23a.bqn
@@ -8,11 +8,11 @@ e   ←[0‿0‿1,0‿0‿1,0‿0‿1]
 w   ←[1‿0‿0,1‿0‿0,1‿0‿0]
 Any←{∨´⥊𝕨∧𝕩}
 
-ProposeN←(Any⟜self)∧(Any⟜near)∧(¬Any⟜n)
-ProposeS←(Any⟜self)∧(Any⟜near)∧(Any⟜n)∧(¬Any⟜s)
-ProposeE←(Any⟜self)∧(Any⟜near)∧(Any⟜n)∧(Any⟜s)∧(¬Any⟜e)
-ProposeW←(Any⟜self)∧(Any⟜near)∧(Any⟜n)∧(Any⟜s)∧(Any⟜e)∧(¬Any⟜w)
-Propose0←(Any⟜self)∧(¬Any⟜near)∨(Any⟜n)∧(Any⟜s)∧(Any⟜e)∧(Any⟜w)
+ProposeN←{∧´(𝕩⊸Any)¨⟨self,near⟩∧(¬𝕩 Any n)}
+ProposeS←{∧´(𝕩⊸Any)¨⟨self,near,n⟩∧(¬𝕩 Any s)}
+ProposeE←{∧´(𝕩⊸Any)¨⟨self,near,n,s⟩∧(¬𝕩 Any e)}
+ProposeW←{∧´(𝕩⊸Any)¨⟨self,near,n,s,e⟩∧(¬𝕩 Any w)}
+Propose0←{∧´(𝕩⊸Any)¨⟨self,near,n,s,e,w⟩}
 
 Pad←{ »˘»(2+≢𝕩)↑𝕩 }
 
@@ -23,7 +23,7 @@ Round←{𝕊map:
   proposals←{ Pad 𝕏⎉2⟨3,3⟩↕map }¨proposers
   collisions← 1<+´⥊ shifts { 𝕎 𝕩 }¨ proposals
   stay← unshifts { 𝕩∧ 𝕎 collisions }¨ proposals
-  (∨´stay)∨(∨´ shifts { 𝕎 𝕩 }¨ proposals∧¬stay)
+  map↩(∨´stay)∨(∨´ shifts { 𝕎 𝕩 }¨ proposals∧¬stay)
 }
 
 Main←Round⍟1