work on lazy operator fixes

Author: phantomics

functions.lisp

@@ -1095,7 +1095,8 @@
                               ;; populate it with the function's identity value
                               (xdotimes output (i (size output))
                                 (setf (row-major-aref output i)
-                                      (if (functionp identity) (funcall identity) identity)))
+                                      (enclose (if (functionp identity)
+                                                   (funcall identity) identity))))
                               output)
                             (error "The operand of [/ reduce] has no identity value.")))
                     ;; if reduction produces a scalar, the result is the identity value
@@ -1225,7 +1226,7 @@
                   (if oscalar (setq output (enclose (funcall op-rendered (disclose-any oscalar))))
                       (xdotimes output (i (size omega) :synchronous-if (not threaded))
                         (setf (row-major-aref output i)
-                              (render-varrays (funcall op-rendered (row-major-aref omega i)))))))
+                              (time (render-varrays (funcall op-rendered (row-major-aref omega i))))))))
               output))))))
 
 (defun operate-commuting (operand)

libraries/dfns/array/array.apl

@@ -36,7 +36,7 @@ acc ← { ⊃⍺⍺{(⊂⍺ ⍺⍺⊃⍬⍴⍵),⍵}/1↓{⍵,⊂⍬⍴⍵}¯1
 disp ← { ⎕IO←0                               ⍝ Boxed sketch of nested array.
   ⍺←⍬ ⋄ dec ctd←2↑⍺                          ⍝ 1:decorated, 1:centred.
 
-  box←{                                      ⍝ Recursive boxing of nested array.
+  box←{ ⎕IO←0                                     ⍝ Recursive boxing of nested array.
     isor ⍵:⎕FMT⊂⍵                            ⍝ ⎕or: '∇name'.
     1=≡,⍵:dec open ⎕FMT dec open ⍵           ⍝ simple array: format.
     mat←matr 1/dec open ⍵                    ⍝ matrix of opened subarrays.
@@ -46,43 +46,43 @@ disp ← { ⎕IO←0                               ⍝ Boxed sketch of nested ar
     (≢⍴⍵)gaps ⍵ plane subs                   ⍝ collection into single plane.
   }
 
-  aligned←{                                  ⍝ Alignment and centring.
+  aligned←{    ⎕IO←0                                 ⍝ Alignment and centring.
     rows cols←sepr⍴¨⍵                        ⍝ subarray dimensions.
     sizes←(⌈/rows)∘.,⌈⌿cols                  ⍝ aligned subarray sizes.
     ctd=0:sizes↑¨⍵                           ⍝ top-left alignment.
     v h←sepr⌈0.5×↑(⍴¨⍵)-sizes                ⍝ vertical and horizontal rotation.
     v⊖¨h⌽¨sizes↑¨⍵                           ⍝ centred aligned subarrays.
   }
 
-  gaps←{                                     ⍝ Gap-separated sub-planes.
+  gaps←{     ⎕IO←0                                 ⍝ Gap-separated sub-planes.
     ⍺≤2:⍵                                    ⍝ lowish rank: done.
     subs←(⍺-1)∇¨⍵                            ⍝ sub-hyperplanes.
     width←⊃⌽⍴⊃subs                           ⍝ width of inter-plane gap.
     fill←(⍺ width-3 0)⍴' '                   ⍝ inter-plane gap.
     ↑{⍺⍪fill⍪⍵}/1 open subs                  ⍝ gap-separated planes.
   }
 
-  plane←{                                    ⍝ Boxed rank-2 plane.
+  plane←{     ⎕IO←0                                  ⍝ Boxed rank-2 plane.
     2<⍴⍴⍺:⍺ join ⍵                           ⍝ gap-separated sub-planes.
     odec←(dec shape ⍺)outer ⍵                ⍝ outer type and shape decoration.
     idec←inner ⍺                             ⍝ inner type and shape decorations.
     (odec,idec)collect ⍵                     ⍝ collected, formatted subarrays.
   }
 
-  join←{                                     ⍝ Join of gap-separated sub-planes.
+  join←{      ⎕IO←0                                  ⍝ Join of gap-separated sub-planes.
     sep←(≢⍵)÷1⌈≢⍺                            ⍝ sub plane separation.
     split←(0=sep|⍳≢⍵)⊂[0]⍵                   ⍝ separation along first axis.
     (⊂⍤¯1⊢⍺)plane¨split                      ⍝ sub-plane join.
   }
 
-  outer←{                                    ⍝ Outer decoration.
+  outer←{      ⎕IO←0                                 ⍝ Outer decoration.
     sizes←1 0{⊃↓(⍉⍣⍺)⍵}¨sepr⍴¨⍵              ⍝ row and col sizes of subarrays.
     sides←sizes/¨¨'│─'                       ⍝ vert and horiz cell sides.
     bords←dec↓¨'├┬'glue¨sides                ⍝ joined up outer borders.
     ↑,¨/('┌' '')⍺ bords'└┐'                  ⍝ vertical and horizontal borders.
   }
 
-  inner←{                                    ⍝ Inner subarray decorations.
+  inner←{     ⎕IO←0                                  ⍝ Inner subarray decorations.
     deco←{(type ⍵),1 shape ⍵}                ⍝ type and shape decorators.
     sepr deco¨matr dec open ⍵                ⍝ decorators: tt vv hh .
   }
@@ -94,20 +94,20 @@ disp ← { ⎕IO←0                               ⍝ Boxed sketch of nested ar
     lft,top⍪↑⍪⌿,/boxes                       ⍝ completed collection.
   }
 
-  right←{                                    ⍝ Border right each subarray.
+  right←{     ⎕IO←0                                  ⍝ Border right each subarray.
     types←2⊥¨(⍳⍴⍵)=⊂¯1+⍴⍵                    ⍝ right border lower corner types.
     chars←'┼┤┴┘'[types]                      ⍝    ..     ..      ..      chars.
     rgt←{⍵,(-≢⍵)↑(≢⍵)1 1/'│',⍺}              ⍝ form right border.
     ((matr 1 open ⍺),¨chars)rgt¨⍵            ⍝ cells bordered right.
   }
 
-  lower←{                                    ⍝ Border below each subarray.
+  lower←{     ⎕IO←0                                  ⍝ Border below each subarray.
     split←{((¯2+1⊃⍴⍵)/'─')glue ⍺}            ⍝ decorators split with horiz line.
     bot←{⍵⍪(-1⊃⍴⍵)↑⍺ split ⍵}                ⍝ lower border.
     (matr↑,¨/⍺)bot¨matr ⍵                    ⍝ cells bordered below.
   }
 
-  type←{                                     ⍝ Type decoration char.
+  type←{  ⎕IO←0                                    ⍝ Type decoration char.
     dec<|≡⍵:'─'                              ⍝ nested: '─'
     isor ⍵:'∇'                               ⍝ ⎕or:    '∇'
     sst←{                                    ⍝ simple scalar type.
@@ -118,7 +118,7 @@ disp ← { ⎕IO←0                               ⍝ Boxed sketch of nested ar
     {(1=⍴⍵)⊃'+'⍵}∪,sst¨dec open ⍵            ⍝ array: mixed or uniform type.
   }
 
-  shape←{                                    ⍝ Row and column shape decorators.
+  shape←{     ⎕IO←0                                  ⍝ Row and column shape decorators.
     dec≤0=⍴⍴⍵:⍺/¨'│─'                        ⍝ no decoration or scalar.
     cols←(ׯ1↑⍴⍵)⊃'⊖→'                       ⍝ zero or more cols.
     rsig←(××/¯1↓⍴⍵)⊃'⌽↓'                     ⍝ zero or more rows.
@@ -146,7 +146,7 @@ display ← { ⎕IO←0                            ⍝ Boxed display of array.
     top←'─⊖→'[¯1↑⍺],hrz                      ⍝ upper border with axis
     bot←(⊃⍺),hrz                             ⍝ lower border with type
     rgt←'┐│',vrt,'┘'                         ⍝ right side with corners
-    lax←'│⌽↓'[¯1↓1↓⍺],¨⊂vrt                  ⍝ left side(s) with axes,
+    lax←'│⌽↓'[¯1↓1↓⍺],¨⊂vrt    ⍝⍝              ⍝ left side(s) with axes,
     lft←⍉'┌',(↑lax),'└'                      ⍝ ... and corners
     lft,(top⍪⍵⍪bot),rgt                      ⍝ fully boxed array
   }
@@ -159,7 +159,7 @@ display ← { ⎕IO←0                            ⍝ Boxed display of array.
   type←{{(1=⍴⍵)⊃'+'⍵}∪,char¨⍵}               ⍝ simple array type
   line←{(49=⎕DT 1⍴⍵)⊃' -'}                   ⍝ underline for atom
 
-  {                                          ⍝ recursive boxing of arrays:
+  { ⎕IO←0                                         ⍝ recursive boxing of arrays:
     0=≡⍵:' '⍪(open ⎕FMT ⍵)⍪line ⍵            ⍝ simple scalar
     1 ⍬≡(≡⍵)(⍴⍵):'∇' 0 0 box ⎕FMT ⍵          ⍝ object rep: ⎕OR
     1=≡⍵:(deco ⍵)box open ⎕FMT open ⍵        ⍝ simple array

spec.lisp

@@ -1393,8 +1393,8 @@
             (is "+⍀[2]3 4⍴⍳12" #2A((1 3 6 10) (5 11 18 26) (9 19 30 42)))))
   (\¨ (has :title "Each")
       (lateral (lambda (operand)
-                 `(operate-each ,operand) ; "bla←{ ⍺[0] } ⋄ {⎕io←0 ⋄ {⍵∘bla¨⊂0 1} ⎕←⍵} 3 4"
-                 ;; `(op-compose 'vacomp-each :left (sub-lex ,operand))
+                 ;;`(operate-each ,operand) ; "bla←{ ⍺[0] } ⋄ {⎕io←0 ⋄ {⍵∘bla¨⊂0 1} ⎕←⍵} 3 4"
+                 `(op-compose 'vacomp-each :left (sub-lex ,operand))
                  ))
       (tests (is "⍳¨1 2 3" #(#(1) #(1 2) #(1 2 3)))
              (is "⊃¨↓⍳5" 1)

varray/varray.lisp

@@ -3664,6 +3664,8 @@
          ashape))))
 
 (defmethod indexer-of ((varray vacomp-each) &optional params)
+  ;; (setf (vacmp-omega varray) (render (vacmp-omega varray))
+  ;;       (vacmp-alpha varray) (render (vacmp-alpha varray)))
   (let ((this-shape (shape-of varray))
         (oshape (shape-of (vacmp-omega varray)))
         (ashape (shape-of (vacmp-alpha varray)))