From 21770e2f44ec3cd6f654d28eedb581c915d558fa Mon Sep 17 00:00:00 2001 From: Marshall Lochbaum Date: Sun, 12 Jul 2020 17:32:31 -0400 Subject: Fix _bins reference implementation --- dc.bqn | 2 +- spec/dzref | 10 +++++----- spec/reference.bqn | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/dc.bqn b/dc.bqn index 53808991..020ef566 100755 --- a/dc.bqn +++ b/dc.bqn @@ -26,7 +26,7 @@ Tokenize←{ g←⍋q←∾⟨ s⋄¯1↓d⋄/r⟩ ⋄q↩g⊏q e← g⊏∾⟨2+s⋄ 1↓d⋄(⊢-¯1↓0∾⊢)∘⊏⟜(0∾+`r)⊸//(𝕩=nl)∾1⟩ Se←{(⊏˜𝕨)Se 1¨⌾((𝕩/𝕨)⊸⊏)𝕩}⍟{0=⊑⌽𝕩} - st←¯1↓Se⟜(1↑˜≠)∾⟜≠q⊸⍋¨e⋄b←st/q∾˘e + st←¯1↓Se⟜(1↑˜≠)∾⟜≠q⍋e⋄b←st/q∾˘e ToI←¯1↓·/⁼(≠𝕩)∾˜⥊⋄f←¬≠`ToI b cb←(¬(st/q)⊏r)/b nl←≠lu←⍷lit←𝕩⊔˜1-˜(+`ToI⊑˘cb)×≠`ToI cb diff --git a/spec/dzref b/spec/dzref index f0354d9f..23ea3390 100755 --- a/spec/dzref +++ b/spec/dzref @@ -160,11 +160,11 @@ _grade←{ i⊐˜+´˘((2⥊≠𝕩)⥊𝔽⎉∞‿¯1⎉¯1‿∞˜𝕩)(⌈⟜0+=⟜0⊸×)>⌜˜i←↕≠𝕩 } _bins←{ - r←1-˜≠≢𝕨 - ! 0≤r - LE←0≤𝔽⎉r - ! (0<≠)◶⟨1,∧´·LE´˘2↕<˘⟩𝕩 - +´𝕨LE⎉¯1‿∞𝕩 + c←1-˜≠≢𝕨 + ! 0≤c + LE←𝔽⎉c≤0˜ + ! (0<≠)◶⟨1,∧´·LE´˘2↕<˘⟩𝕨 + 𝕨 (0<≠𝕨)◶⟨0⎉c∘⊢,(+´<˘)LE⎉¯1‿∞⟩ 𝕩 } OccurrenceCount ← ⊐˜(⊢-⊏)⍋∘⍋ diff --git a/spec/reference.bqn b/spec/reference.bqn index 84f403bf..2072f96a 100644 --- a/spec/reference.bqn +++ b/spec/reference.bqn @@ -400,11 +400,11 @@ _grade←{ i⊐˜+´˘(𝔽⎉∞‿¯1⎉¯1‿∞˜𝕩)(⌈⟜0+=⟜0⊸×)>⌜˜i←↕≠𝕩 } _bins←{ - r←1-˜≠≢𝕨 - ! 0≤r - LE←0≤𝔽⎉r - ! ∧´LE´˘2↕<˘𝕩 - +´𝕨LE⎉¯1‿∞𝕩 + c←1-˜≠≢𝕨 + ! 0≤c + LE←𝔽⎉c≤0˜ + ! (0<≠)◶⟨1,∧´·LE´˘2↕<˘⟩𝕨 + 𝕨 (0<≠𝕨)◶⟨0⎉c∘⊢,(+´<˘)LE⎉¯1‿∞⟩ 𝕩 } OccurrenceCount ← ⊐˜(⊢-⊏)⍋∘⍋ -- cgit v1.2.3