add Matrix operator

Currently only for quantitative and XY comparisons
JoshDavid · Sep 18, 2023 · 2d2b5e6 · 2d2b5e6
1 parent cd2403a
commit 2d2b5e6
Show file tree

Hide file tree

Showing 10 changed files with 65 additions and 30 deletions.
diff --git a/APLSource/API/BoxPlot.aplf b/APLSource/API/BoxPlot.aplf
@@ -1,17 +1,16 @@
  BoxPlot←{
  ⍝ ⍵ ←→ APL matrix with headers
  ⍝ ⍺ ←→ Optional existing HTML document (WIP -- prob need a full param ns)
-     ⍺←⊢
+     ⍺←##.Utils.Alpha''
      ns←##.Spec.New''
-     ns.description←'vertical box plot'
-     ns.width←800
-     ns.height←400
-     m←⍎'mark'ns.⎕NS''
+     s←##.Spec.GetSpecNS ns
+     s.description←'vertical box plot'
+     s.width←800
+     s.height←400
+     m←⍎'mark's.⎕NS''
      m.type←'boxplot'
      m.extent←'min-max'
-     ns←ns ##.Spec.PackageArgs↓⍉⍵
+     _←ns ##.Spec.PackData ⍵
      _←##.Spec.AddColor ns
-     ns←ns ##.Spec.InjectData ⍵
-     j←##.Spec.ToJson ns
-     ⍺ ##.Html.Render j
+     ⍺.HtmlRendererObj ##.Html.Render ns
  }
diff --git a/APLSource/API/HeatMap.aplf b/APLSource/API/HeatMap.aplf
@@ -1,19 +1,17 @@
  HeatMap←{
  ⍝ ⍵ ←→ APL matrix with headers
  ⍝ ⍺ ←→ Optional parameter namespace
-     ⍺←##.Utils.Alpha ''
+     ⍺←##.Utils.Alpha''
      ns←##.Spec.New ⍺.SpecOverride
      ns.description←'Grid heat map'
      ns.width←800
      ns.height←400
      m←⍎'mark'ns.⎕NS''
      m.type←'rect'
-     _←ns ##.Spec.PackageArgs↓⍉⍵
-     _←'z'##.Spec.AddColor ns
      a←⍎'config.axis'ns.⎕NS''
      a.grid←'true'
      a.tickBand←'extent'
-     ns←ns ##.Spec.InjectData ⍵
-     j←##.Spec.ToJson ns
-     ⍺.HtmlRendererObj ##.Html.Render j
+     _←ns ##.Spec.PackData ⍵
+     _←'z'##.Spec.AddColor ns
+     ⍺.HtmlRendererObj ##.Html.Render ns
  }
diff --git a/APLSource/API/Matrix.aplo b/APLSource/API/Matrix.aplo
@@ -0,0 +1,23 @@
+ Matrix←{
+ ⍝ Operator -- all combinations of ⍵
+ ⍝ Limited to 2D comparisons currently
+ ⍝ AND type of quantitative for now
+ ⍝ ⍺  ←→ Optional ParamNS
+ ⍝ ⍺⍺ ←→ Plot fn
+ ⍝ ⍵  ←→ Data
+     ⍺←##.Utils.Alpha''
+     o←⍺.SpecOverride
+     r←⍎'repeat'o.⎕NS''
+     h←,1↑⍵
+     r.row←h
+     r.column←⌽h
+     s←⍎'spec' o.⎕NS ''
+     e←⍎'encoding's.⎕NS''
+     _←'xy'{
+         t←⍎⍺ e.⎕NS''
+         t.type←'quantitative'
+         f←⍎'field't.⎕NS''
+         f.repeat←⍵ ⋄ 0
+     }¨'column' 'row'
+     ⍺ ⍺⍺ ⍵
+ }
diff --git a/APLSource/API/ScatterPlot.aplf b/APLSource/API/ScatterPlot.aplf
@@ -3,14 +3,13 @@
  ⍝ ⍺ ←→ Optional existing HTML document (WIP -- prob need a full param ns)
  ⍝ TODO: Multi scatter plots in a new fn ? Or figure out how to
  ⍝ Represent several arguments w diff shapes/colors on same graph
-     ⍺←⊢
-     ns←##.Spec.New''
-     ns.description←'Scatter plot'
-     ns.width←800
-     ns.height←400
-     ns.mark←'point'
-     ns←ns ##.Spec.PackageArgs↓⍉⍵
-     ns←ns ##.Spec.InjectData ⍵
-     j←##.Spec.ToJson ns     
-     ⍺ ##.Html.Render j
+     ⍺←##.Utils.Alpha''
+     ns←##.Spec.New ⍺.SpecOverride
+     s←##.Spec.GetSpecNS ns
+     s.description←'Scatter plot'
+     s.width←800
+     s.height←400
+     s.mark←'point'
+     _←ns ##.Spec.PackData ⍵
+     ⍺.HtmlRendererObj ##.Html.Render ns
  }
diff --git a/APLSource/Demo/CorrelationHeatMap.aplf b/APLSource/Demo/CorrelationHeatMap.aplf
@@ -3,8 +3,7 @@
  ⍝ Special case of HeatMap used for viewing correlations
      a←##.Utils.Alpha''
      o←a.SpecOverride
-     f←'encoding.color.scale'
-     _←f o.⎕NS'' ⋄ s←o⍎f
+     s←⍎'encoding.color.scale' o.⎕NS ''
      s.scheme←'redblue'
      s.domain←¯1 1
      a ##.API.HeatMap ⍵

diff --git a/APLSource/Html/Render.aplf b/APLSource/Html/Render.aplf
@@ -1,6 +1,7 @@
  Render←{
 ⍝ ⍺ ←→ HR object, creates one if none passed in
-⍝ ⍵ ←→ JSON string of the spec
+⍝ ⍵ ←→ NS of the entire spec
+     j←##.Spec.ToJson ⍵
      ⍺←NewHtmlRender''
-     ⍺ InjectJson ⍵
+     ⍺ InjectJson j
  }
diff --git a/APLSource/Spec/GetSpecNS.aplf b/APLSource/Spec/GetSpecNS.aplf
@@ -0,0 +1,5 @@
+ GetSpecNS←{
+ ⍝ VL specs require nesting certain properties under spec sometimes -- but not always. Argh!
+    9=⍵.⎕NC 'spec':⍵.spec
+    ⍵
+ }
diff --git a/APLSource/Spec/InitEncoding.aplf b/APLSource/Spec/InitEncoding.aplf
@@ -1,5 +1,6 @@
  InitEncoding←{
 ⍝ ⍵ ←→ ns
+     9=⍵.⎕NC 'encoding':⍵ ⍝ For now
      e←⍎'encoding'⍵.⎕NS''
      s←⍎'size'e.⎕NS''
      s.value←90

diff --git a/APLSource/Spec/PackData.aplf b/APLSource/Spec/PackData.aplf
@@ -0,0 +1,10 @@
+ PackData←{
+ ⍝ ⍺ ←→ master spec ns
+ ⍝ ⍵ ←→ data
+     e←⊃9≠⍺.⎕NC'spec.encoding.x'
+     ⍝ ↑Hmm, done for Matrix op, definitly need to discuss cons of this approach:
+     ⍝ e.g.: partial x spec done outside of Mat op?
+     _←⍺ PackageArgs(⍣e)↓⍉⍵
+     _←⍺ InjectData ⍵
+     0
+  }
diff --git a/APLSource/Utils/Alpha.aplf b/APLSource/Utils/Alpha.aplf
@@ -3,7 +3,7 @@
  ⍝ Generates default left arg that can be passed to any API function
      a←⎕NS''
      a.HtmlRendererObj←⊢
-     a.SpecOverride←⎕NS'' ⍝ NS, VL String, or both? Override/augment default spec with this
+     a.SpecOverride←⍎(UniqueName'a') ⎕NS '' ⍝ NS, VL String, or both? Override/augment default spec with this
      a
      ⍝ a.ReuseExistingHR    ⍝ Experiment with: Keep a cached "invisible" HRobj to allow quick displays?
      ⍝ a.DocumentLandingDiv ⍝ Where the image should land on an existing page...