@explorable-viz/fluid 0.11.2 → 0.11.4

package/dist/fluid/fluid/lib/graphics.fld

@@ -1,18 +1,26 @@
+# type Colour = Str
+# type Colours = List Colour
+# type Cat = Str
+
+# Group has location (0, 0) because it doesn't interfere with positioning of its children.
+# GraphicsElement -> Point
 def coords(Group(gs)): Point(0, 0)
 def coords(Rect(x, y, _, _, _)): Point(x, y)
 def coords(String(x, y, _, _, _)): Point(x, y)
 def coords(Viewport(x, y, _, _, _, _, _, _, _)): Point(x, y)
 
+# GraphicsElement -> Float
 def get_x(g):
   def Point(x, _): coords(g)
-
   x
 
+# GraphicsElement -> Float
 def get_y(g):
   def Point(_, y): coords(g)
+  y
 
-  x
-
+# Want some kind of typeclass mechanism plus record accessors/updaters.
+# Float -> GraphicsElement -> GraphicsElement
 def set_x(x, Group(gs)):
   error("Group has immutable coordinates")
 def set_x(x, Rect(_, y, w, h, fill)):
@@ -22,9 +30,14 @@ def set_x(x, String(_, y, str, anchor, baseline)):
 def set_x(x, Viewport(_, y, w, h, fill, margin, scale, translate, g)):
   Viewport(x, y, w, h, fill, margin, scale, translate, g)
 
+# (Point, Point) -> Point
 def dimensions2((Point(x1, y1), Point(x2, y2))):
   Point(max(x1, x2), max(y1, y2))
 
+# For Group, dimensions are relative to implicit coords of (0, 0), since a Group's children are effectively
+# positioned relative to parent of Group. For Polymarker, will probably have to ignore the markers themselves,
+# since they are scale-invariant.
+# GraphicsElement -> Point
 def dimensions(Group(gs)):
   foldl(curry(dimensions2), Point(0, 0), map(coords_op, gs))
 def dimensions(Polyline(ps, _, _)):
@@ -32,25 +45,28 @@ def dimensions(Polyline(ps, _, _)):
 def dimensions(Rect(_, _, w, h, _)): Point(w, h)
 def dimensions(String(_, _, _, _, _)): Point(0, 0)
 def dimensions(Viewport(_, _, w, h, _, _, _, _, _)): Point(w, h)
+
 def coords_op(g):
   def (Point(x, y), Point(w, h)):
     prod(coords, dimensions, g)
-
   Point(x + w, y + h)
 
+# GraphicsElement -> Float
 def width(g):
   def Point(w, _): dimensions(g)
-
   w
 
+# GraphicsElement -> Float
 def height(g):
   def Point(_, h): dimensions(g)
-
   h
 
+# Float -> Float -> List GraphicsElement -> List GraphicsElement
 def spaceRight(z, sep, gs):
   zipWith(set_x, iterate(length(gs), (+)(sep), z), gs)
 
+# Bake colour decisions into the library for the time being. Provide two palettes, so we can have two
+# different sets of categorical values (e.g. countries and energy types). Palettes from colorbrewer2.org
 def colours1: [
   "#66c2a5",
   "#a6d854",
@@ -73,23 +89,29 @@ def colours2: [
   "#f781bf"
 ]
 
+# Compositionality principle: child coords/dimensions are always expressed directly using parent reference
+# frame, to avoid depending on content of child, and so are not themselves scaled. Polyline can't be scaled
+# directly because it inherits its frame of reference from its parent. For Viewport, margin will shrink the
+# available area, possibly to zero, at which point nothing will be rendered.
+# Float -> GraphicsElement -> GraphicsElement
 def scaleToWidth(w, Rect(x, y, _, h, fill)):
   Rect(x, y, w, h, fill)
 def scaleToWidth(w, Viewport(x, y, w0, h, fill, margin, Scale(x_scale, y_scale), translate, g)):
-  def scale:
-    Scale((x_scale * w) / w0, y_scale)
-
+  def scale: Scale((x_scale * w) / w0, y_scale)
   Viewport(x, y, w, h, fill, margin, scale, translate, g)
 
+# Float -> List GraphicsElement -> List GraphicsElement
 def stackRight(sep, gs):
   map(scaleToWidth(1 - sep), spaceRight(sep / 2, 1, gs))
 
+# Float -> List GraphicsElement -> GraphicsElement
 def groupRight(sep, gs):
   Viewport(0, 0, length(gs), maximum(map(height, gs)), "none", 0, Scale(1, 1), Translate(0, 0), Group(stackRight(sep, gs)))
 
+# Heuristic saying how often to place a tick on an axis of length n.
+# Float -> Float
 def tickEvery(n):
-  def m:
-    floor(logBase(10, n))
+  def m: floor(logBase(10, n))
 
   if n <= 2 * 10 ** m: 2 * 10 ** (m - 1)
   else: 10 ** m
@@ -101,47 +123,45 @@ def defaultMargin: 24
 def markerRadius: 3.5
 def tickLength: 4
 
+# Helpers for axis functions.
+# Orient -> Colour -> Float -> GraphicsElement
 def tick(Horiz, colour, len):
   Line(Point(0, 0), Point(0, 0 - len), colour, axisStrokeWidth)
 def tick(Vert, colour, len):
   Line(Point(0, 0), Point(0 - len, 0), colour, axisStrokeWidth)
 
+# Orient -> Float -> Float -> Str -> GraphicsElement
 def label(Horiz, x, distance, str):
   String(x, (0 - distance) - 4, str, "middle", "hanging")
 def label(Vert, x, distance, str):
   String(0 - distance, x, str, "end", "central")
 
+# Orient -> Colour -> Float -> Str -> GraphicsElement
 def labelledTick(orient, colour, len, str):
   Group([
     tick(orient, colour, len),
     label(orient, 0, len, str)
   ])
 
+# Orient -> Float -> Float -> Point
 def mkPoint(Horiz, x, y): Point(y, x)
 def mkPoint(Vert, x, y): Point(x, y)
 
+# x is position of this axis on the other axis. Returns axis and position of last tick.
+# Orient -> Float -> Float -> Float -> GraphicsElement
 def axis(orient, x, start, end):
-  def tickSp:
-    tickEvery(end - start)
-  def firstTick:
-    ceilingToNearest(start, tickSp)
-  def lastTick:
-    ceilingToNearest(end, tickSp)
-  def n:
-    floor((end - firstTick) / tickSp) + 1
-  def ys:
-    iterate(n, (+)(tickSp), firstTick)
+  def tickSp: tickEvery(end - start)
+  def firstTick: ceilingToNearest(start, tickSp)
+  def lastTick: ceilingToNearest(end, tickSp)
+  def n: floor((end - firstTick) / tickSp) + 1
+  def ys: iterate(n, (+)(tickSp), firstTick)
   def ys:
-    match firstTick > start:
-      case True: start :| ys
-      case False: ys
+    if firstTick > start: start :| ys
+    else: ys
   def ys:
-    match lastTick > end:
-      case True:
-        concat2(ys, [lastTick])
-      case False: ys
-  def ps:
-    map(mkPoint(orient, x), ys)
+    if lastTick > end: concat2(ys, [lastTick])
+    else: ys
+  def ps: map(mkPoint(orient, x), ys)
   def ax:
     Group([
       Line(head(ps), last(ps), axisColour, axisStrokeWidth),
@@ -150,11 +170,11 @@ def axis(orient, x, start, end):
 
   (ax, lastTick)
 
+# x is position of this axis on the other axis.
+# Orient -> Float -> List Cat -> GraphicsElement
 def catAxis(orient, x, catValues):
-  def ys:
-    iterate(length(catValues) + 1, (+)(1), 0)
-  def ps:
-    map(mkPoint(orient, x), ys)
+  def ys: iterate(length(catValues) + 1, (+)(1), 0)
+  def ps: map(mkPoint(orient, x), ys)
 
   Group([
     Line(head(ps), last(ps), axisColour, axisStrokeWidth),
@@ -162,14 +182,18 @@ def catAxis(orient, x, catValues):
     Polymarkers(flip(map, tail(ps), lambda Point(x, y): Point(x - 0.5, y)), map(label(orient, -0.5, 0), catValues))
   ])
 
+# Float -> Float -> Float -> Float -> List GraphicsElement -> GraphicsElement
 def viewport(x_start, x_finish, y_finish, margin, gs):
   Viewport(0, 0, x_finish - x_start, y_finish, backgroundColour, margin, Scale(1, 1), Translate(0 - x_start, 0), Group(gs))
 
+# Plot a map of x values to lists of (categorical value, y value) pairs. Importantly, assume all data is uniform
+# (categorical keys are the same for each x value and are ordered the same each time).
+# Bool -> Colours -> Float -> List (Float, List (Cat, Float)) -> GraphicsElement
 def lineChart(withAxes, colours, x_start, data):
   def xs: map(fst, data)
-  def nCat:
-    length(snd(head(data)))
+  def nCat: length(snd(head(data)))
 
+  # (Int, Colour) -> GraphicsElement
   def plot((n, colour)):
     def ps:
       map(lambda (x, kvs): Point(x, snd(nth(n, kvs))), data)
@@ -179,68 +203,72 @@ def lineChart(withAxes, colours, x_start, data):
       Polymarkers(ps, repeat(length(ps), Circle(0, 0, markerRadius, colour)))
     ])
 
+  # List GraphicsElement
   def lines:
     zipWith(curry(plot), iterate(nCat, (+)(1), 0), colours)
   def x_finish: last(xs)
   def y_finish:
     maximum(flip(map, data, lambda (_, kvs): maximum(map(snd, kvs))))
 
-  match withAxes:
-    case True:
-      def (x_axis, x_finish):
-        axis(Horiz, 0, x_start, x_finish)
-      def (y_axis, y_finish'):
-        axis(Vert, x_start, 0, y_finish)
-
-      viewport(x_start, x_finish, y_finish', defaultMargin, x_axis :| y_axis :| lines)
-    case False:
-      viewport(x_start, x_finish, y_finish, 0, lines)
+  if withAxes:
+    def (x_axis, x_finish): axis(Horiz, 0, x_start, x_finish)
+    def (y_axis, y_finish_): axis(Vert, x_start, 0, y_finish)
+    viewport(x_start, x_finish, y_finish_, defaultMargin, x_axis :| y_axis :| lines)
+  else:
+    viewport(x_start, x_finish, y_finish, 0, lines)
 
+# Plot a chart of categorical values on the x-axis and renderings of the corresponding a-value on the y-axis.
+# (Colours -> List a -> GraphicsElement) -> Bool -> Colours -> Float -> List (Cat, a) -> GraphicsElement
 def categoricalChart(plotValue, withAxes, colours, sep, data):
   def gs:
     stackRight(sep, plotValue(colours, map(snd, data)))
   def w: length(gs)
-  def h:
-    maximum(map(height, gs))
-
-  match withAxes:
-    case True:
-      def x_axis:
-        catAxis(Horiz, 0, map(fst, data))
-      def (y_axis, h'): axis(Vert, 0, 0, h)
+  def h: maximum(map(height, gs))
 
-      viewport(0, w, h', defaultMargin, concat2(gs, [x_axis, y_axis]))
-    case False:
-      viewport(0, w, h, 0, gs)
+  if withAxes:
+    def x_axis: catAxis(Horiz, 0, map(fst, data))
+    def (y_axis, h_): axis(Vert, 0, 0, h)
+    viewport(0, w, h_, defaultMargin, concat2(gs, [x_axis, y_axis]))
+  else:
+    viewport(0, w, h, 0, gs)
 
+# Colours -> List a -> GraphicsElement
 def rects(colours, ns):
   zipWith(lambda colour, n: Rect(0, 0, 1, n, colour), colours, ns)
 
+# First component of data (categorical value) currently ignored; values just mapped positionally to colors.
+# Can we use Group instead of Viewport here?
+# Colours -> List (a, Num) -> GraphicsElement
 def stackedBar(colours, ns):
   def heights: map(snd, ns)
-  def subtotals:
-    scanl1((+), 0, heights)
-  def dims:
-    zip(0 :| subtotals, heights)
+  def subtotals: scanl1((+), 0, heights)
+  def dims: zip(0 :| subtotals, heights)
   def rects:
     map(lambda ((y, height), colour): Rect(0, y, 1, height, colour), zip(dims, colours))
 
   Viewport(0, 0, 1, last(subtotals), "none", 0, Scale(1, 1), Translate(0, 0), Group(rects))
 
+# Bool -> Colours -> Float -> List (a, Float) -> GraphicsElement
 def barChart:
   categoricalChart(rects)
 
+# For each categorical value of type a, plot a bar chart for the corresponding b-indexed data.
+# Bool -> Colours -> Float -> List (a, List (b, Float)) -> GraphicsElement
 def groupedBarChart:
   categoricalChart(compose(map, flip(barChart(False), 0)))
 
+# See stackedBar for strong (unjustified) assumption about uniformity of data.
+# Bool -> Colours -> Num -> List (a, List (b, Num)) -> GraphicsElement
 def stackedBarChart:
   categoricalChart(compose(map, stackedBar))
 
+# Bit of a hack, but how text fits into our model is a bit unclear at the moment.
+# Str -> GraphicsElement -> GraphicsElement
 def caption(str, Viewport(x, y, w, h, fill, margin, scale, translate, g)):
-  def g':
+  def g_:
     Group([
       String(x + w / 2, -2, str, "middle", "hanging"),
       Viewport(0, 0, w, h, fill, margin, scale, translate, g)
     ])
 
-  Viewport(x, y, w, h, backgroundColour, defaultMargin / 2 + 4, Scale(1, 1), Translate(0, 0), g')
+  Viewport(x, y, w, h, backgroundColour, defaultMargin / 2 + 4, Scale(1, 1), Translate(0, 0), g_)

package/dist/fluid/shared/fluid.mjs

@@ -10312,6 +10312,7 @@ var inlinable = (m) => (doc) => {
   }
   fail();
 };
+var expr = /* @__PURE__ */ Mode(Expr);
 var format = (m) => (w) => (doc) => {
   if (inlinable(m)(doc) && width(m)(doc) < (80 - w | 0)) {
     return Inline;
@@ -10371,9 +10372,8 @@ var renderWithIndent = (m) => (i) => (w) => (doc) => {
   }
   fail();
 };
-var expr = /* @__PURE__ */ Mode(Expr);
 
-// output-es/Pretty.Helpers/index.js
+// output-es/Pretty.Util/index.js
 var vsep = (v) => {
   if (v.tag === "Nil") {
     return Empty;
@@ -18933,12 +18933,6 @@ var isHexDigit = (c) => {
 var isAlphaNum = (x) => checkAttr([524288, 512, 4096, 1048576, 16384, 8388608, 4194304, 2097152, 131072, 256, 16777216])(x);
 var isAlpha = (x) => checkAttr([4096, 512, 524288, 1048576, 16384])(x);
 
-// output-es/Parse.Error/index.js
-var prettyParseError = (v) => "ParseError on line " + showIntImpl(v._2.line) + ", column " + showIntImpl(v._2.column) + ":\n" + v._1;
-
-// output-es/Parse.Constants/index.js
-var opChars = [":", "!", "#", "$", "%", "&", "*", "+", ".", "/", "<", "=", ">", "?", "@", "\\", "^", "|", "-", "~"];
-
 // output-es/Parsing.Combinators.Array/index.js
 var many2 = (p) => {
   const $0 = monadRecParserT.tailRecM((xs) => (v2, $02, $1, $2, $3) => {
@@ -19304,7 +19298,8 @@ var stringChar = /* @__PURE__ */ withErrorMessage((state1, more, lift12, $$throw
   $$throw2,
   (state2, a) => more((v2) => done(state2, $Maybe("Just", a)))
 )))("string character");
-var lexeme = (p) => (state1, more, lift12, $$throw2, done) => more((v2) => more((v1) => p(
+var opChars = [":", "!", "#", "$", "%", "&", "*", "+", ".", "/", "<", "=", ">", "?", "@", "\\", "^", "|", "-", "~"];
+var lexeme = (v) => (state1, more, lift12, $$throw2, done) => more((v2) => more((v1) => v(
   state1,
   more,
   lift12,
@@ -19361,7 +19356,7 @@ var stringLiteral = /* @__PURE__ */ lexeme(/* @__PURE__ */ withErrorMessage(/* @
     ))
   ));
 })())("literal string"));
-var keywords = ["def", "if", "else", "lambda", "match", "case", "for", "in"];
+var keywords = ["case", "def", "else", "for", "if", "import", "in", "lambda", "match"];
 var unreserved = (p) => (state1, more, lift12, $$throw2, done) => more((v1) => p(
   state1,
   more,
@@ -20101,7 +20096,7 @@ var topLevel = (p) => (state1, more, lift12, $$throw2, done) => more((v2) => mor
 var parse = (parser) => (input) => {
   const $0 = runParserT2(input)(parser)(initialPos)._1;
   if ($0.tag === "Left") {
-    return $Either("Left", prettyParseError($0._1));
+    return $Either("Left", "ParseError on line " + showIntImpl($0._1._2.line) + ", column " + showIntImpl($0._1._2.column) + ":\n" + $0._1._1);
   }
   if ($0.tag === "Right") {
     return $Either("Right", $0._1);

package/dist/fluid/shared/load-figure.js

@@ -24025,6 +24025,45 @@ var nubBy = (comp) => (xs) => {
   }
   return [];
 };
+var transpose = (xs) => {
+  const go = (go$a0$copy) => (go$a1$copy) => {
+    let go$a0 = go$a0$copy, go$a1 = go$a1$copy, go$c = true, go$r;
+    while (go$c) {
+      const idx = go$a0, allArrays = go$a1;
+      const v = foldlArray((acc) => (nextArr) => {
+        if (idx >= 0 && idx < nextArr.length) {
+          const $0 = nextArr[idx];
+          return $Maybe(
+            "Just",
+            (() => {
+              if (acc.tag === "Nothing") {
+                return [$0];
+              }
+              if (acc.tag === "Just") {
+                return snoc(acc._1)($0);
+              }
+              fail();
+            })()
+          );
+        }
+        return acc;
+      })(Nothing)(xs);
+      if (v.tag === "Nothing") {
+        go$c = false;
+        go$r = allArrays;
+        continue;
+      }
+      if (v.tag === "Just") {
+        go$a0 = idx + 1 | 0;
+        go$a1 = snoc(allArrays)(v._1);
+        continue;
+      }
+      fail();
+    }
+    return go$r;
+  };
+  return go(0)([]);
+};
 var foldM = (dictMonad) => (f) => (b) => ($0) => unconsImpl((v) => dictMonad.Applicative0().pure(b), (a) => (as) => dictMonad.Bind1().bind(f(b)(a))((b$p) => foldM(dictMonad)(f)(b$p)(as)), $0);
 var elem = (dictEq) => (a) => (arr) => {
   const $0 = findIndexImpl(Just, Nothing, (v) => dictEq.eq(v)(a), arr);
@@ -27856,7 +27895,7 @@ var renderWithIndent = (m) => (i) => (w) => (doc2) => {
   fail();
 };
 
-// output-es/Pretty.Helpers/index.js
+// output-es/Pretty.Util/index.js
 var sep$p = (v) => (v1) => {
   if (v1.tag === "Nil") {
     return Empty;
@@ -43386,47 +43425,6 @@ var toStringWith = (v) => {
   fail();
 };
 
-// output-es/Util.Array/index.js
-var transpose2 = (xs) => {
-  const go = (go$a0$copy) => (go$a1$copy) => {
-    let go$a0 = go$a0$copy, go$a1 = go$a1$copy, go$c = true, go$r;
-    while (go$c) {
-      const idx = go$a0, allArrays = go$a1;
-      const v = foldlArray((acc) => (nextArr) => {
-        if (idx >= 0 && idx < nextArr.length) {
-          const $0 = nextArr[idx];
-          return $Maybe(
-            "Just",
-            (() => {
-              if (acc.tag === "Nothing") {
-                return [$0];
-              }
-              if (acc.tag === "Just") {
-                return snoc(acc._1)($0);
-              }
-              fail();
-            })()
-          );
-        }
-        return acc;
-      })(Nothing)(xs);
-      if (v.tag === "Nothing") {
-        go$c = false;
-        go$r = allArrays;
-        continue;
-      }
-      if (v.tag === "Just") {
-        go$a0 = idx + 1 | 0;
-        go$a1 = snoc(allArrays)(v._1);
-        continue;
-      }
-      fail();
-    }
-    return go$r;
-  };
-  return go(0)([]);
-};
-
 // output-es/App.View.TableView/index.js
 var toUnfoldable6 = /* @__PURE__ */ (() => {
   const $0 = unfoldableArray.unfoldr((xs) => {
@@ -43619,7 +43617,7 @@ var viewableTableViewUnit = {
       fail();
     };
     const $3 = selectAll2(".table-row")(rootElement);
-    const column_isVisible = arrayMap(any(visible($0.length >= 10 ? Interactive : Everything)))(transpose2($1));
+    const column_isVisible = arrayMap(any(visible($0.length >= 10 ? Interactive : Everything)))(transpose($1));
     const column_visiblePred = (column_visiblePred$a0$copy) => {
       let column_visiblePred$a0 = column_visiblePred$a0$copy, column_visiblePred$c = true, column_visiblePred$r;
       while (column_visiblePred$c) {
@@ -46975,12 +46973,6 @@ var isHexDigit = (c) => {
 var isAlphaNum = (x2) => checkAttr([524288, 512, 4096, 1048576, 16384, 8388608, 4194304, 2097152, 131072, 256, 16777216])(x2);
 var isAlpha = (x2) => checkAttr([4096, 512, 524288, 1048576, 16384])(x2);
 
-// output-es/Parse.Error/index.js
-var prettyParseError = (v) => "ParseError on line " + showIntImpl(v._2.line) + ", column " + showIntImpl(v._2.column) + ":\n" + v._1;
-
-// output-es/Parse.Constants/index.js
-var opChars = [":", "!", "#", "$", "%", "&", "*", "+", ".", "/", "<", "=", ">", "?", "@", "\\", "^", "|", "-", "~"];
-
 // output-es/Parsing.Combinators.Array/index.js
 var many2 = (p) => {
   const $0 = monadRecParserT.tailRecM((xs) => (v2, $02, $1, $2, $3) => {
@@ -47341,7 +47333,8 @@ var stringChar = /* @__PURE__ */ withErrorMessage((state1, more, lift12, $$throw
   $$throw2,
   (state2, a) => more((v2) => done(state2, $Maybe("Just", a)))
 )))("string character");
-var lexeme = (p) => (state1, more, lift12, $$throw2, done) => more((v2) => more((v1) => p(
+var opChars = [":", "!", "#", "$", "%", "&", "*", "+", ".", "/", "<", "=", ">", "?", "@", "\\", "^", "|", "-", "~"];
+var lexeme = (v) => (state1, more, lift12, $$throw2, done) => more((v2) => more((v1) => v(
   state1,
   more,
   lift12,
@@ -47398,7 +47391,7 @@ var stringLiteral = /* @__PURE__ */ lexeme(/* @__PURE__ */ withErrorMessage(/* @
     ))
   ));
 })())("literal string"));
-var keywords = ["def", "if", "else", "lambda", "match", "case", "for", "in"];
+var keywords = ["case", "def", "else", "for", "if", "import", "in", "lambda", "match"];
 var unreserved = (p) => (state1, more, lift12, $$throw2, done) => more((v1) => p(
   state1,
   more,
@@ -48138,7 +48131,7 @@ var topLevel = (p) => (state1, more, lift12, $$throw2, done) => more((v2) => mor
 var parse = (parser2) => (input) => {
   const $0 = runParserT2(input)(parser2)(initialPos)._1;
   if ($0.tag === "Left") {
-    return $Either("Left", prettyParseError($0._1));
+    return $Either("Left", "ParseError on line " + showIntImpl($0._1._2.line) + ", column " + showIntImpl($0._1._2.column) + ":\n" + $0._1._1);
   }
   if ($0.tag === "Right") {
     return $Either("Right", $0._1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@explorable-viz/fluid",
-  "version": "0.11.2",
+  "version": "0.11.4",
   "description": "A functional programming language which integrates a bidirectional dynamic analysis, connecting outputs to data sources in a fine-grained way. Fluid is implemented in PureScript and runs in the browser.",
   "main": "index.js",
   "repository": {
@@ -75,7 +75,7 @@
     "karma-mocha": "2.0.1",
     "karma-mocha-reporter": "2.2.5",
     "mocha": "^10.0.0",
-    "puppeteer": "^23.2.0",
+    "puppeteer": "23.11.1",
     "purescript": "0.15.10",
     "purescript-language-server": "0.16.6",
     "purescript-psa": "0.8.2",

package/website/article/fluid/convolution.fld

@@ -19,9 +19,8 @@ def convolve(image, kernel):
   def area: i * j
 
   def interMatrix(m_, n_):
-   #  @doc(f"""average these values to compute element""")
-    [| kernel!(i_, j_) *
-       lookup(m_ + i_ - 1 - half_i, n_ + j_ - 1 - half_j, image)
+    @doc(f"""average these to compute element ({m_}, {n_})""")
+    [| lookup(m_ + i_ - 1 - half_i, n_ + j_ - 1 - half_j, image) * kernel!(i_, j_)
        for (i_, j_) in (i, j) |]
 
   [| matrixSum(interMatrix(m_, n_)) |quot| area for (m_, n_) in (m, n) |]

package/website/article/fluid/dataset/scigen/_1805_02474v1_10.fld

@@ -1,2 +1,2 @@
 def tableData:
-   loadJson("/dataset/SciGen/1805.02474v1-10.json")
+   loadJson("../dataset/SciGen/1805.02474v1-10.json")

package/website/article/fluid/methane_data.fld

@@ -1 +1 @@
-def methane: loadJson("/dataset/methane-emissions.json")
+def methane: loadJson("../dataset/methane-emissions.json")

package/website/article/fluid/nonRenewables.fld

@@ -1,5 +1,5 @@
 def nonRenewables:
-  loadJson("/dataset/non-renewables.json")
+  loadJson("../dataset/non-renewables.json")
 
 def renewables:
-  loadJson("/dataset/renewable.json")
+  loadJson("../dataset/renewable.json")

package/website/article/fluid/renewables.fld

@@ -1 +1 @@
-def renewables: loadJson("/dataset/renewable-new.json")
+def renewables: loadJson("../dataset/renewable-new.json")

package/website/article/publications.html

@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-   <meta charset="UTF-8">
-   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-   <meta http-equiv="X-UA-Compatible" content="ie=edge">
-   <title>Some publications</title>
-   <link href="css/styles.css" rel="stylesheet" type="text/css">
-   <script src="https://kit.fontawesome.com/20cf8b42c0.js" crossorigin="anonymous"></script>
-</head>
-<body>
-
-<div class="grid-container double-size">
-   <div></div>
-   <div></div>
-   <div class="flex-left-align">
-      <div></div>
-      <h2>Preprints</h2>
-
-      <a href="https://dynamicaspects.org/papers/authoring-assistant.pdf">AI-Assisted Authoring for Transparent, Data-Driven Documents</a>
-      Alfonso Piscitelli, Cristina David, Mattia De Rosa, Ali Muhammad, Federico Nanni, Jacob Pake, Roly Perera, Jessy Sodimu, Chenyiqiu Zheng
-      <br>(Under review)
-      <br><br>
-      <a href="https://bentnib.org/galois-autodiff.pdf">
-        <strong>Galois Slicing as Automatic Differentiation</strong>
-      </a>
-      Robert Atkey, Roly Perera
-      <br>(Under review)
-
-      <h2>Recent papers</h2>
-      <a href="https://link.springer.com/chapter/10.1007/978-3-031-91118-7_6">
-         Cognacy Queries over Dependence Graphs for Transparent Visualisations
-      </a>
-      Joseph Bond, Cristina David, Minh Nguyen, Dominic Orchard, Roly Perera
-      <br>European Symposium on Programming (ESOP 2025)
-      <br><br>
-      <a href="https://arxiv.org/abs/2109.00445">Linked Visualisations via Galois Dependencies</a>
-      Roly Perera, Minh Nguyen, Tomas Petricek, Meng Wang
-      <br>
-      ACM SIGPLAN Conference on Principles of Programming Languages (POPL 2022)
-   </div>
-</div>
-</body>
-</html>