npm - @digital4better/data - Versions diffs - 1.3.47 → 1.3.49 - Mend

@digital4better/data 1.3.47 → 1.3.49

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (65) hide show

package/data/factor/continent-monthly-green.csv +238 -238
package/data/factor/continent-monthly-green.json +2109 -2109
package/data/factor/continent-monthly.csv +240 -240
package/data/factor/continent-monthly.json +2102 -2102
package/data/factor/continent-yearly-green.csv +28 -28
package/data/factor/continent-yearly-green.json +245 -245
package/data/factor/continent-yearly.csv +28 -28
package/data/factor/continent-yearly.json +239 -239
package/data/factor/country-monthly-green.csv +1396 -1485
package/data/factor/country-monthly-green.json +11847 -12828
package/data/factor/country-monthly.csv +1514 -1603
package/data/factor/country-monthly.json +11208 -12189
package/data/factor/country-yearly-green.csv +305 -313
package/data/factor/country-yearly-green.json +2361 -2451
package/data/factor/country-yearly.csv +299 -307
package/data/factor/country-yearly.json +2169 -2259
package/data/factor/subdivision-monthly-green.csv +39 -39
package/data/factor/subdivision-monthly-green.json +351 -351
package/data/factor/subdivision-monthly.csv +52 -52
package/data/factor/subdivision-monthly.json +448 -448
package/data/factor/subdivision-yearly-green.csv +40 -40
package/data/factor/subdivision-yearly-green.json +151 -151
package/data/factor/subdivision-yearly.csv +30 -30
package/data/factor/subdivision-yearly.json +136 -136
package/data/factor/world-monthly-green.csv +89 -89
package/data/factor/world-monthly-green.json +801 -801
package/data/factor/world-monthly.csv +89 -89
package/data/factor/world-monthly.json +801 -801
package/data/factor/world-yearly-green.csv +8 -8
package/data/factor/world-yearly-green.json +72 -72
package/data/factor/world-yearly.csv +8 -8
package/data/factor/world-yearly.json +72 -72
package/data/mix/continent-monthly-green.csv +209 -209
package/data/mix/continent-monthly-green.json +587 -587
package/data/mix/continent-monthly.csv +209 -209
package/data/mix/continent-monthly.json +1190 -1190
package/data/mix/continent-yearly-green.csv +23 -23
package/data/mix/continent-yearly-green.json +63 -63
package/data/mix/continent-yearly.csv +23 -23
package/data/mix/continent-yearly.json +132 -132
package/data/mix/country-monthly-green.csv +1139 -1228
package/data/mix/country-monthly-green.json +3561 -4097
package/data/mix/country-monthly.csv +1139 -1228
package/data/mix/country-monthly.json +6131 -7112
package/data/mix/country-yearly-green.csv +190 -198
package/data/mix/country-yearly-green.json +582 -632
package/data/mix/country-yearly.csv +190 -198
package/data/mix/country-yearly.json +1106 -1196
package/data/mix/subdivision-monthly-green.csv +49 -49
package/data/mix/subdivision-monthly-green.json +135 -135
package/data/mix/subdivision-monthly.csv +49 -49
package/data/mix/subdivision-monthly.json +306 -306
package/data/mix/subdivision-yearly-green.csv +13 -13
package/data/mix/subdivision-yearly-green.json +42 -42
package/data/mix/subdivision-yearly.csv +13 -13
package/data/mix/subdivision-yearly.json +87 -87
package/data/mix/world-monthly-green.csv +89 -89
package/data/mix/world-monthly-green.json +356 -356
package/data/mix/world-monthly.csv +89 -89
package/data/mix/world-monthly.json +454 -454
package/data/mix/world-yearly-green.csv +8 -8
package/data/mix/world-yearly-green.json +32 -32
package/data/mix/world-yearly.csv +8 -8
package/data/mix/world-yearly.json +44 -44
package/package.json +1 -1

package/data/mix/country-yearly-green.json CHANGED Viewed

@@ -82,7 +82,7 @@
     },
     "2024": {
       "Bioenergy": 0.0385,
-      "Hydro": 0.6675,
+      "Hydro": 0.6674,
       "Solar": 0.1617,
       "Wind": 0.1324
     },
@@ -93,10 +93,10 @@
       "Wind": 0.1391
     },
     "2026": {
-      "Bioenergy": 0.0387,
-      "Hydro": 0.6029,
-      "Solar": 0.2088,
-      "Wind": 0.1495
+      "Bioenergy": 0.0365,
+      "Hydro": 0.5937,
+      "Solar": 0.2173,
+      "Wind": 0.1525
     }
   },
   "AG": {
@@ -149,56 +149,6 @@
       "Wind": 0
     }
   },
-  "AL": {
-    "2019": {
-      "Bioenergy": 0.0112,
-      "Hydro": 0.9358,
-      "Solar": 0.0159,
-      "Wind": 0.0371
-    },
-    "2020": {
-      "Bioenergy": 0.0116,
-      "Hydro": 0.9278,
-      "Solar": 0.0186,
-      "Wind": 0.042
-    },
-    "2021": {
-      "Bioenergy": 0.012,
-      "Hydro": 0.9285,
-      "Solar": 0.0197,
-      "Wind": 0.0398
-    },
-    "2022": {
-      "Bioenergy": 0.0121,
-      "Hydro": 0.9186,
-      "Solar": 0.024,
-      "Wind": 0.0453
-    },
-    "2023": {
-      "Bioenergy": 0.0109,
-      "Hydro": 0.9114,
-      "Solar": 0.0284,
-      "Wind": 0.0493
-    },
-    "2024": {
-      "Bioenergy": 0.0109,
-      "Hydro": 0.9062,
-      "Solar": 0.0331,
-      "Wind": 0.0498
-    },
-    "2025": {
-      "Bioenergy": 0.0108,
-      "Hydro": 0.9001,
-      "Solar": 0.0397,
-      "Wind": 0.0494
-    },
-    "2026": {
-      "Bioenergy": 0.0115,
-      "Hydro": 0.8963,
-      "Solar": 0.0374,
-      "Wind": 0.0548
-    }
-  },
   "AM": {
     "2019": {
       "Bioenergy": 0,
@@ -232,20 +182,20 @@
     },
     "2024": {
       "Bioenergy": 0.0008,
-      "Hydro": 0.7529,
-      "Solar": 0.2436,
-      "Wind": 0.0028
+      "Hydro": 0.751,
+      "Solar": 0.2455,
+      "Wind": 0.0027
     },
     "2025": {
       "Bioenergy": 0.0003,
-      "Hydro": 0.7784,
+      "Hydro": 0.7783,
       "Solar": 0.2203,
       "Wind": 0.0011
     },
     "2026": {
       "Bioenergy": 0,
-      "Hydro": 0.664,
-      "Solar": 0.336,
+      "Hydro": 0.6773,
+      "Solar": 0.3227,
       "Wind": 0
     }
   },
@@ -343,10 +293,10 @@
       "Wind": 0.3215
     },
     "2026": {
-      "Bioenergy": 0.0296,
-      "Hydro": 0.4736,
-      "Solar": 0.1306,
-      "Wind": 0.3661
+      "Bioenergy": 0.0299,
+      "Hydro": 0.4974,
+      "Solar": 0.1208,
+      "Wind": 0.3518
     }
   },
   "AS": {
@@ -425,10 +375,10 @@
       "Wind": 0.159
     },
     "2023": {
-      "Bioenergy": 0.0269,
-      "Hydro": 0.7237,
-      "Solar": 0.0932,
-      "Wind": 0.1562
+      "Bioenergy": 0.027,
+      "Hydro": 0.7234,
+      "Solar": 0.0931,
+      "Wind": 0.1565
     },
     "2024": {
       "Bioenergy": 0.0307,
@@ -437,16 +387,16 @@
       "Wind": 0.1511
     },
     "2025": {
-      "Bioenergy": 0.0352,
-      "Hydro": 0.6393,
-      "Solar": 0.1681,
-      "Wind": 0.1573
+      "Bioenergy": 0.0354,
+      "Hydro": 0.638,
+      "Solar": 0.1683,
+      "Wind": 0.1583
     },
     "2026": {
-      "Bioenergy": 0.0405,
-      "Hydro": 0.5756,
-      "Solar": 0.1915,
-      "Wind": 0.1924
+      "Bioenergy": 0.0391,
+      "Hydro": 0.5734,
+      "Solar": 0.2002,
+      "Wind": 0.1873
     }
   },
   "AU": {
@@ -454,7 +404,7 @@
       "Bioenergy": 0.0073,
       "Hydro": 0.2697,
       "Solar": 0.3486,
-      "Wind": 0.3743
+      "Wind": 0.3744
     },
     "2020": {
       "Bioenergy": 0.0048,
@@ -488,15 +438,15 @@
     },
     "2025": {
       "Bioenergy": 0.0048,
-      "Hydro": 0.1236,
-      "Solar": 0.5041,
-      "Wind": 0.3676
+      "Hydro": 0.1232,
+      "Solar": 0.5054,
+      "Wind": 0.3667
     },
     "2026": {
-      "Bioenergy": 0.0057,
-      "Hydro": 0.1129,
-      "Solar": 0.5426,
-      "Wind": 0.3388
+      "Bioenergy": 0.0055,
+      "Hydro": 0.121,
+      "Solar": 0.5239,
+      "Wind": 0.3496
     }
   },
   "AW": {
@@ -588,15 +538,15 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.9664,
-      "Solar": 0.0336,
+      "Hydro": 0.9662,
+      "Solar": 0.0338,
       "Wind": 0
     },
     "2026": {
       "Bioenergy": 0,
-      "Hydro": 0.7513,
-      "Solar": 0.0634,
-      "Wind": 0.1854
+      "Hydro": 0.6561,
+      "Solar": 0.0678,
+      "Wind": 0.276
     }
   },
   "BA": {
@@ -626,9 +576,9 @@
     },
     "2023": {
       "Bioenergy": 0,
-      "Hydro": 0.94,
-      "Solar": 0.0308,
-      "Wind": 0.0292
+      "Hydro": 0.9408,
+      "Solar": 0.0304,
+      "Wind": 0.0288
     },
     "2024": {
       "Bioenergy": 0,
@@ -638,15 +588,15 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.8518,
-      "Solar": 0.1111,
-      "Wind": 0.0371
+      "Hydro": 0.8515,
+      "Solar": 0.1115,
+      "Wind": 0.037
     },
     "2026": {
       "Bioenergy": 0,
-      "Hydro": 0.924,
-      "Solar": 0.0434,
-      "Wind": 0.0326
+      "Hydro": 0.9084,
+      "Solar": 0.0616,
+      "Wind": 0.03
     }
   },
   "BB": {
@@ -734,19 +684,19 @@
       "Bioenergy": 0.0443,
       "Hydro": 0.4346,
       "Solar": 0.3519,
-      "Wind": 0.1692
+      "Wind": 0.1691
     },
     "2025": {
       "Bioenergy": 0.0442,
       "Hydro": 0.378,
-      "Solar": 0.3992,
+      "Solar": 0.3993,
       "Wind": 0.1786
     },
     "2026": {
-      "Bioenergy": 0.0513,
-      "Hydro": 0.3014,
-      "Solar": 0.4432,
-      "Wind": 0.2041
+      "Bioenergy": 0.0479,
+      "Hydro": 0.288,
+      "Solar": 0.4504,
+      "Wind": 0.2138
     }
   },
   "BE": {
@@ -775,10 +725,10 @@
       "Wind": 0.5695
     },
     "2023": {
-      "Bioenergy": 0.0431,
-      "Hydro": 0.0393,
-      "Solar": 0.3079,
-      "Wind": 0.6097
+      "Bioenergy": 0.0428,
+      "Hydro": 0.0402,
+      "Solar": 0.3052,
+      "Wind": 0.6119
     },
     "2024": {
       "Bioenergy": 0.0374,
@@ -787,16 +737,16 @@
       "Wind": 0.5425
     },
     "2025": {
-      "Bioenergy": 0.0419,
-      "Hydro": 0.081,
-      "Solar": 0.3874,
-      "Wind": 0.4897
+      "Bioenergy": 0.08,
+      "Hydro": 0.0801,
+      "Solar": 0.3732,
+      "Wind": 0.4667
     },
     "2026": {
-      "Bioenergy": 0.0483,
-      "Hydro": 0.1116,
-      "Solar": 0.3493,
-      "Wind": 0.4908
+      "Bioenergy": 0.0731,
+      "Hydro": 0.126,
+      "Solar": 0.3557,
+      "Wind": 0.4452
     }
   },
   "BF": {
@@ -887,16 +837,16 @@
       "Wind": 0.1609
     },
     "2025": {
-      "Bioenergy": 0.0136,
-      "Hydro": 0.2625,
-      "Solar": 0.594,
-      "Wind": 0.1298
+      "Bioenergy": 0.0138,
+      "Hydro": 0.2623,
+      "Solar": 0.5938,
+      "Wind": 0.1302
     },
     "2026": {
-      "Bioenergy": 0.0124,
-      "Hydro": 0.4397,
-      "Solar": 0.4223,
-      "Wind": 0.1256
+      "Bioenergy": 0.0117,
+      "Hydro": 0.4239,
+      "Solar": 0.4393,
+      "Wind": 0.1251
     }
   },
   "BH": {
@@ -1194,9 +1144,9 @@
     },
     "2026": {
       "Bioenergy": 0,
-      "Hydro": 0.8743,
-      "Solar": 0.0944,
-      "Wind": 0.0314
+      "Hydro": 0.8698,
+      "Solar": 0.0888,
+      "Wind": 0.0414
     }
   },
   "BR": {
@@ -1437,16 +1387,16 @@
       "Wind": 0.1851
     },
     "2025": {
-      "Bioenergy": 0.1377,
-      "Hydro": 0.4809,
-      "Solar": 0.1545,
-      "Wind": 0.227
+      "Bioenergy": 0.1364,
+      "Hydro": 0.5269,
+      "Solar": 0.0873,
+      "Wind": 0.2495
     },
     "2026": {
-      "Bioenergy": 0.2603,
-      "Hydro": 0.3133,
-      "Solar": 0.1558,
-      "Wind": 0.2706
+      "Bioenergy": 0.2692,
+      "Hydro": 0.3869,
+      "Solar": 0.1182,
+      "Wind": 0.2257
     }
   },
   "BZ": {
@@ -1493,10 +1443,10 @@
       "Wind": 0.055
     },
     "2026": {
-      "Bioenergy": 0.2304,
-      "Hydro": 0.6607,
-      "Solar": 0.0648,
-      "Wind": 0.0441
+      "Bioenergy": 0.2307,
+      "Hydro": 0.659,
+      "Solar": 0.064,
+      "Wind": 0.0463
     }
   },
   "CA": {
@@ -1543,10 +1493,10 @@
       "Wind": 0.1238
     },
     "2026": {
-      "Bioenergy": 0.0247,
-      "Hydro": 0.8526,
-      "Solar": 0.0081,
-      "Wind": 0.1146
+      "Bioenergy": 0.0231,
+      "Hydro": 0.8375,
+      "Solar": 0.0098,
+      "Wind": 0.1296
     }
   },
   "CD": {
@@ -1726,9 +1676,9 @@
     },
     "2023": {
       "Bioenergy": 0.0016,
-      "Hydro": 0.8823,
-      "Solar": 0.1041,
-      "Wind": 0.012
+      "Hydro": 0.8826,
+      "Solar": 0.1039,
+      "Wind": 0.0119
     },
     "2024": {
       "Bioenergy": 0.0006,
@@ -1737,16 +1687,16 @@
       "Wind": 0.0069
     },
     "2025": {
-      "Bioenergy": 0.0039,
+      "Bioenergy": 0.004,
       "Hydro": 0.7996,
-      "Solar": 0.174,
+      "Solar": 0.1739,
       "Wind": 0.0225
     },
     "2026": {
-      "Bioenergy": 0.0082,
-      "Hydro": 0.7272,
-      "Solar": 0.2179,
-      "Wind": 0.0467
+      "Bioenergy": 0.0078,
+      "Hydro": 0.7369,
+      "Solar": 0.2105,
+      "Wind": 0.0448
     }
   },
   "CI": {
@@ -1988,15 +1938,15 @@
     },
     "2025": {
       "Bioenergy": 0.0525,
-      "Hydro": 0.3456,
+      "Hydro": 0.3455,
       "Solar": 0.3062,
       "Wind": 0.2957
     },
     "2026": {
-      "Bioenergy": 0.0519,
-      "Hydro": 0.2712,
-      "Solar": 0.3438,
-      "Wind": 0.333
+      "Bioenergy": 0.0516,
+      "Hydro": 0.2838,
+      "Solar": 0.3375,
+      "Wind": 0.3271
     }
   },
   "CO": {
@@ -2093,10 +2043,10 @@
       "Wind": 0.1331
     },
     "2026": {
-      "Bioenergy": 0.0119,
-      "Hydro": 0.7819,
-      "Solar": 0.0029,
-      "Wind": 0.2033
+      "Bioenergy": 0.0093,
+      "Hydro": 0.7888,
+      "Solar": 0.0022,
+      "Wind": 0.1997
     }
   },
   "CU": {
@@ -2245,8 +2195,8 @@
     "2026": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.6779,
-      "Wind": 0.3221
+      "Solar": 0.7423,
+      "Wind": 0.2577
     }
   },
   "CZ": {
@@ -2287,16 +2237,16 @@
       "Wind": 0.0743
     },
     "2025": {
-      "Bioenergy": 0.2898,
-      "Hydro": 0.1668,
-      "Solar": 0.4787,
-      "Wind": 0.0648
+      "Bioenergy": 0.29,
+      "Hydro": 0.1669,
+      "Solar": 0.4786,
+      "Wind": 0.0645
     },
     "2026": {
-      "Bioenergy": 0.2787,
-      "Hydro": 0.1592,
-      "Solar": 0.4848,
-      "Wind": 0.0773
+      "Bioenergy": 0.2767,
+      "Hydro": 0.1517,
+      "Solar": 0.498,
+      "Wind": 0.0736
     }
   },
   "DE": {
@@ -2325,10 +2275,10 @@
       "Wind": 0.4975
     },
     "2023": {
-      "Bioenergy": 0.1587,
-      "Hydro": 0.0869,
+      "Bioenergy": 0.1586,
+      "Hydro": 0.0871,
       "Solar": 0.2434,
-      "Wind": 0.5111
+      "Wind": 0.5109
     },
     "2024": {
       "Bioenergy": 0.1481,
@@ -2337,16 +2287,16 @@
       "Wind": 0.4908
     },
     "2025": {
-      "Bioenergy": 0.1446,
+      "Bioenergy": 0.1447,
       "Hydro": 0.0741,
-      "Solar": 0.3144,
+      "Solar": 0.3145,
       "Wind": 0.4668
     },
     "2026": {
-      "Bioenergy": 0.141,
-      "Hydro": 0.0484,
-      "Solar": 0.3195,
-      "Wind": 0.4911
+      "Bioenergy": 0.1416,
+      "Hydro": 0.0519,
+      "Solar": 0.334,
+      "Wind": 0.4724
     }
   },
   "DJ": {
@@ -2426,9 +2376,9 @@
     },
     "2023": {
       "Bioenergy": 0.1389,
-      "Hydro": 0.0232,
-      "Solar": 0.1203,
-      "Wind": 0.7176
+      "Hydro": 0.0233,
+      "Solar": 0.1269,
+      "Wind": 0.7109
     },
     "2024": {
       "Bioenergy": 0.1375,
@@ -2437,16 +2387,16 @@
       "Wind": 0.7017
     },
     "2025": {
-      "Bioenergy": 0.1259,
-      "Hydro": 0.0408,
-      "Solar": 0.1674,
-      "Wind": 0.6659
+      "Bioenergy": 0.1476,
+      "Hydro": 0.0384,
+      "Solar": 0.1621,
+      "Wind": 0.6519
     },
     "2026": {
-      "Bioenergy": 0.1744,
-      "Hydro": 0.0331,
-      "Solar": 0.1408,
-      "Wind": 0.6517
+      "Bioenergy": 0.1717,
+      "Hydro": 0.0358,
+      "Solar": 0.1498,
+      "Wind": 0.6427
     }
   },
   "DM": {
@@ -2675,10 +2625,10 @@
       "Wind": 0.35
     },
     "2023": {
-      "Bioenergy": 0.1794,
-      "Hydro": 0.1691,
-      "Solar": 0.2792,
-      "Wind": 0.3723
+      "Bioenergy": 0.181,
+      "Hydro": 0.1706,
+      "Solar": 0.2727,
+      "Wind": 0.3757
     },
     "2024": {
       "Bioenergy": 0.1394,
@@ -2687,16 +2637,16 @@
       "Wind": 0.4175
     },
     "2025": {
-      "Bioenergy": 0.1296,
-      "Hydro": 0.1278,
-      "Solar": 0.3208,
-      "Wind": 0.4217
+      "Bioenergy": 0.1278,
+      "Hydro": 0.1209,
+      "Solar": 0.3389,
+      "Wind": 0.4124
     },
     "2026": {
-      "Bioenergy": 0.1382,
-      "Hydro": 0.1398,
-      "Solar": 0.2816,
-      "Wind": 0.4404
+      "Bioenergy": 0.1359,
+      "Hydro": 0.1376,
+      "Solar": 0.3135,
+      "Wind": 0.4131
     }
   },
   "EG": {
@@ -2801,14 +2751,14 @@
   },
   "ES": {
     "2019": {
-      "Bioenergy": 0.0315,
-      "Hydro": 0.2821,
-      "Solar": 0.1488,
-      "Wind": 0.5377
+      "Bioenergy": 0.0316,
+      "Hydro": 0.2826,
+      "Solar": 0.1486,
+      "Wind": 0.5372
     },
     "2020": {
       "Bioenergy": 0.0355,
-      "Hydro": 0.308,
+      "Hydro": 0.3079,
       "Solar": 0.1792,
       "Wind": 0.4773
     },
@@ -2816,37 +2766,37 @@
       "Bioenergy": 0.0347,
       "Hydro": 0.2729,
       "Solar": 0.2096,
-      "Wind": 0.4828
+      "Wind": 0.4827
     },
     "2022": {
       "Bioenergy": 0.0345,
-      "Hydro": 0.1876,
-      "Solar": 0.2732,
-      "Wind": 0.5047
+      "Hydro": 0.1877,
+      "Solar": 0.2729,
+      "Wind": 0.5049
     },
     "2023": {
       "Bioenergy": 0.0234,
-      "Hydro": 0.1836,
-      "Solar": 0.332,
+      "Hydro": 0.1837,
+      "Solar": 0.3319,
       "Wind": 0.4611
     },
     "2024": {
       "Bioenergy": 0.0232,
-      "Hydro": 0.2148,
-      "Solar": 0.3643,
-      "Wind": 0.3977
+      "Hydro": 0.2149,
+      "Solar": 0.364,
+      "Wind": 0.3979
     },
     "2025": {
       "Bioenergy": 0.0249,
-      "Hydro": 0.2038,
-      "Solar": 0.3965,
-      "Wind": 0.3748
+      "Hydro": 0.204,
+      "Solar": 0.3963,
+      "Wind": 0.3749
     },
     "2026": {
-      "Bioenergy": 0.0217,
-      "Hydro": 0.2462,
-      "Solar": 0.321,
-      "Wind": 0.4111
+      "Bioenergy": 0.022,
+      "Hydro": 0.245,
+      "Solar": 0.3343,
+      "Wind": 0.3988
     }
   },
   "ET": {
@@ -2943,10 +2893,10 @@
       "Wind": 0.474
     },
     "2026": {
-      "Bioenergy": 0.2653,
-      "Hydro": 0.2737,
-      "Solar": 0.0296,
-      "Wind": 0.4315
+      "Bioenergy": 0.2498,
+      "Hydro": 0.286,
+      "Solar": 0.0325,
+      "Wind": 0.4317
     }
   },
   "FJ": {
@@ -3116,7 +3066,7 @@
       "Bioenergy": 0.0293,
       "Hydro": 0.5192,
       "Solar": 0.122,
-      "Wind": 0.3295
+      "Wind": 0.3296
     },
     "2022": {
       "Bioenergy": 0.0381,
@@ -3126,9 +3076,9 @@
     },
     "2023": {
       "Bioenergy": 0.0263,
-      "Hydro": 0.4093,
-      "Solar": 0.1721,
-      "Wind": 0.3923
+      "Hydro": 0.4094,
+      "Solar": 0.1717,
+      "Wind": 0.3927
     },
     "2024": {
       "Bioenergy": 0.0227,
@@ -3138,15 +3088,15 @@
     },
     "2025": {
       "Bioenergy": 0.0203,
-      "Hydro": 0.3899,
+      "Hydro": 0.39,
       "Solar": 0.2245,
       "Wind": 0.3653
     },
     "2026": {
-      "Bioenergy": 0.0245,
-      "Hydro": 0.3918,
-      "Solar": 0.1993,
-      "Wind": 0.3845
+      "Bioenergy": 0.0234,
+      "Hydro": 0.4004,
+      "Solar": 0.2062,
+      "Wind": 0.3699
     }
   },
   "GA": {
@@ -3238,15 +3188,15 @@
     },
     "2025": {
       "Bioenergy": 0.1511,
-      "Hydro": 0.0594,
-      "Solar": 0.155,
+      "Hydro": 0.0595,
+      "Solar": 0.1549,
       "Wind": 0.6345
     },
     "2026": {
-      "Bioenergy": 0.131,
-      "Hydro": 0.0536,
-      "Solar": 0.1331,
-      "Wind": 0.6822
+      "Bioenergy": 0.1352,
+      "Hydro": 0.056,
+      "Solar": 0.1419,
+      "Wind": 0.6668
     }
   },
   "GD": {
@@ -3338,15 +3288,15 @@
     },
     "2025": {
       "Bioenergy": 0.003,
-      "Hydro": 0.9633,
+      "Hydro": 0.9632,
       "Solar": 0.0122,
       "Wind": 0.0215
     },
     "2026": {
-      "Bioenergy": 0.0083,
-      "Hydro": 0.9075,
-      "Solar": 0.039,
-      "Wind": 0.0451
+      "Bioenergy": 0.0059,
+      "Hydro": 0.9315,
+      "Solar": 0.0272,
+      "Wind": 0.0354
     }
   },
   "GF": {
@@ -3775,10 +3725,10 @@
       "Wind": 0.4979
     },
     "2023": {
-      "Bioenergy": 0.0064,
-      "Hydro": 0.188,
-      "Solar": 0.3611,
-      "Wind": 0.4445
+      "Bioenergy": 0.0062,
+      "Hydro": 0.1821,
+      "Solar": 0.3811,
+      "Wind": 0.4306
     },
     "2024": {
       "Bioenergy": 0.0014,
@@ -3788,15 +3738,15 @@
     },
     "2025": {
       "Bioenergy": 0.0007,
-      "Hydro": 0.0988,
-      "Solar": 0.5032,
-      "Wind": 0.3974
+      "Hydro": 0.1042,
+      "Solar": 0.4697,
+      "Wind": 0.4255
     },
     "2026": {
       "Bioenergy": 0,
-      "Hydro": 0.2076,
-      "Solar": 0.3591,
-      "Wind": 0.4332
+      "Hydro": 0.2242,
+      "Solar": 0.3229,
+      "Wind": 0.4529
     }
   },
   "GT": {
@@ -4038,15 +3988,15 @@
     },
     "2025": {
       "Bioenergy": 0.0952,
-      "Hydro": 0.3597,
-      "Solar": 0.3036,
+      "Hydro": 0.3596,
+      "Solar": 0.3037,
       "Wind": 0.2415
     },
     "2026": {
-      "Bioenergy": 0.1052,
-      "Hydro": 0.2885,
-      "Solar": 0.3391,
-      "Wind": 0.2672
+      "Bioenergy": 0.0984,
+      "Hydro": 0.2861,
+      "Solar": 0.3483,
+      "Wind": 0.2673
     }
   },
   "HN": {
@@ -4094,9 +4044,9 @@
     },
     "2026": {
       "Bioenergy": 0.1776,
-      "Hydro": 0.4621,
+      "Hydro": 0.462,
       "Solar": 0.2077,
-      "Wind": 0.1526
+      "Wind": 0.1528
     }
   },
   "HR": {
@@ -4104,13 +4054,13 @@
       "Bioenergy": 0.065,
       "Hydro": 0.6851,
       "Solar": 0.0331,
-      "Wind": 0.2168
+      "Wind": 0.2169
     },
     "2020": {
       "Bioenergy": 0.0708,
       "Hydro": 0.6457,
       "Solar": 0.034,
-      "Wind": 0.2495
+      "Wind": 0.2496
     },
     "2021": {
       "Bioenergy": 0.0687,
@@ -4125,10 +4075,10 @@
       "Wind": 0.3024
     },
     "2023": {
-      "Bioenergy": 0.0596,
-      "Hydro": 0.6402,
-      "Solar": 0.0515,
-      "Wind": 0.2487
+      "Bioenergy": 0.0595,
+      "Hydro": 0.6414,
+      "Solar": 0.0516,
+      "Wind": 0.2475
     },
     "2024": {
       "Bioenergy": 0.0632,
@@ -4137,16 +4087,16 @@
       "Wind": 0.2748
     },
     "2025": {
-      "Bioenergy": 0.0634,
-      "Hydro": 0.459,
-      "Solar": 0.1594,
-      "Wind": 0.3183
+      "Bioenergy": 0.0636,
+      "Hydro": 0.4597,
+      "Solar": 0.1592,
+      "Wind": 0.3175
     },
     "2026": {
-      "Bioenergy": 0.0605,
-      "Hydro": 0.5403,
-      "Solar": 0.0872,
-      "Wind": 0.312
+      "Bioenergy": 0.0612,
+      "Hydro": 0.5369,
+      "Solar": 0.0958,
+      "Wind": 0.3061
     }
   },
   "HT": {
@@ -4227,7 +4177,7 @@
     "2023": {
       "Bioenergy": 0.0845,
       "Hydro": 0.168,
-      "Solar": 0.5816,
+      "Solar": 0.5817,
       "Wind": 0.1659
     },
     "2024": {
@@ -4237,16 +4187,16 @@
       "Wind": 0.1367
     },
     "2025": {
-      "Bioenergy": 0.1042,
-      "Hydro": 0.0973,
-      "Solar": 0.6958,
-      "Wind": 0.1027
+      "Bioenergy": 0.1041,
+      "Hydro": 0.0997,
+      "Solar": 0.6911,
+      "Wind": 0.1051
     },
     "2026": {
-      "Bioenergy": 0.1185,
-      "Hydro": 0.1322,
-      "Solar": 0.6048,
-      "Wind": 0.1444
+      "Bioenergy": 0.0994,
+      "Hydro": 0.1204,
+      "Solar": 0.6538,
+      "Wind": 0.1264
     }
   },
   "ID": {
@@ -4293,18 +4243,18 @@
       "Wind": 0.0177
     },
     "2026": {
-      "Bioenergy": 0.3547,
-      "Hydro": 0.6189,
-      "Solar": 0.0086,
-      "Wind": 0.0178
+      "Bioenergy": 0.3544,
+      "Hydro": 0.6187,
+      "Solar": 0.009,
+      "Wind": 0.018
     }
   },
   "IE": {
     "2019": {
-      "Bioenergy": 0.0089,
-      "Hydro": 0.1265,
+      "Bioenergy": 0.009,
+      "Hydro": 0.1257,
       "Solar": 0.0097,
-      "Wind": 0.8549
+      "Wind": 0.8556
     },
     "2020": {
       "Bioenergy": 0.0081,
@@ -4314,21 +4264,21 @@
     },
     "2021": {
       "Bioenergy": 0.0088,
-      "Hydro": 0.1135,
+      "Hydro": 0.1119,
       "Solar": 0.0127,
-      "Wind": 0.8651
+      "Wind": 0.8666
     },
     "2022": {
       "Bioenergy": 0.007,
-      "Hydro": 0.0874,
+      "Hydro": 0.0867,
       "Solar": 0.0119,
-      "Wind": 0.8937
+      "Wind": 0.8945
     },
     "2023": {
       "Bioenergy": 0.008,
-      "Hydro": 0.1137,
-      "Solar": 0.0448,
-      "Wind": 0.8335
+      "Hydro": 0.1131,
+      "Solar": 0.0449,
+      "Wind": 0.834
     },
     "2024": {
       "Bioenergy": 0.0395,
@@ -4337,16 +4287,16 @@
       "Wind": 0.7751
     },
     "2025": {
-      "Bioenergy": 0.0407,
-      "Hydro": 0.1071,
+      "Bioenergy": 0.0409,
+      "Hydro": 0.1072,
       "Solar": 0.1072,
-      "Wind": 0.745
+      "Wind": 0.7447
     },
     "2026": {
-      "Bioenergy": 0.0356,
-      "Hydro": 0.1162,
-      "Solar": 0.0796,
-      "Wind": 0.7687
+      "Bioenergy": 0.0405,
+      "Hydro": 0.1161,
+      "Solar": 0.1064,
+      "Wind": 0.7371
     }
   },
   "IL": {
@@ -4443,10 +4393,10 @@
       "Wind": 0.2074
     },
     "2026": {
-      "Bioenergy": 0.04,
-      "Hydro": 0.2382,
-      "Solar": 0.5748,
-      "Wind": 0.1469
+      "Bioenergy": 0.0343,
+      "Hydro": 0.2432,
+      "Solar": 0.5664,
+      "Wind": 0.156
     }
   },
   "IQ": {
@@ -4637,16 +4587,16 @@
       "Wind": 0.1961
     },
     "2025": {
-      "Bioenergy": 0.1055,
-      "Hydro": 0.3508,
-      "Solar": 0.3485,
-      "Wind": 0.1952
+      "Bioenergy": 0.1056,
+      "Hydro": 0.3507,
+      "Solar": 0.3483,
+      "Wind": 0.1953
     },
     "2026": {
-      "Bioenergy": 0.1098,
-      "Hydro": 0.3034,
-      "Solar": 0.3466,
-      "Wind": 0.2402
+      "Bioenergy": 0.1062,
+      "Hydro": 0.3205,
+      "Solar": 0.3425,
+      "Wind": 0.2308
     }
   },
   "JM": {
@@ -4793,10 +4743,10 @@
       "Wind": 0.0518
     },
     "2026": {
-      "Bioenergy": 0.3245,
-      "Hydro": 0.2159,
-      "Solar": 0.3756,
-      "Wind": 0.0841
+      "Bioenergy": 0.3169,
+      "Hydro": 0.2186,
+      "Solar": 0.3797,
+      "Wind": 0.0848
     }
   },
   "KE": {
@@ -4843,10 +4793,10 @@
       "Wind": 0.3025
     },
     "2026": {
-      "Bioenergy": 0.0805,
-      "Hydro": 0.541,
-      "Solar": 0.0866,
-      "Wind": 0.2919
+      "Bioenergy": 0.0739,
+      "Hydro": 0.6,
+      "Solar": 0.0798,
+      "Wind": 0.2463
     }
   },
   "KG": {
@@ -4881,22 +4831,22 @@
       "Wind": 0.0062
     },
     "2024": {
-      "Bioenergy": 0.004,
-      "Hydro": 0.9691,
-      "Solar": 0.0131,
-      "Wind": 0.0138
+      "Bioenergy": 0.0024,
+      "Hydro": 0.9817,
+      "Solar": 0.0079,
+      "Wind": 0.008
     },
     "2025": {
-      "Bioenergy": 0.0039,
-      "Hydro": 0.9617,
-      "Solar": 0.0191,
-      "Wind": 0.0153
+      "Bioenergy": 0.0018,
+      "Hydro": 0.9823,
+      "Solar": 0.0088,
+      "Wind": 0.0071
     },
     "2026": {
-      "Bioenergy": 0,
-      "Hydro": 1,
-      "Solar": 0,
-      "Wind": 0
+      "Bioenergy": 0.0018,
+      "Hydro": 0.9805,
+      "Solar": 0.0099,
+      "Wind": 0.0077
     }
   },
   "KH": {
@@ -4943,10 +4893,10 @@
       "Wind": 0.0478
     },
     "2026": {
-      "Bioenergy": 0.0306,
-      "Hydro": 0.839,
-      "Solar": 0.0803,
-      "Wind": 0.0501
+      "Bioenergy": 0.0299,
+      "Hydro": 0.8338,
+      "Solar": 0.0843,
+      "Wind": 0.052
     }
   },
   "KI": {
@@ -5193,10 +5143,10 @@
       "Wind": 0.064
     },
     "2026": {
-      "Bioenergy": 0.1889,
-      "Hydro": 0.0412,
-      "Solar": 0.7051,
-      "Wind": 0.0649
+      "Bioenergy": 0.1873,
+      "Hydro": 0.0427,
+      "Solar": 0.7017,
+      "Wind": 0.0683
     }
   },
   "KW": {
@@ -5344,9 +5294,9 @@
     },
     "2026": {
       "Bioenergy": 0,
-      "Hydro": 0.5442,
-      "Solar": 0.0442,
-      "Wind": 0.4117
+      "Hydro": 0.4504,
+      "Solar": 0.1137,
+      "Wind": 0.436
     }
   },
   "LA": {
@@ -5676,9 +5626,9 @@
     },
     "2023": {
       "Bioenergy": 0.0721,
-      "Hydro": 0.2525,
-      "Solar": 0.1683,
-      "Wind": 0.5071
+      "Hydro": 0.2526,
+      "Solar": 0.1685,
+      "Wind": 0.5068
     },
     "2024": {
       "Bioenergy": 0.0513,
@@ -5687,16 +5637,16 @@
       "Wind": 0.5281
     },
     "2025": {
-      "Bioenergy": 0.0332,
-      "Hydro": 0.1192,
+      "Bioenergy": 0.0335,
+      "Hydro": 0.1198,
       "Solar": 0.2616,
-      "Wind": 0.5861
+      "Wind": 0.5851
     },
     "2026": {
-      "Bioenergy": 0.0265,
-      "Hydro": 0.0962,
-      "Solar": 0.1858,
-      "Wind": 0.6915
+      "Bioenergy": 0.0268,
+      "Hydro": 0.0988,
+      "Solar": 0.217,
+      "Wind": 0.6574
     }
   },
   "LU": {
@@ -5704,7 +5654,7 @@
       "Bioenergy": 0.1488,
       "Hydro": 0.388,
       "Solar": 0.1303,
-      "Wind": 0.3329
+      "Wind": 0.333
     },
     "2020": {
       "Bioenergy": 0.1644,
@@ -5725,10 +5675,10 @@
       "Wind": 0.3281
     },
     "2023": {
-      "Bioenergy": 0.1101,
-      "Hydro": 0.2889,
-      "Solar": 0.2006,
-      "Wind": 0.4004
+      "Bioenergy": 0.1063,
+      "Hydro": 0.29,
+      "Solar": 0.2017,
+      "Wind": 0.402
     },
     "2024": {
       "Bioenergy": 0.1377,
@@ -5737,16 +5687,16 @@
       "Wind": 0.3493
     },
     "2025": {
-      "Bioenergy": 0.1295,
-      "Hydro": 0.2421,
-      "Solar": 0.2799,
-      "Wind": 0.3486
+      "Bioenergy": 0.1299,
+      "Hydro": 0.2422,
+      "Solar": 0.2794,
+      "Wind": 0.3485
     },
     "2026": {
-      "Bioenergy": 0.0931,
-      "Hydro": 0.2662,
-      "Solar": 0.2615,
-      "Wind": 0.3792
+      "Bioenergy": 0.0924,
+      "Hydro": 0.2655,
+      "Solar": 0.2717,
+      "Wind": 0.3704
     }
   },
   "LV": {
@@ -5776,9 +5726,9 @@
     },
     "2023": {
       "Bioenergy": 0.0582,
-      "Hydro": 0.7752,
-      "Solar": 0.0657,
-      "Wind": 0.1009
+      "Hydro": 0.7754,
+      "Solar": 0.0656,
+      "Wind": 0.1007
     },
     "2024": {
       "Bioenergy": 0.0896,
@@ -5787,16 +5737,16 @@
       "Wind": 0.1075
     },
     "2025": {
-      "Bioenergy": 0.0823,
-      "Hydro": 0.665,
-      "Solar": 0.1733,
-      "Wind": 0.0794
+      "Bioenergy": 0.0912,
+      "Hydro": 0.6572,
+      "Solar": 0.1687,
+      "Wind": 0.0829
     },
     "2026": {
-      "Bioenergy": 0.0641,
-      "Hydro": 0.7627,
-      "Solar": 0.1198,
-      "Wind": 0.0533
+      "Bioenergy": 0.07,
+      "Hydro": 0.6082,
+      "Solar": 0.2674,
+      "Wind": 0.0544
     }
   },
   "LY": {
@@ -5852,51 +5802,51 @@
   "MA": {
     "2019": {
       "Bioenergy": 0,
-      "Hydro": 0.2113,
-      "Solar": 0.2037,
-      "Wind": 0.5851
+      "Hydro": 0.2127,
+      "Solar": 0.2025,
+      "Wind": 0.5848
     },
     "2020": {
-      "Bioenergy": 0,
-      "Hydro": 0.1776,
-      "Solar": 0.2063,
-      "Wind": 0.6161
+      "Bioenergy": 0.0001,
+      "Hydro": 0.1829,
+      "Solar": 0.2052,
+      "Wind": 0.6117
     },
     "2021": {
-      "Bioenergy": 0,
-      "Hydro": 0.1481,
-      "Solar": 0.2221,
-      "Wind": 0.6298
+      "Bioenergy": 0.0001,
+      "Hydro": 0.1501,
+      "Solar": 0.2216,
+      "Wind": 0.6282
     },
     "2022": {
-      "Bioenergy": 0,
-      "Hydro": 0.0922,
-      "Solar": 0.1982,
-      "Wind": 0.7096
+      "Bioenergy": 0.0007,
+      "Hydro": 0.1198,
+      "Solar": 0.1932,
+      "Wind": 0.6864
     },
     "2023": {
-      "Bioenergy": 0,
-      "Hydro": 0.058,
-      "Solar": 0.2355,
-      "Wind": 0.7065
+      "Bioenergy": 0.0007,
+      "Hydro": 0.0868,
+      "Solar": 0.229,
+      "Wind": 0.6836
     },
     "2024": {
-      "Bioenergy": 0,
-      "Hydro": 0.0589,
-      "Solar": 0.1412,
-      "Wind": 0.7999
+      "Bioenergy": 0.0007,
+      "Hydro": 0.0908,
+      "Solar": 0.138,
+      "Wind": 0.7704
     },
     "2025": {
-      "Bioenergy": 0,
-      "Hydro": 0.0689,
-      "Solar": 0.157,
-      "Wind": 0.7742
+      "Bioenergy": 0.001,
+      "Hydro": 0.114,
+      "Solar": 0.1514,
+      "Wind": 0.7335
     },
     "2026": {
-      "Bioenergy": 0,
-      "Hydro": 0.0685,
-      "Solar": 0.1509,
-      "Wind": 0.7806
+      "Bioenergy": 0.0015,
+      "Hydro": 0.1346,
+      "Solar": 0.1433,
+      "Wind": 0.7206
     }
   },
   "MD": {
@@ -5925,28 +5875,28 @@
       "Wind": 0.1769
     },
     "2023": {
-      "Bioenergy": 0.0113,
-      "Hydro": 0.8462,
-      "Solar": 0.0159,
-      "Wind": 0.1266
+      "Bioenergy": 0.0118,
+      "Hydro": 0.8426,
+      "Solar": 0.0163,
+      "Wind": 0.1293
     },
     "2024": {
-      "Bioenergy": 0.0122,
-      "Hydro": 0.6419,
-      "Solar": 0.1682,
-      "Wind": 0.1777
+      "Bioenergy": 0.0193,
+      "Hydro": 0.584,
+      "Solar": 0.1128,
+      "Wind": 0.2839
     },
     "2025": {
-      "Bioenergy": 0.0082,
-      "Hydro": 0.6342,
-      "Solar": 0.3205,
-      "Wind": 0.0372
+      "Bioenergy": 0.0478,
+      "Hydro": 0.4231,
+      "Solar": 0.25,
+      "Wind": 0.2791
     },
     "2026": {
-      "Bioenergy": 0.0086,
-      "Hydro": 0.6324,
-      "Solar": 0.3177,
-      "Wind": 0.0413
+      "Bioenergy": 0.0459,
+      "Hydro": 0.3899,
+      "Solar": 0.281,
+      "Wind": 0.2832
     }
   },
   "ME": {
@@ -5976,9 +5926,9 @@
     },
     "2023": {
       "Bioenergy": 0.0013,
-      "Hydro": 0.8431,
-      "Solar": 0.005,
-      "Wind": 0.1506
+      "Hydro": 0.8479,
+      "Solar": 0.0048,
+      "Wind": 0.1461
     },
     "2024": {
       "Bioenergy": 0.0068,
@@ -5987,16 +5937,16 @@
       "Wind": 0.1632
     },
     "2025": {
-      "Bioenergy": 0.0224,
-      "Hydro": 0.6161,
-      "Solar": 0.1477,
-      "Wind": 0.2137
+      "Bioenergy": 0.0222,
+      "Hydro": 0.6149,
+      "Solar": 0.1513,
+      "Wind": 0.2116
     },
     "2026": {
       "Bioenergy": 0.0036,
-      "Hydro": 0.8037,
-      "Solar": 0.0499,
-      "Wind": 0.1428
+      "Hydro": 0.7858,
+      "Solar": 0.054,
+      "Wind": 0.1566
     }
   },
   "MG": {
@@ -6087,16 +6037,16 @@
       "Wind": 0.1214
     },
     "2025": {
-      "Bioenergy": 0.0207,
-      "Hydro": 0.4675,
-      "Solar": 0.3611,
-      "Wind": 0.1506
+      "Bioenergy": 0.0274,
+      "Hydro": 0.4213,
+      "Solar": 0.4325,
+      "Wind": 0.1188
     },
     "2026": {
-      "Bioenergy": 0.0186,
-      "Hydro": 0.4535,
-      "Solar": 0.3693,
-      "Wind": 0.1587
+      "Bioenergy": 0.009,
+      "Hydro": 0.578,
+      "Solar": 0.296,
+      "Wind": 0.117
     }
   },
   "ML": {
@@ -6288,15 +6238,15 @@
     },
     "2025": {
       "Bioenergy": 0.1764,
-      "Hydro": 0.329,
-      "Solar": 0.2736,
+      "Hydro": 0.3289,
+      "Solar": 0.2738,
       "Wind": 0.2209
     },
     "2026": {
-      "Bioenergy": 0.1905,
-      "Hydro": 0.2624,
-      "Solar": 0.3041,
-      "Wind": 0.243
+      "Bioenergy": 0.1808,
+      "Hydro": 0.2612,
+      "Solar": 0.3139,
+      "Wind": 0.2441
     }
   },
   "MQ": {
@@ -6452,7 +6402,7 @@
   "MT": {
     "2019": {
       "Bioenergy": 0.0873,
-      "Hydro": 0.5245,
+      "Hydro": 0.5244,
       "Solar": 0.1019,
       "Wind": 0.2863
     },
@@ -6487,16 +6437,16 @@
       "Wind": 0.1333
     },
     "2025": {
-      "Bioenergy": 0.0303,
-      "Hydro": 0.1799,
-      "Solar": 0.6526,
-      "Wind": 0.1372
+      "Bioenergy": 0.0308,
+      "Hydro": 0.18,
+      "Solar": 0.6518,
+      "Wind": 0.1374
     },
     "2026": {
-      "Bioenergy": 0.0328,
-      "Hydro": 0.1852,
-      "Solar": 0.6257,
-      "Wind": 0.1563
+      "Bioenergy": 0.0301,
+      "Hydro": 0.178,
+      "Solar": 0.6554,
+      "Wind": 0.1365
     }
   },
   "MU": {
@@ -6743,9 +6693,9 @@
       "Wind": 0.0002
     },
     "2026": {
-      "Bioenergy": 0.1298,
-      "Hydro": 0.7804,
-      "Solar": 0.0897,
+      "Bioenergy": 0.1304,
+      "Hydro": 0.7743,
+      "Solar": 0.0954,
       "Wind": 0
     }
   },
@@ -7043,21 +6993,21 @@
       "Wind": 0.3668
     },
     "2026": {
-      "Bioenergy": 0.4034,
-      "Hydro": 0.2015,
-      "Solar": 0.0333,
-      "Wind": 0.3618
+      "Bioenergy": 0.4036,
+      "Hydro": 0.2008,
+      "Solar": 0.033,
+      "Wind": 0.3627
     }
   },
   "NL": {
     "2019": {
-      "Bioenergy": 0.2234,
+      "Bioenergy": 0.2235,
       "Hydro": 0.0256,
       "Solar": 0.2425,
-      "Wind": 0.5085
+      "Wind": 0.5084
     },
     "2020": {
-      "Bioenergy": 0.2457,
+      "Bioenergy": 0.2456,
       "Hydro": 0.0078,
       "Solar": 0.2639,
       "Wind": 0.4826
@@ -7077,8 +7027,8 @@
     "2023": {
       "Bioenergy": 0.123,
       "Hydro": 0.0025,
-      "Solar": 0.3673,
-      "Wind": 0.5073
+      "Solar": 0.367,
+      "Wind": 0.5075
     },
     "2024": {
       "Bioenergy": 0.0981,
@@ -7090,13 +7040,13 @@
       "Bioenergy": 0.091,
       "Hydro": 0.0005,
       "Solar": 0.4399,
-      "Wind": 0.4685
+      "Wind": 0.4686
     },
     "2026": {
-      "Bioenergy": 0.0979,
-      "Hydro": 0.0016,
-      "Solar": 0.392,
-      "Wind": 0.5084
+      "Bioenergy": 0.0987,
+      "Hydro": 0.0017,
+      "Solar": 0.4038,
+      "Wind": 0.4959
     }
   },
   "NO": {
@@ -7138,15 +7088,15 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.9127,
+      "Hydro": 0.9125,
       "Solar": 0,
-      "Wind": 0.0873
+      "Wind": 0.0875
     },
     "2026": {
-      "Bioenergy": 0.0016,
-      "Hydro": 0.8706,
-      "Solar": 0.0056,
-      "Wind": 0.1222
+      "Bioenergy": 0.0011,
+      "Hydro": 0.8847,
+      "Solar": 0.0035,
+      "Wind": 0.1107
     }
   },
   "NP": {
@@ -7193,10 +7143,10 @@
       "Wind": 0.0212
     },
     "2026": {
-      "Bioenergy": 0.0053,
-      "Hydro": 0.9349,
-      "Solar": 0.0377,
-      "Wind": 0.022
+      "Bioenergy": 0.0051,
+      "Hydro": 0.9325,
+      "Solar": 0.0395,
+      "Wind": 0.0229
     }
   },
   "NR": {
@@ -7343,10 +7293,10 @@
       "Wind": 0.1373
     },
     "2026": {
-      "Bioenergy": 0.0047,
-      "Hydro": 0.8597,
+      "Bioenergy": 0.0036,
+      "Hydro": 0.8678,
       "Solar": 0,
-      "Wind": 0.1356
+      "Wind": 0.1286
     }
   },
   "OM": {
@@ -7493,10 +7443,10 @@
       "Wind": 0.1003
     },
     "2026": {
-      "Bioenergy": 0.0122,
+      "Bioenergy": 0.013,
       "Hydro": 0.8452,
-      "Solar": 0.0633,
-      "Wind": 0.0793
+      "Solar": 0.0639,
+      "Wind": 0.0779
     }
   },
   "PF": {
@@ -7688,15 +7638,15 @@
     },
     "2025": {
       "Bioenergy": 0.0081,
-      "Hydro": 0.4908,
-      "Solar": 0.451,
+      "Hydro": 0.491,
+      "Solar": 0.4508,
       "Wind": 0.0501
     },
     "2026": {
-      "Bioenergy": 0.0209,
-      "Hydro": 0.1493,
-      "Solar": 0.7795,
-      "Wind": 0.0503
+      "Bioenergy": 0.0137,
+      "Hydro": 0.2798,
+      "Solar": 0.6615,
+      "Wind": 0.045
     }
   },
   "PL": {
@@ -7728,7 +7678,7 @@
       "Bioenergy": 0.0544,
       "Hydro": 0.0656,
       "Solar": 0.3311,
-      "Wind": 0.5489
+      "Wind": 0.5488
     },
     "2024": {
       "Bioenergy": 0.0521,
@@ -7737,16 +7687,16 @@
       "Wind": 0.5178
     },
     "2025": {
-      "Bioenergy": 0.0625,
-      "Hydro": 0.0392,
-      "Solar": 0.4149,
-      "Wind": 0.4835
+      "Bioenergy": 0.0633,
+      "Hydro": 0.0397,
+      "Solar": 0.4206,
+      "Wind": 0.4763
     },
     "2026": {
-      "Bioenergy": 0.0562,
-      "Hydro": 0.0361,
-      "Solar": 0.4425,
-      "Wind": 0.4653
+      "Bioenergy": 0.0566,
+      "Hydro": 0.0347,
+      "Solar": 0.4631,
+      "Wind": 0.4457
     }
   },
   "PM": {
@@ -7845,8 +7795,8 @@
     "2026": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.5454,
-      "Wind": 0.4546
+      "Solar": 0.5294,
+      "Wind": 0.4706
     }
   },
   "PS": {
@@ -7902,9 +7852,9 @@
   "PT": {
     "2019": {
       "Bioenergy": 0.1097,
-      "Hydro": 0.2976,
+      "Hydro": 0.2977,
       "Solar": 0.0575,
-      "Wind": 0.5353
+      "Wind": 0.5352
     },
     "2020": {
       "Bioenergy": 0.1169,
@@ -7913,40 +7863,40 @@
       "Wind": 0.4313
     },
     "2021": {
-      "Bioenergy": 0.1207,
-      "Hydro": 0.3505,
+      "Bioenergy": 0.1208,
+      "Hydro": 0.3504,
       "Solar": 0.0815,
-      "Wind": 0.4473
+      "Wind": 0.4474
     },
     "2022": {
       "Bioenergy": 0.127,
-      "Hydro": 0.2421,
+      "Hydro": 0.242,
       "Solar": 0.1357,
-      "Wind": 0.4952
+      "Wind": 0.4953
     },
     "2023": {
       "Bioenergy": 0.0907,
       "Hydro": 0.3327,
       "Solar": 0.1741,
-      "Wind": 0.4024
+      "Wind": 0.4025
     },
     "2024": {
       "Bioenergy": 0.0835,
-      "Hydro": 0.3396,
+      "Hydro": 0.3395,
       "Solar": 0.201,
       "Wind": 0.376
     },
     "2025": {
-      "Bioenergy": 0.0746,
-      "Hydro": 0.333,
+      "Bioenergy": 0.0735,
+      "Hydro": 0.3337,
       "Solar": 0.2391,
-      "Wind": 0.3533
+      "Wind": 0.3537
     },
     "2026": {
-      "Bioenergy": 0.0715,
-      "Hydro": 0.3702,
-      "Solar": 0.181,
-      "Wind": 0.3773
+      "Bioenergy": 0.0651,
+      "Hydro": 0.354,
+      "Solar": 0.208,
+      "Wind": 0.373
     }
   },
   "PY": {
@@ -8126,7 +8076,7 @@
     },
     "2023": {
       "Bioenergy": 0.0132,
-      "Hydro": 0.6463,
+      "Hydro": 0.6462,
       "Solar": 0.0766,
       "Wind": 0.264
     },
@@ -8137,16 +8087,16 @@
       "Wind": 0.2537
     },
     "2025": {
-      "Bioenergy": 0.0222,
-      "Hydro": 0.4981,
+      "Bioenergy": 0.0217,
+      "Hydro": 0.4997,
       "Solar": 0.231,
-      "Wind": 0.2488
+      "Wind": 0.2476
     },
     "2026": {
-      "Bioenergy": 0.0179,
-      "Hydro": 0.5954,
-      "Solar": 0.1236,
-      "Wind": 0.2631
+      "Bioenergy": 0.0182,
+      "Hydro": 0.5776,
+      "Solar": 0.1342,
+      "Wind": 0.27
     }
   },
   "RS": {
@@ -8175,10 +8125,10 @@
       "Wind": 0.1262
     },
     "2023": {
-      "Bioenergy": 0.0184,
-      "Hydro": 0.9089,
+      "Bioenergy": 0.0183,
+      "Hydro": 0.9094,
       "Solar": 0.0011,
-      "Wind": 0.0716
+      "Wind": 0.0712
     },
     "2024": {
       "Bioenergy": 0.025,
@@ -8187,16 +8137,16 @@
       "Wind": 0.1092
     },
     "2025": {
-      "Bioenergy": 0.0349,
-      "Hydro": 0.8053,
-      "Solar": 0.0121,
-      "Wind": 0.1477
+      "Bioenergy": 0.0355,
+      "Hydro": 0.7986,
+      "Solar": 0.0149,
+      "Wind": 0.151
     },
     "2026": {
-      "Bioenergy": 0.0235,
-      "Hydro": 0.8048,
-      "Solar": 0.0183,
-      "Wind": 0.1533
+      "Bioenergy": 0.0307,
+      "Hydro": 0.7804,
+      "Solar": 0.0267,
+      "Wind": 0.1621
     }
   },
   "RU": {
@@ -8243,10 +8193,10 @@
       "Wind": 0.0212
     },
     "2026": {
-      "Bioenergy": 0.0048,
-      "Hydro": 0.9601,
-      "Solar": 0.0084,
-      "Wind": 0.0267
+      "Bioenergy": 0.0044,
+      "Hydro": 0.96,
+      "Solar": 0.0097,
+      "Wind": 0.0259
     }
   },
   "RW": {
@@ -8543,10 +8493,10 @@
       "Wind": 0.3314
     },
     "2026": {
-      "Bioenergy": 0.0722,
-      "Hydro": 0.5673,
-      "Solar": 0.024,
-      "Wind": 0.3365
+      "Bioenergy": 0.0706,
+      "Hydro": 0.5666,
+      "Solar": 0.0362,
+      "Wind": 0.3266
     }
   },
   "SG": {
@@ -8593,10 +8543,10 @@
       "Wind": 0.0128
     },
     "2026": {
-      "Bioenergy": 0.0025,
-      "Hydro": 0.0103,
-      "Solar": 0.9776,
-      "Wind": 0.0096
+      "Bioenergy": 0.0034,
+      "Hydro": 0.0155,
+      "Solar": 0.9667,
+      "Wind": 0.0144
     }
   },
   "SH": {
@@ -8687,16 +8637,16 @@
       "Wind": 0.0053
     },
     "2025": {
-      "Bioenergy": 0.0315,
-      "Hydro": 0.6889,
-      "Solar": 0.265,
-      "Wind": 0.0146
+      "Bioenergy": 0.0314,
+      "Hydro": 0.6909,
+      "Solar": 0.264,
+      "Wind": 0.0137
     },
     "2026": {
-      "Bioenergy": 0.0575,
-      "Hydro": 0.5897,
-      "Solar": 0.3337,
-      "Wind": 0.0191
+      "Bioenergy": 0.0516,
+      "Hydro": 0.5889,
+      "Solar": 0.3427,
+      "Wind": 0.0167
     }
   },
   "SK": {
@@ -8727,7 +8677,7 @@
     "2023": {
       "Bioenergy": 0.1378,
       "Hydro": 0.7805,
-      "Solar": 0.0817,
+      "Solar": 0.0816,
       "Wind": 0
     },
     "2024": {
@@ -8738,14 +8688,14 @@
     },
     "2025": {
       "Bioenergy": 0.1986,
-      "Hydro": 0.6757,
-      "Solar": 0.1258,
+      "Hydro": 0.6756,
+      "Solar": 0.1257,
       "Wind": 0
     },
     "2026": {
-      "Bioenergy": 0.1915,
-      "Hydro": 0.6868,
-      "Solar": 0.1217,
+      "Bioenergy": 0.1956,
+      "Hydro": 0.6801,
+      "Solar": 0.1243,
       "Wind": 0
     }
   },
@@ -9094,9 +9044,9 @@
     },
     "2026": {
       "Bioenergy": 0.0009,
-      "Hydro": 0.6569,
+      "Hydro": 0.6568,
       "Solar": 0.309,
-      "Wind": 0.0331
+      "Wind": 0.0333
     }
   },
   "SY": {
@@ -9388,15 +9338,15 @@
     },
     "2025": {
       "Bioenergy": 0.2493,
-      "Hydro": 0.2855,
+      "Hydro": 0.2854,
       "Solar": 0.317,
       "Wind": 0.1482
     },
     "2026": {
-      "Bioenergy": 0.2152,
-      "Hydro": 0.3021,
-      "Solar": 0.3552,
-      "Wind": 0.1276
+      "Bioenergy": 0.224,
+      "Hydro": 0.3159,
+      "Solar": 0.338,
+      "Wind": 0.1221
     }
   },
   "TJ": {
@@ -9693,10 +9643,10 @@
       "Wind": 0.2767
     },
     "2026": {
-      "Bioenergy": 0.0425,
-      "Hydro": 0.546,
-      "Solar": 0.1617,
-      "Wind": 0.2498
+      "Bioenergy": 0.0405,
+      "Hydro": 0.5679,
+      "Solar": 0.1714,
+      "Wind": 0.2201
     }
   },
   "TT": {
@@ -9776,27 +9726,27 @@
     },
     "2023": {
       "Bioenergy": 0.0105,
-      "Hydro": 0.1667,
-      "Solar": 0.5601,
-      "Wind": 0.2627
+      "Hydro": 0.1665,
+      "Solar": 0.5607,
+      "Wind": 0.2623
     },
     "2024": {
-      "Bioenergy": 0.0072,
-      "Hydro": 0.1393,
-      "Solar": 0.5044,
-      "Wind": 0.3492
+      "Bioenergy": 0.0071,
+      "Hydro": 0.1378,
+      "Solar": 0.5092,
+      "Wind": 0.3458
     },
     "2025": {
-      "Bioenergy": 0.0073,
-      "Hydro": 0.162,
-      "Solar": 0.4709,
-      "Wind": 0.3597
+      "Bioenergy": 0.0075,
+      "Hydro": 0.1589,
+      "Solar": 0.4822,
+      "Wind": 0.3513
     },
     "2026": {
-      "Bioenergy": 0.009,
-      "Hydro": 0.0771,
-      "Solar": 0.4483,
-      "Wind": 0.4656
+      "Bioenergy": 0.0079,
+      "Hydro": 0.0796,
+      "Solar": 0.4849,
+      "Wind": 0.4277
     }
   },
   "TZ": {
@@ -9993,10 +9943,10 @@
       "Wind": 0.4066
     },
     "2026": {
-      "Bioenergy": 0.0336,
-      "Hydro": 0.225,
-      "Solar": 0.309,
-      "Wind": 0.4323
+      "Bioenergy": 0.0339,
+      "Hydro": 0.2241,
+      "Solar": 0.3232,
+      "Wind": 0.4187
     }
   },
   "UY": {
@@ -10043,10 +9993,10 @@
       "Wind": 0.344
     },
     "2026": {
-      "Bioenergy": 0.1667,
-      "Hydro": 0.4157,
-      "Solar": 0.0459,
-      "Wind": 0.3717
+      "Bioenergy": 0.1623,
+      "Hydro": 0.4365,
+      "Solar": 0.0438,
+      "Wind": 0.3574
     }
   },
   "UZ": {
@@ -10088,15 +10038,15 @@
     },
     "2025": {
       "Bioenergy": 0.0039,
-      "Hydro": 0.9597,
+      "Hydro": 0.9596,
       "Solar": 0.021,
       "Wind": 0.0154
     },
     "2026": {
-      "Bioenergy": 0.0042,
-      "Hydro": 0.9578,
-      "Solar": 0.0219,
-      "Wind": 0.0161
+      "Bioenergy": 0.004,
+      "Hydro": 0.9559,
+      "Solar": 0.0234,
+      "Wind": 0.0168
     }
   },
   "VC": {
@@ -10476,9 +10426,9 @@
     },
     "2023": {
       "Bioenergy": 0.0235,
-      "Hydro": 0.4803,
-      "Solar": 0.041,
-      "Wind": 0.4552
+      "Hydro": 0.4802,
+      "Solar": 0.0411,
+      "Wind": 0.4551
     },
     "2024": {
       "Bioenergy": 0.0281,
@@ -10487,16 +10437,16 @@
       "Wind": 0.5373
     },
     "2025": {
-      "Bioenergy": 0.035,
-      "Hydro": 0.4405,
-      "Solar": 0.1044,
-      "Wind": 0.4201
+      "Bioenergy": 0.0356,
+      "Hydro": 0.4,
+      "Solar": 0.0974,
+      "Wind": 0.4669
     },
     "2026": {
-      "Bioenergy": 0.034,
-      "Hydro": 0.4468,
-      "Solar": 0.1016,
-      "Wind": 0.4175
+      "Bioenergy": 0.0374,
+      "Hydro": 0.4308,
+      "Solar": 0.1086,
+      "Wind": 0.4233
     }
   },
   "YE": {
@@ -10594,9 +10544,9 @@
     },
     "2026": {
       "Bioenergy": 0,
-      "Hydro": 0.0793,
-      "Solar": 0.6159,
-      "Wind": 0.3047
+      "Hydro": 0.1121,
+      "Solar": 0.5872,
+      "Wind": 0.3007
     }
   },
   "ZM": {