@digital4better/data 1.3.16 → 1.3.18

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

@@ -59,32 +59,32 @@
     "2021": {
       "Bioenergy": 0.0378,
       "Hydro": 0.7443,
-      "Solar": 0.1063,
+      "Solar": 0.1062,
       "Wind": 0.1116
     },
     "2022": {
-      "Bioenergy": 0.0398,
+      "Bioenergy": 0.0399,
       "Hydro": 0.7195,
       "Solar": 0.1204,
       "Wind": 0.1202
     },
     "2023": {
       "Bioenergy": 0.0411,
-      "Hydro": 0.6876,
-      "Solar": 0.1392,
+      "Hydro": 0.6877,
+      "Solar": 0.1391,
       "Wind": 0.1321
     },
     "2024": {
       "Bioenergy": 0.0379,
       "Hydro": 0.6672,
-      "Solar": 0.1618,
+      "Solar": 0.1617,
       "Wind": 0.1331
     },
     "2025": {
-      "Bioenergy": 0.0341,
-      "Hydro": 0.6244,
-      "Solar": 0.1981,
-      "Wind": 0.1434
+      "Bioenergy": 0.0347,
+      "Hydro": 0.6262,
+      "Solar": 0.1969,
+      "Wind": 0.1421
     }
   },
   "AG": {
@@ -169,10 +169,10 @@
       "Wind": 0.0495
     },
     "2025": {
-      "Bioenergy": 0.0106,
-      "Hydro": 0.8995,
-      "Solar": 0.0451,
-      "Wind": 0.0448
+      "Bioenergy": 0.0108,
+      "Hydro": 0.8986,
+      "Solar": 0.0453,
+      "Wind": 0.0453
     }
   },
   "AM": {
@@ -301,10 +301,10 @@
       "Wind": 0.2828
     },
     "2025": {
-      "Bioenergy": 0.0262,
-      "Hydro": 0.5849,
-      "Solar": 0.0752,
-      "Wind": 0.3136
+      "Bioenergy": 0.0275,
+      "Hydro": 0.5714,
+      "Solar": 0.081,
+      "Wind": 0.3201
     }
   },
   "AS": {
@@ -389,10 +389,10 @@
       "Wind": 0.1511
     },
     "2025": {
-      "Bioenergy": 0.0312,
-      "Hydro": 0.6433,
-      "Solar": 0.1811,
-      "Wind": 0.1444
+      "Bioenergy": 0.0316,
+      "Hydro": 0.6443,
+      "Solar": 0.1826,
+      "Wind": 0.1415
     }
   },
   "AU": {
@@ -433,10 +433,10 @@
       "Wind": 0.3444
     },
     "2025": {
-      "Bioenergy": 0.0037,
-      "Hydro": 0.1344,
-      "Solar": 0.4727,
-      "Wind": 0.3892
+      "Bioenergy": 0.0038,
+      "Hydro": 0.1338,
+      "Solar": 0.4818,
+      "Wind": 0.3806
     }
   },
   "AW": {
@@ -566,9 +566,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.8619,
-      "Solar": 0.1016,
-      "Wind": 0.0365
+      "Hydro": 0.8611,
+      "Solar": 0.102,
+      "Wind": 0.0369
     }
   },
   "BB": {
@@ -630,33 +630,33 @@
     },
     "2021": {
       "Bioenergy": 0.0504,
-      "Hydro": 0.6001,
+      "Hydro": 0.6002,
       "Solar": 0.2001,
       "Wind": 0.1494
     },
     "2022": {
       "Bioenergy": 0.0504,
-      "Hydro": 0.5477,
-      "Solar": 0.2485,
+      "Hydro": 0.5478,
+      "Solar": 0.2484,
       "Wind": 0.1534
     },
     "2023": {
       "Bioenergy": 0.0605,
-      "Hydro": 0.4506,
-      "Solar": 0.2955,
+      "Hydro": 0.4507,
+      "Solar": 0.2954,
       "Wind": 0.1934
     },
     "2024": {
       "Bioenergy": 0.0504,
-      "Hydro": 0.4304,
-      "Solar": 0.3424,
+      "Hydro": 0.4305,
+      "Solar": 0.3423,
       "Wind": 0.1768
     },
     "2025": {
-      "Bioenergy": 0.0452,
-      "Hydro": 0.3442,
-      "Solar": 0.42,
-      "Wind": 0.1905
+      "Bioenergy": 0.0457,
+      "Hydro": 0.353,
+      "Solar": 0.4136,
+      "Wind": 0.1876
     }
   },
   "BE": {
@@ -697,10 +697,10 @@
       "Wind": 0.5425
     },
     "2025": {
-      "Bioenergy": 0.0355,
-      "Hydro": 0.0812,
-      "Solar": 0.479,
-      "Wind": 0.4043
+      "Bioenergy": 0.0364,
+      "Hydro": 0.0794,
+      "Solar": 0.4769,
+      "Wind": 0.4073
     }
   },
   "BF": {
@@ -785,10 +785,10 @@
       "Wind": 0.1609
     },
     "2025": {
-      "Bioenergy": 0.0106,
-      "Hydro": 0.2457,
-      "Solar": 0.6409,
-      "Wind": 0.1027
+      "Bioenergy": 0.011,
+      "Hydro": 0.2509,
+      "Solar": 0.632,
+      "Wind": 0.1062
     }
   },
   "BH": {
@@ -1087,16 +1087,16 @@
       "Wind": 0.1571
     },
     "2024": {
-      "Bioenergy": 0.0153,
-      "Hydro": 0.6923,
+      "Bioenergy": 0.0151,
+      "Hydro": 0.6924,
       "Solar": 0.12,
       "Wind": 0.1724
     },
     "2025": {
-      "Bioenergy": 0.0119,
-      "Hydro": 0.679,
-      "Solar": 0.1356,
-      "Wind": 0.1735
+      "Bioenergy": 0.0116,
+      "Hydro": 0.6764,
+      "Solar": 0.1368,
+      "Wind": 0.1752
     }
   },
   "BS": {
@@ -1272,7 +1272,7 @@
       "Bioenergy": 0.4571,
       "Hydro": 0.3087,
       "Solar": 0.0782,
-      "Wind": 0.156
+      "Wind": 0.1561
     }
   },
   "BZ": {
@@ -1309,14 +1309,14 @@
     "2024": {
       "Bioenergy": 0.2235,
       "Hydro": 0.6679,
-      "Solar": 0.0547,
+      "Solar": 0.0548,
       "Wind": 0.0539
     },
     "2025": {
-      "Bioenergy": 0.2209,
-      "Hydro": 0.667,
-      "Solar": 0.0574,
-      "Wind": 0.0547
+      "Bioenergy": 0.2212,
+      "Hydro": 0.665,
+      "Solar": 0.0582,
+      "Wind": 0.0556
     }
   },
   "CA": {
@@ -1533,10 +1533,10 @@
       "Wind": 0.0069
     },
     "2025": {
-      "Bioenergy": 0.0022,
-      "Hydro": 0.7822,
-      "Solar": 0.2025,
-      "Wind": 0.0131
+      "Bioenergy": 0.0023,
+      "Hydro": 0.7823,
+      "Solar": 0.2022,
+      "Wind": 0.0133
     }
   },
   "CI": {
@@ -1665,10 +1665,10 @@
       "Wind": 0.1887
     },
     "2025": {
-      "Bioenergy": 0.0404,
-      "Hydro": 0.3815,
-      "Solar": 0.3463,
-      "Wind": 0.2318
+      "Bioenergy": 0.0403,
+      "Hydro": 0.3887,
+      "Solar": 0.3465,
+      "Wind": 0.2246
     }
   },
   "CM": {
@@ -1791,7 +1791,7 @@
       "Wind": 0.0094
     },
     "2024": {
-      "Bioenergy": 0.0015,
+      "Bioenergy": 0.0014,
       "Hydro": 0.9198,
       "Solar": 0.0625,
       "Wind": 0.0162
@@ -1842,9 +1842,9 @@
     },
     "2025": {
       "Bioenergy": 0.0052,
-      "Hydro": 0.8415,
+      "Hydro": 0.8458,
       "Solar": 0.001,
-      "Wind": 0.1523
+      "Wind": 0.148
     }
   },
   "CU": {
@@ -2017,10 +2017,10 @@
       "Wind": 0.0743
     },
     "2025": {
-      "Bioenergy": 0.2603,
-      "Hydro": 0.1613,
-      "Solar": 0.5268,
-      "Wind": 0.0515
+      "Bioenergy": 0.2623,
+      "Hydro": 0.1597,
+      "Solar": 0.527,
+      "Wind": 0.051
     }
   },
   "DE": {
@@ -2061,10 +2061,10 @@
       "Wind": 0.4786
     },
     "2025": {
-      "Bioenergy": 0.1424,
-      "Hydro": 0.0785,
-      "Solar": 0.3733,
-      "Wind": 0.4057
+      "Bioenergy": 0.1442,
+      "Hydro": 0.0791,
+      "Solar": 0.3743,
+      "Wind": 0.4024
     }
   },
   "DJ": {
@@ -2145,14 +2145,14 @@
     "2024": {
       "Bioenergy": 0.1375,
       "Hydro": 0.0247,
-      "Solar": 0.1361,
+      "Solar": 0.1362,
       "Wind": 0.7017
     },
     "2025": {
-      "Bioenergy": 0.1164,
+      "Bioenergy": 0.1166,
       "Hydro": 0.0459,
-      "Solar": 0.2153,
-      "Wind": 0.6224
+      "Solar": 0.2121,
+      "Wind": 0.6253
     }
   },
   "DM": {
@@ -2326,8 +2326,8 @@
     },
     "2025": {
       "Bioenergy": 0.0003,
-      "Hydro": 0.9888,
-      "Solar": 0.0029,
+      "Hydro": 0.9887,
+      "Solar": 0.003,
       "Wind": 0.008
     }
   },
@@ -2364,15 +2364,15 @@
     },
     "2024": {
       "Bioenergy": 0.1396,
-      "Hydro": 0.1358,
+      "Hydro": 0.1357,
       "Solar": 0.3073,
       "Wind": 0.4173
     },
     "2025": {
-      "Bioenergy": 0.1232,
-      "Hydro": 0.1037,
-      "Solar": 0.3969,
-      "Wind": 0.3762
+      "Bioenergy": 0.1247,
+      "Hydro": 0.1066,
+      "Solar": 0.3912,
+      "Wind": 0.3775
     }
   },
   "EG": {
@@ -2501,10 +2501,10 @@
       "Wind": 0.3979
     },
     "2025": {
-      "Bioenergy": 0.0234,
-      "Hydro": 0.2175,
-      "Solar": 0.4123,
-      "Wind": 0.3468
+      "Bioenergy": 0.0236,
+      "Hydro": 0.2195,
+      "Solar": 0.4122,
+      "Wind": 0.3446
     }
   },
   "ET": {
@@ -2589,10 +2589,10 @@
       "Wind": 0.4323
     },
     "2025": {
-      "Bioenergy": 0.215,
-      "Hydro": 0.3017,
-      "Solar": 0.0509,
-      "Wind": 0.4324
+      "Bioenergy": 0.2137,
+      "Hydro": 0.2969,
+      "Solar": 0.0501,
+      "Wind": 0.4392
     }
   },
   "FJ": {
@@ -2765,10 +2765,10 @@
       "Wind": 0.3414
     },
     "2025": {
-      "Bioenergy": 0.021,
-      "Hydro": 0.3984,
-      "Solar": 0.2555,
-      "Wind": 0.3251
+      "Bioenergy": 0.0211,
+      "Hydro": 0.3997,
+      "Solar": 0.2537,
+      "Wind": 0.3255
     }
   },
   "GA": {
@@ -2853,10 +2853,10 @@
       "Wind": 0.6476
     },
     "2025": {
-      "Bioenergy": 0.1601,
-      "Hydro": 0.0635,
-      "Solar": 0.1988,
-      "Wind": 0.5775
+      "Bioenergy": 0.1568,
+      "Hydro": 0.0623,
+      "Solar": 0.1942,
+      "Wind": 0.5867
     }
   },
   "GD": {
@@ -3338,9 +3338,9 @@
     },
     "2025": {
       "Bioenergy": 0.0009,
-      "Hydro": 0.0975,
-      "Solar": 0.545,
-      "Wind": 0.3566
+      "Hydro": 0.0927,
+      "Solar": 0.5347,
+      "Wind": 0.3716
     }
   },
   "GT": {
@@ -3535,32 +3535,32 @@
     "2021": {
       "Bioenergy": 0.117,
       "Hydro": 0.4996,
-      "Solar": 0.166,
+      "Solar": 0.1659,
       "Wind": 0.2175
     },
     "2022": {
       "Bioenergy": 0.1159,
       "Hydro": 0.4681,
-      "Solar": 0.1889,
+      "Solar": 0.1888,
       "Wind": 0.2271
     },
     "2023": {
       "Bioenergy": 0.1171,
-      "Hydro": 0.4118,
-      "Solar": 0.2232,
+      "Hydro": 0.4119,
+      "Solar": 0.2231,
       "Wind": 0.2479
     },
     "2024": {
       "Bioenergy": 0.1059,
-      "Hydro": 0.3948,
-      "Solar": 0.258,
-      "Wind": 0.2412
+      "Hydro": 0.3949,
+      "Solar": 0.2578,
+      "Wind": 0.2413
     },
     "2025": {
-      "Bioenergy": 0.0927,
-      "Hydro": 0.3469,
-      "Solar": 0.3117,
-      "Wind": 0.2487
+      "Bioenergy": 0.0944,
+      "Hydro": 0.3471,
+      "Solar": 0.3109,
+      "Wind": 0.2476
     }
   },
   "HN": {
@@ -3602,9 +3602,9 @@
     },
     "2025": {
       "Bioenergy": 0.2441,
-      "Hydro": 0.4247,
-      "Solar": 0.1902,
-      "Wind": 0.141
+      "Hydro": 0.4245,
+      "Solar": 0.1903,
+      "Wind": 0.1411
     }
   },
   "HR": {
@@ -3640,15 +3640,15 @@
     },
     "2024": {
       "Bioenergy": 0.0633,
-      "Hydro": 0.55,
+      "Hydro": 0.5499,
       "Solar": 0.1121,
       "Wind": 0.2746
     },
     "2025": {
-      "Bioenergy": 0.0577,
-      "Hydro": 0.476,
-      "Solar": 0.1743,
-      "Wind": 0.292
+      "Bioenergy": 0.0589,
+      "Hydro": 0.4722,
+      "Solar": 0.172,
+      "Wind": 0.2969
     }
   },
   "HT": {
@@ -3733,10 +3733,10 @@
       "Wind": 0.1362
     },
     "2025": {
-      "Bioenergy": 0.0949,
-      "Hydro": 0.0882,
-      "Solar": 0.7272,
-      "Wind": 0.0898
+      "Bioenergy": 0.0903,
+      "Hydro": 0.0828,
+      "Solar": 0.743,
+      "Wind": 0.0839
     }
   },
   "ID": {
@@ -3767,7 +3767,7 @@
     "2023": {
       "Bioenergy": 0.3552,
       "Hydro": 0.6212,
-      "Solar": 0.0065,
+      "Solar": 0.0064,
       "Wind": 0.0172
     },
     "2024": {
@@ -3778,8 +3778,8 @@
     },
     "2025": {
       "Bioenergy": 0.3542,
-      "Hydro": 0.6195,
-      "Solar": 0.0085,
+      "Hydro": 0.6196,
+      "Solar": 0.0084,
       "Wind": 0.0178
     }
   },
@@ -3815,16 +3815,16 @@
       "Wind": 0.8275
     },
     "2024": {
-      "Bioenergy": 0.018,
-      "Hydro": 0.114,
-      "Solar": 0.0753,
-      "Wind": 0.7928
+      "Bioenergy": 0.0179,
+      "Hydro": 0.1136,
+      "Solar": 0.0758,
+      "Wind": 0.7927
     },
     "2025": {
       "Bioenergy": 0.0197,
-      "Hydro": 0.1075,
-      "Solar": 0.1315,
-      "Wind": 0.7413
+      "Hydro": 0.1057,
+      "Solar": 0.1357,
+      "Wind": 0.7388
     }
   },
   "IL": {
@@ -3909,10 +3909,10 @@
       "Wind": 0.212
     },
     "2025": {
-      "Bioenergy": 0.0283,
-      "Hydro": 0.3348,
-      "Solar": 0.3757,
-      "Wind": 0.2612
+      "Bioenergy": 0.0321,
+      "Hydro": 0.3607,
+      "Solar": 0.3458,
+      "Wind": 0.2614
     }
   },
   "IQ": {
@@ -4085,10 +4085,10 @@
       "Wind": 0.205
     },
     "2025": {
-      "Bioenergy": 0.1027,
-      "Hydro": 0.2984,
-      "Solar": 0.3978,
-      "Wind": 0.2011
+      "Bioenergy": 0.1048,
+      "Hydro": 0.2966,
+      "Solar": 0.3984,
+      "Wind": 0.2002
     }
   },
   "JM": {
@@ -4217,10 +4217,10 @@
       "Wind": 0.0718
     },
     "2025": {
-      "Bioenergy": 0.2146,
-      "Hydro": 0.2845,
-      "Solar": 0.417,
-      "Wind": 0.084
+      "Bioenergy": 0.2154,
+      "Hydro": 0.2657,
+      "Solar": 0.4366,
+      "Wind": 0.0823
     }
   },
   "KE": {
@@ -4261,10 +4261,10 @@
       "Wind": 0.2855
     },
     "2025": {
-      "Bioenergy": 0.0589,
-      "Hydro": 0.6033,
-      "Solar": 0.0772,
-      "Wind": 0.2606
+      "Bioenergy": 0.0527,
+      "Hydro": 0.5765,
+      "Solar": 0.0712,
+      "Wind": 0.2996
     }
   },
   "KG": {
@@ -4305,10 +4305,10 @@
       "Wind": 0.0081
     },
     "2025": {
-      "Bioenergy": 0.0017,
-      "Hydro": 0.9818,
-      "Solar": 0.0091,
-      "Wind": 0.0073
+      "Bioenergy": 0.0018,
+      "Hydro": 0.982,
+      "Solar": 0.009,
+      "Wind": 0.0072
     }
   },
   "KH": {
@@ -4332,7 +4332,7 @@
     },
     "2022": {
       "Bioenergy": 0.0312,
-      "Hydro": 0.8795,
+      "Hydro": 0.8796,
       "Solar": 0.0525,
       "Wind": 0.0367
     },
@@ -4349,10 +4349,10 @@
       "Wind": 0.0421
     },
     "2025": {
-      "Bioenergy": 0.0296,
-      "Hydro": 0.843,
-      "Solar": 0.0802,
-      "Wind": 0.0471
+      "Bioenergy": 0.0298,
+      "Hydro": 0.8441,
+      "Solar": 0.0796,
+      "Wind": 0.0465
     }
   },
   "KI": {
@@ -5005,14 +5005,14 @@
     "2024": {
       "Bioenergy": 0.0515,
       "Hydro": 0.1841,
-      "Solar": 0.2363,
+      "Solar": 0.2364,
       "Wind": 0.5281
     },
     "2025": {
       "Bioenergy": 0.0325,
-      "Hydro": 0.1089,
-      "Solar": 0.3283,
-      "Wind": 0.5303
+      "Hydro": 0.1094,
+      "Solar": 0.32,
+      "Wind": 0.5381
     }
   },
   "LU": {
@@ -5053,10 +5053,10 @@
       "Wind": 0.3489
     },
     "2025": {
-      "Bioenergy": 0.1207,
-      "Hydro": 0.2358,
+      "Bioenergy": 0.1273,
+      "Hydro": 0.2332,
       "Solar": 0.3329,
-      "Wind": 0.3106
+      "Wind": 0.3066
     }
   },
   "LV": {
@@ -5097,10 +5097,10 @@
       "Wind": 0.1073
     },
     "2025": {
-      "Bioenergy": 0.0797,
-      "Hydro": 0.6931,
-      "Solar": 0.1664,
-      "Wind": 0.0607
+      "Bioenergy": 0.0817,
+      "Hydro": 0.6712,
+      "Solar": 0.1861,
+      "Wind": 0.061
     }
   },
   "LY": {
@@ -5225,14 +5225,14 @@
     "2024": {
       "Bioenergy": 0.0123,
       "Hydro": 0.6419,
-      "Solar": 0.1683,
+      "Solar": 0.1684,
       "Wind": 0.1774
     },
     "2025": {
-      "Bioenergy": 0.008,
-      "Hydro": 0.6342,
+      "Bioenergy": 0.0081,
+      "Hydro": 0.6337,
       "Solar": 0.3241,
-      "Wind": 0.0337
+      "Wind": 0.0341
     }
   },
   "ME": {
@@ -5273,10 +5273,10 @@
       "Wind": 0.1637
     },
     "2025": {
-      "Bioenergy": 0.0248,
-      "Hydro": 0.5851,
-      "Solar": 0.1719,
-      "Wind": 0.2182
+      "Bioenergy": 0.0239,
+      "Hydro": 0.5895,
+      "Solar": 0.1676,
+      "Wind": 0.2189
     }
   },
   "MG": {
@@ -5361,10 +5361,10 @@
       "Wind": 0.1212
     },
     "2025": {
-      "Bioenergy": 0.0282,
-      "Hydro": 0.6124,
-      "Solar": 0.175,
-      "Wind": 0.1845
+      "Bioenergy": 0.0285,
+      "Hydro": 0.6109,
+      "Solar": 0.1752,
+      "Wind": 0.1853
     }
   },
   "ML": {
@@ -5515,32 +5515,32 @@
     "2021": {
       "Bioenergy": 0.2166,
       "Hydro": 0.4461,
-      "Solar": 0.1431,
+      "Solar": 0.143,
       "Wind": 0.1942
     },
     "2022": {
-      "Bioenergy": 0.21,
-      "Hydro": 0.4208,
-      "Solar": 0.1651,
+      "Bioenergy": 0.2101,
+      "Hydro": 0.4209,
+      "Solar": 0.165,
       "Wind": 0.2041
     },
     "2023": {
-      "Bioenergy": 0.2099,
-      "Hydro": 0.3707,
-      "Solar": 0.1962,
-      "Wind": 0.2231
+      "Bioenergy": 0.21,
+      "Hydro": 0.3708,
+      "Solar": 0.1961,
+      "Wind": 0.2232
     },
     "2024": {
-      "Bioenergy": 0.1936,
+      "Bioenergy": 0.1937,
       "Hydro": 0.3581,
-      "Solar": 0.2295,
+      "Solar": 0.2294,
       "Wind": 0.2188
     },
     "2025": {
-      "Bioenergy": 0.1738,
-      "Hydro": 0.3175,
-      "Solar": 0.2811,
-      "Wind": 0.2276
+      "Bioenergy": 0.1761,
+      "Hydro": 0.3174,
+      "Solar": 0.2802,
+      "Wind": 0.2263
     }
   },
   "MQ": {
@@ -5713,10 +5713,10 @@
       "Wind": 0.1327
     },
     "2025": {
-      "Bioenergy": 0.0253,
-      "Hydro": 0.1545,
-      "Solar": 0.7124,
-      "Wind": 0.1077
+      "Bioenergy": 0.0257,
+      "Hydro": 0.1537,
+      "Solar": 0.7118,
+      "Wind": 0.1088
     }
   },
   "MU": {
@@ -5933,9 +5933,9 @@
       "Wind": 0.0001
     },
     "2025": {
-      "Bioenergy": 0.1085,
-      "Hydro": 0.8081,
-      "Solar": 0.0834,
+      "Bioenergy": 0.1087,
+      "Hydro": 0.8096,
+      "Solar": 0.0817,
       "Wind": 0
     }
   },
@@ -6191,16 +6191,16 @@
       "Wind": 0.3663
     },
     "2024": {
-      "Bioenergy": 0.4021,
+      "Bioenergy": 0.402,
       "Hydro": 0.201,
       "Solar": 0.0293,
       "Wind": 0.3676
     },
     "2025": {
-      "Bioenergy": 0.4005,
-      "Hydro": 0.2022,
-      "Solar": 0.0304,
-      "Wind": 0.3669
+      "Bioenergy": 0.4007,
+      "Hydro": 0.2012,
+      "Solar": 0.0307,
+      "Wind": 0.3674
     }
   },
   "NL": {
@@ -6241,10 +6241,10 @@
       "Wind": 0.5115
     },
     "2025": {
-      "Bioenergy": 0.0887,
+      "Bioenergy": 0.0902,
       "Hydro": 0.0006,
-      "Solar": 0.5297,
-      "Wind": 0.3811
+      "Solar": 0.5241,
+      "Wind": 0.3851
     }
   },
   "NO": {
@@ -6286,9 +6286,9 @@
     },
     "2025": {
       "Bioenergy": 0,
-      "Hydro": 0.9251,
+      "Hydro": 0.9196,
       "Solar": 0,
-      "Wind": 0.0749
+      "Wind": 0.0804
     }
   },
   "NP": {
@@ -6313,7 +6313,7 @@
     "2022": {
       "Bioenergy": 0.0052,
       "Hydro": 0.953,
-      "Solar": 0.0248,
+      "Solar": 0.0247,
       "Wind": 0.0171
     },
     "2023": {
@@ -6325,14 +6325,14 @@
     "2024": {
       "Bioenergy": 0.0051,
       "Hydro": 0.9444,
-      "Solar": 0.031,
+      "Solar": 0.0309,
       "Wind": 0.0195
     },
     "2025": {
-      "Bioenergy": 0.0048,
-      "Hydro": 0.9362,
-      "Solar": 0.0372,
-      "Wind": 0.0219
+      "Bioenergy": 0.0049,
+      "Hydro": 0.9367,
+      "Solar": 0.0369,
+      "Wind": 0.0216
     }
   },
   "NR": {
@@ -6725,10 +6725,10 @@
       "Wind": 0.0721
     },
     "2025": {
-      "Bioenergy": 0.0738,
-      "Hydro": 0.628,
-      "Solar": 0.2532,
-      "Wind": 0.045
+      "Bioenergy": 0.0649,
+      "Hydro": 0.6418,
+      "Solar": 0.2396,
+      "Wind": 0.0538
     }
   },
   "PK": {
@@ -6740,39 +6740,39 @@
     },
     "2020": {
       "Bioenergy": 0.0137,
-      "Hydro": 0.8421,
-      "Solar": 0.0868,
+      "Hydro": 0.8426,
+      "Solar": 0.0862,
       "Wind": 0.0575
     },
     "2021": {
-      "Bioenergy": 0.0148,
-      "Hydro": 0.7875,
-      "Solar": 0.126,
-      "Wind": 0.0717
+      "Bioenergy": 0.0149,
+      "Hydro": 0.7913,
+      "Solar": 0.1218,
+      "Wind": 0.072
     },
     "2022": {
-      "Bioenergy": 0.0184,
-      "Hydro": 0.7187,
-      "Solar": 0.1673,
-      "Wind": 0.0956
+      "Bioenergy": 0.0186,
+      "Hydro": 0.7252,
+      "Solar": 0.1597,
+      "Wind": 0.0965
     },
     "2023": {
-      "Bioenergy": 0.0137,
-      "Hydro": 0.6916,
-      "Solar": 0.2158,
-      "Wind": 0.0789
+      "Bioenergy": 0.0138,
+      "Hydro": 0.6996,
+      "Solar": 0.2069,
+      "Wind": 0.0797
     },
     "2024": {
-      "Bioenergy": 0.0127,
-      "Hydro": 0.6083,
-      "Solar": 0.3242,
-      "Wind": 0.0549
+      "Bioenergy": 0.0129,
+      "Hydro": 0.6163,
+      "Solar": 0.3152,
+      "Wind": 0.0556
     },
     "2025": {
-      "Bioenergy": 0.0072,
-      "Hydro": 0.5112,
-      "Solar": 0.4243,
-      "Wind": 0.0573
+      "Bioenergy": 0.0076,
+      "Hydro": 0.5173,
+      "Solar": 0.4113,
+      "Wind": 0.0638
     }
   },
   "PL": {
@@ -6813,10 +6813,10 @@
       "Wind": 0.5178
     },
     "2025": {
-      "Bioenergy": 0.0563,
-      "Hydro": 0.0359,
-      "Solar": 0.4766,
-      "Wind": 0.4312
+      "Bioenergy": 0.0593,
+      "Hydro": 0.0361,
+      "Solar": 0.4753,
+      "Wind": 0.4293
     }
   },
   "PM": {
@@ -6903,8 +6903,8 @@
     "2025": {
       "Bioenergy": 0,
       "Hydro": 0,
-      "Solar": 0.4999,
-      "Wind": 0.5001
+      "Solar": 0.4547,
+      "Wind": 0.5453
     }
   },
   "PS": {
@@ -6984,15 +6984,15 @@
     },
     "2024": {
       "Bioenergy": 0.0835,
-      "Hydro": 0.3395,
+      "Hydro": 0.3394,
       "Solar": 0.2011,
       "Wind": 0.3759
     },
     "2025": {
-      "Bioenergy": 0.0695,
-      "Hydro": 0.3507,
-      "Solar": 0.2458,
-      "Wind": 0.3339
+      "Bioenergy": 0.071,
+      "Hydro": 0.3547,
+      "Solar": 0.2448,
+      "Wind": 0.3295
     }
   },
   "PY": {
@@ -7165,10 +7165,10 @@
       "Wind": 0.2537
     },
     "2025": {
-      "Bioenergy": 0.0224,
-      "Hydro": 0.4791,
-      "Solar": 0.2654,
-      "Wind": 0.2331
+      "Bioenergy": 0.0217,
+      "Hydro": 0.4828,
+      "Solar": 0.2628,
+      "Wind": 0.2327
     }
   },
   "RS": {
@@ -7209,10 +7209,10 @@
       "Wind": 0.109
     },
     "2025": {
-      "Bioenergy": 0.0315,
-      "Hydro": 0.8279,
-      "Solar": 0.011,
-      "Wind": 0.1296
+      "Bioenergy": 0.0311,
+      "Hydro": 0.8258,
+      "Solar": 0.0109,
+      "Wind": 0.1322
     }
   },
   "RU": {
@@ -7253,10 +7253,10 @@
       "Wind": 0.0243
     },
     "2025": {
-      "Bioenergy": 0.0039,
-      "Hydro": 0.9625,
-      "Solar": 0.0118,
-      "Wind": 0.0217
+      "Bioenergy": 0.004,
+      "Hydro": 0.9629,
+      "Solar": 0.0123,
+      "Wind": 0.0208
     }
   },
   "RW": {
@@ -7517,10 +7517,10 @@
       "Wind": 0.3508
     },
     "2025": {
-      "Bioenergy": 0.0492,
-      "Hydro": 0.5846,
-      "Solar": 0.0491,
-      "Wind": 0.3171
+      "Bioenergy": 0.049,
+      "Hydro": 0.5726,
+      "Solar": 0.0493,
+      "Wind": 0.3291
     }
   },
   "SG": {
@@ -7562,9 +7562,9 @@
     },
     "2025": {
       "Bioenergy": 0.0036,
-      "Hydro": 0.0224,
-      "Solar": 0.959,
-      "Wind": 0.0151
+      "Hydro": 0.0221,
+      "Solar": 0.9594,
+      "Wind": 0.0148
     }
   },
   "SH": {
@@ -7649,9 +7649,9 @@
       "Wind": 0.0053
     },
     "2025": {
-      "Bioenergy": 0.0212,
-      "Hydro": 0.707,
-      "Solar": 0.2708,
+      "Bioenergy": 0.0215,
+      "Hydro": 0.6983,
+      "Solar": 0.2793,
       "Wind": 0.001
     }
   },
@@ -7693,9 +7693,9 @@
       "Wind": 0.0002
     },
     "2025": {
-      "Bioenergy": 0.2018,
-      "Hydro": 0.6499,
-      "Solar": 0.1483,
+      "Bioenergy": 0.2012,
+      "Hydro": 0.6485,
+      "Solar": 0.1503,
       "Wind": 0
     }
   },
@@ -8001,10 +8001,10 @@
       "Wind": 0.0367
     },
     "2025": {
-      "Bioenergy": 0.2821,
-      "Hydro": 0.3324,
-      "Solar": 0.2899,
-      "Wind": 0.0956
+      "Bioenergy": 0.2822,
+      "Hydro": 0.3318,
+      "Solar": 0.2902,
+      "Wind": 0.0958
     }
   },
   "SY": {
@@ -8247,28 +8247,28 @@
       "Wind": 0.1752
     },
     "2022": {
-      "Bioenergy": 0.3871,
+      "Bioenergy": 0.3872,
       "Hydro": 0.2971,
       "Solar": 0.1805,
-      "Wind": 0.1352
+      "Wind": 0.1353
     },
     "2023": {
       "Bioenergy": 0.392,
       "Hydro": 0.2703,
-      "Solar": 0.185,
+      "Solar": 0.1849,
       "Wind": 0.1527
     },
     "2024": {
       "Bioenergy": 0.3584,
-      "Hydro": 0.2688,
+      "Hydro": 0.2689,
       "Solar": 0.2152,
       "Wind": 0.1575
     },
     "2025": {
-      "Bioenergy": 0.3083,
-      "Hydro": 0.2644,
-      "Solar": 0.2954,
-      "Wind": 0.1319
+      "Bioenergy": 0.2863,
+      "Hydro": 0.264,
+      "Solar": 0.3119,
+      "Wind": 0.1378
     }
   },
   "TJ": {
@@ -8617,10 +8617,10 @@
       "Wind": 0.3484
     },
     "2025": {
-      "Bioenergy": 0.0077,
-      "Hydro": 0.1819,
-      "Solar": 0.4673,
-      "Wind": 0.343
+      "Bioenergy": 0.0073,
+      "Hydro": 0.1846,
+      "Solar": 0.4486,
+      "Wind": 0.3594
     }
   },
   "TZ": {
@@ -8793,10 +8793,10 @@
       "Wind": 0.4378
     },
     "2025": {
-      "Bioenergy": 0.0384,
-      "Hydro": 0.2144,
-      "Solar": 0.3513,
-      "Wind": 0.396
+      "Bioenergy": 0.0391,
+      "Hydro": 0.2138,
+      "Solar": 0.3491,
+      "Wind": 0.3979
     }
   },
   "UY": {
@@ -8837,10 +8837,10 @@
       "Wind": 0.3343
     },
     "2025": {
-      "Bioenergy": 0.1449,
-      "Hydro": 0.4814,
-      "Solar": 0.0383,
-      "Wind": 0.3354
+      "Bioenergy": 0.1441,
+      "Hydro": 0.4748,
+      "Solar": 0.0393,
+      "Wind": 0.3418
     }
   },
   "UZ": {
@@ -8882,9 +8882,9 @@
     },
     "2025": {
       "Bioenergy": 0.0038,
-      "Hydro": 0.9587,
-      "Solar": 0.0216,
-      "Wind": 0.016
+      "Hydro": 0.9591,
+      "Solar": 0.0213,
+      "Wind": 0.0157
     }
   },
   "VC": {
@@ -9233,10 +9233,10 @@
       "Wind": 0.5371
     },
     "2025": {
-      "Bioenergy": 0.0352,
-      "Hydro": 0.4379,
-      "Solar": 0.1137,
-      "Wind": 0.4132
+      "Bioenergy": 0.0357,
+      "Hydro": 0.4365,
+      "Solar": 0.114,
+      "Wind": 0.4138
     }
   },
   "YE": {