From 9b1d8bfc16fa0f89544ae10493bbaf5f15c9a144 Mon Sep 17 00:00:00 2001
From: Marshall Lochbaum <mwlochbaum@gmail.com>
Date: Tue, 4 Aug 2020 19:58:52 -0400
Subject: =?UTF-8?q?Move=20=E2=8A=91=20redefinition=20still=20further=20dow?=
 =?UTF-8?q?n=20in=20impl.bqn?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 impl.bqn | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/impl.bqn b/impl.bqn
index 8fdb7570..df067c0f 100644
--- a/impl.bqn
+++ b/impl.bqn
@@ -296,8 +296,6 @@ Pick1←{
 }
 Pickd←(∨´∘⥊IsArray¨∘⊣)◶Pick1‿{Pickd⟜𝕩¨𝕨}
 Pick←IsArray◶⥊‿⊢⊸Pickd
-⊑ ↩ (0¨∘≢)⊸Pick    ⊘ Pick
-◶ ↩ {𝕨((𝕨𝔽𝕩)⊑𝕘){𝔽}𝕩}  # Same definition, new Pick
 
 # Searching
 IndexOf←{
@@ -308,7 +306,7 @@ IndexOf←{
 UniqueMask←{
   ! 1≤=𝕩
   u←0↑𝕩
-  {(≠u)>⊑u IndexOf 𝕩}◶{u↩u∾𝕩⋄1}‿0˘𝕩
+  {(≠u)>0⊑⥊u IndexOf 𝕩}◶{u↩u∾𝕩⋄1}‿0˘𝕩
 }
 Find←{
   r←=𝕨
@@ -329,7 +327,7 @@ ReorderAxes←{
   r←(=𝕩)-+´¬∊𝕨
   ! ∧´𝕨<r
   𝕨↩𝕨∾𝕨(¬∘∊˜/⊢)↕r
-  (𝕨⊸⊏⊑𝕩˜)¨↕⌊´¨𝕨⊔≢𝕩
+  (𝕨⊸⊏Pick𝕩˜)¨↕⌊´¨𝕨⊔≢𝕩
 }
 Transpose←(=-1˜)⊸ReorderAxes⍟(0<=)
 ⍉ ← Transpose      ⊘ ReorderAxes
@@ -409,6 +407,9 @@ OccurrenceCount ← ⊐˜(⊢-⊏)⍋∘⍋
 ProgressiveIndexOf ← {𝕨⊐○(≍˘⟜OccurrenceCount𝕨⊸⊐)𝕩}
 ⊒ ← OccurrenceCount⊘ ProgressiveIndexOf
 
+⊑ ↩ (0¨∘≢)⊸Pick    ⊘ Pick
+◶ ↩ {𝕨((𝕨𝔽𝕩)⊑𝕘){𝔽}𝕩}  # Same definition, new Pick
+
 inverse ← {(⊑(0⊏𝕩)⊐<) ⊑ ((1⊏𝕩)∾⟨!∘0⟩)˜} ⍉ (2∾˜2÷˜≠)⊸⥊ ⟨
   +, +⊘(-˜)
   -, -
-- 
cgit v1.2.3