@explorable-viz/fluid 0.0.23

package/dist/article/fluid/example/lookup.fld

@@ -0,0 +1,15 @@
+let lookup k Empty = None;
+    lookup k (NonEmpty t1 (key, val) t2) =
+       match compare k key as {
+          LT -> lookup k t1;
+          EQ -> Some val;
+          GT -> lookup k t2
+       }
+in
+lookup
+   6
+   (NonEmpty
+      (NonEmpty Empty (3, "simon") Empty)
+      (4, "john")
+      (NonEmpty (NonEmpty Empty (6, "sarah") Empty) (7, "claire") Empty)
+   )                                                                    

package/dist/article/fluid/example/map.fld

@@ -0,0 +1 @@
+map ((+) 1) [4, 6, 12, 14, 3, 2, -4]

package/dist/article/fluid/example/mergeSort.fld

@@ -0,0 +1,22 @@
+let split [] = ([], []);
+    split (x : xs) =
+      let (ys, zs) = split xs in (x : zs, ys);
+
+    merge xs ys =
+       match (xs, ys) as {
+          ([], _) -> ys;
+          (x : xs', []) -> xs;
+          (x : xs', y : ys') ->
+             if x < y
+             then x : merge xs' ys
+             else y : merge xs ys'
+       };
+
+    mergesort xs =
+       if length xs < 2
+       then xs
+       else
+          let (ys, zs) = split xs in
+          merge (mergesort ys) (mergesort zs)
+in
+mergesort [3, 1, 2]

package/dist/article/fluid/example/normalise.fld

@@ -0,0 +1,3 @@
+let (x, y) = (6.0, 12.0);
+    sum = x + y in
+(floor (x * 100.0 / sum), floor (y * 100 / sum))

package/dist/article/fluid/example/nub.fld

@@ -0,0 +1 @@
+nub [1, 2, 3, 3, 4]

package/dist/article/fluid/example/pattern-match.fld

@@ -0,0 +1,12 @@
+-- Silly test of pattern-matching for list notation
+let
+   zip3 [] [] = [];
+   zip3 [x1] [y1] = (x1, y1) : zip3 [] [];
+   zip3 [x1, x2] [y1, y2] =
+      (x1, y1) : zip3 [x2] [y2];
+   zip3 [x1, x2, x3] [y1, y2, y3] =
+      (x1 , y1) : zip3 [x2, x3] [y2, y3];
+   zip3 (x1 : x2 : x3 : x4 : xs) (y1 : y2 : y3 : y4 : ys) =
+      (x1, y1) : (x2, y2) : (x3, y3) : (x4, y4) : zip3 xs ys
+in
+length (zip3 [3, 4, 5, 6] [5, 6, 7, 8])

package/dist/article/fluid/example/range.fld

@@ -0,0 +1,4 @@
+let range1 (m, n) = [m..n];
+    range2 ((m1, n1), (m2, n2)) =
+      [ (i1, i2) | i1 <- range1 (m1, m2), i2 <- range1 (n1, n2)]
+in range2 ((0, 0), (1, 1))

package/dist/article/fluid/example/record-lookup.fld

@@ -0,0 +1,3 @@
+let city = { name: "Germany" };
+    country = { cities: [ "Germany" ] }
+in city.name `elem` country.cities

package/dist/article/fluid/example/records.fld

@@ -0,0 +1,11 @@
+let f {fst: x, snd: []} = x;
+    f {fst: x, snd: (y: xs)} = y;
+
+    g {} = 7
+in {
+   a: f {snd: [], fst: 2},
+   b: f {fst: 4, snd: [6, 7]},
+   c: g {unused: 22},
+   d: [ x | {fst: x, snd: []} <- [{fst: 5, third: "hello", snd: []}, {fst: 6, snd: [7, 8]}] ],
+   e: {a: 4, h: {i: 6, j: 7}}.h.j
+}

package/dist/article/fluid/example/reverse.fld

@@ -0,0 +1 @@
+reverse [1, 2]

package/dist/article/fluid/example/scratchpad.fld

@@ -0,0 +1,6 @@
+let nth2 i j xs = nth (i - 1) (nth (j - 1) xs) in
+let xs = [[1, 4, 8],
+          [3, 2, 17],
+          [0, 14, 6]];
+    ys = [| nth2 i j xs | (i, j) in (3, 3) |]
+in ys ! (3, 2)

package/dist/article/fluid/example/slicing/add.expect.fld

@@ -0,0 +1 @@
+⸨5⸩ + (⸨0⸩ + ⸨3⸩)

package/dist/article/fluid/example/slicing/add.fld

@@ -0,0 +1 @@
+5 + (0 + 3)

package/dist/article/fluid/example/slicing/array/array.expect.fld

@@ -0,0 +1,2 @@
+let xs = [[1, 4, 8], [3, _2_, 17], [0, 14, 6]]
+in [| nth2 i j xs | (i, j) in (3, 3) |]

package/dist/article/fluid/example/slicing/array/array.fld

@@ -0,0 +1,4 @@
+let xs = [[1, 4, 8],
+          [3, 2, 17],
+          [0, 14, 6]]
+in [| nth2 i j xs | (i, j) in (3, 3) |]

package/dist/article/fluid/example/slicing/array/dims.expect.fld

@@ -0,0 +1,3 @@
+let (x, y) = ⸨(⸨3⸩, ⸨3⸩)⸩;
+    yss = ⸨[|0|(i, j) in (x, y)|]⸩ in
+dims yss

package/dist/article/fluid/example/slicing/array/dims.fld

@@ -0,0 +1,3 @@
+let (x, y) = (3, 3);
+    yss = [| 0 | (i, j) in (x, y) |]
+in dims yss

package/dist/article/fluid/example/slicing/array/lookup.expect.fld

@@ -0,0 +1,3 @@
+let xs = [[1, 4, 8], [3, 2, 17], [0, ⸨14⸩, 6]];
+    ys = [|nth2 i j xs|(i, j) in (3, 3)|] in
+ys ! ((3, 2))

package/dist/article/fluid/example/slicing/array/lookup.fld

@@ -0,0 +1,5 @@
+let xs = [[1, 4, 8],
+          [3, 2, 17],
+          [0, 14, 6]];
+    ys = [| nth2 i j xs | (i, j) in (3, 3) |]
+in ys ! (3, 2)

package/dist/article/fluid/example/slicing/convolution/edgeDetect.expect.fld

@@ -0,0 +1 @@
+convolve input_image filter extend

package/dist/article/fluid/example/slicing/convolution/edgeDetect.fld

@@ -0,0 +1 @@
+convolve input_image filter extend

package/dist/article/fluid/example/slicing/convolution/emboss-wrap.fld

@@ -0,0 +1 @@
+convolve input_image filter wrap

package/dist/article/fluid/example/slicing/convolution/emboss.expect.fld

@@ -0,0 +1 @@
+convolve input_image filter zero

package/dist/article/fluid/example/slicing/convolution/emboss.fld

@@ -0,0 +1 @@
+convolve input_image filter zero

package/dist/article/fluid/example/slicing/convolution/filter/edge-detect.fld

@@ -0,0 +1,5 @@
+let filter =
+   let edgeDetect = [[0,  1, 0],
+                     [1, -4, 1],
+                     [0,  1, 0]] in
+   [| nth2 i j edgeDetect | (i, j) in (3, 3) |];

package/dist/article/fluid/example/slicing/convolution/filter/emboss.fld

@@ -0,0 +1,5 @@
+let filter =
+   let emboss = [[-2, -1, 0],
+                 [-1,  1, 1],
+                 [ 0,  1, 2]] in
+   [| nth2 i j emboss | (i, j) in (3, 3) |];

package/dist/article/fluid/example/slicing/convolution/filter/gaussian.fld

@@ -0,0 +1,5 @@
+let filter =
+   let gaussian = [[1,  4, 1],
+                   [4, 16, 4],
+                   [1,  4, 1]] in
+   [| nth2 i j gaussian | (i, j) in (3, 3) |];

package/dist/article/fluid/example/slicing/convolution/gaussian.expect.fld

@@ -0,0 +1 @@
+convolve input_image filter zero

package/dist/article/fluid/example/slicing/convolution/gaussian.fld

@@ -0,0 +1 @@
+convolve input_image filter zero

package/dist/article/fluid/example/slicing/convolution/test-image.fld

@@ -0,0 +1,7 @@
+let input_image =
+   let image = [[15, 13,  6, 9, 16],
+                 [12,  5, 15, 4, 13],
+                 [14,  9, 20, 8,  1],
+                 [ 4, 10,  3, 7, 19],
+                 [ 3, 11, 15, 2,  9]] in
+   [| nth2 i j image | (i, j) in (5, 5) |];

package/dist/article/fluid/example/slicing/dict/create.expect.fld

@@ -0,0 +1 @@
+{|"a" := 5, ⸨"a"⸩ ++ ⸨"b"⸩ := 6|}

package/dist/article/fluid/example/slicing/dict/create.fld

@@ -0,0 +1 @@
+{| "a" := 5, "a" ++ "b" := 6 |}

package/dist/article/fluid/example/slicing/dict/difference.expect.fld

@@ -0,0 +1,3 @@
+let e = ⸨{|"a" := 5, "a" ++ "b" := 6|}⸩;
+    f = ⸨{|"ab" := 12|}⸩ in
+dict_difference e f

package/dist/article/fluid/example/slicing/dict/difference.fld

@@ -0,0 +1,3 @@
+let e = {| "a" := 5, "a" ++ "b" := 6 |};
+    f = {| "ab" := 12 |}
+in dict_difference e f

package/dist/article/fluid/example/slicing/dict/disjointUnion.expect.fld

@@ -0,0 +1 @@
+{|⸨"a"⸩ := 5, "b" := 6|} `dict_disjointUnion` {|"c" := ⸨7⸩|}

package/dist/article/fluid/example/slicing/dict/disjointUnion.fld

@@ -0,0 +1 @@
+{| "a" := 5, "b" := 6 |} `dict_disjointUnion` {| "c" := 7 |}

package/dist/article/fluid/example/slicing/dict/foldl.expect.fld

@@ -0,0 +1 @@
+foldl (*) 1 (dict_foldl concat2 [] {|"a" := [5, 6], "b" := [⸨0⸩, 10], "c" := [3, 4]|})

package/dist/article/fluid/example/slicing/dict/foldl.fld

@@ -0,0 +1 @@
+foldl (*) 1 (dict_foldl concat2 [] {| "a" := [5, 6], "b" := [0, 10], "c" := [3, 4] |})

package/dist/article/fluid/example/slicing/dict/fromRecord.expect.fld

@@ -0,0 +1,2 @@
+dict_fromRecord ⸨{a : 5,
+                    ab : 6}⸩

package/dist/article/fluid/example/slicing/dict/fromRecord.fld

@@ -0,0 +1 @@
+dict_fromRecord { a: 5, ab: 6 }

package/dist/article/fluid/example/slicing/dict/get.expect.fld

@@ -0,0 +1,3 @@
+let d = {|"a" := 5, "a" ++ "b" := {fst : 6,
+                                      snd : ⸨0⸩}|} in
+dict_get "a" d * (dict_get "ab" d).snd

package/dist/article/fluid/example/slicing/dict/get.fld

@@ -0,0 +1,2 @@
+let d = {| "a" := 5, "a" ++ "b" := {fst: 6, snd: 0} |}
+in dict_get "a" d * (dict_get "ab" d).snd

package/dist/article/fluid/example/slicing/dict/intersectionWith.expect.fld

@@ -0,0 +1,2 @@
+dict_intersectionWith (let x = ⸨2⸩ in
+                        (fun n m = (n + m) * x)) {|"a" := 5, "b" := ⸨6⸩, "c" := ⸨3⸩|} {|"b" := ⸨-6⸩, "c" := ⸨7⸩|}

package/dist/article/fluid/example/slicing/dict/intersectionWith.fld

@@ -0,0 +1,4 @@
+ dict_intersectionWith 
+   (let x = 2 in (fun n m  = (( n  +  m ) *  x )) )
+   {| "a" := 5, "b" := 6, "c" := 3 |}
+   {| "b" := -6, "c" := 7 |}

package/dist/article/fluid/example/slicing/dict/map.expect.fld

@@ -0,0 +1,6 @@
+let incHead = let x = ⸨3⸩ in
+              (fun xs = head xs + x);
+    d = {|"a" := [⸨5⸩, 6], "b" := [⸨9⸩, 10], "c" := [3, 4]|};
+    e = {|"c" := []|};
+    d' = dict_map incHead (dict_difference d e) in
+dict_get "a" d' + dict_get "b" d'

package/dist/article/fluid/example/slicing/dict/map.fld

@@ -0,0 +1,5 @@
+let incHead = let x = 3 in fun xs -> head xs + x;
+    d = {| "a" := [5, 6], "b" := [9, 10], "c" := [3, 4] |};
+    e = {| "c" := [] |};
+    d' = dict_map incHead (dict_difference d e)
+in dict_get "a" d' + dict_get "b" d'

package/dist/article/fluid/example/slicing/divide.expect.fld

@@ -0,0 +1 @@
+⸨362⸩ / ⸨9⸩

package/dist/article/fluid/example/slicing/divide.fld

@@ -0,0 +1 @@
+362 / 9

package/dist/article/fluid/example/slicing/dtw/average-series.expect.fld

@@ -0,0 +1,8 @@
+let d x y = (x - y) * (x - y) in
+let avg x y = (x + y) / ⸨2⸩ in
+let avgSeq seq1 seq2 f = map (fun (i, j) = f (nth (i - 1) seq1) (nth (j - 1) seq2)) in
+let seq1 = [3, ⸨1⸩, 2, 2, 1];
+    seq2 = [2, 0, ⸨0⸩, 3, 3, 1, 0];
+    window = 2;
+    (costs, matched) = computeDTW seq1 seq2 d window in
+avgSeq seq1 seq2 avg matched

package/dist/article/fluid/example/slicing/dtw/average-series.fld

@@ -0,0 +1,8 @@
+let d x y = (x - y) * (x - y);
+let avg x y = (x + y) / 2;
+let avgSeq seq1 seq2 f = map (fun (i, j) -> f (nth (i - 1) seq1) (nth (j - 1) seq2));
+let seq1 = [3,1,2,2,1];
+    seq2 = [2,0,0,3,3,1,0];
+    window = 2;
+    (costs, matched) = computeDTW seq1 seq2 d window
+in avgSeq seq1 seq2 avg matched

package/dist/article/fluid/example/slicing/dtw/compute-dtw.expect.fld

@@ -0,0 +1,6 @@
+let d x y = (x - y) * (x - y) in
+let seq1 = ⸨[⸩ ⸨3⸩ ⸨,⸩ ⸨1⸩ ⸨,⸩ 2 ⸨,⸩ 2 ⸨,⸩ 1 ⸨]⸩;
+    seq2 = ⸨[⸩ ⸨2⸩ ⸨,⸩ ⸨0⸩ ⸨,⸩ ⸨0⸩ ⸨,⸩ 3 ⸨,⸩ 3 ⸨,⸩ 1 ⸨,⸩ 0 ⸨]⸩;
+    window = ⸨2⸩;
+    (costs, matched) = computeDTW seq1 seq2 d window in
+matched

package/dist/article/fluid/example/slicing/dtw/compute-dtw.fld

@@ -0,0 +1,6 @@
+let d x y = (x - y) * (x - y) in
+let seq1 = [3, 1, 2, 2, 1];
+    seq2 = [2, 0, 0, 3, 3, 1, 0];
+    window = 2;
+    (costs, matched) = computeDTW seq1 seq2 d window in
+matched

package/dist/article/fluid/example/slicing/filter.expect.fld

@@ -0,0 +1,4 @@
+let filter p [] = [];
+    filter p (x : xs) = let ys = filter p xs in
+                          if p x then ⸨(x : ys)⸩ else ys in
+filter ((<) ⸨5⸩) [⸨8⸩, 4, 7, 3]

package/dist/article/fluid/example/slicing/filter.fld

@@ -0,0 +1,6 @@
+let filter p [] = [];
+    filter p (x : xs) =
+      let ys = filter p xs in
+      if p x then x : ys else ys
+in
+filter ((<) 5) [8, 4, 7, 3]

package/dist/article/fluid/example/slicing/intersperse-1.expect.fld

@@ -0,0 +1,4 @@
+let intersperse [] _ = [];
+    intersperse [x] _ = [x];
+    intersperse (x : (y : ys)) sep = (x : ⸨(sep : intersperse ((y : ys)) sep)⸩) in
+intersperse ⸨[⸩ 1 ⸨,⸩ 2, 3] 0

package/dist/article/fluid/example/slicing/intersperse-2.expect.fld

@@ -0,0 +1,4 @@
+let intersperse [] _ = [];
+    intersperse [x] _ = [x];
+    intersperse (x : (y : ys)) sep = ⸨(x : (sep : intersperse (⸨(y : ys)⸩) sep))⸩ in
+intersperse ⸨[⸩ 1 ⸨,⸩ 2 ⸨,⸩ 3] 0

package/dist/article/fluid/example/slicing/intersperse.fld

@@ -0,0 +1,5 @@
+let intersperse [] _ = [];
+    intersperse [x] _ = [x];
+    intersperse (x : y : ys) sep = x : sep : intersperse (y : ys) sep
+in
+intersperse [1, 2, 3] 0

package/dist/article/fluid/example/slicing/length.expect.fld

@@ -0,0 +1 @@
+length ⸨[⸩ 1 ⸨,⸩ 2 ⸨,⸩ 3 ⸨,⸩ 4 ⸨,⸩ 5 ⸨]⸩

package/dist/article/fluid/example/slicing/length.fld

@@ -0,0 +1 @@
+length [1, 2, 3, 4, 5]

package/dist/article/fluid/example/slicing/linked-outputs/bar-chart-line-chart.fld

@@ -0,0 +1,26 @@
+MultiView {|
+   "bar-chart" :=
+      let totalFor c rows =
+         sum [ row.output | row <- rows, row.country == c ];
+      let data2015 = [ row | row <- renewables, row.year == 2015 ];
+         countryData = [ { x: c, bars: [ { y: "output", z: totalFor c data2015 } ] }
+                        | c <- ["China", "USA", "Germany"] ]
+      in BarChart {
+         caption: "Total output by country",
+         data: countryData
+      },
+   "line-chart" :=
+      let series type country = [
+         { x: row.year, y: row.output }
+         | year <- [2013..2018], row <- renewables,
+         row.year == year, row.energyType == type, row.country == country
+      ] in LineChart {
+         caption: "Output of USA relative to China",
+         plots: [
+            LinePlot { name: type, data: plot }
+            | type <- ["Bio", "Hydro", "Solar", "Wind"],
+            let plot = zipWith (fun p1 p2 -> { x: p1.x, y: p1.y / p2.y })
+                               (series type "USA") (series type "China")
+         ]
+      }
+|}

package/dist/article/fluid/example/slicing/linked-outputs/renewables.fld

@@ -0,0 +1,100 @@
+-- The original dataset sometimes has '~0' instead of '0'.
+-- Including only 3 countries here. Also, have reduced the Hydro value for China 2015 from 296 to 96 (ouch)
+-- to make the charts fit nicely into grant proposal. Fix this once proposal submitted!
+[
+   -- https://www.ren21.net/wp-content/uploads/2019/05/GSR2014_Full-Report_English.pdf
+   { year: 2013, country: "China", energyType: "Bio", output: 6.2 },
+   { year: 2013, country: "China", energyType: "Hydro", output: 260 },
+   { year: 2013, country: "China", energyType: "Solar", output: 19.9 },
+   { year: 2013, country: "China", energyType: "Wind", output: 91 },
+
+   { year: 2013, country: "USA", energyType: "Bio", output: 15.8 },
+   { year: 2013, country: "USA", energyType: "Hydro", output: 78 },
+   { year: 2013, country: "USA", energyType: "Solar", output: 12.1 },
+   { year: 2013, country: "USA", energyType: "Wind", output: 61 },
+
+   { year: 2013, country: "Germany", energyType: "Bio", output: 8.1 },
+   { year: 2013, country: "Germany", energyType: "Hydro", output: 5.6 },
+   { year: 2013, country: "Germany", energyType: "Solar", output: 36 },
+   { year: 2013, country: "Germany", energyType: "Wind", output: 34 },
+
+   -- https://www.ren21.net/wp-content/uploads/2019/05/GSR2015_Full-Report_English.pdf
+   { year: 2014, country: "China", energyType: "Bio", output: 10 },
+   { year: 2014, country: "China", energyType: "Hydro", output: 280 },
+   { year: 2014, country: "China", energyType: "Solar", output: 28 },
+   { year: 2014, country: "China", energyType: "Wind", output: 115 },
+
+   { year: 2014, country: "USA", energyType: "Bio", output: 16.1 },
+   { year: 2014, country: "USA", energyType: "Hydro", output: 79 },
+   { year: 2014, country: "USA", energyType: "Solar", output: 18 },
+   { year: 2014, country: "USA", energyType: "Wind", output: 66 },
+
+   { year: 2014, country: "Germany", energyType: "Bio", output: 8.8 },
+   { year: 2014, country: "Germany", energyType: "Hydro", output: 5.6 },
+   { year: 2014, country: "Germany", energyType: "Solar", output: 38 },
+   { year: 2014, country: "Germany", energyType: "Wind", output: 39 },
+
+   -- https://www.ren21.net/gsr-2016/00-Reference-Tables.php
+   { year: 2015, country: "China", energyType: "Bio", output: 10.3 },
+   { year: 2015, country: "China", energyType: "Hydro", output: 96 },
+   { year: 2015, country: "China", energyType: "Solar", output: 44 },
+   { year: 2015, country: "China", energyType: "Wind", output: 145 },
+
+   { year: 2015, country: "USA", energyType: "Bio", output: 16.7 },
+   { year: 2015, country: "USA", energyType: "Hydro", output: 80 },
+   { year: 2015, country: "USA", energyType: "Solar", output: 26 },
+   { year: 2015, country: "USA", energyType: "Wind", output: 74 },
+
+   { year: 2015, country: "Germany", energyType: "Bio", output: 7.1 },
+   { year: 2015, country: "Germany", energyType: "Hydro", output: 5.6 },
+   { year: 2015, country: "Germany", energyType: "Solar", output: 40 },
+   { year: 2015, country: "Germany", energyType: "Wind", output: 45 },
+
+   -- https://www.ren21.net/gsr-2017/pages/tables/tables/#table-R2
+   { year: 2016, country: "China", energyType: "Bio", output: 12 },
+   { year: 2016, country: "China", energyType: "Hydro", output: 305 },
+   { year: 2016, country: "China", energyType: "Solar", output: 77 },
+   { year: 2016, country: "China", energyType: "Wind", output: 169 },
+
+   { year: 2016, country: "USA", energyType: "Bio", output: 16.8 },
+   { year: 2016, country: "USA", energyType: "Hydro", output: 80 },
+   { year: 2016, country: "USA", energyType: "Solar", output: 41 },
+   { year: 2016, country: "USA", energyType: "Wind", output: 82 },
+
+   { year: 2016, country: "Germany", energyType: "Bio", output: 7.6 },
+   { year: 2016, country: "Germany", energyType: "Hydro", output: 5.6 },
+   { year: 2016, country: "Germany", energyType: "Solar", output: 41 },
+   { year: 2016, country: "Germany", energyType: "Wind", output: 50 },
+
+   -- https://www.ren21.net/gsr-2018/pages/tables/tables/#Table_R2
+   { year: 2017, country: "China", energyType: "Bio", output: 14.9 },
+   { year: 2017, country: "China", energyType: "Hydro", output: 313 },
+   { year: 2017, country: "China", energyType: "Solar", output: 131 },
+   { year: 2017, country: "China", energyType: "Wind", output: 188},
+
+   { year: 2017, country: "USA", energyType: "Bio", output: 16.7 },
+   { year: 2017, country: "USA", energyType: "Hydro", output: 80 },
+   { year: 2017, country: "USA", energyType: "Solar", output: 51 },
+   { year: 2017, country: "USA", energyType: "Wind", output: 89 },
+
+   { year: 2017, country: "Germany", energyType: "Bio", output: 8 },
+   { year: 2017, country: "Germany", energyType: "Hydro", output: 5.6 },
+   { year: 2017, country: "Germany", energyType: "Solar", output: 42 },
+   { year: 2017, country: "Germany", energyType: "Wind", output: 56 },
+
+   -- https://www.ren21.net/gsr-2019/tables/table_02/table_02/
+   { year: 2018, country: "China", energyType: "Bio", output: 17.8 },
+   { year: 2018, country: "China", energyType: "Hydro", output: 322 },
+   { year: 2018, country: "China", energyType: "Solar", output: 176 },
+   { year: 2018, country: "China", energyType: "Wind", output: 210 },
+
+   { year: 2018, country: "USA", energyType: "Bio", output: 16.2 },
+   { year: 2018, country: "USA", energyType: "Hydro", output: 80 },
+   { year: 2018, country: "USA", energyType: "Solar", output: 62 },
+   { year: 2018, country: "USA", energyType: "Wind", output: 96 },
+
+   { year: 2018, country: "Germany", energyType: "Bio", output: 8.4 },
+   { year: 2018, country: "Germany", energyType: "Hydro", output: 5.6 },
+   { year: 2018, country: "Germany", energyType: "Solar", output: 45 },
+   { year: 2018, country: "Germany", energyType: "Wind", output: 59 }
+]

package/dist/article/fluid/example/slicing/linked-outputs/stacked-bar-scatter-plot.fld

@@ -0,0 +1,38 @@
+MultiView {|
+   "stacked-bar-chart" :=
+      let totalFor year country rows =
+         let [ row ] = [ row | row <- rows, row.year == year, row.country == country ]
+         in row.nuclearOut + row.gasOut + row.coalOut + row.petrolOut;
+      let stack year = [ { y: country, z: totalFor year country nonRenewables }
+                     | country <- ["BRA", "EGY", "IND", "JPN"] ]
+      in BarChart {
+         caption: "Non-renewables by country",
+         data: [ { x: numToStr year, bars: stack year }
+               | year <- [2014..2018] ]
+      },
+   "scatter-plot" :=
+      let isCountry name x = name == x.country;
+         isYear year x = year == x.year;
+
+      let plot year countries =
+      let rens = filter (isYear year) renewables;
+            nonRens = filter (isYear year) nonRenewables;
+      let plotCountry country =
+         let rens' = filter (isCountry country) rens;
+            rensOut = sum (map (fun x -> x.output) rens');
+            rensCap = sum (map (fun x -> x.capacity) rens');
+            x = head (filter (isCountry country) nonRens);
+            nonRensCap = x.nuclearCap + x.petrolCap + x.gasCap + x.coalCap
+         in {
+            x: rensCap / (rensCap + nonRensCap),
+            y: (rensOut + x.nuclearOut) / (rensCap + x.nuclearCap)
+         }
+      in map plotCountry countries
+
+      in ScatterPlot {
+         caption: "Clean energy efficiency vs proportion of renewable energy capacity",
+         data: plot 2018 [ "BRA", "CHN", "DEU", "FRA", "EGY", "IND", "JPN", "MEX", "NGA", "USA" ],
+         xlabel: "Renewables/TotalEnergyCap",
+         ylabel: "Clean Capacity Factor"
+      }
+|}

package/dist/article/fluid/example/slicing/list-comp-1.expect.fld

@@ -0,0 +1,6 @@
+let data = [{year : 2013, country : "China", energyType : "Bio", output : 6.2}
+          , {year : 2013, country : "China", energyType : ⸨"Hydro"⸩, output : 260}
+          , {year : 2013, country : "China", energyType : "Solar", output : 19.9}
+          , {year : 2013, country : "China", energyType : "Wind", output : 91}
+          ] in
+⸨[row.output|type <- ["Bio", ⸨"Hydro"⸩, "Solar", "Wind"], row <- data, row.energyType == type]⸩

package/dist/article/fluid/example/slicing/list-comp-2.expect.fld

@@ -0,0 +1,6 @@
+let data = [{year : 2013, country : "China", energyType : "Bio", output : 6.2}
+          , {year : 2013, country : "China", energyType : "Hydro", output : 260}
+          , {year : 2013, country : "China", energyType : ⸨"Solar"⸩, output : 19.9}
+          , {year : 2013, country : "China", energyType : "Wind", output : 91}
+          ] in
+⸨[row.output|type <- ["Bio", "Hydro", ⸨"Solar"⸩, "Wind"], row <- data, row.energyType == type]⸩

package/dist/article/fluid/example/slicing/list-comp.fld

@@ -0,0 +1,8 @@
+let data = [
+   { year: 2013, country: "China", energyType: "Bio", output: 6.2 },
+   { year: 2013, country: "China", energyType: "Hydro", output: 260 },
+   { year: 2013, country: "China", energyType: "Solar", output: 19.9 },
+   { year: 2013, country: "China", energyType: "Wind", output: 91 }
+] in
+[ row.output | type <- ["Bio", "Hydro", "Solar", "Wind"],
+               row <- data, row.energyType == type ]

package/dist/article/fluid/example/slicing/lookup.expect.fld

@@ -0,0 +1,6 @@
+let lookup k (Empty) = None;
+    lookup k (NonEmpty t1 (key, val) t2) = match compare k key as
+                                                {(LT) -> lookup k t1;
+                                                  (EQ) -> ⸨Some val⸩;
+                                                  (GT) -> lookup k t2} in
+lookup ⸨6⸩ (NonEmpty (NonEmpty (Empty) ((3, "USA")) (Empty)) ((4, "China")) (NonEmpty (⸨NonEmpty (Empty) (⸨(⸨6⸩, "Germany")⸩) (Empty)⸩) ((7, "UK")) (Empty)))

package/dist/article/fluid/example/slicing/lookup.fld

@@ -0,0 +1,14 @@
+let lookup k Empty = None;
+    lookup k (NonEmpty t1 (key, val) t2) =
+       match compare k key as {
+          LT -> lookup k t1;
+          EQ -> Some val;
+          GT -> lookup k t2
+       }
+in
+lookup 6
+   (NonEmpty
+      (NonEmpty Empty (3, "USA") Empty)
+      (4, "China")
+      (NonEmpty (NonEmpty Empty (6, "Germany") Empty) (7, "UK") Empty)
+   )

package/dist/article/fluid/example/slicing/map.expect.fld

@@ -0,0 +1 @@
+map ((+) 2) ⸨[⸩ 3 ⸨,⸩ 4]

package/dist/article/fluid/example/slicing/map.fld

@@ -0,0 +1 @@
+map ((+) 2) [3, 4]

package/dist/article/fluid/example/slicing/matrix-update.expect.fld

@@ -0,0 +1,5 @@
+let image' = [[15, 13, 6, 9, 16], [12, 5, 15, 4, 13], [14, 9, 20, 8, 1], [4, 10, 3, 7, 19], [3, 11, 15, 2, 9]];
+    image = [|nth2 i j image'|(i, j) in (5, 5)|];
+    index = (2, 2);
+    pair = ⸨4000⸩ in
+matrixUpdate image index pair

package/dist/article/fluid/example/slicing/matrix-update.fld

@@ -0,0 +1,10 @@
+let image' = [[15, 13,  6, 9, 16],
+              [12,  5, 15, 4, 13],
+              [14,  9, 20, 8,  1],
+              [ 4, 10,  3, 7, 19],
+              [ 3, 11, 15, 2,  9]];
+    image = [| nth2 i j image'
+            | (i, j) in (5, 5) |];
+    index = (2, 2);
+    pair = 4000
+in matrixUpdate image index pair

package/dist/article/fluid/example/slicing/multiply.expect.fld

@@ -0,0 +1 @@
+5 * (⸨0⸩ * 3)

package/dist/article/fluid/example/slicing/multiply.fld

@@ -0,0 +1 @@
+5 * (0 * 3)

package/dist/article/fluid/example/slicing/nth.expect.fld

@@ -0,0 +1 @@
+nth 1 [3, ⸨4⸩, 5]

package/dist/article/fluid/example/slicing/nth.fld

@@ -0,0 +1 @@
+nth 1 [3, 4, 5]

package/dist/article/fluid/example/slicing/output-not-source.expect.fld

@@ -0,0 +1,2 @@
+let x = ⸨3⸩ in
+(x, x < ⸨5⸩)

package/dist/article/fluid/example/slicing/output-not-source.fld

@@ -0,0 +1 @@
+let x = 3 in (x, x < 5)