@explorable-viz/fluid 0.7.64 → 0.7.66
Sign up to get free protection for your applications and to get access to all the features.
- package/dist/fluid/fluid/lib/graphics.fld +6 -6
- package/dist/fluid/shared/fluid.mjs +4 -3
- package/dist/fluid/shared/load-figure.js +338 -168
- package/package.json +3 -2
- package/script/bundle-website.sh +4 -1
- package/dist/fluid/fluid/dataset/methane-emissions.fld +0 -123
- package/dist/fluid/fluid/dataset/mini-non-renewables.fld +0 -3
- package/dist/fluid/fluid/dataset/mini-renewables.fld +0 -6
- package/dist/fluid/fluid/dataset/non-renewables.fld +0 -67
- package/dist/fluid/fluid/dataset/renewables-new.fld +0 -301
- package/dist/fluid/fluid/dataset/renewables-restricted.fld +0 -139
- package/dist/fluid/fluid/dataset/renewables.fld +0 -100
- package/dist/fluid/fluid/dataset/ssp126-2081-2100.fld +0 -194
- package/dist/fluid/fluid/example/arithmetic.fld +0 -1
- package/dist/fluid/fluid/example/array.fld +0 -2
- package/dist/fluid/fluid/example/compose.fld +0 -2
- package/dist/fluid/fluid/example/desugar/list-comp-1.fld +0 -1
- package/dist/fluid/fluid/example/desugar/list-comp-10.fld +0 -1
- package/dist/fluid/fluid/example/desugar/list-comp-2.fld +0 -1
- package/dist/fluid/fluid/example/desugar/list-comp-3.fld +0 -1
- package/dist/fluid/fluid/example/desugar/list-comp-4.fld +0 -1
- package/dist/fluid/fluid/example/desugar/list-comp-5.fld +0 -1
- package/dist/fluid/fluid/example/desugar/list-comp-6.fld +0 -1
- package/dist/fluid/fluid/example/desugar/list-comp-7.fld +0 -1
- package/dist/fluid/fluid/example/desugar/list-comp-8.fld +0 -1
- package/dist/fluid/fluid/example/desugar/list-comp-9.fld +0 -1
- package/dist/fluid/fluid/example/desugar/list-enum.fld +0 -1
- package/dist/fluid/fluid/example/dict-list-comp.fld +0 -1
- package/dist/fluid/fluid/example/dicts.fld +0 -10
- package/dist/fluid/fluid/example/div-mod-quot-rem.fld +0 -4
- package/dist/fluid/fluid/example/factorial.fld +0 -6
- package/dist/fluid/fluid/example/filter.fld +0 -1
- package/dist/fluid/fluid/example/first-class-constr.fld +0 -1
- package/dist/fluid/fluid/example/flatten.fld +0 -12
- package/dist/fluid/fluid/example/foldr-sumSquares.fld +0 -1
- package/dist/fluid/fluid/example/graphics/background.fld +0 -7
- package/dist/fluid/fluid/example/graphics/grouped-bar-chart.fld +0 -9
- package/dist/fluid/fluid/example/graphics/line-chart.fld +0 -13
- package/dist/fluid/fluid/example/graphics/stacked-bar-chart.fld +0 -3
- package/dist/fluid/fluid/example/include-input-into-output.fld +0 -1
- package/dist/fluid/fluid/example/length.fld +0 -1
- package/dist/fluid/fluid/example/lexicalScoping.fld +0 -3
- package/dist/fluid/fluid/example/lib/some-constants.fld +0 -1
- package/dist/fluid/fluid/example/linked-inputs/energyscatter.fld +0 -23
- package/dist/fluid/fluid/example/linked-inputs/mini-energyscatter.fld +0 -29
- package/dist/fluid/fluid/example/linked-outputs/convolution-data.fld +0 -5
- package/dist/fluid/fluid/example/linked-outputs/convolution.fld +0 -12
- package/dist/fluid/fluid/example/linked-outputs/line-chart.fld +0 -15
- package/dist/fluid/fluid/example/linked-outputs/moving-average.fld +0 -19
- package/dist/fluid/fluid/example/linked-outputs/pairs-data.fld +0 -1
- package/dist/fluid/fluid/example/lookup.fld +0 -15
- package/dist/fluid/fluid/example/map.fld +0 -1
- package/dist/fluid/fluid/example/mergeSort.fld +0 -22
- package/dist/fluid/fluid/example/normalise.fld +0 -3
- package/dist/fluid/fluid/example/nub.fld +0 -1
- package/dist/fluid/fluid/example/pattern-match.fld +0 -12
- package/dist/fluid/fluid/example/percent.fld +0 -1
- package/dist/fluid/fluid/example/plot/methane.fld +0 -14
- package/dist/fluid/fluid/example/plot/non-renewables.fld +0 -21
- package/dist/fluid/fluid/example/range.fld +0 -4
- package/dist/fluid/fluid/example/record-lookup.fld +0 -3
- package/dist/fluid/fluid/example/records.expect.fld +0 -0
- package/dist/fluid/fluid/example/records.fld +0 -11
- package/dist/fluid/fluid/example/reverse.fld +0 -1
- package/dist/fluid/fluid/example/scratchpad.fld +0 -6
- package/dist/fluid/fluid/example/slicing/add.expect.fld +0 -1
- package/dist/fluid/fluid/example/slicing/add.fld +0 -1
- package/dist/fluid/fluid/example/slicing/array/array.expect.fld +0 -2
- package/dist/fluid/fluid/example/slicing/array/array.fld +0 -4
- package/dist/fluid/fluid/example/slicing/array/dims.expect.fld +0 -3
- package/dist/fluid/fluid/example/slicing/array/dims.fld +0 -3
- package/dist/fluid/fluid/example/slicing/array/lookup.expect.fld +0 -3
- package/dist/fluid/fluid/example/slicing/array/lookup.fld +0 -5
- package/dist/fluid/fluid/example/slicing/array/renewables.fld +0 -100
- package/dist/fluid/fluid/example/slicing/convolution/edgeDetect.expect.fld +0 -1
- package/dist/fluid/fluid/example/slicing/convolution/edgeDetect.fld +0 -1
- package/dist/fluid/fluid/example/slicing/convolution/emboss-wrap.fld +0 -1
- package/dist/fluid/fluid/example/slicing/convolution/emboss.expect.fld +0 -1
- package/dist/fluid/fluid/example/slicing/convolution/emboss.fld +0 -1
- package/dist/fluid/fluid/example/slicing/convolution/filter/edge-detect.fld +0 -5
- package/dist/fluid/fluid/example/slicing/convolution/filter/emboss.fld +0 -5
- package/dist/fluid/fluid/example/slicing/convolution/filter/gaussian.fld +0 -5
- package/dist/fluid/fluid/example/slicing/convolution/gaussian.expect.fld +0 -1
- package/dist/fluid/fluid/example/slicing/convolution/gaussian.fld +0 -1
- package/dist/fluid/fluid/example/slicing/convolution/test-image.fld +0 -7
- package/dist/fluid/fluid/example/slicing/dict/create.expect.fld +0 -2
- package/dist/fluid/fluid/example/slicing/dict/create.fld +0 -1
- package/dist/fluid/fluid/example/slicing/dict/difference.expect.fld +0 -4
- package/dist/fluid/fluid/example/slicing/dict/difference.fld +0 -3
- package/dist/fluid/fluid/example/slicing/dict/disjointUnion.expect.fld +0 -2
- package/dist/fluid/fluid/example/slicing/dict/disjointUnion.fld +0 -1
- package/dist/fluid/fluid/example/slicing/dict/foldl.expect.fld +0 -3
- package/dist/fluid/fluid/example/slicing/dict/foldl.fld +0 -1
- package/dist/fluid/fluid/example/slicing/dict/get.expect.fld +0 -5
- package/dist/fluid/fluid/example/slicing/dict/get.fld +0 -3
- package/dist/fluid/fluid/example/slicing/dict/intersectionWith.expect.fld +0 -5
- package/dist/fluid/fluid/example/slicing/dict/intersectionWith.fld +0 -4
- package/dist/fluid/fluid/example/slicing/dict/map.expect.fld +0 -8
- package/dist/fluid/fluid/example/slicing/dict/map.fld +0 -5
- package/dist/fluid/fluid/example/slicing/dict/match.expect.fld +0 -6
- package/dist/fluid/fluid/example/slicing/dict/match.fld +0 -5
- package/dist/fluid/fluid/example/slicing/divide.expect.fld +0 -1
- package/dist/fluid/fluid/example/slicing/divide.fld +0 -1
- package/dist/fluid/fluid/example/slicing/dtw/average-series.expect.fld +0 -8
- package/dist/fluid/fluid/example/slicing/dtw/average-series.fld +0 -8
- package/dist/fluid/fluid/example/slicing/dtw/compute-dtw.expect.fld +0 -6
- package/dist/fluid/fluid/example/slicing/dtw/compute-dtw.fld +0 -6
- package/dist/fluid/fluid/example/slicing/explained.expect.fld +0 -1
- package/dist/fluid/fluid/example/slicing/explained.fld +0 -1
- package/dist/fluid/fluid/example/slicing/filter.expect.fld +0 -4
- package/dist/fluid/fluid/example/slicing/filter.fld +0 -6
- package/dist/fluid/fluid/example/slicing/intersperse-1.expect.fld +0 -4
- package/dist/fluid/fluid/example/slicing/intersperse-2.expect.fld +0 -4
- package/dist/fluid/fluid/example/slicing/intersperse.fld +0 -5
- package/dist/fluid/fluid/example/slicing/length.expect.fld +0 -1
- package/dist/fluid/fluid/example/slicing/length.fld +0 -1
- package/dist/fluid/fluid/example/slicing/linked-outputs/bar-chart-line-chart.expect.fld +0 -0
- package/dist/fluid/fluid/example/slicing/linked-outputs/bar-chart-line-chart.fld +0 -29
- package/dist/fluid/fluid/example/slicing/linked-outputs/stacked-bar-scatter-plot.expect.fld +0 -0
- package/dist/fluid/fluid/example/slicing/linked-outputs/stacked-bar-scatter-plot.fld +0 -38
- package/dist/fluid/fluid/example/slicing/list-comp-1.expect.fld +0 -6
- package/dist/fluid/fluid/example/slicing/list-comp-2.expect.fld +0 -6
- package/dist/fluid/fluid/example/slicing/list-comp.fld +0 -8
- package/dist/fluid/fluid/example/slicing/lookup.expect.fld +0 -6
- package/dist/fluid/fluid/example/slicing/lookup.fld +0 -14
- package/dist/fluid/fluid/example/slicing/map.expect.fld +0 -1
- package/dist/fluid/fluid/example/slicing/map.fld +0 -1
- package/dist/fluid/fluid/example/slicing/matrix-update.expect.fld +0 -5
- package/dist/fluid/fluid/example/slicing/matrix-update.fld +0 -10
- package/dist/fluid/fluid/example/slicing/multiply.expect.fld +0 -1
- package/dist/fluid/fluid/example/slicing/multiply.fld +0 -1
- package/dist/fluid/fluid/example/slicing/nth.expect.fld +0 -1
- package/dist/fluid/fluid/example/slicing/nth.fld +0 -1
- package/dist/fluid/fluid/example/slicing/output-not-source.expect.fld +0 -2
- package/dist/fluid/fluid/example/slicing/output-not-source.fld +0 -1
- package/dist/fluid/fluid/example/slicing/qcut.expect.fld +0 -0
- package/dist/fluid/fluid/example/slicing/qcut.fld +0 -2
- package/dist/fluid/fluid/example/slicing/section-5-example-1.expect.fld +0 -10
- package/dist/fluid/fluid/example/slicing/section-5-example-2.expect.fld +0 -10
- package/dist/fluid/fluid/example/slicing/section-5-example-3.expect.fld +0 -10
- package/dist/fluid/fluid/example/slicing/section-5-example.fld +0 -14
- package/dist/fluid/fluid/example/slicing/zeros-1.expect.fld +0 -3
- package/dist/fluid/fluid/example/slicing/zeros-2.expect.fld +0 -3
- package/dist/fluid/fluid/example/slicing/zeros.fld +0 -4
- package/dist/fluid/fluid/example/slicing/zipWith-1.expect.fld +0 -4
- package/dist/fluid/fluid/example/slicing/zipWith.fld +0 -4
- package/dist/fluid/fluid/example/text-viz/datasets/ssp126.fld +0 -898
- package/dist/fluid/fluid/example/text-viz/datasets/ssp245.fld +0 -954
- package/dist/fluid/fluid/example/text-viz/datasets/ssp370.fld +0 -842
- package/dist/fluid/fluid/example/text-viz/datasets/ssp585.fld +0 -954
- package/dist/fluid/fluid/example/text-viz/explainable-table.fld +0 -7
- package/dist/fluid/fluid/example/text-viz/fake-probabilities.fld +0 -3
- package/dist/fluid/fluid/example/text-viz/figure-spm-4.fld +0 -42
- package/dist/fluid/fluid/example/text-viz/left-barchart-table.fld +0 -5
- package/dist/fluid/fluid/example/text-viz/likelihoods.fld +0 -9
- package/dist/fluid/fluid/example/text-viz/right-barchart-table.fld +0 -5
- package/dist/fluid/fluid/example/text-viz/table-spm-1.fld +0 -30
@@ -1,139 +0,0 @@
|
|
1
|
-
-- typedef Year = Num
|
2
|
-
-- typedef Country = Str
|
3
|
-
-- typedef EnergyType = Str
|
4
|
-
-- typedef Output = Num
|
5
|
-
-- typedef CountryData = List (EnergyType, Output)
|
6
|
-
-- typedef AnnualData = List (Country, CountryData)
|
7
|
-
-- typedef Data = List (Year, AnnualData)
|
8
|
-
-- The original dataset sometimes has '~0' instead of '0'.
|
9
|
-
|
10
|
-
-- Including only 3 countries here. Also, have reduced the Hydro value for China 2015 from 296 to 96 (ouch)
|
11
|
-
-- to make the charts fit nicely into my grant proposal. Fix this once proposal submitted!
|
12
|
-
-- https://www.ren21.net/wp-content/uploads/2019/05/GSR2014_Full-Report_English.pdf
|
13
|
-
[
|
14
|
-
(2013, [
|
15
|
-
("China", [
|
16
|
-
("Bio", 6.2),
|
17
|
-
("Hydro", 260),
|
18
|
-
("Solar", 19.9),
|
19
|
-
("Wind", 91)
|
20
|
-
]),
|
21
|
-
("USA", [
|
22
|
-
("Bio", 15.8),
|
23
|
-
("Hydro", 78),
|
24
|
-
("Solar", 12.1),
|
25
|
-
("Wind", 61)
|
26
|
-
]),
|
27
|
-
("Germany", [
|
28
|
-
("Bio", 8.1),
|
29
|
-
("Hydro", 5.6),
|
30
|
-
("Solar", 36),
|
31
|
-
("Wind", 34)
|
32
|
-
])
|
33
|
-
]),
|
34
|
-
-- https://www.ren21.net/wp-content/uploads/2019/05/GSR2015_Full-Report_English.pdf
|
35
|
-
(2014, [
|
36
|
-
("China", [
|
37
|
-
("Bio", 10),
|
38
|
-
("Hydro", 280),
|
39
|
-
("Solar", 28),
|
40
|
-
("Wind", 115)
|
41
|
-
]),
|
42
|
-
("USA", [
|
43
|
-
("Bio", 16.1),
|
44
|
-
("Hydro", 79),
|
45
|
-
("Solar", 18),
|
46
|
-
("Wind", 66)
|
47
|
-
]),
|
48
|
-
("Germany", [
|
49
|
-
("Bio", 8.8),
|
50
|
-
("Hydro", 5.6),
|
51
|
-
("Solar", 38),
|
52
|
-
("Wind", 39)
|
53
|
-
])
|
54
|
-
]),
|
55
|
-
-- https://www.ren21.net/gsr-2016/00-Reference-Tables.php
|
56
|
-
(2015, [
|
57
|
-
("China", [
|
58
|
-
("Bio", 10.3),
|
59
|
-
("Hydro", 96),
|
60
|
-
("Solar", 44),
|
61
|
-
("Wind", 145)
|
62
|
-
]),
|
63
|
-
("USA", [
|
64
|
-
("Bio", 16.7),
|
65
|
-
("Hydro", 80),
|
66
|
-
("Solar", 26),
|
67
|
-
("Wind", 74)
|
68
|
-
]),
|
69
|
-
("Germany", [
|
70
|
-
("Bio", 7.1),
|
71
|
-
("Hydro", 5.6),
|
72
|
-
("Solar", 40),
|
73
|
-
("Wind", 45)
|
74
|
-
])
|
75
|
-
]),
|
76
|
-
-- https://www.ren21.net/gsr-2017/pages/tables/tables/#table-R2
|
77
|
-
(2016, [
|
78
|
-
("China", [
|
79
|
-
("Bio", 12),
|
80
|
-
("Hydro", 305),
|
81
|
-
("Solar", 77),
|
82
|
-
("Wind", 169)
|
83
|
-
]),
|
84
|
-
("USA", [
|
85
|
-
("Bio", 16.8),
|
86
|
-
("Hydro", 80),
|
87
|
-
("Solar", 41),
|
88
|
-
("Wind", 82)
|
89
|
-
]),
|
90
|
-
("Germany", [
|
91
|
-
("Bio", 7.6),
|
92
|
-
("Hydro", 5.6),
|
93
|
-
("Solar", 41),
|
94
|
-
("Wind", 50)
|
95
|
-
])
|
96
|
-
]),
|
97
|
-
-- https://www.ren21.net/gsr-2018/pages/tables/tables/#Table_R2
|
98
|
-
(2017, [
|
99
|
-
("China", [
|
100
|
-
("Bio", 14.9),
|
101
|
-
("Hydro", 313),
|
102
|
-
("Solar", 131),
|
103
|
-
("Wind", 188)
|
104
|
-
]),
|
105
|
-
("USA", [
|
106
|
-
("Bio", 16.7),
|
107
|
-
("Hydro", 80),
|
108
|
-
("Solar", 51),
|
109
|
-
("Wind", 89)
|
110
|
-
]),
|
111
|
-
("Germany", [
|
112
|
-
("Bio", 8),
|
113
|
-
("Hydro", 5.6),
|
114
|
-
("Solar", 42),
|
115
|
-
("Wind", 56)
|
116
|
-
])
|
117
|
-
]),
|
118
|
-
-- https://www.ren21.net/gsr-2019/tables/table_02/table_02/
|
119
|
-
(2018, [
|
120
|
-
("China", [
|
121
|
-
("Bio", 17.8),
|
122
|
-
("Hydro", 322),
|
123
|
-
("Solar", 176),
|
124
|
-
("Wind", 210)
|
125
|
-
]),
|
126
|
-
("USA", [
|
127
|
-
("Bio", 16.2),
|
128
|
-
("Hydro", 80),
|
129
|
-
("Solar", 62),
|
130
|
-
("Wind", 96)
|
131
|
-
]),
|
132
|
-
("Germany", [
|
133
|
-
("Bio", 8.4),
|
134
|
-
("Hydro", 5.6),
|
135
|
-
("Solar", 45),
|
136
|
-
("Wind", 59)
|
137
|
-
])
|
138
|
-
])
|
139
|
-
]
|
@@ -1,100 +0,0 @@
|
|
1
|
-
-- The original dataset sometimes has '~0' instead of '0'.
|
2
|
-
-- Including only 3 countries here. Also, have reduced the Hydro value for China 2015 from 296 to 96 (ouch)
|
3
|
-
-- to make the charts fit nicely into grant proposal. Fix this once proposal submitted!
|
4
|
-
[
|
5
|
-
-- https://www.ren21.net/wp-content/uploads/2019/05/GSR2014_Full-Report_English.pdf
|
6
|
-
{ year: 2013, country: "China", energyType: "Bio", output: 6.2 },
|
7
|
-
{ year: 2013, country: "China", energyType: "Hydro", output: 260 },
|
8
|
-
{ year: 2013, country: "China", energyType: "Solar", output: 19.9 },
|
9
|
-
{ year: 2013, country: "China", energyType: "Wind", output: 91 },
|
10
|
-
|
11
|
-
{ year: 2013, country: "USA", energyType: "Bio", output: 15.8 },
|
12
|
-
{ year: 2013, country: "USA", energyType: "Hydro", output: 78 },
|
13
|
-
{ year: 2013, country: "USA", energyType: "Solar", output: 12.1 },
|
14
|
-
{ year: 2013, country: "USA", energyType: "Wind", output: 61 },
|
15
|
-
|
16
|
-
{ year: 2013, country: "Germany", energyType: "Bio", output: 8.1 },
|
17
|
-
{ year: 2013, country: "Germany", energyType: "Hydro", output: 5.6 },
|
18
|
-
{ year: 2013, country: "Germany", energyType: "Solar", output: 36 },
|
19
|
-
{ year: 2013, country: "Germany", energyType: "Wind", output: 34 },
|
20
|
-
|
21
|
-
-- https://www.ren21.net/wp-content/uploads/2019/05/GSR2015_Full-Report_English.pdf
|
22
|
-
{ year: 2014, country: "China", energyType: "Bio", output: 10 },
|
23
|
-
{ year: 2014, country: "China", energyType: "Hydro", output: 280 },
|
24
|
-
{ year: 2014, country: "China", energyType: "Solar", output: 28 },
|
25
|
-
{ year: 2014, country: "China", energyType: "Wind", output: 115 },
|
26
|
-
|
27
|
-
{ year: 2014, country: "USA", energyType: "Bio", output: 16.1 },
|
28
|
-
{ year: 2014, country: "USA", energyType: "Hydro", output: 79 },
|
29
|
-
{ year: 2014, country: "USA", energyType: "Solar", output: 18 },
|
30
|
-
{ year: 2014, country: "USA", energyType: "Wind", output: 66 },
|
31
|
-
|
32
|
-
{ year: 2014, country: "Germany", energyType: "Bio", output: 8.8 },
|
33
|
-
{ year: 2014, country: "Germany", energyType: "Hydro", output: 5.6 },
|
34
|
-
{ year: 2014, country: "Germany", energyType: "Solar", output: 38 },
|
35
|
-
{ year: 2014, country: "Germany", energyType: "Wind", output: 39 },
|
36
|
-
|
37
|
-
-- https://www.ren21.net/gsr-2016/00-Reference-Tables.php
|
38
|
-
{ year: 2015, country: "China", energyType: "Bio", output: 10.3 },
|
39
|
-
{ year: 2015, country: "China", energyType: "Hydro", output: 96 },
|
40
|
-
{ year: 2015, country: "China", energyType: "Solar", output: 44 },
|
41
|
-
{ year: 2015, country: "China", energyType: "Wind", output: 145 },
|
42
|
-
|
43
|
-
{ year: 2015, country: "USA", energyType: "Bio", output: 16.7 },
|
44
|
-
{ year: 2015, country: "USA", energyType: "Hydro", output: 80 },
|
45
|
-
{ year: 2015, country: "USA", energyType: "Solar", output: 26 },
|
46
|
-
{ year: 2015, country: "USA", energyType: "Wind", output: 74 },
|
47
|
-
|
48
|
-
{ year: 2015, country: "Germany", energyType: "Bio", output: 7.1 },
|
49
|
-
{ year: 2015, country: "Germany", energyType: "Hydro", output: 5.6 },
|
50
|
-
{ year: 2015, country: "Germany", energyType: "Solar", output: 40 },
|
51
|
-
{ year: 2015, country: "Germany", energyType: "Wind", output: 45 },
|
52
|
-
|
53
|
-
-- https://www.ren21.net/gsr-2017/pages/tables/tables/#table-R2
|
54
|
-
{ year: 2016, country: "China", energyType: "Bio", output: 12 },
|
55
|
-
{ year: 2016, country: "China", energyType: "Hydro", output: 305 },
|
56
|
-
{ year: 2016, country: "China", energyType: "Solar", output: 77 },
|
57
|
-
{ year: 2016, country: "China", energyType: "Wind", output: 169 },
|
58
|
-
|
59
|
-
{ year: 2016, country: "USA", energyType: "Bio", output: 16.8 },
|
60
|
-
{ year: 2016, country: "USA", energyType: "Hydro", output: 80 },
|
61
|
-
{ year: 2016, country: "USA", energyType: "Solar", output: 41 },
|
62
|
-
{ year: 2016, country: "USA", energyType: "Wind", output: 82 },
|
63
|
-
|
64
|
-
{ year: 2016, country: "Germany", energyType: "Bio", output: 7.6 },
|
65
|
-
{ year: 2016, country: "Germany", energyType: "Hydro", output: 5.6 },
|
66
|
-
{ year: 2016, country: "Germany", energyType: "Solar", output: 41 },
|
67
|
-
{ year: 2016, country: "Germany", energyType: "Wind", output: 50 },
|
68
|
-
|
69
|
-
-- https://www.ren21.net/gsr-2018/pages/tables/tables/#Table_R2
|
70
|
-
{ year: 2017, country: "China", energyType: "Bio", output: 14.9 },
|
71
|
-
{ year: 2017, country: "China", energyType: "Hydro", output: 313 },
|
72
|
-
{ year: 2017, country: "China", energyType: "Solar", output: 131 },
|
73
|
-
{ year: 2017, country: "China", energyType: "Wind", output: 188},
|
74
|
-
|
75
|
-
{ year: 2017, country: "USA", energyType: "Bio", output: 16.7 },
|
76
|
-
{ year: 2017, country: "USA", energyType: "Hydro", output: 80 },
|
77
|
-
{ year: 2017, country: "USA", energyType: "Solar", output: 51 },
|
78
|
-
{ year: 2017, country: "USA", energyType: "Wind", output: 89 },
|
79
|
-
|
80
|
-
{ year: 2017, country: "Germany", energyType: "Bio", output: 8 },
|
81
|
-
{ year: 2017, country: "Germany", energyType: "Hydro", output: 5.6 },
|
82
|
-
{ year: 2017, country: "Germany", energyType: "Solar", output: 42 },
|
83
|
-
{ year: 2017, country: "Germany", energyType: "Wind", output: 56 },
|
84
|
-
|
85
|
-
-- https://www.ren21.net/gsr-2019/tables/table_02/table_02/
|
86
|
-
{ year: 2018, country: "China", energyType: "Bio", output: 17.8 },
|
87
|
-
{ year: 2018, country: "China", energyType: "Hydro", output: 322 },
|
88
|
-
{ year: 2018, country: "China", energyType: "Solar", output: 176 },
|
89
|
-
{ year: 2018, country: "China", energyType: "Wind", output: 210 },
|
90
|
-
|
91
|
-
{ year: 2018, country: "USA", energyType: "Bio", output: 16.2 },
|
92
|
-
{ year: 2018, country: "USA", energyType: "Hydro", output: 80 },
|
93
|
-
{ year: 2018, country: "USA", energyType: "Solar", output: 62 },
|
94
|
-
{ year: 2018, country: "USA", energyType: "Wind", output: 96 },
|
95
|
-
|
96
|
-
{ year: 2018, country: "Germany", energyType: "Bio", output: 8.4 },
|
97
|
-
{ year: 2018, country: "Germany", energyType: "Hydro", output: 5.6 },
|
98
|
-
{ year: 2018, country: "Germany", energyType: "Solar", output: 45 },
|
99
|
-
{ year: 2018, country: "Germany", energyType: "Wind", output: 59 }
|
100
|
-
]
|
@@ -1,194 +0,0 @@
|
|
1
|
-
[
|
2
|
-
{
|
3
|
-
model: "NorESM2-LM",
|
4
|
-
world: 15.76,
|
5
|
-
world_historical: 14.5,
|
6
|
-
changed: 1.01
|
7
|
-
},
|
8
|
-
{
|
9
|
-
model: "NorESM2-MM",
|
10
|
-
world: 15.22,
|
11
|
-
world_historical: 13.92,
|
12
|
-
changed: 1.05
|
13
|
-
},
|
14
|
-
{
|
15
|
-
model: "GFDL-ESM4",
|
16
|
-
world: 14.82,
|
17
|
-
world_historical: 13.5,
|
18
|
-
changed: 1.07
|
19
|
-
},
|
20
|
-
{
|
21
|
-
model: "CAMS-CSM1-0",
|
22
|
-
world: 15.13,
|
23
|
-
world_historical: 13.8,
|
24
|
-
changed: 1.09
|
25
|
-
},
|
26
|
-
{
|
27
|
-
model: "BCC-CSM2-MR",
|
28
|
-
world: 16.29,
|
29
|
-
world_historical: 14.82,
|
30
|
-
changed: 1.22
|
31
|
-
},
|
32
|
-
{
|
33
|
-
model: "INM-CM4-8",
|
34
|
-
world: 14.79,
|
35
|
-
world_historical: 13.31,
|
36
|
-
changed: 1.23
|
37
|
-
},
|
38
|
-
{
|
39
|
-
model: "FGOALS-g3",
|
40
|
-
world: 14.3,
|
41
|
-
world_historical: 12.81,
|
42
|
-
changed: 1.24
|
43
|
-
},
|
44
|
-
{
|
45
|
-
model: "MPI-ESM1-2-LR",
|
46
|
-
world: 15.03,
|
47
|
-
world_historical: 13.54,
|
48
|
-
changed: 1.24
|
49
|
-
},
|
50
|
-
{
|
51
|
-
model: "INM-CM5-0",
|
52
|
-
world: 14.64,
|
53
|
-
world_historical: 13.14,
|
54
|
-
changed: 1.25
|
55
|
-
},
|
56
|
-
{
|
57
|
-
model: "IITM-ESM",
|
58
|
-
world: 15.56,
|
59
|
-
world_historical: 13.99,
|
60
|
-
changed: 1.32
|
61
|
-
},
|
62
|
-
{
|
63
|
-
model: "MPI-ESM1-2-HR",
|
64
|
-
world: 15.51,
|
65
|
-
world_historical: 13.94,
|
66
|
-
changed: 1.32
|
67
|
-
},
|
68
|
-
{
|
69
|
-
model: "MIROC6",
|
70
|
-
world: 16.72,
|
71
|
-
world_historical: 15.12,
|
72
|
-
changed: 1.35
|
73
|
-
},
|
74
|
-
{
|
75
|
-
model: "MIROC-ES2L",
|
76
|
-
world: 16.6,
|
77
|
-
world_historical: 14.96,
|
78
|
-
changed: 1.39
|
79
|
-
},
|
80
|
-
{
|
81
|
-
model: "MRI-ESM2-0",
|
82
|
-
world: 15.47,
|
83
|
-
world_historical: 13.74,
|
84
|
-
changed: 1.47
|
85
|
-
},
|
86
|
-
{
|
87
|
-
model: "KIOST-ESM",
|
88
|
-
world: 14.22,
|
89
|
-
world_historical: 12.4,
|
90
|
-
changed: 1.57
|
91
|
-
},
|
92
|
-
{
|
93
|
-
model: "AWI-CM-1-1-MR",
|
94
|
-
world: 15.72,
|
95
|
-
world_historical: 13.76,
|
96
|
-
changed: 1.72
|
97
|
-
},
|
98
|
-
{
|
99
|
-
model: "NESM3",
|
100
|
-
world: 15.64,
|
101
|
-
world_historical: 13.66,
|
102
|
-
changed: 1.73
|
103
|
-
},
|
104
|
-
{
|
105
|
-
model: "ACCESS-ESM1-5",
|
106
|
-
world: 16.54,
|
107
|
-
world_historical: 14.54,
|
108
|
-
changed: 1.75
|
109
|
-
},
|
110
|
-
{
|
111
|
-
model: "CNRM-ESM2-1",
|
112
|
-
world: 15.65,
|
113
|
-
world_historical: 13.64,
|
114
|
-
changed: 1.76
|
115
|
-
},
|
116
|
-
{
|
117
|
-
model: "EC-Earth3",
|
118
|
-
world: 16.02,
|
119
|
-
world_historical: 13.94,
|
120
|
-
changed: 1.83
|
121
|
-
},
|
122
|
-
{
|
123
|
-
model: "CNRM-CM6-1",
|
124
|
-
world: 15.0,
|
125
|
-
world_historical: 12.88,
|
126
|
-
changed: 1.87
|
127
|
-
},
|
128
|
-
{
|
129
|
-
model: "CESM2",
|
130
|
-
world: 16.21,
|
131
|
-
world_historical: 14.02,
|
132
|
-
changed: 1.94
|
133
|
-
},
|
134
|
-
{
|
135
|
-
model: "IPSL-CM6A-LR",
|
136
|
-
world: 15.17,
|
137
|
-
world_historical: 12.88,
|
138
|
-
changed: 2.04
|
139
|
-
},
|
140
|
-
{
|
141
|
-
model: "CESM2-WACCM",
|
142
|
-
world: 16.23,
|
143
|
-
world_historical: 13.84,
|
144
|
-
changed: 2.14
|
145
|
-
},
|
146
|
-
{
|
147
|
-
model: "ACCESS-CM2",
|
148
|
-
world: 16.27,
|
149
|
-
world_historical: 13.84,
|
150
|
-
changed: 2.18
|
151
|
-
},
|
152
|
-
{
|
153
|
-
model: "UKESM1-0-LL",
|
154
|
-
world: 16.06,
|
155
|
-
world_historical: 13.45,
|
156
|
-
changed: 2.36
|
157
|
-
},
|
158
|
-
{
|
159
|
-
model: "EC-Earth3-Veg",
|
160
|
-
world: 16.15,
|
161
|
-
world_historical: 13.53,
|
162
|
-
changed: 2.37
|
163
|
-
},
|
164
|
-
{
|
165
|
-
model: "HadGEM3-GC31-LL",
|
166
|
-
world: 16.34,
|
167
|
-
world_historical: 13.71,
|
168
|
-
changed: 2.38
|
169
|
-
},
|
170
|
-
{
|
171
|
-
model: "CMCC-CM2-SR5",
|
172
|
-
world: 16.87,
|
173
|
-
world_historical: 14.1,
|
174
|
-
changed: 2.52
|
175
|
-
},
|
176
|
-
{
|
177
|
-
model: "CNRM-CM6-1-HR",
|
178
|
-
world: 15.12,
|
179
|
-
world_historical: 12.32,
|
180
|
-
changed: 2.54
|
181
|
-
},
|
182
|
-
{
|
183
|
-
model: "CanESM5",
|
184
|
-
world: 16.39,
|
185
|
-
world_historical: 13.54,
|
186
|
-
changed: 2.61
|
187
|
-
},
|
188
|
-
{
|
189
|
-
model: "KACE-1-0-G",
|
190
|
-
world: 16.47,
|
191
|
-
world_historical: 13.55,
|
192
|
-
changed: 2.67
|
193
|
-
}
|
194
|
-
]
|
@@ -1 +0,0 @@
|
|
1
|
-
(1 + 5) * ((let x = 2; y = 8 in x * y) - (let y = 3 in y * y))
|
@@ -1 +0,0 @@
|
|
1
|
-
[ x + y | x <- [5, 4, 3], y <- [9, 7, 5] ]
|
@@ -1 +0,0 @@
|
|
1
|
-
[ x | [x] <- [[], [4, 6]] ]
|
@@ -1 +0,0 @@
|
|
1
|
-
[ z | x <- [5, 4, 3], y <- [9, 7, 5], let z = x + y, c <- [9, 7, 5] ]
|
@@ -1 +0,0 @@
|
|
1
|
-
[ z | x <- [5, 4, 3], y <- [9, 7, 5], let z = x + y, z < 10 ]
|
@@ -1 +0,0 @@
|
|
1
|
-
[ x | x : xs <- [[5], [4], [3], []] ]
|
@@ -1 +0,0 @@
|
|
1
|
-
[ z | x <- [5, 4, 3], let z = x ]
|
@@ -1 +0,0 @@
|
|
1
|
-
[ z | let z = 5 ]
|
@@ -1 +0,0 @@
|
|
1
|
-
[ [] | [] <- [[5], [4], [3], []] ]
|
@@ -1 +0,0 @@
|
|
1
|
-
[ x | [x] <- [[5], [4], [3], []] ]
|
@@ -1 +0,0 @@
|
|
1
|
-
[ x + y | [x, y] <- [[5], [4, 6], [3], [], [9, 10]] ]
|
@@ -1 +0,0 @@
|
|
1
|
-
[3..7]
|
@@ -1 +0,0 @@
|
|
1
|
-
[ x | {fst: x, snd: []} <- [{fst: 5, third: "hello", snd: []}, {fst: 6, snd: [7, 8]}] ]
|
@@ -1 +0,0 @@
|
|
1
|
-
filter ((<) 5) [8, 4, 7, 3]
|
@@ -1 +0,0 @@
|
|
1
|
-
zipWith (:) [10, 12, 20] [[], [], [], [], []]
|
@@ -1,12 +0,0 @@
|
|
1
|
-
let
|
2
|
-
flatten Empty = [];
|
3
|
-
flatten (NonEmpty t1 (key, val) t2) =
|
4
|
-
concat2 (flatten t1) ((key, val) : flatten t2)
|
5
|
-
in
|
6
|
-
flatten
|
7
|
-
(NonEmpty
|
8
|
-
(NonEmpty Empty (3, "simon") Empty)
|
9
|
-
(4, "john")
|
10
|
-
(NonEmpty (NonEmpty Empty (6, "sarah") Empty) (7, "claire") Empty)
|
11
|
-
)
|
12
|
-
|
@@ -1 +0,0 @@
|
|
1
|
-
foldr (fun x y -> x * x + y * y) 0 [6, 3, 2]
|
@@ -1,9 +0,0 @@
|
|
1
|
-
let year = 2015;
|
2
|
-
-- List (Country, List (EnergyType, Output)) -> List (Country, List (EnergyType, Output))
|
3
|
-
let exclude countries yearData =
|
4
|
-
flip map yearData (second (filter (fun (country, countryData) -> not (elem country countries))))
|
5
|
-
in caption ("Renewables (GW) by country and energy type, " ++ numToStr year)
|
6
|
-
(groupedBarChart True colours1 0.2
|
7
|
-
(exclude
|
8
|
-
[] -- ["Geothermal", "Ocean", "CSP"]
|
9
|
-
(lookup year data)))
|
@@ -1,13 +0,0 @@
|
|
1
|
-
let year1 = head data;
|
2
|
-
-- List (EnergyType, Output) -> List (EnergyType, Output)
|
3
|
-
let addTotal kvs =
|
4
|
-
("Total", sum (map snd kvs)) : kvs;
|
5
|
-
-- Country -> List (Year, List (EnergyType, Output))
|
6
|
-
let countryData country =
|
7
|
-
map (second (compose addTotal (lookup country))) data in
|
8
|
-
-- List Country
|
9
|
-
(fun country ->
|
10
|
-
caption country
|
11
|
-
(lineChart True ("black" : colours1) (fst year1)
|
12
|
-
(countryData country)))
|
13
|
-
"China"
|
@@ -1 +0,0 @@
|
|
1
|
-
(x, x)
|
@@ -1 +0,0 @@
|
|
1
|
-
length [2, 3]
|
@@ -1 +0,0 @@
|
|
1
|
-
let x = 1;
|
@@ -1,23 +0,0 @@
|
|
1
|
-
let isCountry name x = name == x.country;
|
2
|
-
isYear year x = year == x.year;
|
3
|
-
|
4
|
-
let plot year countries =
|
5
|
-
let rens = filter (isYear year) renewables;
|
6
|
-
nonRens = filter (isYear year) nonRenewables;
|
7
|
-
let plotCountry country =
|
8
|
-
let rens' = filter (isCountry country) rens;
|
9
|
-
rensOut = sum (map (fun x -> x.output) rens');
|
10
|
-
rensCap = sum (map (fun x -> x.capacity) rens');
|
11
|
-
x = head (filter (isCountry country) nonRens);
|
12
|
-
nonRensCap = x.nuclearCap + x.petrolCap + x.gasCap + x.coalCap
|
13
|
-
in {
|
14
|
-
x: rensCap / (rensCap + nonRensCap),
|
15
|
-
y: (rensOut + x.nuclearOut) / (rensCap + x.nuclearCap)
|
16
|
-
}
|
17
|
-
in map plotCountry countries
|
18
|
-
|
19
|
-
in ScatterPlot {
|
20
|
-
caption: "Clean energy efficiency vs. proportion of renewable energy capacity",
|
21
|
-
points: plot 2018 [ "BRA", "CHN", "DEU", "FRA", "EGY", "IND", "JPN", "MEX", "NGA", "USA" ],
|
22
|
-
labels: { x: "Renewables/TotalEnergyCap", y: "Clean Capacity Factor" }
|
23
|
-
}
|
@@ -1,29 +0,0 @@
|
|
1
|
-
let sumNonRenewables x = x.nuclearCap + x.petrolCap + x.gasCap + x.coalCap;
|
2
|
-
let country_check name x = name == x.country;
|
3
|
-
let year_check year x = year == x.year;
|
4
|
-
|
5
|
-
let energy year c_names =
|
6
|
-
let rens2018 = filter (year_check year) renewables;
|
7
|
-
let nonrens2018 = filter (year_check year) nonRenewables;
|
8
|
-
let energy_per_country c_name =
|
9
|
-
let filteredRen = filter (country_check c_name) rens2018;
|
10
|
-
let non_ren_x = head (filter (country_check c_name) nonrens2018);
|
11
|
-
let rensOut = sum (map (fun x = x.output) filteredRen);
|
12
|
-
let rensCap = sum (map (fun x = x.capacity) filteredRen);
|
13
|
-
let nonRensCap = sumNonRenewables non_ren_x
|
14
|
-
in {
|
15
|
-
name: c_name,
|
16
|
-
totalCap: rensCap + nonRensCap,
|
17
|
-
nonRenewables: nonRensCap,
|
18
|
-
renCapFactor: (rensOut + non_ren_x.nuclearOut) / (rensCap + non_ren_x.nuclearCap)
|
19
|
-
}
|
20
|
-
in
|
21
|
-
map energy_per_country c_names
|
22
|
-
in ScatterPlot {
|
23
|
-
caption: "Clean energy efficiency against proportion of renewable energy cap",
|
24
|
-
points: [{
|
25
|
-
x: country.nonRenewables / country.totalCap,
|
26
|
-
y: country.renCapFactor
|
27
|
-
}| country <- energy 2018 ["USA"]],
|
28
|
-
labels: { x: "Renewables/TotalEnergyCap", y: "Clean Capacity Factor" }
|
29
|
-
}
|
@@ -1,12 +0,0 @@
|
|
1
|
-
(let filter' = [[0, 0, 0],
|
2
|
-
[3, 7, 1],
|
3
|
-
[0, 0, 0]];
|
4
|
-
filter = [| nth2 i j filter' | (i, j) in (3, 3) |];
|
5
|
-
image = [| nth2 i j data | (i, j) in (5, 5) |]
|
6
|
-
in convolve image filter wrap,
|
7
|
-
let filter' = [[0, 2, 0],
|
8
|
-
[0, 7, 0],
|
9
|
-
[0, 5, 0]];
|
10
|
-
filter = [| nth2 i j filter' | (i, j) in (3, 3) |];
|
11
|
-
image = [| nth2 i j data | (i, j) in (5, 5) |]
|
12
|
-
in convolve image filter zero)
|