@explorable-viz/fluid 0.8.2 → 0.9.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@explorable-viz/fluid",
-  "version": "0.8.2",
-  "description": "Fluid is an experimental programming language which integrates a bidirectional dynamic analysis to connect outputs to data sources in a fine-grained way. Fluid is implemented in PureScript and runs in the browser.",
+  "version": "0.9.0",
+  "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": {
     "type": "git",
@@ -46,7 +46,6 @@
     "test": "./script/test.sh",
     "test-all": "./script/test-all.sh",
     "test-browser": "./script/test.sh --browsers=Chrome --singleRun=false",
-    "test-page": "./script/test-page.sh",
     "test-website": "./script/test-website.sh",
     "test-website-all": "./script/test-website-all.sh",
     "tidy": "./script/tidy.sh"
@@ -69,7 +68,7 @@
     "util": "^0.12.5"
   },
   "devDependencies": {
-    "esbuild": "0.15.1",
+    "esbuild": "^0.25.8",
     "gh-pages": "^6.1.1",
     "karma": "6.4.0",
     "karma-chrome-launcher": "3.1.1",
@@ -80,7 +79,7 @@
     "purescript": "^0.15.10",
     "purescript-language-server": "0.16.6",
     "purescript-psa": "0.8.2",
-    "purs-backend-es": "1.4.2",
+    "purs-backend-es": "^1.4.2",
     "purs-tidy": "^0.9.3",
     "spago": "^0.21.0",
     "typescript": "^5.5.3"

package/website/article/convolution/spec.json

@@ -1,6 +1,5 @@
 {
     "fluidSrcPath": ["../fluid"],
-    "datasets": [],
     "inputs": [ "inputImage", "filter" ],
     "query": true,
     "linking": false

package/website/article/fluid/convolution.fld

@@ -17,7 +17,7 @@ let convolve image kernel =
         (half_i, half_j) = (i `quot` 2, j `quot` 2);
         area = i * j
     in [| let interMatrix =
-              """average these to compute value of element (${m'},${n'})"""
+              @doc("""average these to compute value of element (${m'},${n'})""")
               [| let x = m' + i' - 1 - half_i;
                      y = n' + j' - 1 - half_j in
                 lookup x y image * kernel!(i', j')

package/website/article/fluid/dataset/methane-emissions.json

@@ -0,0 +1,111 @@
+[
+  { "year": 2015, "type": "total", "emissions": 64.82295407 },
+  { "year": 2015, "type": "Agricultural Waste Burning", "emissions": 0.411253 },
+  { "year": 2015, "type": "Agriculture", "emissions": 18.17094166 },
+  { "year": 2015, "type": "Energy Sector", "emissions": 29.76188165 },
+  { "year": 2015, "type": "Forest Burning", "emissions": 0.51736129 },
+  { "year": 2015, "type": "Grassland Burning", "emissions": 4.12193675 },
+  { "year": 2015, "type": "Industrial Sector", "emissions": 0.09559156 },
+  { "year": 2015, "type": "Residential Commercial Other", "emissions": 2.6914635 },
+  { "year": 2015, "type": "Transportation Sector", "emissions": 0.06519554 },
+  { "year": 2015, "type": "Waste", "emissions": 8.98732911 },
+
+  { "year": 2020, "type": "total", "emissions": 78.43285535 },
+  { "year": 2020, "type": "Agricultural Waste Burning", "emissions": 0.54358088 },
+  { "year": 2020, "type": "Agriculture", "emissions": 22.13282073 },
+  { "year": 2020, "type": "Energy Sector", "emissions": 38.81883821 },
+  { "year": 2020, "type": "Forest Burning", "emissions": 0.51329337 },
+  { "year": 2020, "type": "Grassland Burning", "emissions": 3.95741764 },
+  { "year": 2020, "type": "Industrial Sector", "emissions": 0.09594071 },
+  { "year": 2020, "type": "Residential Commercial Other", "emissions": 2.56548807 },
+  { "year": 2020, "type": "Transportation Sector", "emissions": 0.06546724 },
+  { "year": 2020, "type": "Waste", "emissions": 9.7400085 },
+
+  { "year": 2030, "type": "total", "emissions": 121.57147078 },
+  { "year": 2030, "type": "Agricultural Waste Burning", "emissions": 0.84583739 },
+  { "year": 2030, "type": "Agriculture", "emissions": 37.74454937 },
+  { "year": 2030, "type": "Energy Sector", "emissions": 64.1859774 },
+  { "year": 2030, "type": "Forest Burning", "emissions": 0.80870342 },
+  { "year": 2030, "type": "Grassland Burning", "emissions": 4.02610215 },
+  { "year": 2030, "type": "Industrial Sector", "emissions": 0.09598039 },
+  { "year": 2030, "type": "Residential Commercial Other", "emissions": 1.97035231 },
+  { "year": 2030, "type": "Transportation Sector", "emissions": 0.06571693 },
+  { "year": 2030, "type": "Waste", "emissions": 11.8282514 },
+
+  { "year": 2040, "type": "total", "emissions": 179.45174841 },
+  { "year": 2040, "type": "Agricultural Waste Burning", "emissions": 1.19171607 },
+  { "year": 2040, "type": "Agriculture", "emissions": 61.27090324 },
+  { "year": 2040, "type": "Energy Sector", "emissions": 97.37841569 },
+  { "year": 2040, "type": "Forest Burning", "emissions": 0.66064656 },
+  { "year": 2040, "type": "Grassland Burning", "emissions": 3.84519255 },
+  { "year": 2040, "type": "Industrial Sector", "emissions": 0.09689225 },
+  { "year": 2040, "type": "Residential Commercial Other", "emissions": 1.33010499 },
+  { "year": 2040, "type": "Transportation Sector", "emissions": 0.0663173 },
+  { "year": 2040, "type": "Waste", "emissions": 13.61155975 },
+
+  { "year": 2050, "type": "total", "emissions": 219.38894442 },
+  { "year": 2050, "type": "Agricultural Waste Burning", "emissions": 1.60321718 },
+  { "year": 2050, "type": "Agriculture", "emissions": 90.85759433 },
+  { "year": 2050, "type": "Energy Sector", "emissions": 107.15311705 },
+  { "year": 2050, "type": "Forest Burning", "emissions": 0.52749839 },
+  { "year": 2050, "type": "Grassland Burning", "emissions": 3.76717842 },
+  { "year": 2050, "type": "Industrial Sector", "emissions": 0.09848635 },
+  { "year": 2050, "type": "Residential Commercial Other", "emissions": 0.82742253 },
+  { "year": 2050, "type": "Transportation Sector", "emissions": 0.06709878 },
+  { "year": 2050, "type": "Waste", "emissions": 14.48733139 },
+
+  { "year": 2060, "type": "total", "emissions": 242.63229347 },
+  { "year": 2060, "type": "Agricultural Waste Burning", "emissions": 1.93557102 },
+  { "year": 2060, "type": "Agriculture", "emissions": 104.69106253 },
+  { "year": 2060, "type": "Energy Sector", "emissions": 116.7472953 },
+  { "year": 2060, "type": "Forest Burning", "emissions": 0.46539144 },
+  { "year": 2060, "type": "Grassland Burning", "emissions": 3.66022062 },
+  { "year": 2060, "type": "Industrial Sector", "emissions": 0.09971953 },
+  { "year": 2060, "type": "Residential Commercial Other", "emissions": 0.46752611 },
+  { "year": 2060, "type": "Transportation Sector", "emissions": 0.06781869 },
+  { "year": 2060, "type": "Waste", "emissions": 14.49768823 },
+
+  { "year": 2070, "type": "total", "emissions": 255.90313098 },
+  { "year": 2070, "type": "Agricultural Waste Burning", "emissions": 2.08050211 },
+  { "year": 2070, "type": "Agriculture", "emissions": 109.93855666 },
+  { "year": 2070, "type": "Energy Sector", "emissions": 125.14149136 },
+  { "year": 2070, "type": "Forest Burning", "emissions": 0.45346383 },
+  { "year": 2070, "type": "Grassland Burning", "emissions": 3.52716441 },
+  { "year": 2070, "type": "Industrial Sector", "emissions": 0.10005683 },
+  { "year": 2070, "type": "Residential Commercial Other", "emissions": 0.21893571 },
+  { "year": 2070, "type": "Transportation Sector", "emissions": 0.06817304 },
+  { "year": 2070, "type": "Waste", "emissions": 14.37478702 },
+
+  { "year": 2080, "type": "total", "emissions": 249.84379933 },
+  { "year": 2080, "type": "Agricultural Waste Burning", "emissions": 2.15889057 },
+  { "year": 2080, "type": "Agriculture", "emissions": 110.0702472 },
+  { "year": 2080, "type": "Energy Sector", "emissions": 119.99949417 },
+  { "year": 2080, "type": "Forest Burning", "emissions": 0.45790596 },
+  { "year": 2080, "type": "Grassland Burning", "emissions": 3.37155974 },
+  { "year": 2080, "type": "Industrial Sector", "emissions": 0.09982383 },
+  { "year": 2080, "type": "Residential Commercial Other", "emissions": 0.11500102 },
+  { "year": 2080, "type": "Transportation Sector", "emissions": 0.068312 },
+  { "year": 2080, "type": "Waste", "emissions": 13.50256483 },
+
+  { "year": 2090, "type": "total", "emissions": 209.67760329 },
+  { "year": 2090, "type": "Agricultural Waste Burning", "emissions": 2.25135814 },
+  { "year": 2090, "type": "Agriculture", "emissions": 100.25638786 },
+  { "year": 2090, "type": "Energy Sector", "emissions": 90.74292491 },
+  { "year": 2090, "type": "Forest Burning", "emissions": 0.47913947 },
+  { "year": 2090, "type": "Grassland Burning", "emissions": 3.019728 },
+  { "year": 2090, "type": "Industrial Sector", "emissions": 0.09911105 },
+  { "year": 2090, "type": "Residential Commercial Other", "emissions": 0.06762289 },
+  { "year": 2090, "type": "Transportation Sector", "emissions": 0.06829208 },
+  { "year": 2090, "type": "Waste", "emissions": 12.69303888 },
+
+  { "year": 2100, "type": "total", "emissions": 187.43439917 },
+  { "year": 2100, "type": "Agricultural Waste Burning", "emissions": 2.27400509 },
+  { "year": 2100, "type": "Agriculture", "emissions": 84.57857015 },
+  { "year": 2100, "type": "Energy Sector", "emissions": 82.87915239 },
+  { "year": 2100, "type": "Forest Burning", "emissions": 0.47888571 },
+  { "year": 2100, "type": "Grassland Burning", "emissions": 2.92857597 },
+  { "year": 2100, "type": "Industrial Sector", "emissions": 0.09806927 },
+  { "year": 2100, "type": "Residential Commercial Other", "emissions": 0.04356964 },
+  { "year": 2100, "type": "Transportation Sector", "emissions": 0.06813231 },
+  { "year": 2100, "type": "Waste", "emissions": 14.08543862 }
+]

package/website/article/fluid/dataset/non-renewables.json

@@ -0,0 +1,67 @@
+[
+  { "country": "BRA", "year": 2013, "nuclearOut": 14.65, "nuclearCap": 17.43, "gasOut": 66.14, "gasCap": 81.99, "coalOut": 21.06, "coalCap": 29.35, "petrolOut": 24.79, "petrolCap": 32.67 },
+  { "country": "CHN", "year": 2013, "nuclearOut": 111.5, "nuclearCap": 128.42, "gasOut": 116.39, "gasCap": 371.6, "coalOut": 4077.37, "coalCap": 6895.7, "petrolOut": 33.0, "petrolCap": 66.58 },
+  { "country": "DEU", "year": 2013, "nuclearOut": 97.29, "nuclearCap": 105.73, "gasOut": 67.0, "gasCap": 236.34, "coalOut": 288.2, "coalCap": 444.31, "petrolOut": 25.25, "petrolCap": 14.63 },
+  { "country": "FRA", "year": 2013, "nuclearOut": 423.68, "nuclearCap": 553.02, "gasOut": 18.39, "gasCap": 69.29, "coalOut": 23.84, "coalCap": 55.28, "petrolOut": 11.41, "petrolCap": 15.07 },
+  { "country": "EGY", "year": 2013, "nuclearOut": 0.0, "nuclearCap": 0.0, "gasOut": 125.91, "gasCap": 214.36, "coalOut": 0.0, "coalCap": 0.0, "petrolOut": 27.66, "petrolCap": 0.0 },
+  { "country": "IND", "year": 2013, "nuclearOut": 33.31, "nuclearCap": 41.87, "gasOut": 66.31, "gasCap": 180.89, "coalOut": 847.97, "coalCap": 1317.68, "petrolOut": 10.65, "petrolCap": 6.31 },
+  { "country": "JPN", "year": 2013, "nuclearOut": 14.6, "nuclearCap": 387.72, "gasOut": 423.58, "gasCap": 630.72, "coalOut": 362.55, "coalCap": 398.14, "petrolOut": 166.48, "petrolCap": 249.4 },
+  { "country": "MEX", "year": 2013, "nuclearOut": 11.38, "nuclearCap": 14.1, "gasOut": 155.78, "gasCap": 249.31, "coalOut": 29.87, "coalCap": 47.13, "petrolOut": 45.6, "petrolCap": 50.46 },
+  { "country": "NGA", "year": 2013, "nuclearOut": 0.0, "nuclearCap": 0.0, "gasOut": 21.4, "gasCap": 72.18, "coalOut": 0.74, "coalCap": 2.45, "petrolOut": 0.0, "petrolCap": 0.0 },
+  { "country": "USA", "year": 2013, "nuclearOut": 789.02, "nuclearCap": 869.34, "gasOut": 1124.84, "gasCap": 3821.81, "coalOut": 1581.11, "coalCap": 2880.03, "petrolOut": 40.26, "petrolCap": 409.62 },
+
+  { "country": "BRA", "year": 2014, "nuclearOut": 14.46, "nuclearCap": 17.43, "gasOut": 77.75, "gasCap": 86.64, "coalOut": 25.8, "coalCap": 29.35, "petrolOut": 33.04, "petrolCap": 32.67 },
+  { "country": "CHN", "year": 2014, "nuclearOut": 133.22, "nuclearCap": 175.9, "gasOut": 133.28, "gasCap": 486.88, "coalOut": 4203.06, "coalCap": 7168.92, "petrolOut": 35.66, "petrolCap": 61.41 },
+  { "country": "DEU", "year": 2014, "nuclearOut": 97.13, "nuclearCap": 105.73, "gasOut": 60.61, "gasCap": 238.36, "coalOut": 274.41, "coalCap": 438.88, "petrolOut": 24.67, "petrolCap": 14.63 },
+  { "country": "FRA", "year": 2014, "nuclearOut": 436.48, "nuclearCap": 553.02, "gasOut": 13.16, "gasCap": 69.29, "coalOut": 11.26, "coalCap": 50.81, "petrolOut": 11.34, "petrolCap": 16.21 },
+  { "country": "EGY", "year": 2014, "nuclearOut": 0.0, "nuclearCap": 0.0, "gasOut": 127.39, "gasCap": 220.93, "coalOut": 0.0, "coalCap": 0.0, "petrolOut": 32.54, "petrolCap": 0.0 },
+  { "country": "IND", "year": 2014, "nuclearOut": 34.69, "nuclearCap": 50.63, "gasOut": 64.01, "gasCap": 208.49, "coalOut": 949.93, "coalCap": 1496.91, "petrolOut": 11.55, "petrolCap": 6.31 },
+  { "country": "JPN", "year": 2014, "nuclearOut": 0.0, "nuclearCap": 387.72, "gasOut": 450.88, "gasCap": 679.6, "coalOut": 355.6, "coalCap": 398.14, "petrolOut": 122.34, "petrolCap": 249.4 },
+  { "country": "MEX", "year": 2014, "nuclearOut": 9.3, "nuclearCap": 14.1, "gasOut": 161.38, "gasCap": 258.68, "coalOut": 31.32, "coalCap": 47.13, "petrolOut": 30.73, "petrolCap": 50.46 },
+  { "country": "NGA", "year": 2014, "nuclearOut": 0.0, "nuclearCap": 0.0, "gasOut": 24.42, "gasCap": 72.18, "coalOut": 0.84, "coalCap": 2.45, "petrolOut": 0.0, "petrolCap": 0.0 },
+  { "country": "USA", "year": 2014, "nuclearOut": 797.17, "nuclearCap": 863.47, "gasOut": 1126.61, "gasCap": 3920.71, "coalOut": 1581.71, "coalCap": 2840.52, "petrolOut": 43.69, "petrolCap": 392.8 },
+
+  { "country": "BRA", "year": 2015, "nuclearOut": 13.91, "nuclearCap": 17.43, "gasOut": 75.76, "gasCap": 88.74, "coalOut": 25.72, "coalCap": 29.35, "petrolOut": 27.37, "petrolCap": 34.43 },
+  { "country": "CHN", "year": 2015, "nuclearOut": 171.38, "nuclearCap": 238.01, "gasOut": 166.91, "gasCap": 562.04, "coalOut": 4046.17, "coalCap": 7691.02, "petrolOut": 36.46, "petrolCap": 58.52 },
+  { "country": "DEU", "year": 2015, "nuclearOut": 91.79, "nuclearCap": 94.61, "gasOut": 61.47, "gasCap": 240.99, "coalOut": 272.2, "coalCap": 459.02, "petrolOut": 25.57, "petrolCap": 14.8 },
+  { "country": "FRA", "year": 2015, "nuclearOut": 437.43, "nuclearCap": 553.02, "gasOut": 21.14, "gasCap": 70.87, "coalOut": 11.89, "coalCap": 32.76, "petrolOut": 11.81, "petrolCap": 16.56 },
+  { "country": "EGY", "year": 2015, "nuclearOut": 0.0, "nuclearCap": 0.0, "gasOut": 133.29, "gasCap": 257.63, "coalOut": 0.0, "coalCap": 0.0, "petrolOut": 37.39, "petrolCap": 3.07 },
+  { "country": "IND", "year": 2015, "nuclearOut": 38.31, "nuclearCap": 50.63, "gasOut": 64.77, "gasCap": 227.15, "coalOut": 1006.55, "coalCap": 1677.63, "petrolOut": 9.26, "petrolCap": 6.31 },
+  { "country": "JPN", "year": 2015, "nuclearOut": 4.52, "nuclearCap": 368.36, "gasOut": 417.5, "gasCap": 694.67, "coalOut": 349.64, "coalCap": 398.84, "petrolOut": 104.44, "petrolCap": 249.4 },
+  { "country": "MEX", "year": 2015, "nuclearOut": 11.18, "nuclearCap": 14.1, "gasOut": 173.69, "gasCap": 265.87, "coalOut": 31.48, "coalCap": 47.13, "petrolOut": 29.11, "petrolCap": 50.46 },
+  { "country": "NGA", "year": 2015, "nuclearOut": 0.0, "nuclearCap": 0.0, "gasOut": 24.4, "gasCap": 88.13, "coalOut": 0.69, "coalCap": 2.45, "petrolOut": 0.0, "petrolCap": 0.0 },
+  { "country": "USA", "year": 2015, "nuclearOut": 797.18, "nuclearCap": 864.35, "gasOut": 1333.48, "gasCap": 4019.7, "coalOut": 1352.4, "coalCap": 2650.69, "petrolOut": 44.44, "petrolCap": 345.32 },
+
+  { "country": "BRA", "year": 2016, "nuclearOut": 14.97, "nuclearCap": 17.43, "gasOut": 54.07, "gasCap": 93.29, "coalOut": 24.58, "coalCap": 28.73, "petrolOut": 14.41, "petrolCap": 34.43 },
+  { "country": "CHN", "year": 2016, "nuclearOut": 213.18, "nuclearCap": 294.69, "gasOut": 188.28, "gasCap": 585.61, "coalOut": 4156.35, "coalCap": 8071.99, "petrolOut": 52.56, "petrolCap": 43.45 },
+  { "country": "DEU", "year": 2016, "nuclearOut": 84.63, "nuclearCap": 94.61, "gasOut": 80.62, "gasCap": 256.49, "coalOut": 261.75, "coalCap": 453.07, "petrolOut": 25.39, "petrolCap": 14.8 },
+  { "country": "FRA", "year": 2016, "nuclearOut": 403.2, "nuclearCap": 553.02, "gasOut": 34.97, "gasCap": 75.95, "coalOut": 10.23, "coalCap": 32.76, "petrolOut": 11.4, "petrolCap": 16.56 },
+  { "country": "EGY", "year": 2016, "nuclearOut": 0.0, "nuclearCap": 0.0, "gasOut": 139.85, "gasCap": 260.52, "coalOut": 0.0, "coalCap": 0.0, "petrolOut": 34.23, "petrolCap": 5.61 },
+  { "country": "IND", "year": 2016, "nuclearOut": 37.9, "nuclearCap": 50.63, "gasOut": 72.62, "gasCap": 235.38, "coalOut": 1073.6, "coalCap": 1830.66, "petrolOut": 9.41, "petrolCap": 6.31 },
+  { "country": "JPN", "year": 2016, "nuclearOut": 17.68, "nuclearCap": 363.36, "gasOut": 421.84, "gasCap": 723.31, "coalOut": 345.24, "coalCap": 400.42, "petrolOut": 98.57, "petrolCap": 249.4 },
+  { "country": "MEX", "year": 2016, "nuclearOut": 10.27, "nuclearCap": 14.1, "gasOut": 177.08, "gasCap": 283.56, "coalOut": 31.78, "coalCap": 47.13, "petrolOut": 30.92, "petrolCap": 50.46 },
+  { "country": "NGA", "year": 2016, "nuclearOut": 0.0, "nuclearCap": 0.0, "gasOut": 23.24, "gasCap": 89.18, "coalOut": 0.65, "coalCap": 2.45, "petrolOut": 0.0, "petrolCap": 0.0 },
+  { "country": "USA", "year": 2016, "nuclearOut": 805.69, "nuclearCap": 872.15, "gasOut": 1378.31, "gasCap": 4127.36, "coalOut": 1239.15, "coalCap": 2510.88, "petrolOut": 39.5, "petrolCap": 323.42 },
+
+  { "country": "BRA", "year": 2017, "nuclearOut": 14.86, "nuclearCap": 17.43, "gasOut": 62.72, "gasCap": 98.46, "coalOut": 21.85, "coalCap": 24.79, "petrolOut": 17.33, "petrolCap": 34.43 },
+  { "country": "CHN", "year": 2017, "nuclearOut": 248.1, "nuclearCap": 313.78, "gasOut": 203.2, "gasCap": 638.6, "coalOut": 4430.03, "coalCap": 8356.16, "petrolOut": 56.05, "petrolCap": 49.14 },
+  { "country": "DEU", "year": 2017, "nuclearOut": 76.32, "nuclearCap": 94.61, "gasOut": 86.04, "gasCap": 258.42, "coalOut": 241.26, "coalCap": 423.72, "petrolOut": 25.16, "petrolCap": 14.8 },
+  { "country": "FRA", "year": 2017, "nuclearOut": 398.36, "nuclearCap": 553.02, "gasOut": 40.5, "gasCap": 75.95, "coalOut": 12.81, "coalCap": 32.76, "petrolOut": 12.12, "petrolCap": 16.56 },
+  { "country": "EGY", "year": 2017, "nuclearOut": 0.0, "nuclearCap": 0.0, "gasOut": 155.01, "gasCap": 288.55, "coalOut": 0.0, "coalCap": 0.0, "petrolOut": 26.3, "petrolCap": 5.61 },
+  { "country": "IND", "year": 2017, "nuclearOut": 37.41, "nuclearCap": 59.39, "gasOut": 74.99, "gasCap": 237.05, "coalOut": 1115.24, "coalCap": 1878.93, "petrolOut": 8.79, "petrolCap": 6.31 },
+  { "country": "JPN", "year": 2017, "nuclearOut": 29.07, "nuclearCap": 342.78, "gasOut": 428.92, "gasCap": 733.74, "coalOut": 342.88, "coalCap": 403.92, "petrolOut": 74.45, "petrolCap": 249.4 },
+  { "country": "MEX", "year": 2017, "nuclearOut": 10.57, "nuclearCap": 14.1, "gasOut": 179.25, "gasCap": 298.28, "coalOut": 28.12, "coalCap": 47.13, "petrolOut": 35.42, "petrolCap": 50.46 },
+  { "country": "NGA", "year": 2017, "nuclearOut": 0.0, "nuclearCap": 0.0, "gasOut": 24.38, "gasCap": 89.18, "coalOut": 0.68, "coalCap": 2.45, "petrolOut": 0.0, "petrolCap": 0.0 },
+  { "country": "USA", "year": 2017, "nuclearOut": 804.95, "nuclearCap": 872.76, "gasOut": 1296.44, "gasCap": 4229.68, "coalOut": 1205.84, "coalCap": 2433.18, "petrolOut": 37.89, "petrolCap": 320.62 },
+
+  { "country": "BRA", "year": 2018, "nuclearOut": 14.79, "nuclearCap": 17.43, "gasOut": 52.36, "gasCap": 98.46, "coalOut": 19.94, "coalCap": 24.79, "petrolOut": 14.39, "petrolCap": 34.43 },
+  { "country": "CHN", "year": 2018, "nuclearOut": 295.0, "nuclearCap": 391.22, "gasOut": 215.5, "gasCap": 710.7, "coalOut": 4763.92, "coalCap": 8555.54, "petrolOut": 56.4, "petrolCap": 55.19 },
+  { "country": "DEU", "year": 2018, "nuclearOut": 76.0, "nuclearCap": 94.61, "gasOut": 81.56, "gasCap": 259.21, "coalOut": 228.16, "coalCap": 414.52, "petrolOut": 23.63, "petrolCap": 14.8 },
+  { "country": "FRA", "year": 2018, "nuclearOut": 412.94, "nuclearCap": 553.02, "gasOut": 30.61, "gasCap": 75.95, "coalOut": 8.31, "coalCap": 32.76, "petrolOut": 10.56, "petrolCap": 16.56 },
+  { "country": "EGY", "year": 2018, "nuclearOut": 0.0, "nuclearCap": 0.0, "gasOut": 166.61, "gasCap": 425.65, "coalOut": 0.0, "coalCap": 0.0, "petrolOut": 15.7, "petrolCap": 5.61 },
+  { "country": "IND", "year": 2018, "nuclearOut": 39.05, "nuclearCap": 59.39, "gasOut": 71.26, "gasCap": 237.66, "coalOut": 1198.86, "coalCap": 1927.29, "petrolOut": 6.4, "petrolCap": 6.31 },
+  { "country": "JPN", "year": 2018, "nuclearOut": 49.11, "nuclearCap": 333.23, "gasOut": 425.37, "gasCap": 747.84, "coalOut": 345.13, "coalCap": 405.5, "petrolOut": 53.78, "petrolCap": 241.69 },
+  { "country": "MEX", "year": 2018, "nuclearOut": 13.32, "nuclearCap": 14.1, "gasOut": 200.38, "gasCap": 308.88, "coalOut": 27.0, "coalCap": 47.13, "petrolOut": 33.19, "petrolCap": 50.46 },
+  { "country": "NGA", "year": 2018, "nuclearOut": 0.0, "nuclearCap": 0.0, "gasOut": 23.49, "gasCap": 94.26, "coalOut": 0.62, "coalCap": 2.45, "petrolOut": 0.0, "petrolCap": 0.0 },
+  { "country": "USA", "year": 2018, "nuclearOut": 807.08, "nuclearCap": 871.01, "gasOut": 1469.13, "gasCap": 4431.51, "coalOut": 1149.49, "coalCap": 2293.89, "petrolOut": 42.68, "petrolCap": 304.67 }
+]

package/website/article/fluid/dataset/renewable.json

@@ -0,0 +1,301 @@
+[
+  { "year": 2013, "country": "BRA", "energyType": "Bio", "output": 39.27, "capacity": 101.62 },
+  { "year": 2013, "country": "BRA", "energyType": "Hydro", "output": 390.99, "capacity": 753.54 },
+  { "year": 2013, "country": "BRA", "energyType": "Solar", "output": 0.0, "capacity": 0.09 },
+  { "year": 2013, "country": "BRA", "energyType": "Wind", "output": 6.58, "capacity": 19.27 },
+
+  { "year": 2013, "country": "CHN", "energyType": "Bio", "output": 37.13, "capacity": 38.46 },
+  { "year": 2013, "country": "CHN", "energyType": "Hydro", "output": 909.61, "capacity": 2268.05 },
+  { "year": 2013, "country": "CHN", "energyType": "Solar", "output": 8.37, "capacity": 155.58 },
+  { "year": 2013, "country": "CHN", "energyType": "Wind", "output": 138.26, "capacity": 672.15 },
+
+  { "year": 2013, "country": "DEU", "energyType": "Bio", "output": 45.51, "capacity": 61.58 },
+  { "year": 2013, "country": "DEU", "energyType": "Hydro", "output": 23.0, "capacity": 48.97 },
+  { "year": 2013, "country": "DEU", "energyType": "Solar", "output": 30.62, "capacity": 321.58 },
+  { "year": 2013, "country": "DEU", "energyType": "Wind", "output": 52.74, "capacity": 293.28 },
+
+  { "year": 2013, "country": "FRA", "energyType": "Bio", "output": 5.68, "capacity": 6.66 },
+  { "year": 2013, "country": "FRA", "energyType": "Hydro", "output": 71.92, "capacity": 208.84 },
+  { "year": 2013, "country": "FRA", "energyType": "Solar", "output": 5.19, "capacity": 46.25 },
+  { "year": 2013, "country": "FRA", "energyType": "Wind", "output": 16.13, "capacity": 71.48 },
+
+  { "year": 2013, "country": "EGY", "energyType": "Bio", "output": 0.0, "capacity": 0.61 },
+  { "year": 2013, "country": "EGY", "energyType": "Hydro", "output": 13.22, "capacity": 24.53 },
+  { "year": 2013, "country": "EGY", "energyType": "Solar", "output": 0.11, "capacity": 0.26 },
+  { "year": 2013, "country": "EGY", "energyType": "Wind", "output": 1.33, "capacity": 4.91 },
+
+  { "year": 2013, "country": "IND", "energyType": "Bio", "output": 22.48, "capacity": 35.74 },
+  { "year": 2013, "country": "IND", "energyType": "Hydro", "output": 131.98, "capacity": 345.06 },
+  { "year": 2013, "country": "IND", "energyType": "Solar", "output": 3.43, "capacity": 14.02 },
+  { "year": 2013, "country": "IND", "energyType": "Wind", "output": 30.01, "capacity": 161.36 },
+
+  { "year": 2013, "country": "JPN", "energyType": "Bio", "output": 23.18, "capacity": 5.78 },
+  { "year": 2013, "country": "JPN", "energyType": "Hydro", "output": 79.33, "capacity": 243.62 },
+  { "year": 2013, "country": "JPN", "energyType": "Solar", "output": 12.91, "capacity": 119.14 },
+  { "year": 2013, "country": "JPN", "energyType": "Wind", "output": 5.13, "capacity": 23.21 },
+
+  { "year": 2013, "country": "MEX", "energyType": "Bio", "output": 6.89, "capacity": 4.47 },
+  { "year": 2013, "country": "MEX", "energyType": "Hydro", "output": 27.72, "capacity": 101.88 },
+  { "year": 2013, "country": "MEX", "energyType": "Solar", "output": 0.11, "capacity": 0.96 },
+  { "year": 2013, "country": "MEX", "energyType": "Wind", "output": 4.17, "capacity": 18.57 },
+
+  { "year": 2013, "country": "NGA", "energyType": "Bio", "output": 0.02, "capacity": 0.09 },
+  { "year": 2013, "country": "NGA", "energyType": "Hydro", "output": 5.27, "capacity": 18.48 },
+  { "year": 2013, "country": "NGA", "energyType": "Solar", "output": 0.02, "capacity": 0.0 },
+  { "year": 2013, "country": "NGA", "energyType": "Wind", "output": 0.0, "capacity": 0.0 },
+
+  { "year": 2013, "country": "USA", "energyType": "Bio", "output": 60.86, "capacity": 97.85 },
+  { "year": 2013, "country": "USA", "energyType": "Hydro", "output": 263.88, "capacity": 727.17 },
+  { "year": 2013, "country": "USA", "energyType": "Solar", "output": 9.04, "capacity": 116.07 },
+  { "year": 2013, "country": "USA", "energyType": "Wind", "output": 167.84, "capacity": 527.35 },
+
+  { "year": 2014, "country": "BRA", "energyType": "Bio", "output": 45.15, "capacity": 108.1 },
+  { "year": 2014, "country": "BRA", "energyType": "Hydro", "output": 373.44, "capacity": 781.3 },
+  { "year": 2014, "country": "BRA", "energyType": "Solar", "output": 0.02, "capacity": 0.18 },
+  { "year": 2014, "country": "BRA", "energyType": "Wind", "output": 12.21, "capacity": 42.84 },
+
+  { "year": 2014, "country": "CHN", "energyType": "Bio", "output": 46.27, "capacity": 41.7 },
+  { "year": 2014, "country": "CHN", "energyType": "Hydro", "output": 1059.69, "capacity": 2476.89 },
+  { "year": 2014, "country": "CHN", "energyType": "Solar", "output": 23.51, "capacity": 248.78 },
+  { "year": 2014, "country": "CHN", "energyType": "Wind", "output": 159.76, "capacity": 848.14 },
+
+  { "year": 2014, "country": "DEU", "energyType": "Bio", "output": 48.29, "capacity": 63.6 },
+  { "year": 2014, "country": "DEU", "energyType": "Hydro", "output": 19.59, "capacity": 48.88 },
+  { "year": 2014, "country": "DEU", "energyType": "Solar", "output": 35.45, "capacity": 332.0 },
+  { "year": 2014, "country": "DEU", "energyType": "Wind", "output": 58.5, "capacity": 338.22 },
+
+  { "year": 2014, "country": "FRA", "energyType": "Bio", "output": 5.99, "capacity": 7.18 },
+  { "year": 2014, "country": "FRA", "energyType": "Hydro", "output": 63.77, "capacity": 208.93 },
+  { "year": 2014, "country": "FRA", "energyType": "Solar", "output": 6.39, "capacity": 52.82 },
+  { "year": 2014, "country": "FRA", "energyType": "Wind", "output": 17.32, "capacity": 80.59 },
+
+  { "year": 2014, "country": "EGY", "energyType": "Bio", "output": 0.0, "capacity": 0.61 },
+  { "year": 2014, "country": "EGY", "energyType": "Hydro", "output": 13.68, "capacity": 24.53 },
+  { "year": 2014, "country": "EGY", "energyType": "Solar", "output": 0.24, "capacity": 0.26 },
+  { "year": 2014, "country": "EGY", "energyType": "Wind", "output": 1.44, "capacity": 4.91 },
+
+  { "year": 2014, "country": "IND", "energyType": "Bio", "output": 24.68, "capacity": 43.01 },
+  { "year": 2014, "country": "IND", "energyType": "Hydro", "output": 139.0, "capacity": 355.83 },
+  { "year": 2014, "country": "IND", "energyType": "Solar", "output": 4.91, "capacity": 33.11 },
+  { "year": 2014, "country": "IND", "energyType": "Wind", "output": 33.45, "capacity": 196.84 },
+
+  { "year": 2014, "country": "JPN", "energyType": "Bio", "output": 23.63, "capacity": 6.57 },
+  { "year": 2014, "country": "JPN", "energyType": "Hydro", "output": 81.71, "capacity": 244.14 },
+  { "year": 2014, "country": "JPN", "energyType": "Solar", "output": 23.55, "capacity": 204.46 },
+  { "year": 2014, "country": "JPN", "energyType": "Wind", "output": 5.01, "capacity": 24.09 },
+
+  { "year": 2014, "country": "MEX", "energyType": "Bio", "output": 6.62, "capacity": 5.34 },
+  { "year": 2014, "country": "MEX", "energyType": "Hydro", "output": 38.55, "capacity": 109.15 },
+  { "year": 2014, "country": "MEX", "energyType": "Solar", "output": 0.22, "capacity": 1.49 },
+  { "year": 2014, "country": "MEX", "energyType": "Wind", "output": 6.35, "capacity": 22.51 },
+
+  { "year": 2014, "country": "NGA", "energyType": "Bio", "output": 0.03, "capacity": 0.09 },
+  { "year": 2014, "country": "NGA", "energyType": "Hydro", "output": 5.29, "capacity": 18.48 },
+  { "year": 2014, "country": "NGA", "energyType": "Solar", "output": 0.02, "capacity": 0.0 },
+  { "year": 2014, "country": "NGA", "energyType": "Wind", "output": 0.0, "capacity": 0.0 },
+
+  { "year": 2014, "country": "USA", "energyType": "Bio", "output": 63.99, "capacity": 98.99 },
+  { "year": 2014, "country": "USA", "energyType": "Hydro", "output": 253.19, "capacity": 731.37 },
+  { "year": 2014, "country": "USA", "energyType": "Solar", "output": 28.92, "capacity": 158.64 },
+  { "year": 2014, "country": "USA", "energyType": "Wind", "output": 181.65, "capacity": 564.41 },
+
+  { "year": 2015, "country": "BRA", "energyType": "Bio", "output": 47.54, "capacity": 116.6 },
+  { "year": 2015, "country": "BRA", "energyType": "Hydro", "output": 359.74, "capacity": 802.85 },
+  { "year": 2015, "country": "BRA", "energyType": "Solar", "output": 0.06, "capacity": 0.44 },
+  { "year": 2015, "country": "BRA", "energyType": "Wind", "output": 21.47, "capacity": 66.84 },
+
+  { "year": 2015, "country": "CHN", "energyType": "Bio", "output": 54.07, "capacity": 49.41 },
+  { "year": 2015, "country": "CHN", "energyType": "Hydro", "output": 1114.52, "capacity": 2597.34 },
+  { "year": 2015, "country": "CHN", "energyType": "Solar", "output": 39.48, "capacity": 381.5 },
+  { "year": 2015, "country": "CHN", "energyType": "Wind", "output": 185.59, "capacity": 1148.0 },
+
+  { "year": 2015, "country": "DEU", "energyType": "Bio", "output": 50.33, "capacity": 65.44 },
+  { "year": 2015, "country": "DEU", "energyType": "Hydro", "output": 18.98, "capacity": 48.97 },
+  { "year": 2015, "country": "DEU", "energyType": "Solar", "output": 38.08, "capacity": 343.57 },
+  { "year": 2015, "country": "DEU", "energyType": "Wind", "output": 80.62, "capacity": 390.52 },
+
+  { "year": 2015, "country": "FRA", "energyType": "Bio", "output": 6.53, "capacity": 8.15 },
+  { "year": 2015, "country": "FRA", "energyType": "Hydro", "output": 55.56, "capacity": 208.66 },
+  { "year": 2015, "country": "FRA", "energyType": "Solar", "output": 7.75, "capacity": 62.55 },
+  { "year": 2015, "country": "FRA", "energyType": "Wind", "output": 21.42, "capacity": 90.23 },
+
+  { "year": 2015, "country": "EGY", "energyType": "Bio", "output": 0.0, "capacity": 0.61 },
+  { "year": 2015, "country": "EGY", "energyType": "Hydro", "output": 13.41, "capacity": 24.53 },
+  { "year": 2015, "country": "EGY", "energyType": "Solar", "output": 0.17, "capacity": 0.35 },
+  { "year": 2015, "country": "EGY", "energyType": "Wind", "output": 2.06, "capacity": 6.57 },
+
+  { "year": 2015, "country": "IND", "energyType": "Bio", "output": 30.62, "capacity": 46.78 },
+  { "year": 2015, "country": "IND", "energyType": "Hydro", "output": 133.28, "capacity": 370.72 },
+  { "year": 2015, "country": "IND", "energyType": "Solar", "output": 6.57, "capacity": 49.93 },
+  { "year": 2015, "country": "IND", "energyType": "Wind", "output": 32.74, "capacity": 219.79 },
+
+  { "year": 2015, "country": "JPN", "energyType": "Bio", "output": 28.49, "capacity": 8.76 },
+  { "year": 2015, "country": "JPN", "energyType": "Hydro", "output": 85.77, "capacity": 246.24 },
+  { "year": 2015, "country": "JPN", "energyType": "Solar", "output": 34.54, "capacity": 299.15 },
+  { "year": 2015, "country": "JPN", "energyType": "Wind", "output": 5.22, "capacity": 24.62 },
+
+  { "year": 2015, "country": "MEX", "energyType": "Bio", "output": 7.12, "capacity": 6.31 },
+  { "year": 2015, "country": "MEX", "energyType": "Hydro", "output": 30.61, "capacity": 107.05 },
+  { "year": 2015, "country": "MEX", "energyType": "Solar", "output": 0.24, "capacity": 2.54 },
+  { "year": 2015, "country": "MEX", "energyType": "Wind", "output": 8.45, "capacity": 28.65 },
+
+  { "year": 2015, "country": "NGA", "energyType": "Bio", "output": 0.02, "capacity": 0.09 },
+  { "year": 2015, "country": "NGA", "energyType": "Hydro", "output": 5.66, "capacity": 18.48 },
+  { "year": 2015, "country": "NGA", "energyType": "Solar", "output": 0.03, "capacity": 0.09 },
+  { "year": 2015, "country": "NGA", "energyType": "Wind", "output": 0.0, "capacity": 0.0 },
+
+  { "year": 2015, "country": "USA", "energyType": "Bio", "output": 63.63, "capacity": 103.81 },
+  { "year": 2015, "country": "USA", "energyType": "Hydro", "output": 243.99, "capacity": 731.46 },
+  { "year": 2015, "country": "USA", "energyType": "Solar", "output": 39.03, "capacity": 212.34 },
+  { "year": 2015, "country": "USA", "energyType": "Wind", "output": 190.72, "capacity": 637.47 },
+
+  { "year": 2016, "country": "BRA", "energyType": "Bio", "output": 49.14, "capacity": 124.22 },
+  { "year": 2016, "country": "BRA", "energyType": "Hydro", "output": 380.91, "capacity": 849.11 },
+  { "year": 2016, "country": "BRA", "energyType": "Solar", "output": 0.08, "capacity": 1.14 },
+  { "year": 2016, "country": "BRA", "energyType": "Wind", "output": 33.24, "capacity": 88.74 },
+
+  { "year": 2016, "country": "CHN", "energyType": "Bio", "output": 62.13, "capacity": 56.06 },
+  { "year": 2016, "country": "CHN", "energyType": "Hydro", "output": 1153.27, "capacity": 2675.13 },
+  { "year": 2016, "country": "CHN", "energyType": "Solar", "output": 66.53, "capacity": 681.7 },
+  { "year": 2016, "country": "CHN", "energyType": "Wind", "output": 240.86, "capacity": 1301.04 },
+
+  { "year": 2016, "country": "DEU", "energyType": "Bio", "output": 50.93, "capacity": 67.28 },
+  { "year": 2016, "country": "DEU", "energyType": "Hydro", "output": 20.55, "capacity": 49.32 },
+  { "year": 2016, "country": "DEU", "energyType": "Solar", "output": 37.56, "capacity": 356.36 },
+  { "year": 2016, "country": "DEU", "energyType": "Wind", "output": 79.92, "capacity": 433.09 },
+
+  { "year": 2016, "country": "FRA", "energyType": "Bio", "output": 7.52, "capacity": 9.11 },
+  { "year": 2016, "country": "FRA", "energyType": "Hydro", "output": 60.84, "capacity": 209.28 },
+  { "year": 2016, "country": "FRA", "energyType": "Solar", "output": 8.66, "capacity": 67.45 },
+  { "year": 2016, "country": "FRA", "energyType": "Wind", "output": 21.38, "capacity": 101.35 },
+
+  { "year": 2016, "country": "EGY", "energyType": "Bio", "output": 0.0, "capacity": 0.61 },
+  { "year": 2016, "country": "EGY", "energyType": "Hydro", "output": 12.72, "capacity": 24.53 },
+  { "year": 2016, "country": "EGY", "energyType": "Solar", "output": 0.58, "capacity": 0.53 },
+  { "year": 2016, "country": "EGY", "energyType": "Wind", "output": 2.2, "capacity": 6.57 },
+
+  { "year": 2016, "country": "IND", "energyType": "Bio", "output": 24.82, "capacity": 76.74 },
+  { "year": 2016, "country": "IND", "energyType": "Hydro", "output": 128.38, "capacity": 375.28 },
+  { "year": 2016, "country": "IND", "energyType": "Solar", "output": 11.56, "capacity": 87.42 },
+  { "year": 2016, "country": "IND", "energyType": "Wind", "output": 43.45, "capacity": 251.41 },
+
+  { "year": 2016, "country": "JPN", "energyType": "Bio", "output": 23.67, "capacity": 11.3 },
+  { "year": 2016, "country": "JPN", "energyType": "Hydro", "output": 79.43, "capacity": 246.68 },
+  { "year": 2016, "country": "JPN", "energyType": "Solar", "output": 43.33, "capacity": 368.27 },
+  { "year": 2016, "country": "JPN", "energyType": "Wind", "output": 5.34, "capacity": 28.12 },
+
+  { "year": 2016, "country": "MEX", "energyType": "Bio", "output": 7.02, "capacity": 7.36 },
+  { "year": 2016, "country": "MEX", "energyType": "Hydro", "output": 29.74, "capacity": 110.2 },
+  { "year": 2016, "country": "MEX", "energyType": "Solar", "output": 0.46, "capacity": 5.52 },
+  { "year": 2016, "country": "MEX", "energyType": "Wind", "output": 9.93, "capacity": 35.48 },
+
+  { "year": 2016, "country": "NGA", "energyType": "Bio", "output": 0.02, "capacity": 0.09 },
+  { "year": 2016, "country": "NGA", "energyType": "Hydro", "output": 8.07, "capacity": 18.48 },
+  { "year": 2016, "country": "NGA", "energyType": "Solar", "output": 0.03, "capacity": 0.09 },
+  { "year": 2016, "country": "NGA", "energyType": "Wind", "output": 0.0, "capacity": 0.0 },
+
+  { "year": 2016, "country": "USA", "energyType": "Bio", "output": 62.76, "capacity": 103.19 },
+  { "year": 2016, "country": "USA", "energyType": "Hydro", "output": 261.13, "capacity": 734.26 },
+  { "year": 2016, "country": "USA", "energyType": "Solar", "output": 54.87, "capacity": 310.37 },
+  { "year": 2016, "country": "USA", "energyType": "Wind", "output": 226.99, "capacity": 713.94 },
+
+  { "year": 2017, "country": "BRA", "energyType": "Bio", "output": 50.6, "capacity": 127.63 },
+  { "year": 2017, "country": "BRA", "energyType": "Hydro", "output": 370.91, "capacity": 878.89 },
+  { "year": 2017, "country": "BRA", "energyType": "Solar", "output": 0.83, "capacity": 10.6 },
+  { "year": 2017, "country": "BRA", "energyType": "Wind", "output": 42.06, "capacity": 107.75 },
+
+  { "year": 2017, "country": "CHN", "energyType": "Bio", "output": 79.6, "capacity": 66.49 },
+  { "year": 2017, "country": "CHN", "energyType": "Hydro", "output": 1165.06, "capacity": 2753.97 },
+  { "year": 2017, "country": "CHN", "energyType": "Solar", "output": 117.8, "capacity": 1146.07 },
+  { "year": 2017, "country": "CHN", "energyType": "Wind", "output": 304.6, "capacity": 1439.88 },
+
+  { "year": 2017, "country": "DEU", "energyType": "Bio", "output": 50.92, "capacity": 69.9 },
+  { "year": 2017, "country": "DEU", "energyType": "Hydro", "output": 20.15, "capacity": 49.32 },
+  { "year": 2017, "country": "DEU", "energyType": "Solar", "output": 38.76, "capacity": 370.46 },
+  { "year": 2017, "country": "DEU", "energyType": "Wind", "output": 105.69, "capacity": 486.88 },
+
+  { "year": 2017, "country": "FRA", "energyType": "Bio", "output": 7.78, "capacity": 9.55 },
+  { "year": 2017, "country": "FRA", "energyType": "Hydro", "output": 50.0, "capacity": 210.06 },
+  { "year": 2017, "country": "FRA", "energyType": "Solar", "output": 9.59, "capacity": 75.42 },
+  { "year": 2017, "country": "FRA", "energyType": "Wind", "output": 24.61, "capacity": 118.26 },
+
+  { "year": 2017, "country": "EGY", "energyType": "Bio", "output": 0.0, "capacity": 0.61 },
+  { "year": 2017, "country": "EGY", "energyType": "Hydro", "output": 12.6, "capacity": 24.53 },
+  { "year": 2017, "country": "EGY", "energyType": "Solar", "output": 0.6, "capacity": 1.58 },
+  { "year": 2017, "country": "EGY", "energyType": "Wind", "output": 2.33, "capacity": 6.57 },
+
+  { "year": 2017, "country": "IND", "energyType": "Bio", "output": 24.91, "capacity": 81.21 },
+  { "year": 2017, "country": "IND", "energyType": "Hydro", "output": 135.82, "capacity": 391.92 },
+  { "year": 2017, "country": "IND", "energyType": "Solar", "output": 21.54, "capacity": 159.96 },
+  { "year": 2017, "country": "IND", "energyType": "Wind", "output": 52.63, "capacity": 287.77 },
+
+  { "year": 2017, "country": "JPN", "energyType": "Bio", "output": 27.39, "capacity": 14.63 },
+  { "year": 2017, "country": "JPN", "energyType": "Hydro", "output": 79.29, "capacity": 246.33 },
+  { "year": 2017, "country": "JPN", "energyType": "Solar", "output": 54.24, "capacity": 433.62 },
+  { "year": 2017, "country": "JPN", "energyType": "Wind", "output": 5.83, "capacity": 30.48 },
+
+  { "year": 2017, "country": "MEX", "energyType": "Bio", "output": 7.4, "capacity": 7.62 },
+  { "year": 2017, "country": "MEX", "energyType": "Hydro", "output": 31.74, "capacity": 110.64 },
+  { "year": 2017, "country": "MEX", "energyType": "Solar", "output": 1.07, "capacity": 9.9 },
+  { "year": 2017, "country": "MEX", "energyType": "Wind", "output": 9.91, "capacity": 36.62 },
+
+  { "year": 2017, "country": "NGA", "energyType": "Bio", "output": 0.02, "capacity": 0.09 },
+  { "year": 2017, "country": "NGA", "energyType": "Hydro", "output": 7.67, "capacity": 18.48 },
+  { "year": 2017, "country": "NGA", "energyType": "Solar", "output": 0.03, "capacity": 0.18 },
+  { "year": 2017, "country": "NGA", "energyType": "Wind", "output": 0.0, "capacity": 0.0 },
+
+  { "year": 2017, "country": "USA", "energyType": "Bio", "output": 62.73, "capacity": 102.67 },
+  { "year": 2017, "country": "USA", "energyType": "Hydro", "output": 293.84, "capacity": 734.0 },
+  { "year": 2017, "country": "USA", "energyType": "Solar", "output": 77.28, "capacity": 383.43 },
+  { "year": 2017, "country": "USA", "energyType": "Wind", "output": 254.3, "capacity": 769.39 },
+
+  { "year": 2018, "country": "BRA", "energyType": "Bio", "output": 52.13, "capacity": 129.74 },
+  { "year": 2018, "country": "BRA", "energyType": "Hydro", "output": 388.97, "capacity": 915.24 },
+  { "year": 2018, "country": "BRA", "energyType": "Solar", "output": 3.44, "capacity": 21.37 },
+  { "year": 2018, "country": "BRA", "energyType": "Wind", "output": 48.12, "capacity": 130.0 },
+
+  { "year": 2018, "country": "CHN", "energyType": "Bio", "output": 93.73, "capacity": 75.86 },
+  { "year": 2018, "country": "CHN", "energyType": "Hydro", "output": 1198.89, "capacity": 2823.09 },
+  { "year": 2018, "country": "CHN", "energyType": "Solar", "output": 176.9, "capacity": 1535.28 },
+  { "year": 2018, "country": "CHN", "energyType": "Wind", "output": 365.8, "capacity": 1617.62 },
+
+  { "year": 2018, "country": "DEU", "energyType": "Bio", "output": 50.79, "capacity": 75.34 },
+  { "year": 2018, "country": "DEU", "energyType": "Hydro", "output": 17.69, "capacity": 46.69 },
+  { "year": 2018, "country": "DEU", "energyType": "Solar", "output": 44.32, "capacity": 395.6 },
+  { "year": 2018, "country": "DEU", "energyType": "Wind", "output": 109.95, "capacity": 514.39 },
+
+  { "year": 2018, "country": "FRA", "energyType": "Bio", "output": 8.38, "capacity": 11.48 },
+  { "year": 2018, "country": "FRA", "energyType": "Hydro", "output": 65.11, "capacity": 210.24 },
+  { "year": 2018, "country": "FRA", "energyType": "Solar", "output": 10.81, "capacity": 84.71 },
+  { "year": 2018, "country": "FRA", "energyType": "Wind", "output": 28.6, "capacity": 130.52 },
+
+  { "year": 2018, "country": "EGY", "energyType": "Bio", "output": 0.0, "capacity": 0.61 },
+  { "year": 2018, "country": "EGY", "energyType": "Hydro", "output": 12.77, "capacity": 24.79 },
+  { "year": 2018, "country": "EGY", "energyType": "Solar", "output": 1.52, "capacity": 6.66 },
+  { "year": 2018, "country": "EGY", "energyType": "Wind", "output": 3.02, "capacity": 9.9 },
+
+  { "year": 2018, "country": "IND", "energyType": "Bio", "output": 27.22, "capacity": 87.42 },
+  { "year": 2018, "country": "IND", "energyType": "Hydro", "output": 139.75, "capacity": 397.0 },
+  { "year": 2018, "country": "IND", "energyType": "Solar", "output": 36.33, "capacity": 240.72 },
+  { "year": 2018, "country": "IND", "energyType": "Wind", "output": 60.31, "capacity": 309.14 },
+
+  { "year": 2018, "country": "JPN", "energyType": "Bio", "output": 30.13, "capacity": 18.22 },
+  { "year": 2018, "country": "JPN", "energyType": "Hydro", "output": 81.11, "capacity": 246.51 },
+  { "year": 2018, "country": "JPN", "energyType": "Solar", "output": 62.11, "capacity": 491.96 },
+  { "year": 2018, "country": "JPN", "energyType": "Wind", "output": 6.44, "capacity": 30.66 },
+
+  { "year": 2018, "country": "MEX", "energyType": "Bio", "output": 6.85, "capacity": 7.62 },
+  { "year": 2018, "country": "MEX", "energyType": "Hydro", "output": 32.3, "capacity": 110.73 },
+  { "year": 2018, "country": "MEX", "energyType": "Solar", "output": 1.36, "capacity": 22.6 },
+  { "year": 2018, "country": "MEX", "energyType": "Wind", "output": 12.53, "capacity": 36.62 },
+
+  { "year": 2018, "country": "NGA", "energyType": "Bio", "output": 0.02, "capacity": 0.09 },
+  { "year": 2018, "country": "NGA", "energyType": "Hydro", "output": 7.69, "capacity": 18.48 },
+  { "year": 2018, "country": "NGA", "energyType": "Solar", "output": 0.03, "capacity": 0.18 },
+  { "year": 2018, "country": "NGA", "energyType": "Wind", "output": 0.0, "capacity": 0.0 },
+
+  { "year": 2018, "country": "USA", "energyType": "Bio", "output": 61.83, "capacity": 100.74 },
+  { "year": 2018, "country": "USA", "energyType": "Hydro", "output": 286.62, "capacity": 734.79 },
+  { "year": 2018, "country": "USA", "energyType": "Solar", "output": 93.36, "capacity": 455.43 },
+  { "year": 2018, "country": "USA", "energyType": "Wind", "output": 272.67, "capacity": 829.31 }
+]

package/website/article/fluid/methane.fld

@@ -0,0 +1 @@
+let methane = loadJson "dataset/methane-emissions.json";

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

@@ -1,3 +1,5 @@
+import methane
+
 let nthPad n xs =
       nth (min (max n 0) (length xs - 1)) xs;
     movingAvg ys window =

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

@@ -1,3 +1,5 @@
+import nonRenewables
+
 let countries = ["BRA", "EGY", "IND", "JPN"];
 let totalFor year country =
    let [ row ] = [ row | row <- nonRenewables, row.year == year, row.country == country ]

package/website/article/fluid/nonRenewables.fld

@@ -0,0 +1,2 @@
+let nonRenewables = loadJson "dataset/non-renewables.json";
+let renewables = loadJson "dataset/renewable.json";