@digital4better/data 1.3.19 → 1.3.21

package/data/mix/continent-yearly-green.csv

@@ -5,39 +5,39 @@ Africa,2021,0.0071,0.0982,0.4352,0.3108,0.0033,0.124,0.0014,0.0114,0.0087
 Africa,2022,0.0071,0.0958,0.4313,0.3112,0.0029,0.1289,0.0015,0.0121,0.0092
 Africa,2023,0.0071,0.0919,0.436,0.3108,0.0025,0.1268,0.0017,0.0136,0.0097
 Africa,2024,0.0071,0.0931,0.4364,0.3094,0.0024,0.1254,0.0016,0.0144,0.0104
-Africa,2025,0.0071,0.0926,0.4336,0.3117,0.0026,0.1259,0.0016,0.0145,0.0104
+Africa,2025,0.0071,0.093,0.4337,0.3114,0.0026,0.1257,0.0017,0.0144,0.0104
 Asia,2019,0.012,0.356,0.3594,0.0884,0.024,0.1158,0.0072,0.018,0.0191
 Asia,2020,0.0128,0.3533,0.3563,0.0898,0.0241,0.1149,0.007,0.0206,0.0211
 Asia,2021,0.0139,0.36,0.3459,0.0856,0.0253,0.1113,0.0068,0.0238,0.0274
 Asia,2022,0.0146,0.3581,0.3392,0.086,0.0257,0.1099,0.0067,0.0286,0.0311
 Asia,2023,0.0151,0.3641,0.3317,0.0806,0.0264,0.1061,0.0066,0.0344,0.0351
 Asia,2024,0.0148,0.3601,0.3241,0.0837,0.0266,0.1034,0.0065,0.043,0.0378
-Asia,2025,0.0148,0.3503,0.3178,0.0818,0.0277,0.1015,0.0064,0.0573,0.0425
-Europe,2019,0.0249,0.1774,0.2582,0.1917,0.1989,0.0197,0.0181,0.0271,0.0839
-Europe,2020,0.0264,0.1628,0.2441,0.2043,0.1929,0.0196,0.0191,0.033,0.0977
-Europe,2021,0.0273,0.168,0.249,0.1937,0.1955,0.02,0.0185,0.0357,0.0923
-Europe,2022,0.0275,0.1654,0.2524,0.184,0.1803,0.0205,0.0191,0.046,0.1048
-Europe,2023,0.0254,0.1482,0.2378,0.1967,0.1786,0.0192,0.0193,0.0565,0.1182
-Europe,2024,0.0259,0.1388,0.2279,0.2034,0.1764,0.0198,0.0191,0.0684,0.1202
-Europe,2025,0.0255,0.1344,0.2305,0.1922,0.1745,0.0194,0.0191,0.0958,0.1087
+Asia,2025,0.0148,0.3516,0.3158,0.0842,0.0275,0.1007,0.0064,0.0579,0.0411
+Europe,2019,0.0249,0.1773,0.258,0.1925,0.1987,0.0197,0.0181,0.027,0.0838
+Europe,2020,0.0264,0.1627,0.2439,0.2051,0.1927,0.0196,0.0191,0.0329,0.0976
+Europe,2021,0.0273,0.1678,0.2487,0.1947,0.1953,0.02,0.0185,0.0356,0.0922
+Europe,2022,0.0275,0.1653,0.2522,0.1846,0.1802,0.0205,0.0191,0.046,0.1047
+Europe,2023,0.0254,0.1481,0.2376,0.1973,0.1785,0.0192,0.0193,0.0565,0.1181
+Europe,2024,0.0259,0.1387,0.2276,0.2044,0.1762,0.0198,0.019,0.0684,0.1201
+Europe,2025,0.0254,0.1338,0.2276,0.1938,0.1742,0.0193,0.0191,0.0962,0.1106
 North America,2019,0.0221,0.1784,0.3258,0.1315,0.1421,0.1087,0.0068,0.0234,0.0613
 North America,2020,0.0219,0.1475,0.3417,0.1342,0.1414,0.1075,0.0069,0.0286,0.0702
 North America,2021,0.0216,0.1632,0.3295,0.1277,0.1366,0.1053,0.0068,0.0339,0.0754
 North America,2022,0.0207,0.1491,0.3382,0.1278,0.1323,0.1028,0.0067,0.0396,0.0829
 North America,2023,0.0205,0.1263,0.3653,0.1223,0.1381,0.0909,0.0069,0.0463,0.0835
 North America,2024,0.0199,0.1193,0.3702,0.1186,0.1356,0.0877,0.0065,0.0553,0.0869
-North America,2025,0.0192,0.1313,0.3518,0.1185,0.1321,0.0832,0.0063,0.0704,0.0872
+North America,2025,0.0193,0.1304,0.3573,0.1174,0.1319,0.0828,0.0063,0.0708,0.0839
 Oceania,2019,0.0047,0.4124,0.0953,0.1555,0,0.2054,0.0207,0.0528,0.0534
 Oceania,2020,0.0045,0.3994,0.0874,0.155,0,0.2069,0.0209,0.0642,0.0617
 Oceania,2021,0.0045,0.3867,0.0728,0.158,0,0.2068,0.0209,0.0789,0.0715
 Oceania,2022,0.0043,0.3584,0.0786,0.1627,0,0.204,0.0209,0.0917,0.0795
 Oceania,2023,0.0045,0.3505,0.068,0.159,0,0.2028,0.0203,0.1107,0.0844
 Oceania,2024,0.0048,0.3492,0.0711,0.1457,0,0.1993,0.0225,0.1203,0.087
-Oceania,2025,0.004,0.3489,0.0714,0.1404,0,0.1962,0.0242,0.1186,0.0963
+Oceania,2025,0.0041,0.3436,0.0703,0.1422,0,0.1966,0.0244,0.1204,0.0985
 South America,2019,0.0064,0.0228,0.1906,0.6306,0.0108,0.0999,0.0001,0.0073,0.0313
 South America,2020,0.007,0.0219,0.1881,0.6259,0.0108,0.1013,0.0001,0.0101,0.0346
 South America,2021,0.0061,0.0225,0.2051,0.5955,0.0108,0.1025,0.0002,0.0143,0.0429
 South America,2022,0.0059,0.0142,0.1834,0.6203,0.0096,0.0966,0.0002,0.022,0.0478
 South America,2023,0.0063,0.0135,0.1765,0.6128,0.01,0.0944,0.0002,0.0322,0.054
 South America,2024,0.0067,0.0139,0.1762,0.5957,0.011,0.0928,0.0002,0.0433,0.0602
-South America,2025,0.0059,0.0117,0.1762,0.594,0.0106,0.0912,0.0001,0.0483,0.062
+South America,2025,0.006,0.0127,0.1762,0.5898,0.0108,0.0915,0.0001,0.0489,0.0639

package/data/mix/continent-yearly-green.json

@@ -39,8 +39,8 @@
     "2025": {
       "Bioenergy": 0.0208,
       "Hydro": 0.9068,
-      "Solar": 0.0421,
-      "Wind": 0.0303
+      "Solar": 0.042,
+      "Wind": 0.0304
     }
   },
   "Asia": {
@@ -76,59 +76,59 @@
     },
     "2024": {
       "Bioenergy": 0.0828,
-      "Hydro": 0.4666,
+      "Hydro": 0.4667,
       "Solar": 0.2399,
       "Wind": 0.2106
     },
     "2025": {
-      "Bioenergy": 0.0755,
-      "Hydro": 0.4165,
-      "Solar": 0.2916,
-      "Wind": 0.2164
+      "Bioenergy": 0.0747,
+      "Hydro": 0.4253,
+      "Solar": 0.2923,
+      "Wind": 0.2077
     }
   },
   "Europe": {
     "2019": {
-      "Bioenergy": 0.076,
-      "Hydro": 0.5851,
-      "Solar": 0.0826,
-      "Wind": 0.2562
+      "Bioenergy": 0.0758,
+      "Hydro": 0.5864,
+      "Solar": 0.0823,
+      "Wind": 0.2555
     },
     "2020": {
-      "Bioenergy": 0.0731,
-      "Hydro": 0.5654,
-      "Solar": 0.0913,
-      "Wind": 0.2703
+      "Bioenergy": 0.0729,
+      "Hydro": 0.5666,
+      "Solar": 0.091,
+      "Wind": 0.2695
     },
     "2021": {
-      "Bioenergy": 0.0783,
-      "Hydro": 0.5551,
-      "Solar": 0.1022,
-      "Wind": 0.2644
+      "Bioenergy": 0.078,
+      "Hydro": 0.5566,
+      "Solar": 0.1018,
+      "Wind": 0.2636
     },
     "2022": {
-      "Bioenergy": 0.076,
-      "Hydro": 0.5079,
-      "Solar": 0.127,
-      "Wind": 0.2892
+      "Bioenergy": 0.0758,
+      "Hydro": 0.5089,
+      "Solar": 0.1267,
+      "Wind": 0.2886
     },
     "2023": {
-      "Bioenergy": 0.0641,
-      "Hydro": 0.4956,
-      "Solar": 0.1424,
-      "Wind": 0.2979
+      "Bioenergy": 0.064,
+      "Hydro": 0.4966,
+      "Solar": 0.1421,
+      "Wind": 0.2973
     },
     "2024": {
-      "Bioenergy": 0.062,
-      "Hydro": 0.4866,
-      "Solar": 0.1637,
-      "Wind": 0.2877
+      "Bioenergy": 0.0618,
+      "Hydro": 0.4881,
+      "Solar": 0.1633,
+      "Wind": 0.2869
     },
     "2025": {
-      "Bioenergy": 0.0604,
-      "Hydro": 0.4553,
-      "Solar": 0.2269,
-      "Wind": 0.2574
+      "Bioenergy": 0.0596,
+      "Hydro": 0.4549,
+      "Solar": 0.2258,
+      "Wind": 0.2597
     }
   },
   "North America": {
@@ -169,10 +169,10 @@
       "Wind": 0.3095
     },
     "2025": {
-      "Bioenergy": 0.0651,
-      "Hydro": 0.4012,
-      "Solar": 0.2383,
-      "Wind": 0.2953
+      "Bioenergy": 0.0664,
+      "Hydro": 0.4028,
+      "Solar": 0.243,
+      "Wind": 0.2878
     }
   },
   "Oceania": {
@@ -213,10 +213,10 @@
       "Wind": 0.2432
     },
     "2025": {
-      "Bioenergy": 0.0111,
-      "Hydro": 0.3908,
-      "Solar": 0.33,
-      "Wind": 0.2681
+      "Bioenergy": 0.0112,
+      "Hydro": 0.3894,
+      "Solar": 0.3296,
+      "Wind": 0.2698
     }
   },
   "South America": {
@@ -257,10 +257,10 @@
       "Wind": 0.0853
     },
     "2025": {
-      "Bioenergy": 0.0083,
-      "Hydro": 0.8363,
-      "Solar": 0.068,
-      "Wind": 0.0873
+      "Bioenergy": 0.0084,
+      "Hydro": 0.8324,
+      "Solar": 0.0691,
+      "Wind": 0.0902
     }
   }
 }

package/data/mix/continent-yearly.csv

@@ -5,39 +5,39 @@ Africa,2021,0.0071,0.0982,0.4352,0.3108,0.0033,0.124,0.0014,0.0114,0.0087
 Africa,2022,0.0071,0.0958,0.4313,0.3112,0.0029,0.1289,0.0015,0.0121,0.0092
 Africa,2023,0.0071,0.0919,0.436,0.3108,0.0025,0.1268,0.0017,0.0136,0.0097
 Africa,2024,0.0071,0.0931,0.4364,0.3094,0.0024,0.1254,0.0016,0.0144,0.0104
-Africa,2025,0.0071,0.0926,0.4336,0.3117,0.0026,0.1259,0.0016,0.0145,0.0104
+Africa,2025,0.0071,0.093,0.4337,0.3114,0.0026,0.1257,0.0017,0.0144,0.0104
 Asia,2019,0.012,0.356,0.3594,0.0884,0.024,0.1158,0.0072,0.018,0.0191
 Asia,2020,0.0128,0.3533,0.3563,0.0898,0.0241,0.1149,0.007,0.0206,0.0211
 Asia,2021,0.0139,0.36,0.3459,0.0856,0.0253,0.1113,0.0068,0.0238,0.0274
 Asia,2022,0.0146,0.3581,0.3392,0.086,0.0257,0.1099,0.0067,0.0286,0.0311
 Asia,2023,0.0151,0.3641,0.3317,0.0806,0.0264,0.1061,0.0066,0.0344,0.0351
 Asia,2024,0.0148,0.3601,0.3241,0.0837,0.0266,0.1034,0.0065,0.043,0.0378
-Asia,2025,0.0148,0.3503,0.3178,0.0818,0.0277,0.1015,0.0064,0.0573,0.0425
-Europe,2019,0.0249,0.1774,0.2582,0.1917,0.1989,0.0197,0.0181,0.0271,0.0839
-Europe,2020,0.0264,0.1628,0.2441,0.2043,0.1929,0.0196,0.0191,0.033,0.0977
-Europe,2021,0.0273,0.168,0.249,0.1937,0.1955,0.02,0.0185,0.0357,0.0923
-Europe,2022,0.0275,0.1654,0.2524,0.184,0.1803,0.0205,0.0191,0.046,0.1048
-Europe,2023,0.0254,0.1482,0.2378,0.1967,0.1786,0.0192,0.0193,0.0565,0.1182
-Europe,2024,0.0259,0.1388,0.2279,0.2034,0.1764,0.0198,0.0191,0.0684,0.1202
-Europe,2025,0.0255,0.1344,0.2305,0.1922,0.1745,0.0194,0.0191,0.0958,0.1087
+Asia,2025,0.0148,0.3516,0.3158,0.0842,0.0275,0.1007,0.0064,0.0579,0.0411
+Europe,2019,0.0249,0.1773,0.258,0.1925,0.1987,0.0197,0.0181,0.027,0.0838
+Europe,2020,0.0264,0.1627,0.2439,0.2051,0.1927,0.0196,0.0191,0.0329,0.0976
+Europe,2021,0.0273,0.1678,0.2487,0.1947,0.1953,0.02,0.0185,0.0356,0.0922
+Europe,2022,0.0275,0.1653,0.2522,0.1846,0.1802,0.0205,0.0191,0.046,0.1047
+Europe,2023,0.0254,0.1481,0.2376,0.1973,0.1785,0.0192,0.0193,0.0565,0.1181
+Europe,2024,0.0259,0.1387,0.2276,0.2044,0.1762,0.0198,0.019,0.0684,0.1201
+Europe,2025,0.0254,0.1338,0.2276,0.1938,0.1742,0.0193,0.0191,0.0962,0.1106
 North America,2019,0.0221,0.1784,0.3258,0.1315,0.1421,0.1087,0.0068,0.0234,0.0613
 North America,2020,0.0219,0.1475,0.3417,0.1342,0.1414,0.1075,0.0069,0.0286,0.0702
 North America,2021,0.0216,0.1632,0.3295,0.1277,0.1366,0.1053,0.0068,0.0339,0.0754
 North America,2022,0.0207,0.1491,0.3382,0.1278,0.1323,0.1028,0.0067,0.0396,0.0829
 North America,2023,0.0205,0.1263,0.3653,0.1223,0.1381,0.0909,0.0069,0.0463,0.0835
 North America,2024,0.0199,0.1193,0.3702,0.1186,0.1356,0.0877,0.0065,0.0553,0.0869
-North America,2025,0.0192,0.1313,0.3518,0.1185,0.1321,0.0832,0.0063,0.0704,0.0872
+North America,2025,0.0193,0.1304,0.3573,0.1174,0.1319,0.0828,0.0063,0.0708,0.0839
 Oceania,2019,0.0047,0.4124,0.0953,0.1555,0,0.2054,0.0207,0.0528,0.0534
 Oceania,2020,0.0045,0.3994,0.0874,0.155,0,0.2069,0.0209,0.0642,0.0617
 Oceania,2021,0.0045,0.3867,0.0728,0.158,0,0.2068,0.0209,0.0789,0.0715
 Oceania,2022,0.0043,0.3584,0.0786,0.1627,0,0.204,0.0209,0.0917,0.0795
 Oceania,2023,0.0045,0.3505,0.068,0.159,0,0.2028,0.0203,0.1107,0.0844
 Oceania,2024,0.0048,0.3492,0.0711,0.1457,0,0.1993,0.0225,0.1203,0.087
-Oceania,2025,0.004,0.3489,0.0714,0.1404,0,0.1962,0.0242,0.1186,0.0963
+Oceania,2025,0.0041,0.3436,0.0703,0.1422,0,0.1966,0.0244,0.1204,0.0985
 South America,2019,0.0064,0.0228,0.1906,0.6306,0.0108,0.0999,0.0001,0.0073,0.0313
 South America,2020,0.007,0.0219,0.1881,0.6259,0.0108,0.1013,0.0001,0.0101,0.0346
 South America,2021,0.0061,0.0225,0.2051,0.5955,0.0108,0.1025,0.0002,0.0143,0.0429
 South America,2022,0.0059,0.0142,0.1834,0.6203,0.0096,0.0966,0.0002,0.022,0.0478
 South America,2023,0.0063,0.0135,0.1765,0.6128,0.01,0.0944,0.0002,0.0322,0.054
 South America,2024,0.0067,0.0139,0.1762,0.5957,0.011,0.0928,0.0002,0.0433,0.0602
-South America,2025,0.0059,0.0117,0.1762,0.594,0.0106,0.0912,0.0001,0.0483,0.062
+South America,2025,0.006,0.0127,0.1762,0.5898,0.0108,0.0915,0.0001,0.0489,0.0639

package/data/mix/continent-yearly.json

@@ -68,13 +68,13 @@
     },
     "2025": {
       "Bioenergy": 0.0071,
-      "Coal": 0.0926,
-      "Gas": 0.4336,
-      "Hydro": 0.3117,
+      "Coal": 0.093,
+      "Gas": 0.4337,
+      "Hydro": 0.3114,
       "Nuclear": 0.0026,
-      "Other Fossil": 0.1259,
-      "Other Renewables": 0.0016,
-      "Solar": 0.0145,
+      "Other Fossil": 0.1257,
+      "Other Renewables": 0.0017,
+      "Solar": 0.0144,
       "Wind": 0.0104
     }
   },
@@ -147,93 +147,93 @@
     },
     "2025": {
       "Bioenergy": 0.0148,
-      "Coal": 0.3503,
-      "Gas": 0.3178,
-      "Hydro": 0.0818,
-      "Nuclear": 0.0277,
-      "Other Fossil": 0.1015,
+      "Coal": 0.3516,
+      "Gas": 0.3158,
+      "Hydro": 0.0842,
+      "Nuclear": 0.0275,
+      "Other Fossil": 0.1007,
       "Other Renewables": 0.0064,
-      "Solar": 0.0573,
-      "Wind": 0.0425
+      "Solar": 0.0579,
+      "Wind": 0.0411
     }
   },
   "Europe": {
     "2019": {
       "Bioenergy": 0.0249,
-      "Coal": 0.1774,
-      "Gas": 0.2582,
-      "Hydro": 0.1917,
-      "Nuclear": 0.1989,
+      "Coal": 0.1773,
+      "Gas": 0.258,
+      "Hydro": 0.1925,
+      "Nuclear": 0.1987,
       "Other Fossil": 0.0197,
       "Other Renewables": 0.0181,
-      "Solar": 0.0271,
-      "Wind": 0.0839
+      "Solar": 0.027,
+      "Wind": 0.0838
     },
     "2020": {
       "Bioenergy": 0.0264,
-      "Coal": 0.1628,
-      "Gas": 0.2441,
-      "Hydro": 0.2043,
-      "Nuclear": 0.1929,
+      "Coal": 0.1627,
+      "Gas": 0.2439,
+      "Hydro": 0.2051,
+      "Nuclear": 0.1927,
       "Other Fossil": 0.0196,
       "Other Renewables": 0.0191,
-      "Solar": 0.033,
-      "Wind": 0.0977
+      "Solar": 0.0329,
+      "Wind": 0.0976
     },
     "2021": {
       "Bioenergy": 0.0273,
-      "Coal": 0.168,
-      "Gas": 0.249,
-      "Hydro": 0.1937,
-      "Nuclear": 0.1955,
+      "Coal": 0.1678,
+      "Gas": 0.2487,
+      "Hydro": 0.1947,
+      "Nuclear": 0.1953,
       "Other Fossil": 0.02,
       "Other Renewables": 0.0185,
-      "Solar": 0.0357,
-      "Wind": 0.0923
+      "Solar": 0.0356,
+      "Wind": 0.0922
     },
     "2022": {
       "Bioenergy": 0.0275,
-      "Coal": 0.1654,
-      "Gas": 0.2524,
-      "Hydro": 0.184,
-      "Nuclear": 0.1803,
+      "Coal": 0.1653,
+      "Gas": 0.2522,
+      "Hydro": 0.1846,
+      "Nuclear": 0.1802,
       "Other Fossil": 0.0205,
       "Other Renewables": 0.0191,
       "Solar": 0.046,
-      "Wind": 0.1048
+      "Wind": 0.1047
     },
     "2023": {
       "Bioenergy": 0.0254,
-      "Coal": 0.1482,
-      "Gas": 0.2378,
-      "Hydro": 0.1967,
-      "Nuclear": 0.1786,
+      "Coal": 0.1481,
+      "Gas": 0.2376,
+      "Hydro": 0.1973,
+      "Nuclear": 0.1785,
       "Other Fossil": 0.0192,
       "Other Renewables": 0.0193,
       "Solar": 0.0565,
-      "Wind": 0.1182
+      "Wind": 0.1181
     },
     "2024": {
       "Bioenergy": 0.0259,
-      "Coal": 0.1388,
-      "Gas": 0.2279,
-      "Hydro": 0.2034,
-      "Nuclear": 0.1764,
+      "Coal": 0.1387,
+      "Gas": 0.2276,
+      "Hydro": 0.2044,
+      "Nuclear": 0.1762,
       "Other Fossil": 0.0198,
-      "Other Renewables": 0.0191,
+      "Other Renewables": 0.019,
       "Solar": 0.0684,
-      "Wind": 0.1202
+      "Wind": 0.1201
     },
     "2025": {
-      "Bioenergy": 0.0255,
-      "Coal": 0.1344,
-      "Gas": 0.2305,
-      "Hydro": 0.1922,
-      "Nuclear": 0.1745,
-      "Other Fossil": 0.0194,
+      "Bioenergy": 0.0254,
+      "Coal": 0.1338,
+      "Gas": 0.2276,
+      "Hydro": 0.1938,
+      "Nuclear": 0.1742,
+      "Other Fossil": 0.0193,
       "Other Renewables": 0.0191,
-      "Solar": 0.0958,
-      "Wind": 0.1087
+      "Solar": 0.0962,
+      "Wind": 0.1106
     }
   },
   "North America": {
@@ -304,15 +304,15 @@
       "Wind": 0.0869
     },
     "2025": {
-      "Bioenergy": 0.0192,
-      "Coal": 0.1313,
-      "Gas": 0.3518,
-      "Hydro": 0.1185,
-      "Nuclear": 0.1321,
-      "Other Fossil": 0.0832,
+      "Bioenergy": 0.0193,
+      "Coal": 0.1304,
+      "Gas": 0.3573,
+      "Hydro": 0.1174,
+      "Nuclear": 0.1319,
+      "Other Fossil": 0.0828,
       "Other Renewables": 0.0063,
-      "Solar": 0.0704,
-      "Wind": 0.0872
+      "Solar": 0.0708,
+      "Wind": 0.0839
     }
   },
   "Oceania": {
@@ -383,15 +383,15 @@
       "Wind": 0.087
     },
     "2025": {
-      "Bioenergy": 0.004,
-      "Coal": 0.3489,
-      "Gas": 0.0714,
-      "Hydro": 0.1404,
+      "Bioenergy": 0.0041,
+      "Coal": 0.3436,
+      "Gas": 0.0703,
+      "Hydro": 0.1422,
       "Nuclear": 0,
-      "Other Fossil": 0.1962,
-      "Other Renewables": 0.0242,
-      "Solar": 0.1186,
-      "Wind": 0.0963
+      "Other Fossil": 0.1966,
+      "Other Renewables": 0.0244,
+      "Solar": 0.1204,
+      "Wind": 0.0985
     }
   },
   "South America": {
@@ -462,15 +462,15 @@
       "Wind": 0.0602
     },
     "2025": {
-      "Bioenergy": 0.0059,
-      "Coal": 0.0117,
+      "Bioenergy": 0.006,
+      "Coal": 0.0127,
       "Gas": 0.1762,
-      "Hydro": 0.594,
-      "Nuclear": 0.0106,
-      "Other Fossil": 0.0912,
+      "Hydro": 0.5898,
+      "Nuclear": 0.0108,
+      "Other Fossil": 0.0915,
       "Other Renewables": 0.0001,
-      "Solar": 0.0483,
-      "Wind": 0.062
+      "Solar": 0.0489,
+      "Wind": 0.0639
     }
   }
 }