@explorable-viz/fluid 0.10.1 → 0.10.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@explorable-viz/fluid",
-  "version": "0.10.1",
+  "version": "0.10.3",
   "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": {

package/website/article/css/styles.css

@@ -1,41 +1,9 @@
 @charset "UTF-8";
 @import url("https://fonts.googleapis.com/css2?family=Fira+Code&display=swap");
 @import url('https://fonts.googleapis.com/css2?family=Ubuntu+Mono&display=swap');
+@import url('https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,300;1,300&display=swap');
 
-@font-face {
-   font-family: 'OdiseanTech';
-   src: url('/font/OdiseanTech.woff2') format('woff2');
-   font-weight: normal;
-   font-style: normal;
-}
-
-@font-face {
-   font-family: 'GraphikLight';
-   src: url('/font/GraphikLight.woff2') format('woff2');
-   font-weight: 300;
-   font-style: normal;
-}
-
-@font-face {
-   font-family: 'GraphikLightItalic';
-   src: url('/font/GraphikLightItalic.woff2') format('woff2');
-   font-weight: 300;
-   font-style: italic;
-}
-
-@font-face {
-   font-family: 'GraphikMedium';
-   src: url('/font/GraphikMedium.woff2') format('woff2');
-   font-weight: 500;
-   font-style: normal;
-}
-
-@font-face {
-   font-family: 'GraphikMediumItalic';
-   src: url('/font/GraphikMediumItalic.woff2') format('woff2');
-   font-weight: 500;
-   font-style: italic;
-}
+/* Dropped use of Graphik as seems to have a bug at font-weight 300 */
 
 .fluid-logo {
    margin-bottom: 0;
@@ -78,7 +46,7 @@ code {
 
 body {
    font-size: 12pt;
-   font-family: "GraphikLight", sans-serif;
+   font-family: "Roboto", sans-serif;
    font-weight: 300;
    line-height: 1.25;
    padding: 0;

package/website/article/css/view-styles.css

@@ -134,7 +134,7 @@ td.table-cell {
 
 .matrix-cell-text {
    font-size: 10pt;
-   font-family: "GraphikLight", sans-serif;
+   font-family: "Roboto", sans-serif;
    color: rgb(205, 205, 205)
 }
 
@@ -193,6 +193,6 @@ td.table-cell {
    font-size: 10pt;
 }
 
-.para-text span::after {
-  content: " ";
+.bar {
+   stroke-width: 1.5;
 }

package/website/article/fluid/1805.02474v1-10.fld

@@ -17,7 +17,7 @@ def mostEfficient:
    accuracies compared to uni-directional LSTM2, with the training time per epoch
    ${trendWord(model_BiLSTM.time_s, model_LSTM.time_s, growShrink)} from
    ${model_LSTM.time_s} seconds to ${model_BiLSTM.time_s} seconds.
-   Stacking 2 layers of BiLSTM gives ${trendWord(model_2_stacked_BiLSTM.acc, model_BiLSTM.acc, improve)}
+   Stacking 2 layers of BiLSTM gives ${trendWord(model_2_stacked_BiLSTM.acc, model_BiLSTM.acc, improvements)}
    to development results, with a ${trendWord(model_2_stacked_BiLSTM.time_s, model_BiLSTM.time_s, smallerHigher)}
    time of ${model_2_stacked_BiLSTM.time_s} seconds. 3 layers of stacked BiLSTM
    ${trendWord(model_3_stacked_BiLSTM.acc, model_BiLSTM.acc, improve)} the results.
@@ -34,7 +34,7 @@ def mostEfficient:
    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
-   ${model_3_stacked_CNN.acc}%, which is also the
+   ${numToStr(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

@@ -3,35 +3,35 @@ import renewables
 def totalFor(c, rows): sum([row.output for row in rows if row.country == c])
 
 def data2015: [row for row in renewables if row.year == 2015]
-
 def countryData: [{
     x: c,
     segments: [{ y: "output", z: totalFor(c, data2015) }]
   } for c in ["China", "USA", "Germany"]]
 
-def series(type, country):
+def series(energyType, country):
   [
     { x: row.year, y: row.output }
     for year in [2013 .. 2018] for row in renewables
-    if row.year == year if row.energyType == type if row.country == country
+    if row.year == year if row.energyType == energyType if row.country == country
   ]
 
 MultiView({
-  barChart: BarChart({
-    caption: "Total output by country",
-    size: { width: 275, height: 185 },
-    stackedBars: countryData
-  }),
+#   barChart: BarChart({
+#     caption: "Total renewables output by country",
+#     size: { width: 275, height: 185 },
+#     stackedBars: countryData
+#   }),
   lineChart: LineChart({
-    tickLabels: { x: Rotated, y: Default },
+    tickLabels: { x: Default, y: Default },
     size: { width: 330, height: 285 },
-    caption: "Output of USA relative to China",
+    caption: "Renewables output of USA relative to China",
     plots: [
-      LinePlot({ name: energyType, points: plot })
-      for energyType in ["Bio", "Hydro", "Solar", "Wind"]
-      for plot in [
-        zipWith((lambda p1, p2: { x: p1.x, y: p1.y / p2.y }), series(energyType, "USA"), series(energyType, "China"))
-      ]
-    ]
-  })
+     LinePlot({
+       name: energyType,
+       points: zipWith(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

@@ -6,23 +6,22 @@ def lookup(m, n, image):
   if m >= 1 |and| m <= m_max |and| n >= 1 |and| n <= n_max:
     image!(m, n)
   else: 0
-  # image!((m - 1 |mod| m_max) + 1, (n - 1 |mod| n_max) + 1)
+#   image!((m - 1 |mod| m_max) + 1, (n - 1 |mod| n_max) + 1)
 
 def matrixSum(matr):
   def (m, n): dims(matr)
   foldl((+), 0, [matr!(i, j) for (i, j) in range((1, 1), (m, n))])
 
 def convolve(image, kernel):
-  def ((m, n), (i, j)):
-    (dims(image), dims(kernel))
-  def (half_i, half_j):
-    (i |quot| 2, j |quot| 2)
+  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 interMatrix(m_, n_):
-    # @doc("""average these values to compute element (${m_},${n_})""")
+   #  @doc("""average these values to compute element""")
     [| kernel!(i_, j_) *
-       lookup(((m_ + i_) - 1) - half_i, ((n_ + j_) - 1) - half_j, image)
+       lookup(m_ + i_ - 1 - half_i, n_ + j_ - 1 - half_j, image)
        for (i_, j_) in (i, j) |]
 
   [| matrixSum(interMatrix(m_, n_)) |quot| area for (m_, n_) in (m, n) |]

package/website/article/fluid/scigen.fld

@@ -17,8 +17,10 @@ def ordinal(n):
         error("n > 20 not supported")
 
 def rankLabel(word, n):
-  if n == 1: ""
-  else: ordinal(n) ++ "-" ++ word
+  def prefix:
+    if n == 1: ""
+    else: ordinal(n) ++ "-"
+  prefix ++ word
 
 def trendWord(n1, n2, compareWord):
   compareWord(compare(n1, n2))
@@ -35,6 +37,10 @@ def improve(EQ): "does not further improve"
 def improve(LT): "does not further improve"
 def improve(GT): "further improves"
 
+def improvements(EQ): "no further improvements"
+def improvements(LT): "no further improvements"
+def improvements(GT): "further improvements"
+
 def shorterLonger(EQ): "equal"
 def shorterLonger(LT): "shorter"
 def shorterLonger(GT): "longer"

package/website/article/renewables-linked/index.html

@@ -17,9 +17,6 @@
    <div></div>
    <div>
       <h3>Non-renewables energy output</h3>
-      <p>Click the grey toggle and mouse over the bars.
-      <br>
-      <b>Clicking</b> makes a selection “persistent”.</p>
    </div>
 
    <div id="fig-data-pane" class="flex-right-align data-pane">
@@ -32,15 +29,6 @@
       <div id="fig">
          <div class="fig-loading">loading figure(s)</div>
       </div>
-      <p>Source code:</p>
-      <details>
-         <summary>bar-chart-line-chart.fld</summary>
-         <div id="codemirror-bar-chart-line-chart"></div>
-      </details>
-      <details>
-         <summary>renewables.fld</summary>
-         <div id="codemirror-renewables"></div>
-      </details>
    </div>
 </div>
 
@@ -52,8 +40,6 @@
     "query": false,
     "linking": true
    }
-
-   drawCode("../fluid/bar-chart-line-chart.fld")()
    loadFigureSpec(jsonSpec)("../fluid/bar-chart-line-chart.fld")()
 </script>
 </body>

package/website/article/scigen-1805.02474v1-10/index.html

@@ -14,6 +14,10 @@
         .data-pane {
             max-width: 400px;
         }
+
+        :root {
+            --text-pane-width: 530px;
+        }
     </style>
 </head>
 <body>
@@ -41,7 +45,7 @@
       "fluidSrcPath": ["../fluid"],
       "inputs": [ "tableData" ],
       "query": true,
-      "linking": false
+      "linking": true
    }
 
    loadFigureSpec(jsonSpec)("../fluid/1805.02474v1-10.fld")()

package/website/article/test.mjs

@@ -7,9 +7,6 @@ export const main = async () => {
       page => waitFor("#fig-output > svg:nth-child(1)")(page),
       page => waitFor("#fig-output > svg:nth-child(2)")(page),
    ]))()
-   await runTests(testURL("renewables-linked")([
-      page => waitFor("#fig-output > svg:nth-child(1)")(page),
-      page => waitFor("#fig-output > svg:nth-child(2)")(page),
-   ]))()
+   await runTests(testURL("renewables-linked")([page => waitFor("#fig-output > svg:nth-child(1)")(page)]))()
    await runTests(testURL("scigen-1805.02474v1-10")([ page => waitFor("div#fig-output")(page) ]))()
 }