basedpl 0.1.34__tar.gz → 0.1.35__tar.gz

{basedpl-0.1.34 → basedpl-0.1.35}/Cargo.lock

@@ -90,7 +90,7 @@ checksum = "ac07cdecf99051d9a5238b80f35af32cdeba5b336e55d957b318b50137e18da5"
 
 [[package]]
 name = "basedpl"
-version = "0.1.34"
+version = "0.1.35"
 dependencies = [
  "base64 0.23.1",
  "bytemuck",
@@ -136,7 +136,7 @@ dependencies = [
 
 [[package]]
 name = "basedpl-cli"
-version = "0.1.34"
+version = "0.1.35"
 dependencies = [
  "async-trait",
  "basedpl",
@@ -149,7 +149,7 @@ dependencies = [
 
 [[package]]
 name = "basedpl-py"
-version = "0.1.34"
+version = "0.1.35"
 dependencies = [
  "basedpl",
  "bytemuck",
@@ -163,7 +163,7 @@ dependencies = [
 
 [[package]]
 name = "basedpl-wasm"
-version = "0.1.34"
+version = "0.1.35"
 dependencies = [
  "basedpl",
  "js-sys",
@@ -2574,7 +2574,7 @@ checksum = "3ad82d2a33cdc9674dc7465672f271e096168fcdbe0f799d9e6db8c5892679dc"
 
 [[package]]
 name = "xtask"
-version = "0.1.34"
+version = "0.1.35"
 dependencies = [
  "anyhow",
  "serde_json",

{basedpl-0.1.34 → basedpl-0.1.35}/Cargo.toml

@@ -2,7 +2,7 @@
 members = ["py"]
 
 [workspace.package]
-version = "0.1.34"
+version = "0.1.35"
 edition = "2021"
 rust-version = "1.98"
 license = "Apache-2.0"

{basedpl-0.1.34 → basedpl-0.1.35}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: basedpl
-Version: 0.1.34
+Version: 0.1.35
 Classifier: Programming Language :: Rust
 Classifier: Programming Language :: Python :: Implementation :: CPython
 Requires-Dist: fastcore
@@ -96,13 +96,13 @@ avg 1 2 3 4
 
     2.5
 
-To see how these ideas express an algorithm, start from “a prime has exactly two positive divisors”. Form all remainders of 1 to 50 (`|⊗⍨⍈50`), count the zeros down each column (`+⌿0=`), and find the positions (`⍸`) whose count is two. Positions count from 0. `1+` turns each position back into its number:
+To see how these ideas express an algorithm, start from “a prime has exactly two positive divisors”. Form all remainders of 1 to 50 (`|⊗⍨↦50`), count the zeros down each column (`+⌿0=`), and find the positions (`⍸`) whose count is two. Positions count from 0. `≥` increments each position to recover its number:
 
 ``` bpl
-1+⍸2=+⌿0=|⊗⍨⍈50
+≥⍸2=+⌿0=|⊗⍨↦50
 ```
 
-    2 3 5 7 11 13 17 19 23 29 31 37 41 43 47
+    [2 3 5 7 11 13 17 19 23 29 31 37 41 43 47]ₓ
 
 [Getting started](https://answerdotai.github.io/basedpl/getting-started.html#example-algorithms) builds a primes function from the same divisor count, step by step, and displays the divisibility matrix along the way.
 

{basedpl-0.1.34 → basedpl-0.1.35}/README.md

@@ -68,13 +68,13 @@ avg 1 2 3 4
 
     2.5
 
-To see how these ideas express an algorithm, start from “a prime has exactly two positive divisors”. Form all remainders of 1 to 50 (`|⊗⍨⍈50`), count the zeros down each column (`+⌿0=`), and find the positions (`⍸`) whose count is two. Positions count from 0. `1+` turns each position back into its number:
+To see how these ideas express an algorithm, start from “a prime has exactly two positive divisors”. Form all remainders of 1 to 50 (`|⊗⍨↦50`), count the zeros down each column (`+⌿0=`), and find the positions (`⍸`) whose count is two. Positions count from 0. `≥` increments each position to recover its number:
 
 ``` bpl
-1+⍸2=+⌿0=|⊗⍨⍈50
+≥⍸2=+⌿0=|⊗⍨↦50
 ```
 
-    2 3 5 7 11 13 17 19 23 29 31 37 41 43 47
+    [2 3 5 7 11 13 17 19 23 29 31 37 41 43 47]ₓ
 
 [Getting started](https://answerdotai.github.io/basedpl/getting-started.html#example-algorithms) builds a primes function from the same divisor count, step by step, and displays the divisibility matrix along the way.
 

{basedpl-0.1.34 → basedpl-0.1.35}/editors/macos/BasedPL-de.bundle/Contents/Resources/BasedPL-de.keylayout

@@ -708,7 +708,7 @@
    <key code="34" output="Û"/>
    <key code="35" output="∏"/>
    <key code="36" output="&#x000D;"/>
-   <key code="37" output="⍈"/>
+   <key code="37" output="↦"/>
    <key code="38" output="ı"/>
    <key code="39" output="Æ"/>
    <key code="40" output="ˆ"/>

{basedpl-0.1.34 → basedpl-0.1.35}/editors/macos/BasedPL-de.txt

@@ -41,7 +41,7 @@ Option-Shift-u	÷
 Option-i	⍳
 Option-p	π
 Control-Option-p	stile prefix
-Option-Shift-l	⍈
+Option-Shift-l	↦
 Option-j	↓
 Option-k	take prefix
 Option-Shift-#	⊢

{basedpl-0.1.34 → basedpl-0.1.35}/editors/macos/BasedPL-es.bundle/Contents/Resources/BasedPL-es.keylayout

@@ -578,7 +578,7 @@
    <key code="34" output="⍳"/>
    <key code="35" output="π"/>
    <key code="36" output="&#x000D;"/>
-   <key code="37" output="⍈"/>
+   <key code="37" output="↦"/>
    <key code="38" output="↓"/>
    <key code="39" output="{"/>
    <key code="40" action="k40-m4"/>

{basedpl-0.1.34 → basedpl-0.1.35}/editors/macos/BasedPL-es.txt

@@ -42,7 +42,7 @@ Option-u	÷
 Option-Shift-`	⋄
 Option-i	⍳
 Option-p	π
-Option-l	⍈
+Option-l	↦
 Option-j	↓
 Option-k	take prefix
 Option-,	↢

{basedpl-0.1.34 → basedpl-0.1.35}/editors/macos/BasedPL-fr.bundle/Contents/Resources/BasedPL-fr.keylayout

@@ -578,7 +578,7 @@
    <key code="34" output="⍳"/>
    <key code="35" output="π"/>
    <key code="36" output="&#x000D;"/>
-   <key code="37" output="⍈"/>
+   <key code="37" output="↦"/>
    <key code="38" output="↓"/>
    <key code="39" output="Ù"/>
    <key code="40" action="k40-m4"/>

{basedpl-0.1.34 → basedpl-0.1.35}/editors/macos/BasedPL-fr.txt

@@ -38,7 +38,7 @@ Option-u	÷
 Option-i	⍳
 Option-p	π
 Control-Option-p	stile prefix
-Option-l	⍈
+Option-l	↦
 Control-Option-Shift-l	⌽
 Option-j	↓
 Option-k	take prefix

{basedpl-0.1.34 → basedpl-0.1.35}/editors/macos/BasedPL-uk.bundle/Contents/Resources/BasedPL-uk.keylayout

@@ -578,7 +578,7 @@
    <key code="34" action="k34-m4"/>
    <key code="35" output="π"/>
    <key code="36" output="&#x000D;"/>
-   <key code="37" output="⍈"/>
+   <key code="37" output="↦"/>
    <key code="38" output="↓"/>
    <key code="39" output="⊢"/>
    <key code="40" action="k40-m4"/>

{basedpl-0.1.34 → basedpl-0.1.35}/editors/macos/BasedPL-uk.txt

@@ -38,7 +38,7 @@ Option-o	circle prefix
 Option-Shift-u	÷
 Option-Shift-i	⍳
 Option-p	π
-Option-l	⍈
+Option-l	↦
 Option-j	↓
 Option-'	⊢
 Option-k	take prefix

{basedpl-0.1.34 → basedpl-0.1.35}/editors/macos/BasedPL-us.bundle/Contents/Resources/BasedPL-us.keylayout

@@ -578,7 +578,7 @@
    <key code="34" output="⍳"/>
    <key code="35" output="π"/>
    <key code="36" output="&#x000D;"/>
-   <key code="37" output="⍈"/>
+   <key code="37" output="↦"/>
    <key code="38" output="↓"/>
    <key code="39" output="⊢"/>
    <key code="40" action="k40-m4"/>

{basedpl-0.1.34 → basedpl-0.1.35}/editors/macos/BasedPL-us.txt

@@ -38,7 +38,7 @@ Option-o	circle prefix
 Option-u	÷
 Option-i	⍳
 Option-p	π
-Option-l	⍈
+Option-l	↦
 Option-j	↓
 Option-'	⊢
 Option-k	take prefix

{basedpl-0.1.34 → basedpl-0.1.35}/editors/vim/syntax/bpl.vim

@@ -8,7 +8,7 @@ syntax match bplNumber /\v¯?∞|¯?(\d+(\.\d+)?|\.\d+)([eEₑ]¯?\d+)?([jJⱼ]
 syntax match bplNumber /\v([\])])@<=ₓ/
 syntax match bplNumber /\v\$[tfn]/
 syntax match bplString /\v\$[ad]/
-syntax match bplFunction /[+×÷⌈⌊|*⍟○π√!∧∨⊼⊽~=≠<≤>≥⍳⍈:⍴≢≡,⍪⊂⊃⊆∊∪∩⍋⍒↑↓⌽⊖⍉⊤⊥⍎⍕⌷⌹#↕⍭⨸⌻⍸⍷⊢⊣¿-]/
+syntax match bplFunction /[+×÷⌈⌊|*⍟○π√!∧∨⊼⊽~=≠<≤>≥⍳↦:⍴≢≡,⍪⊂⊃⊆∊∪∩⍋⍒↑↓⌽⊖⍉⊤⊥⍎⍕⌷⌹#↕⍭⨸⌻⍸⍷⊢⊣¿-]/
 syntax match bplMonadicOperator #[¨⍨⊗⌸∂/⌿\\⍀⁰¹²³⁴⁵⁶⁷⁸⁹⁻ᵀᵘ]#
 syntax match bplDyadicOperator /[↣⍤∘⍠⍥↢.⍣⇄⊘⌾⍚@⌺]/
 syntax match bplArgument /[⍺⍵⍶⍹∇⍢]/

{basedpl-0.1.34 → basedpl-0.1.35}/lib/array.bpl

@@ -37,7 +37,7 @@ acc ← {⍶{(⊂⍺⍶↑⍬⍴⍵),⍵}/1↓{⍵,⊂⍬⍴⍵}¯1⌽⍵}  ⍝
 ⍝ Helpers shared by disp, display, displays, displayr and dsp.
 format ← {t←⊃,↓⍕⍵ ⋄ (¯2↑1 1,⍴t)⍴t}  ⍝ Simple array as a character matrix.
 open ← {(1⌈⍴⍵)⍴⍵}  ⍝ Exposure of null axes.
-axes ← {(-2⌈⍴⍴⍵)↑1+×⍴⍵}  ⍝ Array axis types.
+axes ← {(-2⌈⍴⍴⍵)↑≥×⍴⍵}  ⍝ Array axis types.
 char ← {⍬≡⍴⍵?'─';(↑⍵∊'¯',$d)⊃"#~"}∘⍕  ⍝ Type character of an atom.
 type ← {{(1=⍴⍵)⊃['+' ⍵]}∪,char¨⍵}  ⍝ Type characters of an array.
 deco ← {⍺←type open ⍵ ⋄ ⍺,axes ⍵}  ⍝ Type and axes vector.
@@ -65,7 +65,7 @@ disp ← { ⍺←⍬  ⍝ Boxed sketch of nested array.
   }
   gaps←{  ⍝ Gap-separated sub-planes.
     ⍺≤2?⍵;  ⍝ lowish rank: done.
-    subs←(⍺-1)∇¨⍵  ⍝ sub-hyperplanes.
+    subs←(≤⍺)∇¨⍵  ⍝ sub-hyperplanes.
     width←↑⌽⍴↑subs
     fill←([⍺ width]-3 0)⍴' '  ⍝ inter-plane gap.
     ⊃{⍺⍪fill⍪⍵}/ 1 open subs
@@ -98,7 +98,7 @@ disp ← { ⍺←⍬  ⍝ Boxed sketch of nested array.
     lft,top⍪⍪⌿,/boxes
   }
   right←{  ⍝ Border right each subarray.
-    types←2⊥¨(⍳⍴⍵)=⊂¯1+⍴⍵
+    types←2⊥¨(⍳⍴⍵)=⊂≤⍴⍵
     chars←[types]⌷"┼┤┴┘"
     rgt←{⍵,(-≢⍵)↑[≢⍵ 1 1]#'│',⍺}  ⍝ form right border.
     (matr 1 open ⍺),¨chars rgt¨ ⍵  ⍝ cells bordered right.
@@ -122,7 +122,7 @@ disp ← { ⍺←⍬  ⍝ Boxed sketch of nested array.
     dec≤0=⍴⍴⍵?⍺#¨"│─";  ⍝ no decoration or unit.
     cols←(ׯ1↑⍴⍵)⊃"⊖→"
     rsig←(××/¯1↓⍴⍵)⊃"⌽↓"
-    rows←(¯1+3⌊⍴⍴⍵)⊃['│' rsig '⍒']
+    rows←(≤3⌊⍴⍴⍵)⊃['│' rsig '⍒']
     [rows cols]  ⍝ shape decorators.
   }
   matr←{⊃,↓⍵}
@@ -139,7 +139,7 @@ disp ← { ⍺←⍬  ⍝ Boxed sketch of nested array.
 
 display ← {  ⍝ Boxed display of array.
   box←{  ⍝ box with type and axes
-    [vrt hrz]←(¯1+⍴⍵)⍴¨"│─"  ⍝ vert. and horiz. lines
+    [vrt hrz]←(≤⍴⍵)⍴¨"│─"  ⍝ vert. and horiz. lines
     top←"─⊖→".[¯1↑⍺],hrz
     bot←(↑⍺),hrz
     rgt←"┐│",vrt,'┘'  ⍝ right side with corners
@@ -159,7 +159,7 @@ display ← {  ⍝ Boxed display of array.
 displays ← {  ⍝ Boxed display of array.
   box←{  ⍝ Box with type and axes.
     [shp w]←open\⍵
-    [vrt hrz]←(¯1+⍴w)⍴¨"│─"  ⍝ Vert. and horiz. lines.
+    [vrt hrz]←(≤⍴w)⍴¨"│─"  ⍝ Vert. and horiz. lines.
     top←"─⊖→".[¯1↑⍺],hrz
     ok←(⍴shp)<⍴hrz
     top←⍴top ↑ 2↑top , ok#shp , (2+ok×⍴shp)↓top
@@ -181,12 +181,12 @@ displays ← {  ⍝ Boxed display of array.
 
 displayr ← {  ⍝ Boxed display of array
   box←{  ⍝ box with type and axes
-    [vrt hrz]←(¯1+⍴⍵)⍴¨"│─"  ⍝ vert. and horiz. lines
-    top←(1+⍴hrz)↑(↑ ¯1↑⍺ ⌷ "─⊖",⊂⍕¯1↑⍺₁),hrz
+    [vrt hrz]←(≤⍴⍵)⍴¨"│─"  ⍝ vert. and horiz. lines
+    top←(≥⍴hrz)↑(↑ ¯1↑⍺ ⌷ "─⊖",⊂⍕¯1↑⍺₁),hrz
     bot←⍴top ↑ ↑2↓⍺ , hrz
     rgt←"┐│",vrt,'┘'  ⍝ right side with corners
-    lax←(↑¨ ¯1↓3↓⍺ ⌷¨ -1⌈¯1+⍴⍺₁ ↑ ⊂"│⌽" ,¨ ⊂∘⍕¨¯1↓0,⍺₁),¨⊂vrt
-    lax←⊂1+⍴vrt ↑¨ lax~¨⊂" " ,¨ '│'  ⍝ pad and trim
+    lax←(↑¨ ¯1↓3↓⍺ ⌷¨ -1⌈≤⍴⍺₁ ↑ ⊂"│⌽" ,¨ (⊂⍕)¨¯1↓0,⍺₁),¨⊂vrt
+    lax←⊂≥⍴vrt ↑¨ lax~¨⊂" " ,¨ '│'  ⍝ pad and trim
     lft←⍉'┌',(⊃lax),'└'
     lft,(top⍪⍵⍪bot),rgt  ⍝ fully boxed array
   }
@@ -200,8 +200,8 @@ displayr ← {  ⍝ Boxed display of array
 ⍝ From http://dfns.dyalog.com/c_dist.htm
 
 dist ← {  ⍝ Levenshtein distance.
-  a←(n+1)⍴(⍴⍺)+n←⍴⍵  ⍝ first row of matrix
-  f←⍵{⌊\⍵⌊(↑⍵),(¯1↓⍵)-1ₓ+⍺=⍶}
+  a←(≥n)⍴(⍴⍺)+n←⍴⍵  ⍝ first row of matrix
+  f←⍵{⌊\⍵⌊(↑⍵),(¯1↓⍵)-≥⍺=⍶}
   z←a f/ ⌽⍺
   ↑⌽z
 }
@@ -225,7 +225,7 @@ dsp ← {  ⍝ Reduced version of disp.
   rows←(mrs#¨'│')join¨↓dims↑¨subs  ⍝ complete rows with '│'-separated items
   hzs←'┼'join mcs#¨'─'  ⍝ inter-row horizontal "─┼─" separators
   cells←{⍺⍪hzs⍪⍵}/rows  ⍝ joined rows: array of 2D planes
-  gaps←(⌽1+⍳¯2+⍴⍴⍵)#¨' '  ⍝ increasing cell gaps for higher ranks
+  gaps←(⌽≥⍳¯2+⍴⍴⍵)#¨' '  ⍝ increasing cell gaps for higher ranks
   cjoin←{⍪/(⊂⍺),⍶,⊂⍵}
   top{(⍺ cjoin)⌿⍵}/gaps,⊂cells
 }
@@ -239,7 +239,7 @@ Rgt ← {⊂2↑⍵ , 2↓¯1↓⍵ , ↑⌽⍵}  ⍝ tape-head moves right 1 it
 
 enlist ← {  ⍝ List ⍺-leaves of nested array.
   ⍺←0  ⍝ default: list 0-leaves.
-  ⍺≥¯1+≡⍵?,⍵;  ⍝ all shallow leaves: finished.
+  ⍺≥≤≡⍵?,⍵;  ⍝ all shallow leaves: finished.
   1↓,/(⊂⊂↑↑⍵),⍺∇¨,⍵
 }
 
@@ -270,7 +270,7 @@ in ← {  ⍝ Locations of item ⍺ in array ⍵.
   ⍬{  ⍝ ⍺ is pick-path
     item≡⍵?,⊂⍺;  ⍝ match: path
     D≥≡⍵?⍬;  ⍝ give up
-    paths←⍺↣,∘⊂¨⍳⍴⍵  ⍝ extended paths
+    paths←(⍺↣,⊂)¨⍳⍴⍵  ⍝ extended paths
     ,/, paths ∇¨ ⍵
   }⍵  ⍝ ⍵ is searched-in array
 }
@@ -288,7 +288,7 @@ ltrav ← {  ⍝ List traversal.
 
 ⍝ From http://dfns.dyalog.com/s_list.htm
 
-listLength ← 0ₓ↣({⍺+1ₓ} ltrav)
+listLength ← 0ₓ↣({≥⍺} ltrav)
 
 vectFromList ← ⍬↣({⍺,⊂⍵} ltrav)
 
@@ -354,7 +354,7 @@ pmat ← {  ⍝ Permutation matrix of ⍳⍵.
 
 ⍝ From http://dfns.dyalog.com/c_pred.htm
 
-pred ← {⊃⍶/¨(⍺#1+⍳⍴⍺)⊆⍵}  ⍝ Partitioned reduction.
+pred ← {⊃⍶/¨(⍺#≥⍳⍴⍺)⊆⍵}  ⍝ Partitioned reduction.
 
 ⍝ From http://dfns.dyalog.com/c_rows.htm
 
@@ -420,7 +420,7 @@ shannon ← {-+/(2↣⍟×⊣)¨({≢⍵}⌸÷≢)⍵}  ⍝ Shannon entropy of m
 
 subvec ← {0∊⍴⍺?1;  ⍝ Is ⍺ a subvector of ⍵?
   0∊⍴⍵?0;  ⍝ null ⍵: failure.
-  (1↓⍺)∇(1+⍵⍳1↑⍺)↓⍵  ⍝ otherwise, check remaining items.
+  (1↓⍺)∇(≥⍵⍳1↑⍺)↓⍵  ⍝ otherwise, check remaining items.
 }
 
 ⍝ From http://dfns.dyalog.com/c_subs.htm