lazy ⊃ improvements

Author: phantomics

#utilities.lisp#

@@ -0,0 +1 @@
+[email protected]:1655414857

.#utilities.lisp

@@ -239,15 +239,15 @@
                                     "││noe│wto│htree│││lapha│ebta│agmma│││erd│lbue│rgeen││"
                                     "│└───┴───┴─────┘│└─────┴────┴─────┘│└───┴────┴─────┘│"
                                     "└───────────────┴──────────────────┴────────────────┘"))
-         (is "↓disp ⊃sam ⍪vex" #("┌─────┬──────────────────┬────────────────┐"
-                                 "│┌───┐│┌─────┬────┬─────┐│┌───┬────┬─────┐│"
-                                 "││one│││alpha│beta│gamma│││red│blue│green││"
-                                 "│├───┤│└─────┴────┴─────┘│└───┴────┴─────┘│"
-                                 "││two││                  │                │"
-                                 "│├───┤│                  │                │"
-                                 "││thr││                  │                │"
-                                 "│└───┘│                  │                │"
-                                 "└─────┴──────────────────┴────────────────┘"))
+         (is "↓disp ⊃sam ⍪vex" #("┌───────┬──────────────────┬────────────────┐"
+                                 "│┌─────┐│┌─────┬────┬─────┐│┌───┬────┬─────┐│"
+                                 "││one  │││alpha│beta│gamma│││red│blue│green││"
+                                 "│├─────┤│└─────┴────┴─────┘│└───┴────┴─────┘│"
+                                 "││two  ││                  │                │"
+                                 "│├─────┤│                  │                │"
+                                 "││three││                  │                │"
+                                 "│└─────┘│                  │                │"
+                                 "└───────┴──────────────────┴────────────────┘"))
          (is "↓disp 2⊃sam ⍪vex" #("┌───────────────┬───────┬────────────────┐"
                                   "│┌───┬───┬─────┐│┌─────┐│┌───┬────┬─────┐│"
                                   "││one│two│three│││alpha│││red│blue│green││"

libraries/dfns/array/demo.lisp

@@ -125,7 +125,7 @@
                " ⎕⎕⎕⎕⎕⎕⎕⎕⎕⎕⎕⎕                                                                  "
                " ⎕⎕⎕⎕⎕⎕⎕⎕⎕⎕⎕⎕                                                                  "
                " ⎕⎕⎕⎕⎕⎕⎕⎕⎕⎕⎕⎕                                                                  "))
-         ;; (is "{∧/⍵∧.=⍵∘.{+/⍺ nicediv ⍵}⍵}⍳50" 1)
+         ;; (is "{∧/⍵∧.=⍵∘.{+/⍺ nicediv ⍵}⍵}⍳50" 1) ;; TODO: why is this so slow when lazified?
          (is "osc¨⍳30" #(1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1))
          (is "0 5 10 15 range ¯2+⍳18" #(0 1 1 1 1 1 2 2 2 2 2 3 3 3 3 3 4 4))
          (is "¯1 0 1 range 1○⍳40"

libraries/dfns/numeric/demo.lisp

@@ -1370,8 +1370,13 @@
             (is "⊃,/(⊂'abc') 'def' 'ghi'" #("abc" #\d #\e #\f #\g #\h #\i))
             (is "(×⌿,+⌿)+⌿(⍳2)∘.×⍬∘.×⍳4" #(1 1 1 1 0 0 0 0))))
   (⌿ (has :title "Reduce First")
-     (lateral (lambda (operand) (values `(operate-reducing ,operand index-origin nil)
-                                        '(:axis))))
+     (lateral (lambda (operand) ;; (values `(operate-reducing ,operand index-origin nil)
+                                ;;         '(:axis))
+                (values `(op-compose 'vacomp-reduce :left (sub-lex ,operand)
+                                                    :index-origin index-origin
+                                                    :default-axis index-origin)
+                        '(:axis))
+                ))
      (tests (is "+⌿3 4⍴⍳12" #(15 18 21 24))
             (is "-⌿3 4⍴⍳12" #(5 6 7 8))
             (is "{⍺×⍵+3}⌿3 4⍴⍳12" #(63 162 303 492))
@@ -1568,9 +1573,8 @@
             (is "fn←{2+⍵}⍣{10<⍵} ⋄ fn 2" 14)
             (is "fn←{⍵×2} ⋄ fn⍣3⊢4" 32)
             (is "↓⍣2⊢2 2⍴⍳4" #0A#(#(1 2) #(3 4)))
-            ; (is "⌊1_000_000_000×2○⍣=1" 739085133)
-            ; (is "⌊100000×{⍵{2.0÷⍨⍵+⍺÷⍵}⍣≡⍵}123456789" 1111111106)
-            ))
+            (is "⌊1_000_000_000×2○⍣=1" 739085133)
+            (is "⌊100000×{⍵{2.0÷⍨⍵+⍺÷⍵}⍣≡⍵}123456789" 1111111106)))
   (@ (has :title "At")
      (pivotal (lambda (right left) `(operate-at ,right ,left index-origin)))
      (tests (is "20 20@3 8⍳9" #(1 2 20 4 5 6 7 20 9))