@explorable-viz/fluid 0.8.3 → 0.9.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@explorable-viz/fluid",
-  "version": "0.8.3",
+  "version": "0.9.2",
   "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": {
@@ -25,9 +25,6 @@
     "script/util/clean.sh",
     "script/util/lisp-case.sh",
     "website/article",
-    "website/css",
-    "website/font",
-    "website/shared",
     "script/install-article.sh",
     "script/util/serve.sh"
   ],
@@ -68,7 +65,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",
@@ -79,7 +76,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/index.html

@@ -9,7 +9,6 @@
    <link href="../css/styles.css" rel="stylesheet" type="text/css">
    <link href="../css/view-styles.css" rel="stylesheet" type="text/css">
    <script src="https://kit.fontawesome.com/20cf8b42c0.js" crossorigin="anonymous"></script>
-   <script src="../shared/util.js"></script>
    <style>
       .grid-container, .grid-container.data-pane-hidden {
          grid-template-columns: 0.8fr var(--toggle-button-width) var(--text-pane-width);

package/website/article/convolution/spec.json

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

package/website/{css → article/css}/styles.css

@@ -88,10 +88,6 @@ body {
    margin-bottom: 10em;
 }
 
-.para-text {
-   font-size: 9pt;
-}
-
 p {
    margin-top: 1em;
    margin-bottom: 1em;

package/website/{css → article/css}/view-styles.css

@@ -188,3 +188,11 @@ td.table-cell {
 .scatterplot-point.selected-secondary-transient {
    stroke-width: 1;
 }
+
+.para-text {
+   font-size: 10pt;
+}
+
+.para-text span::after {
+  content: " ";
+}

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 }
+]