@explorable-viz/fluid 0.11.3 → 0.12.1

package/dist/fluid/shared/webtest-lib.js

@@ -2762,16 +2762,16 @@ var require_ms = __commonJS({
     var d = h * 24;
     var w = d * 7;
     var y = d * 365.25;
-    module2.exports = function(val, options) {
+    module2.exports = function(val2, options) {
       options = options || {};
-      var type = typeof val;
-      if (type === "string" && val.length > 0) {
-        return parse2(val);
-      } else if (type === "number" && isFinite(val)) {
-        return options.long ? fmtLong(val) : fmtShort(val);
+      var type = typeof val2;
+      if (type === "string" && val2.length > 0) {
+        return parse2(val2);
+      } else if (type === "number" && isFinite(val2)) {
+        return options.long ? fmtLong(val2) : fmtShort(val2);
       }
       throw new Error(
-        "val is not a non-empty string or a valid number. val=" + JSON.stringify(val)
+        "val is not a non-empty string or a valid number. val=" + JSON.stringify(val2)
       );
     };
     function parse2(str) {
@@ -2924,8 +2924,8 @@ var require_common = __commonJS({
             index2++;
             const formatter = createDebug.formatters[format3];
             if (typeof formatter === "function") {
-              const val = args[index2];
-              match2 = formatter.call(self2, val);
+              const val2 = args[index2];
+              match2 = formatter.call(self2, val2);
               args.splice(index2, 1);
               index2--;
             }
@@ -3030,11 +3030,11 @@ var require_common = __commonJS({
         }
         return false;
       }
-      function coerce2(val) {
-        if (val instanceof Error) {
-          return val.stack || val.message;
+      function coerce2(val2) {
+        if (val2 instanceof Error) {
+          return val2.stack || val2.message;
         }
-        return val;
+        return val2;
       }
       function destroy() {
         console.warn("Instance method `debug.destroy()` is deprecated and no longer does anything. It will be removed in the next major version of `debug`.");
@@ -3432,17 +3432,17 @@ var require_node = __commonJS({
       const prop = key.substring(6).toLowerCase().replace(/_([a-z])/g, (_, k) => {
         return k.toUpperCase();
       });
-      let val = process.env[key];
-      if (/^(yes|on|true|enabled)$/i.test(val)) {
-        val = true;
-      } else if (/^(no|off|false|disabled)$/i.test(val)) {
-        val = false;
-      } else if (val === "null") {
-        val = null;
+      let val2 = process.env[key];
+      if (/^(yes|on|true|enabled)$/i.test(val2)) {
+        val2 = true;
+      } else if (/^(no|off|false|disabled)$/i.test(val2)) {
+        val2 = false;
+      } else if (val2 === "null") {
+        val2 = null;
       } else {
-        val = Number(val);
+        val2 = Number(val2);
       }
-      obj[prop] = val;
+      obj[prop] = val2;
       return obj;
     }, {});
     function useColors() {
@@ -19559,7 +19559,7 @@ var require_logHelper = __commonJS({
         }).join(",")}}`;
       }
       if (arg.type === "array") {
-        return `[${arg.value?.map((val) => toJson(val)).join(",") ?? ""}]`;
+        return `[${arg.value?.map((val2) => toJson(val2)).join(",") ?? ""}]`;
       }
       throw Error(`Invalid value type: ${arg}`);
     }
@@ -34809,9 +34809,9 @@ var require_lru_cache = __commonJS({
       }
       pop() {
         if (this.size) {
-          const val = this.valList[this.head];
+          const val2 = this.valList[this.head];
           this.evict(true);
-          return val;
+          return val2;
         }
       }
       evict(free) {
@@ -42295,14 +42295,14 @@ var require_estraverse = __commonJS({
       "use strict";
       var Syntax, VisitorOption, VisitorKeys, BREAK, SKIP, REMOVE;
       function deepCopy(obj) {
-        var ret = {}, key, val;
+        var ret = {}, key, val2;
         for (key in obj) {
           if (obj.hasOwnProperty(key)) {
-            val = obj[key];
-            if (typeof val === "object" && val !== null) {
-              ret[key] = deepCopy(val);
+            val2 = obj[key];
+            if (typeof val2 === "object" && val2 !== null) {
+              ret[key] = deepCopy(val2);
             } else {
-              ret[key] = val;
+              ret[key] = val2;
             }
           }
         }
@@ -45220,21 +45220,21 @@ var require_escodegen = __commonJS({
         return target;
       }
       function updateDeeply(target, override) {
-        var key, val;
+        var key, val2;
         function isHashObject(target2) {
           return typeof target2 === "object" && target2 instanceof Object && !(target2 instanceof RegExp);
         }
         for (key in override) {
           if (override.hasOwnProperty(key)) {
-            val = override[key];
-            if (isHashObject(val)) {
+            val2 = override[key];
+            if (isHashObject(val2)) {
               if (isHashObject(target[key])) {
-                updateDeeply(target[key], val);
+                updateDeeply(target[key], val2);
               } else {
-                target[key] = updateDeeply({}, val);
+                target[key] = updateDeeply({}, val2);
               }
             } else {
-              target[key] = val;
+              target[key] = val2;
             }
           }
         }
@@ -57180,35 +57180,35 @@ ${err.cause.stack}`;
       return r;
     }
     exports2.compile = compile;
-    function quickJSHandleToHost(vm, val) {
-      return vm.dump(val);
+    function quickJSHandleToHost(vm, val2) {
+      return vm.dump(val2);
     }
-    function hostToQuickJSHandle(vm, val) {
-      if (typeof val === "undefined") {
+    function hostToQuickJSHandle(vm, val2) {
+      if (typeof val2 === "undefined") {
         return vm.undefined;
-      } else if (val === null) {
+      } else if (val2 === null) {
         return vm.null;
-      } else if (typeof val === "string") {
-        return vm.newString(val);
-      } else if (typeof val === "number") {
-        return vm.newNumber(val);
-      } else if (typeof val === "bigint") {
-        return vm.newBigInt(val);
-      } else if (typeof val === "boolean") {
-        return val ? vm.true : vm.false;
-      } else if (util_1.types.isPromise(val)) {
+      } else if (typeof val2 === "string") {
+        return vm.newString(val2);
+      } else if (typeof val2 === "number") {
+        return vm.newNumber(val2);
+      } else if (typeof val2 === "bigint") {
+        return vm.newBigInt(val2);
+      } else if (typeof val2 === "boolean") {
+        return val2 ? vm.true : vm.false;
+      } else if (util_1.types.isPromise(val2)) {
         const promise2 = vm.newPromise();
         promise2.settled.then(vm.runtime.executePendingJobs);
-        val.then((r) => {
+        val2.then((r) => {
           promise2.resolve(hostToQuickJSHandle(vm, r));
         }, (err) => {
           promise2.reject(hostToQuickJSHandle(vm, err));
         });
         return promise2.handle;
-      } else if (util_1.types.isNativeError(val)) {
-        return vm.newError(val);
+      } else if (util_1.types.isNativeError(val2)) {
+        return vm.newError(val2);
       }
-      throw new Error(`Unsupported value: ${val}`);
+      throw new Error(`Unsupported value: ${val2}`);
     }
   }
 });
@@ -63497,29 +63497,29 @@ var require_fast_fifo = __commonJS({
         this.head.clear();
         this.length = 0;
       }
-      push(val) {
+      push(val2) {
         this.length++;
-        if (!this.head.push(val)) {
+        if (!this.head.push(val2)) {
           const prev = this.head;
           this.head = prev.next = new FixedFIFO(2 * this.head.buffer.length);
-          this.head.push(val);
+          this.head.push(val2);
         }
       }
       shift() {
         if (this.length !== 0) this.length--;
-        const val = this.tail.shift();
-        if (val === void 0 && this.tail.next) {
+        const val2 = this.tail.shift();
+        if (val2 === void 0 && this.tail.next) {
           const next = this.tail.next;
           this.tail.next = null;
           this.tail = next;
           return this.tail.shift();
         }
-        return val;
+        return val2;
       }
       peek() {
-        const val = this.tail.peek();
-        if (val === void 0 && this.tail.next) return this.tail.next.peek();
-        return val;
+        const val2 = this.tail.peek();
+        if (val2 === void 0 && this.tail.next) return this.tail.next.peek();
+        return val2;
       }
       isEmpty() {
         return this.length === 0;
@@ -65009,10 +65009,10 @@ var require_headers = __commonJS({
       for (let j = 156; j < 512; j++) sum += block2[j];
       return sum;
     }
-    function encodeOct(val, n) {
-      val = val.toString(8);
-      if (val.length > n) return SEVENS.slice(0, n) + " ";
-      return ZEROS.slice(0, n - val.length) + val + " ";
+    function encodeOct(val2, n) {
+      val2 = val2.toString(8);
+      if (val2.length > n) return SEVENS.slice(0, n) + " ";
+      return ZEROS.slice(0, n - val2.length) + val2 + " ";
     }
     function encodeSizeBin(num, buf, off) {
       buf[off] = 128;
@@ -65047,21 +65047,21 @@ var require_headers = __commonJS({
       }
       return positive ? sum : -1 * sum;
     }
-    function decodeOct(val, offset, length4) {
-      val = val.subarray(offset, offset + length4);
+    function decodeOct(val2, offset, length4) {
+      val2 = val2.subarray(offset, offset + length4);
       offset = 0;
-      if (val[offset] & 128) {
-        return parse256(val);
+      if (val2[offset] & 128) {
+        return parse256(val2);
       } else {
-        while (offset < val.length && val[offset] === 32) offset++;
-        const end = clamp(indexOf2(val, 32, offset, val.length), val.length, val.length);
-        while (offset < end && val[offset] === 0) offset++;
+        while (offset < val2.length && val2[offset] === 32) offset++;
+        const end = clamp(indexOf2(val2, 32, offset, val2.length), val2.length, val2.length);
+        while (offset < end && val2[offset] === 0) offset++;
         if (end === offset) return 0;
-        return parseInt(b4a.toString(val.subarray(offset, end)), 8);
+        return parseInt(b4a.toString(val2.subarray(offset, end)), 8);
       }
     }
-    function decodeStr(val, offset, length4, encoding) {
-      return b4a.toString(val.subarray(offset, indexOf2(val, 0, offset, offset + length4)), encoding);
+    function decodeStr(val2, offset, length4, encoding) {
+      return b4a.toString(val2.subarray(offset, indexOf2(val2, 0, offset, offset + length4)), encoding);
     }
     function addLength(str) {
       const len = b4a.byteLength(str);
@@ -106178,37 +106178,37 @@ ${lanes.join("\n")}
             sourceFile2.setExternalModuleIndicator = setExternalModuleIndicator2;
           }
         }
-        function setContextFlag(val, flag) {
-          if (val) {
+        function setContextFlag(val2, flag) {
+          if (val2) {
             contextFlags |= flag;
           } else {
             contextFlags &= ~flag;
           }
         }
-        function setDisallowInContext(val) {
+        function setDisallowInContext(val2) {
           setContextFlag(
-            val,
+            val2,
             8192
             /* DisallowInContext */
           );
         }
-        function setYieldContext(val) {
+        function setYieldContext(val2) {
           setContextFlag(
-            val,
+            val2,
             16384
             /* YieldContext */
           );
         }
-        function setDecoratorContext(val) {
+        function setDecoratorContext(val2) {
           setContextFlag(
-            val,
+            val2,
             32768
             /* DecoratorContext */
           );
         }
-        function setAwaitContext(val) {
+        function setAwaitContext(val2) {
           setContextFlag(
-            val,
+            val2,
             65536
             /* AwaitContext */
           );
@@ -117436,9 +117436,9 @@ ${lanes.join("\n")}
       function convertJsonOptionOfCustomType(opt, value, errors, valueExpression, sourceFile) {
         if (isNullOrUndefined(value)) return void 0;
         const key = value.toLowerCase();
-        const val = opt.type.get(key);
-        if (val !== void 0) {
-          return validateJsonOptionValue(opt, val, errors, valueExpression, sourceFile);
+        const val2 = opt.type.get(key);
+        if (val2 !== void 0) {
+          return validateJsonOptionValue(opt, val2, errors, valueExpression, sourceFile);
         } else {
           errors.push(createDiagnosticForInvalidCustomType(opt, (message2, ...args) => createDiagnosticForNodeInSourceFileOrCompilerDiagnostic(sourceFile, valueExpression, message2, ...args)));
         }
@@ -183181,8 +183181,8 @@ ${lanes.join("\n")}
           addEmitHelpers(visited, context3.readEmitHelpers());
           return visited;
         }
-        function setContextFlag(flag, val) {
-          contextFlags = val ? contextFlags | flag : contextFlags & ~flag;
+        function setContextFlag(flag, val2) {
+          contextFlags = val2 ? contextFlags | flag : contextFlags & ~flag;
         }
         function inContext(flags) {
           return (contextFlags & flags) !== 0;
@@ -237336,8 +237336,8 @@ ${newComment.split("\n").map((c) => ` * ${c}`).join("\n")}
         if (continuationArgName && !shouldReturn(node, transformer)) {
           if (isSynthIdentifier(continuationArgName)) {
             possibleNameForVarDecl = continuationArgName;
-            transformer.synthNamesMap.forEach((val, key) => {
-              if (val.identifier.text === continuationArgName.identifier.text) {
+            transformer.synthNamesMap.forEach((val2, key) => {
+              if (val2.identifier.text === continuationArgName.identifier.text) {
                 const newSynthName = createUniqueSynthName(continuationArgName);
                 transformer.synthNamesMap.set(key, newSynthName);
               }
@@ -273824,7 +273824,7 @@ ${options.prefix}` : "\n" : options.prefix
           }
           let availableSpace = maxProgramSizeForNonTsFiles;
           this.projectToSizeMap.set(name2, 0);
-          this.projectToSizeMap.forEach((val) => availableSpace -= val || 0);
+          this.projectToSizeMap.forEach((val2) => availableSpace -= val2 || 0);
           let totalNonTsFileSize = 0;
           for (const f of fileNames) {
             const fileName = propertyReader.getFileName(f);
@@ -294187,14 +294187,14 @@ var YargsParser = class {
       setArg(key, argsToSet);
       return i;
     }
-    function setArg(key, val, shouldStripQuotes = inputIsString) {
+    function setArg(key, val2, shouldStripQuotes = inputIsString) {
       if (/-/.test(key) && configuration2["camel-case-expansion"]) {
         const alias = key.split(".").map(function(prop) {
           return camelCase(prop);
         }).join(".");
         addNewAlias(key, alias);
       }
-      const value = processValue(key, val, shouldStripQuotes);
+      const value = processValue(key, val2, shouldStripQuotes);
       const splitKey = key.split(".");
       setKey(argv, splitKey, value);
       if (flags.aliases[key]) {
@@ -294221,10 +294221,10 @@ var YargsParser = class {
           Object.defineProperty(argvReturn, key2, {
             enumerable: true,
             get() {
-              return val;
+              return val2;
             },
             set(value2) {
-              val = typeof value2 === "string" ? mixin2.normalize(value2) : value2;
+              val2 = typeof value2 === "string" ? mixin2.normalize(value2) : value2;
             }
           });
         });
@@ -294239,27 +294239,27 @@ var YargsParser = class {
         addNewAlias(alias, key);
       }
     }
-    function processValue(key, val, shouldStripQuotes) {
+    function processValue(key, val2, shouldStripQuotes) {
       if (shouldStripQuotes) {
-        val = stripQuotes(val);
+        val2 = stripQuotes(val2);
       }
       if (checkAllAliases(key, flags.bools) || checkAllAliases(key, flags.counts)) {
-        if (typeof val === "string")
-          val = val === "true";
+        if (typeof val2 === "string")
+          val2 = val2 === "true";
       }
-      let value = Array.isArray(val) ? val.map(function(v) {
+      let value = Array.isArray(val2) ? val2.map(function(v) {
         return maybeCoerceNumber(key, v);
-      }) : maybeCoerceNumber(key, val);
+      }) : maybeCoerceNumber(key, val2);
       if (checkAllAliases(key, flags.counts) && (isUndefined2(value) || typeof value === "boolean")) {
         value = increment();
       }
       if (checkAllAliases(key, flags.normalize) && checkAllAliases(key, flags.arrays)) {
-        if (Array.isArray(val))
-          value = val.map((val2) => {
-            return mixin2.normalize(val2);
+        if (Array.isArray(val2))
+          value = val2.map((val3) => {
+            return mixin2.normalize(val3);
           });
         else
-          value = mixin2.normalize(val);
+          value = mixin2.normalize(val2);
       }
       return value;
     }
@@ -294634,8 +294634,8 @@ function sanitizeKey(key) {
     return "___proto___";
   return key;
 }
-function stripQuotes(val) {
-  return typeof val === "string" && (val[0] === "'" || val[0] === '"') && val[val.length - 1] === val[0] ? val.substring(1, val.length - 1) : val;
+function stripQuotes(val2) {
+  return typeof val2 === "string" && (val2[0] === "'" || val2[0] === '"') && val2[val2.length - 1] === val2[0] ? val2.substring(1, val2.length - 1) : val2;
 }
 
 // node_modules/@puppeteer/browsers/node_modules/yargs-parser/build/lib/index.js
@@ -296571,18 +296571,18 @@ ${customMsgs.join("\n")}` : "";
   self2.getImplied = function getImplied() {
     return implied;
   };
-  function keyExists(argv, val) {
-    const num = Number(val);
-    val = isNaN(num) ? val : num;
-    if (typeof val === "number") {
-      val = argv._.length >= val;
-    } else if (val.match(/^--no-.+/)) {
-      val = val.match(/^--no-(.+)/)[1];
-      val = !Object.prototype.hasOwnProperty.call(argv, val);
+  function keyExists(argv, val2) {
+    const num = Number(val2);
+    val2 = isNaN(num) ? val2 : num;
+    if (typeof val2 === "number") {
+      val2 = argv._.length >= val2;
+    } else if (val2.match(/^--no-.+/)) {
+      val2 = val2.match(/^--no-(.+)/)[1];
+      val2 = !Object.prototype.hasOwnProperty.call(argv, val2);
     } else {
-      val = Object.prototype.hasOwnProperty.call(argv, val);
+      val2 = Object.prototype.hasOwnProperty.call(argv, val2);
     }
-    return val;
+    return val2;
   }
   self2.implications = function implications(argv) {
     const implyFail = [];
@@ -299702,7 +299702,7 @@ function _launch2(options) {
 var sequence_ = /* @__PURE__ */ traverse_(applicativeAff)(foldableArray)(identity2);
 var testCondition2 = /* @__PURE__ */ testCondition(monadThrowAff)(monadEffectAff);
 var for_2 = /* @__PURE__ */ for_(applicativeAff)(foldableArray);
-var timeout2 = 24e4;
+var timeout2 = 6e4;
 var textContentValue = (page2) => (selector2) => _bind(runPromiseAffE3(_unsafePageEval)(selector2)("element => element.textContent")(page2))((captionText) => _pure(captionText));
 var show$p = (v) => v;
 var runTests = (arr) => fromAff(sequence_(arr));
@@ -299712,13 +299712,13 @@ var waitFor = (selector2) => (page2) => {
   const report = testCondition2(selector2);
   return _bind(_liftEffect(log2("Waiting for " + selector2)))(() => _catchError(_bind(_map((v) => {
   })(runPromiseAffE3(_pageWaitForSelector)(selector2)({
-    timeout: 24e4,
+    timeout: 6e4,
     visible: true
   })(page2)))(() => _bind(_liftEffect(log2("-> found")))(() => report(true)("exists"))))((e) => report(false)(showErrorImpl(e))));
 };
 var waitForHidden = (selector2) => (page2) => _bind(_liftEffect(log2("Waiting for " + selector2)))(() => _bind(_map((v) => {
 })(runPromiseAffE3(_pageWaitForSelector)(selector2)({
-  timeout: 24e4,
+  timeout: 6e4,
   visible: false
 })(page2)))(() => _liftEffect(log2("-> found"))));
 var launch4 = /* @__PURE__ */ runPromiseAffE1(_launch2);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@explorable-viz/fluid",
-  "version": "0.11.3",
+  "version": "0.12.1",
   "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/1805.02474v1-10.fld

@@ -10,7 +10,7 @@ def model_S_LSTM: model("S-LSTM", tableData)
 def model_CNN: model("CNN", tableData)
 def model_3_stacked_CNN: model("3 stacked CNN", tableData)
 def mostEfficient:
-   findWithKey_("time_s", minimum(map(lambda y: y.time_s, tableData)), tableData)
+   find_with_key_("time_s", minimum(map(lambda y: y.time_s, tableData)), tableData)
 
 f"""As shown in Table 3, BiLSTM gives significantly
    {trendWord(model_BiLSTM.acc, model_LSTM.acc, betterWorse)}
@@ -34,7 +34,7 @@ f"""As shown in Table 3, BiLSTM gives significantly
    among all models compared, with the
    {rankLabel("smallest", findIndex("model", "CNN", insertionSort(lambda a, b: a.param < b.param, tableData)))}
    model size. On the other hand, a 3-layer stacked CNN gives an accuracy of
-   {numToStr(model_3_stacked_CNN.acc)}%, which is also the
+   {num_to_str(model_3_stacked_CNN.acc)}%, which is also the
    {rankLabel("lowest", findIndex("model", "CNN", insertionSort(lambda a, b: a.time_s < b.time_s, tableData)))}
    compared with BiLSTM, hierarchical attention and S-LSTM. The
    {rankLabel("best", findIndex("model", "S-LSTM+Attention", insertionSort(lambda a, b: b.acc < a.acc, tableData)))}

package/website/article/fluid/bar-chart-line-chart.fld

@@ -30,7 +30,7 @@ MultiView([
     plots: [
      LinePlot({
        name: energyType,
-       points: zipWith(lambda p1, p2: { x: p1.x, y: p1.y / p2.y }, usa, china)
+       points: zip_with(lambda p1, p2: { x: p1.x, y: p1.y / p2.y }, usa, china)
      })
      for energyType in ["Bio", "Hydro", "Solar", "Wind"]
      for (usa, china) in [(series(energyType, "USA"), series(energyType, "China"))]

package/website/article/fluid/convolution.fld

@@ -1,29 +1,25 @@
-import convolution.testImage
-import convolution.emboss
+import convolution.testImage  # defines inputImage
+import convolution.emboss     # defines filter
 
 def lookup(m, n, image):
-  def (m_max, n_max): dims(image)
-  if m >= 1 |and| m <= m_max |and| n >= 1 |and| n <= n_max:
+  def (m_size, n_size): dims(image)
+  if m >= 0 and m < m_size and n >= 0 and n < n_size:
     image!(m, n)
-  else: 0
-#   image!((m - 1 |mod| m_max) + 1, (n - 1 |mod| n_max) + 1)
+  else: 0 # pad with zeros
 
-def matrixSum(matr):
+def matrix_sum(matr):
   def (m, n): dims(matr)
-  foldl((+), 0, [matr!(i, j) for (i, j) in range((1, 1), (m, n))])
+  foldl((+), 0, [matr!(i, j) for (i, j) in range2d((0, 0), (m, n))])
 
 def convolve(image, kernel):
-  def (m, n): dims(image)
-  def (i, j): dims(kernel)
-  def (half_i, half_j): (i |quot| 2, j |quot| 2)
-  def area: i * j
+  def (k_i, k_j): dims(kernel)
+  def (half_i, half_j): (k_i |quot| 2, k_j |quot| 2)
 
-  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)
-       for (i_, j_) in (i, j) |]
+  def inter_matrix(m, n):
+    @doc(f"""average these to compute element ({m}, {n})""")
+    [| lookup(m + i - half_i, n + j - half_j, image) * kernel!(i, j)
+       for (i, j) in (k_i, k_j) |]
 
-  [| matrixSum(interMatrix(m_, n_)) |quot| area for (m_, n_) in (m, n) |]
+  [| matrix_sum(inter_matrix(m, n)) |quot| k_i * k_j for (m, n) in dims(image) |]
 
 convolve(inputImage, filter)

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

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

package/website/article/fluid/methane_data.fld

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

package/website/article/fluid/moving-average.fld

@@ -5,7 +5,7 @@ def nthPad(n, xs):
 def movingAvg(ys, window):
   [sum([nthPad(n, ys) for n in [i - window .. i + window]]) / (1 + 2 * window) for i in [0 .. length(ys) - 1]]
 def movingAvg_(rs, window):
-  zipWith(lambda x, y: { x: x, y: y }, map(lambda r: r.x, rs), movingAvg(map(lambda r: r.y, rs), window))
+  zip_with(lambda x, y: { x: x, y: y }, map(lambda r: r.x, rs), movingAvg(map(lambda r: r.y, rs), window))
 
 def points:
   [{ x: r.year, y: r.emissions } for r in methane if r.type == "Agriculture"]

package/website/article/fluid/non-renewables.fld

@@ -19,7 +19,7 @@ MultiView([
     caption: "Non-renewables output",
     size: { width: 275, height: 185 },
     tickLabels: { x: Default, y: Default },
-    stackedBars: [{ x: numToStr(year), segments: stack(year) } for year in [2014 .. 2018]],
+    stackedBars: [{ x: num_to_str(year), segments: stack(year) } for year in [2014 .. 2018]],
     legend: True
   }),
   ScatterPlot({

package/website/article/fluid/nonRenewables.fld

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

package/website/article/fluid/renewables.fld

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

package/website/article/fluid/scigen.fld

@@ -9,10 +9,10 @@ def ordinal(n):
     error("n <= 0 not supported")
   else:
     if n < 4:
-      numToStr(n) ++ findWithKey_("lastDigit", n, ordinalMap).suffix
+      num_to_str(n) ++ find_with_key_("lastDigit", n, ordinalMap).suffix
     else:
-      if n >= 4 |and| n <= 20:
-         numToStr(n) ++ "th"
+      if n >= 4 and n <= 20:
+         num_to_str(n) ++ "th"
       else:
         error("n > 20 not supported")