npm - @digital4better/data - Versions diffs - 1.3.12 → 1.3.14 - Mend

@digital4better/data 1.3.12 → 1.3.14

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 +8 -8
package/data/factor/continent-monthly-green.json +72 -72
package/data/factor/continent-monthly.csv +8 -8
package/data/factor/continent-monthly.json +72 -72
package/data/factor/continent-yearly-green.csv +2 -2
package/data/factor/continent-yearly-green.json +18 -18
package/data/factor/continent-yearly.csv +2 -2
package/data/factor/continent-yearly.json +18 -18
package/data/factor/country-monthly-green.csv +192 -192
package/data/factor/country-monthly-green.json +1682 -1682
package/data/factor/country-monthly.csv +192 -192
package/data/factor/country-monthly.json +1451 -1451
package/data/factor/country-yearly-green.csv +54 -54
package/data/factor/country-yearly-green.json +471 -471
package/data/factor/country-yearly.csv +54 -54
package/data/factor/country-yearly.json +444 -444
package/data/factor/subdivision-monthly-green.csv +100 -100
package/data/factor/subdivision-monthly-green.json +900 -900
package/data/factor/subdivision-monthly.csv +100 -100
package/data/factor/subdivision-monthly.json +900 -900
package/data/factor/subdivision-yearly-green.csv +50 -50
package/data/factor/subdivision-yearly-green.json +450 -450
package/data/factor/subdivision-yearly.csv +50 -50
package/data/factor/subdivision-yearly.json +450 -450
package/data/factor/world-monthly-green.csv +8 -8
package/data/factor/world-monthly-green.json +71 -71
package/data/factor/world-monthly.csv +8 -8
package/data/factor/world-monthly.json +71 -71
package/data/factor/world-yearly-green.csv +2 -2
package/data/factor/world-yearly-green.json +18 -18
package/data/factor/world-yearly.csv +2 -2
package/data/factor/world-yearly.json +18 -18
package/data/mix/continent-monthly-green.csv +8 -8
package/data/mix/continent-monthly-green.json +32 -32
package/data/mix/continent-monthly.csv +8 -8
package/data/mix/continent-monthly.json +56 -56
package/data/mix/continent-yearly-green.csv +2 -2
package/data/mix/continent-yearly-green.json +6 -6
package/data/mix/continent-yearly.csv +2 -2
package/data/mix/continent-yearly.json +9 -9
package/data/mix/country-monthly-green.csv +170 -170
package/data/mix/country-monthly-green.json +535 -535
package/data/mix/country-monthly.csv +170 -170
package/data/mix/country-monthly.json +736 -736
package/data/mix/country-yearly-green.csv +30 -30
package/data/mix/country-yearly-green.json +93 -93
package/data/mix/country-yearly.csv +30 -30
package/data/mix/country-yearly.json +137 -137
package/data/mix/subdivision-monthly-green.csv +100 -100
package/data/mix/subdivision-monthly-green.json +362 -362
package/data/mix/subdivision-monthly.csv +100 -100
package/data/mix/subdivision-monthly.json +672 -672
package/data/mix/subdivision-yearly-green.csv +50 -50
package/data/mix/subdivision-yearly-green.json +174 -174
package/data/mix/subdivision-yearly.csv +50 -50
package/data/mix/subdivision-yearly.json +325 -325
package/data/mix/world-monthly-green.csv +7 -7
package/data/mix/world-monthly-green.json +25 -25
package/data/mix/world-monthly.csv +7 -7
package/data/mix/world-monthly.json +25 -25
package/data/mix/world-yearly-green.csv +1 -1
package/data/mix/world-yearly-green.json +3 -3
package/data/mix/world-yearly.csv +1 -1
package/data/mix/world-yearly.json +5 -5
package/package.json +2 -2

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

@@ -1807,9 +1807,9 @@
       "Wind": 0.0511
     },
     "2024-04": {
-      "Bioenergy": 0.0113,
-      "Hydro": 0.8954,
-      "Solar": 0.0386,
+      "Bioenergy": 0.0114,
+      "Hydro": 0.8951,
+      "Solar": 0.0388,
       "Wind": 0.0547
     },
     "2024-05": {
@@ -1863,44 +1863,44 @@
     "2025-01": {
       "Bioenergy": 0.0109,
       "Hydro": 0.917,
-      "Solar": 0.0153,
+      "Solar": 0.0154,
       "Wind": 0.0568
     },
     "2025-02": {
       "Bioenergy": 0.0112,
-      "Hydro": 0.9204,
-      "Solar": 0.023,
+      "Hydro": 0.9203,
+      "Solar": 0.0232,
       "Wind": 0.0454
     },
     "2025-03": {
       "Bioenergy": 0.0108,
-      "Hydro": 0.9043,
-      "Solar": 0.036,
-      "Wind": 0.0488
+      "Hydro": 0.904,
+      "Solar": 0.0364,
+      "Wind": 0.0487
     },
     "2025-04": {
       "Bioenergy": 0.0116,
-      "Hydro": 0.8979,
-      "Solar": 0.0484,
-      "Wind": 0.0421
+      "Hydro": 0.8973,
+      "Solar": 0.0491,
+      "Wind": 0.042
     },
     "2025-05": {
       "Bioenergy": 0.0108,
-      "Hydro": 0.8893,
-      "Solar": 0.0546,
+      "Hydro": 0.8873,
+      "Solar": 0.0565,
       "Wind": 0.0453
     },
     "2025-06": {
       "Bioenergy": 0.01,
-      "Hydro": 0.8832,
-      "Solar": 0.0604,
-      "Wind": 0.0464
+      "Hydro": 0.8822,
+      "Solar": 0.0615,
+      "Wind": 0.0463
     },
     "2025-07": {
-      "Bioenergy": 0.0101,
-      "Hydro": 0.895,
-      "Solar": 0.0579,
-      "Wind": 0.037
+      "Bioenergy": 0.01,
+      "Hydro": 0.8947,
+      "Solar": 0.0583,
+      "Wind": 0.0371
     }
   },
   "AM": {
@@ -4243,20 +4243,20 @@
     "2025-01": {
       "Bioenergy": 0.0494,
       "Hydro": 0.6787,
-      "Solar": 0.0851,
+      "Solar": 0.0852,
       "Wind": 0.1868
     },
     "2025-02": {
       "Bioenergy": 0.0477,
-      "Hydro": 0.6402,
-      "Solar": 0.1385,
+      "Hydro": 0.6401,
+      "Solar": 0.1386,
       "Wind": 0.1736
     },
     "2025-03": {
-      "Bioenergy": 0.0464,
-      "Hydro": 0.5483,
-      "Solar": 0.1955,
-      "Wind": 0.2099
+      "Bioenergy": 0.0463,
+      "Hydro": 0.5482,
+      "Solar": 0.1957,
+      "Wind": 0.2098
     },
     "2025-04": {
       "Bioenergy": 0.0329,
@@ -4267,7 +4267,7 @@
     "2025-05": {
       "Bioenergy": 0.0328,
       "Hydro": 0.6708,
-      "Solar": 0.1941,
+      "Solar": 0.1942,
       "Wind": 0.1023
     },
     "2025-06": {
@@ -7520,8 +7520,8 @@
     },
     "2024-04": {
       "Bioenergy": 0.0308,
-      "Hydro": 0.0712,
-      "Solar": 0.3339,
+      "Hydro": 0.0711,
+      "Solar": 0.334,
       "Wind": 0.5641
     },
     "2024-05": {
@@ -7575,44 +7575,44 @@
     "2025-01": {
       "Bioenergy": 0.0515,
       "Hydro": 0.1301,
-      "Solar": 0.1322,
-      "Wind": 0.6862
+      "Solar": 0.1324,
+      "Wind": 0.6861
     },
     "2025-02": {
       "Bioenergy": 0.0399,
       "Hydro": 0.0847,
-      "Solar": 0.2823,
-      "Wind": 0.5931
+      "Solar": 0.2824,
+      "Wind": 0.593
     },
     "2025-03": {
-      "Bioenergy": 0.0416,
-      "Hydro": 0.0784,
-      "Solar": 0.5264,
-      "Wind": 0.3536
+      "Bioenergy": 0.0415,
+      "Hydro": 0.0783,
+      "Solar": 0.5267,
+      "Wind": 0.3535
     },
     "2025-04": {
-      "Bioenergy": 0.0369,
-      "Hydro": 0.0821,
-      "Solar": 0.549,
-      "Wind": 0.3321
+      "Bioenergy": 0.0368,
+      "Hydro": 0.0819,
+      "Solar": 0.5494,
+      "Wind": 0.3318
     },
     "2025-05": {
       "Bioenergy": 0.0273,
-      "Hydro": 0.0688,
-      "Solar": 0.5131,
-      "Wind": 0.3908
+      "Hydro": 0.0685,
+      "Solar": 0.514,
+      "Wind": 0.3902
     },
     "2025-06": {
       "Bioenergy": 0.0291,
-      "Hydro": 0.0552,
-      "Solar": 0.5251,
-      "Wind": 0.3906
+      "Hydro": 0.0545,
+      "Solar": 0.526,
+      "Wind": 0.3904
     },
     "2025-07": {
-      "Bioenergy": 0.033,
-      "Hydro": 0.0857,
-      "Solar": 0.5777,
-      "Wind": 0.3035
+      "Bioenergy": 0.0328,
+      "Hydro": 0.0846,
+      "Solar": 0.5786,
+      "Wind": 0.3039
     }
   },
   "BF": {
@@ -8550,8 +8550,8 @@
     },
     "2025-05": {
       "Bioenergy": 0.0108,
-      "Hydro": 0.3184,
-      "Solar": 0.5883,
+      "Hydro": 0.3183,
+      "Solar": 0.5884,
       "Wind": 0.0825
     },
     "2025-06": {
@@ -13708,8 +13708,8 @@
     },
     "2024-04": {
       "Bioenergy": 0.3795,
-      "Hydro": 0.3438,
-      "Solar": 0.17,
+      "Hydro": 0.3437,
+      "Solar": 0.1701,
       "Wind": 0.1067
     },
     "2024-05": {
@@ -13763,7 +13763,7 @@
     "2025-01": {
       "Bioenergy": 0.4321,
       "Hydro": 0.3179,
-      "Solar": 0.0784,
+      "Solar": 0.0785,
       "Wind": 0.1715
     },
     "2025-02": {
@@ -16618,20 +16618,20 @@
     },
     "2025-01": {
       "Bioenergy": 0.0045,
-      "Hydro": 0.9043,
+      "Hydro": 0.9042,
       "Solar": 0.0594,
       "Wind": 0.0318
     },
     "2025-02": {
       "Bioenergy": 0.0061,
-      "Hydro": 0.8674,
-      "Solar": 0.0987,
+      "Hydro": 0.8673,
+      "Solar": 0.0988,
       "Wind": 0.0278
     },
     "2025-03": {
-      "Bioenergy": 0.0104,
-      "Hydro": 0.6828,
-      "Solar": 0.2568,
+      "Bioenergy": 0.0103,
+      "Hydro": 0.6825,
+      "Solar": 0.2571,
       "Wind": 0.0501
     },
     "2025-04": {
@@ -21884,9 +21884,9 @@
     },
     "2025-06": {
       "Bioenergy": 0.2065,
-      "Hydro": 0.1473,
-      "Solar": 0.5806,
-      "Wind": 0.0656
+      "Hydro": 0.1467,
+      "Solar": 0.5813,
+      "Wind": 0.0655
     },
     "2025-07": {
       "Bioenergy": 0.2417,
@@ -22329,46 +22329,46 @@
       "Wind": 0.7009
     },
     "2025-01": {
-      "Bioenergy": 0.1563,
-      "Hydro": 0.0698,
-      "Solar": 0.1024,
-      "Wind": 0.6716
+      "Bioenergy": 0.1555,
+      "Hydro": 0.0695,
+      "Solar": 0.1064,
+      "Wind": 0.6686
     },
     "2025-02": {
-      "Bioenergy": 0.1812,
-      "Hydro": 0.0809,
-      "Solar": 0.2157,
-      "Wind": 0.5222
+      "Bioenergy": 0.1792,
+      "Hydro": 0.08,
+      "Solar": 0.2247,
+      "Wind": 0.5162
     },
     "2025-03": {
-      "Bioenergy": 0.1609,
-      "Hydro": 0.0644,
-      "Solar": 0.3662,
-      "Wind": 0.4085
+      "Bioenergy": 0.1572,
+      "Hydro": 0.0628,
+      "Solar": 0.3809,
+      "Wind": 0.3991
     },
     "2025-04": {
-      "Bioenergy": 0.1588,
-      "Hydro": 0.073,
-      "Solar": 0.4412,
-      "Wind": 0.327
+      "Bioenergy": 0.1533,
+      "Hydro": 0.0704,
+      "Solar": 0.4606,
+      "Wind": 0.3157
     },
     "2025-05": {
-      "Bioenergy": 0.1315,
-      "Hydro": 0.0723,
-      "Solar": 0.4161,
-      "Wind": 0.3801
+      "Bioenergy": 0.1267,
+      "Hydro": 0.0697,
+      "Solar": 0.4376,
+      "Wind": 0.366
     },
     "2025-06": {
-      "Bioenergy": 0.1154,
-      "Hydro": 0.0739,
-      "Solar": 0.433,
-      "Wind": 0.3777
+      "Bioenergy": 0.1167,
+      "Hydro": 0.0745,
+      "Solar": 0.4272,
+      "Wind": 0.3816
     },
     "2025-07": {
-      "Bioenergy": 0.1156,
-      "Hydro": 0.0737,
-      "Solar": 0.4333,
-      "Wind": 0.3775
+      "Bioenergy": 0.1348,
+      "Hydro": 0.0998,
+      "Solar": 0.4393,
+      "Wind": 0.3261
     }
   },
   "DJ": {
@@ -23228,7 +23228,7 @@
     },
     "2024-04": {
       "Bioenergy": 0.1307,
-      "Hydro": 0.0213,
+      "Hydro": 0.0212,
       "Solar": 0.1644,
       "Wind": 0.6837
     },
@@ -23289,38 +23289,38 @@
     "2025-02": {
       "Bioenergy": 0.2075,
       "Hydro": 0.0407,
-      "Solar": 0.0781,
-      "Wind": 0.6737
+      "Solar": 0.0782,
+      "Wind": 0.6736
     },
     "2025-03": {
       "Bioenergy": 0.1752,
       "Hydro": 0.0224,
-      "Solar": 0.1615,
+      "Solar": 0.1616,
       "Wind": 0.6408
     },
     "2025-04": {
-      "Bioenergy": 0.1564,
-      "Hydro": 0.0804,
-      "Solar": 0.2811,
-      "Wind": 0.4822
+      "Bioenergy": 0.1562,
+      "Hydro": 0.0802,
+      "Solar": 0.2818,
+      "Wind": 0.4818
     },
     "2025-05": {
-      "Bioenergy": 0.0601,
-      "Hydro": 0.0565,
-      "Solar": 0.2947,
-      "Wind": 0.5888
+      "Bioenergy": 0.06,
+      "Hydro": 0.0563,
+      "Solar": 0.2957,
+      "Wind": 0.588
     },
     "2025-06": {
       "Bioenergy": 0.0255,
-      "Hydro": 0.0333,
-      "Solar": 0.263,
-      "Wind": 0.6782
+      "Hydro": 0.0329,
+      "Solar": 0.2635,
+      "Wind": 0.6781
     },
     "2025-07": {
-      "Bioenergy": 0.0516,
-      "Hydro": 0.0644,
-      "Solar": 0.3401,
-      "Wind": 0.5439
+      "Bioenergy": 0.0515,
+      "Hydro": 0.0635,
+      "Solar": 0.3407,
+      "Wind": 0.5443
     }
   },
   "DM": {
@@ -25607,10 +25607,10 @@
       "Wind": 0.4177
     },
     "2024-04": {
-      "Bioenergy": 0.1148,
-      "Hydro": 0.1757,
-      "Solar": 0.3182,
-      "Wind": 0.3913
+      "Bioenergy": 0.115,
+      "Hydro": 0.1753,
+      "Solar": 0.3185,
+      "Wind": 0.3912
     },
     "2024-05": {
       "Bioenergy": 0.1063,
@@ -25663,44 +25663,44 @@
     "2025-01": {
       "Bioenergy": 0.1671,
       "Hydro": 0.1366,
-      "Solar": 0.0554,
-      "Wind": 0.6409
+      "Solar": 0.0555,
+      "Wind": 0.6408
     },
     "2025-02": {
-      "Bioenergy": 0.2332,
+      "Bioenergy": 0.2331,
       "Hydro": 0.1537,
-      "Solar": 0.172,
-      "Wind": 0.441
+      "Solar": 0.1723,
+      "Wind": 0.4409
     },
     "2025-03": {
-      "Bioenergy": 0.1517,
-      "Hydro": 0.0804,
-      "Solar": 0.3184,
-      "Wind": 0.4495
+      "Bioenergy": 0.1516,
+      "Hydro": 0.0803,
+      "Solar": 0.3188,
+      "Wind": 0.4493
     },
     "2025-04": {
-      "Bioenergy": 0.1304,
-      "Hydro": 0.0693,
-      "Solar": 0.4611,
-      "Wind": 0.3392
+      "Bioenergy": 0.1303,
+      "Hydro": 0.0692,
+      "Solar": 0.4616,
+      "Wind": 0.3389
     },
     "2025-05": {
-      "Bioenergy": 0.0918,
-      "Hydro": 0.0825,
-      "Solar": 0.5359,
-      "Wind": 0.2897
+      "Bioenergy": 0.0917,
+      "Hydro": 0.0821,
+      "Solar": 0.5369,
+      "Wind": 0.2893
     },
     "2025-06": {
       "Bioenergy": 0.1016,
-      "Hydro": 0.0853,
-      "Solar": 0.4579,
-      "Wind": 0.3552
+      "Hydro": 0.0842,
+      "Solar": 0.4592,
+      "Wind": 0.355
     },
     "2025-07": {
-      "Bioenergy": 0.074,
-      "Hydro": 0.1207,
-      "Solar": 0.5433,
-      "Wind": 0.2619
+      "Bioenergy": 0.0738,
+      "Hydro": 0.1192,
+      "Solar": 0.5446,
+      "Wind": 0.2624
     }
   },
   "EG": {
@@ -27988,8 +27988,8 @@
     },
     "2024-04": {
       "Bioenergy": 0.1861,
-      "Hydro": 0.375,
-      "Solar": 0.0455,
+      "Hydro": 0.3749,
+      "Solar": 0.0456,
       "Wind": 0.3934
     },
     "2024-05": {
@@ -28049,38 +28049,38 @@
     "2025-02": {
       "Bioenergy": 0.2449,
       "Hydro": 0.2551,
-      "Solar": 0.0105,
+      "Solar": 0.0106,
       "Wind": 0.4895
     },
     "2025-03": {
       "Bioenergy": 0.2154,
-      "Hydro": 0.2491,
-      "Solar": 0.0333,
-      "Wind": 0.5022
+      "Hydro": 0.249,
+      "Solar": 0.0335,
+      "Wind": 0.5021
     },
     "2025-04": {
-      "Bioenergy": 0.2023,
-      "Hydro": 0.3159,
-      "Solar": 0.0639,
-      "Wind": 0.4179
+      "Bioenergy": 0.2022,
+      "Hydro": 0.3157,
+      "Solar": 0.0644,
+      "Wind": 0.4177
     },
     "2025-05": {
-      "Bioenergy": 0.1788,
-      "Hydro": 0.3361,
-      "Solar": 0.0697,
-      "Wind": 0.4154
+      "Bioenergy": 0.1787,
+      "Hydro": 0.3358,
+      "Solar": 0.0703,
+      "Wind": 0.4152
     },
     "2025-06": {
       "Bioenergy": 0.1751,
-      "Hydro": 0.3567,
-      "Solar": 0.0875,
-      "Wind": 0.3807
+      "Hydro": 0.3564,
+      "Solar": 0.0879,
+      "Wind": 0.3806
     },
     "2025-07": {
       "Bioenergy": 0.2233,
-      "Hydro": 0.3387,
-      "Solar": 0.0926,
-      "Wind": 0.3454
+      "Hydro": 0.3385,
+      "Solar": 0.0927,
+      "Wind": 0.3455
     }
   },
   "FJ": {
@@ -30845,7 +30845,7 @@
     "2024-04": {
       "Bioenergy": 0.1317,
       "Hydro": 0.0627,
-      "Solar": 0.1367,
+      "Solar": 0.1368,
       "Wind": 0.6689
     },
     "2024-05": {
@@ -30899,44 +30899,44 @@
     "2025-01": {
       "Bioenergy": 0.1704,
       "Hydro": 0.0755,
-      "Solar": 0.0477,
-      "Wind": 0.7064
+      "Solar": 0.0478,
+      "Wind": 0.7063
     },
     "2025-02": {
       "Bioenergy": 0.1643,
       "Hydro": 0.0549,
-      "Solar": 0.0629,
+      "Solar": 0.063,
       "Wind": 0.7179
     },
     "2025-03": {
       "Bioenergy": 0.1195,
-      "Hydro": 0.0729,
-      "Solar": 0.1759,
-      "Wind": 0.6317
+      "Hydro": 0.0728,
+      "Solar": 0.1761,
+      "Wind": 0.6316
     },
     "2025-04": {
-      "Bioenergy": 0.1683,
-      "Hydro": 0.0676,
-      "Solar": 0.2605,
-      "Wind": 0.5036
+      "Bioenergy": 0.1682,
+      "Hydro": 0.0675,
+      "Solar": 0.261,
+      "Wind": 0.5033
     },
     "2025-05": {
-      "Bioenergy": 0.1468,
-      "Hydro": 0.053,
-      "Solar": 0.2594,
-      "Wind": 0.5408
+      "Bioenergy": 0.1466,
+      "Hydro": 0.0528,
+      "Solar": 0.2602,
+      "Wind": 0.5403
     },
     "2025-06": {
       "Bioenergy": 0.1326,
-      "Hydro": 0.0428,
-      "Solar": 0.2342,
-      "Wind": 0.5904
+      "Hydro": 0.0424,
+      "Solar": 0.2347,
+      "Wind": 0.5903
     },
     "2025-07": {
       "Bioenergy": 0.1947,
-      "Hydro": 0.0737,
-      "Solar": 0.2869,
-      "Wind": 0.4446
+      "Hydro": 0.0731,
+      "Solar": 0.2874,
+      "Wind": 0.4449
     }
   },
   "GD": {
@@ -36145,16 +36145,16 @@
       "Wind": 0.4787
     },
     "2025-03": {
-      "Bioenergy": 0.0014,
-      "Hydro": 0.0566,
-      "Solar": 0.4767,
-      "Wind": 0.4654
+      "Bioenergy": 0.0013,
+      "Hydro": 0.0565,
+      "Solar": 0.4768,
+      "Wind": 0.4653
     },
     "2025-04": {
       "Bioenergy": 0.0064,
-      "Hydro": 0.0927,
-      "Solar": 0.5405,
-      "Wind": 0.3603
+      "Hydro": 0.0926,
+      "Solar": 0.5408,
+      "Wind": 0.3602
     },
     "2025-05": {
       "Bioenergy": 0,
@@ -39411,9 +39411,9 @@
       "Wind": 0.2579
     },
     "2024-04": {
-      "Bioenergy": 0.062,
-      "Hydro": 0.5572,
-      "Solar": 0.1247,
+      "Bioenergy": 0.0621,
+      "Hydro": 0.557,
+      "Solar": 0.1249,
       "Wind": 0.2561
     },
     "2024-05": {
@@ -39465,46 +39465,46 @@
       "Wind": 0.3771
     },
     "2025-01": {
-      "Bioenergy": 0.0568,
+      "Bioenergy": 0.0567,
       "Hydro": 0.5434,
-      "Solar": 0.039,
+      "Solar": 0.0391,
       "Wind": 0.3608
     },
     "2025-02": {
-      "Bioenergy": 0.0733,
-      "Hydro": 0.5243,
-      "Solar": 0.0855,
-      "Wind": 0.317
+      "Bioenergy": 0.0732,
+      "Hydro": 0.5242,
+      "Solar": 0.0857,
+      "Wind": 0.3169
     },
     "2025-03": {
       "Bioenergy": 0.0476,
-      "Hydro": 0.5396,
-      "Solar": 0.1088,
+      "Hydro": 0.5395,
+      "Solar": 0.109,
       "Wind": 0.3039
     },
     "2025-04": {
-      "Bioenergy": 0.0543,
-      "Hydro": 0.5145,
-      "Solar": 0.1315,
-      "Wind": 0.2996
+      "Bioenergy": 0.0542,
+      "Hydro": 0.5143,
+      "Solar": 0.132,
+      "Wind": 0.2995
     },
     "2025-05": {
-      "Bioenergy": 0.0612,
-      "Hydro": 0.4538,
-      "Solar": 0.2188,
-      "Wind": 0.2663
+      "Bioenergy": 0.0611,
+      "Hydro": 0.4523,
+      "Solar": 0.2209,
+      "Wind": 0.2657
     },
     "2025-06": {
-      "Bioenergy": 0.063,
-      "Hydro": 0.4008,
-      "Solar": 0.2641,
-      "Wind": 0.272
+      "Bioenergy": 0.0629,
+      "Hydro": 0.3993,
+      "Solar": 0.2661,
+      "Wind": 0.2717
     },
     "2025-07": {
-      "Bioenergy": 0.0549,
-      "Hydro": 0.4214,
-      "Solar": 0.2631,
-      "Wind": 0.2606
+      "Bioenergy": 0.0547,
+      "Hydro": 0.4203,
+      "Solar": 0.2639,
+      "Wind": 0.2611
     }
   },
   "HT": {
@@ -40363,8 +40363,8 @@
       "Wind": 0.1686
     },
     "2024-04": {
-      "Bioenergy": 0.0694,
-      "Hydro": 0.0905,
+      "Bioenergy": 0.0695,
+      "Hydro": 0.0904,
       "Solar": 0.7354,
       "Wind": 0.1047
     },
@@ -40418,45 +40418,45 @@
     },
     "2025-01": {
       "Bioenergy": 0.1599,
-      "Hydro": 0.221,
-      "Solar": 0.3715,
+      "Hydro": 0.2209,
+      "Solar": 0.3717,
       "Wind": 0.2475
     },
     "2025-02": {
       "Bioenergy": 0.1367,
       "Hydro": 0.1585,
-      "Solar": 0.5673,
-      "Wind": 0.1375
+      "Solar": 0.5674,
+      "Wind": 0.1374
     },
     "2025-03": {
-      "Bioenergy": 0.1202,
-      "Hydro": 0.1117,
-      "Solar": 0.648,
-      "Wind": 0.1201
+      "Bioenergy": 0.1201,
+      "Hydro": 0.1115,
+      "Solar": 0.6484,
+      "Wind": 0.12
     },
     "2025-04": {
       "Bioenergy": 0.0982,
       "Hydro": 0.0606,
-      "Solar": 0.7771,
+      "Solar": 0.7773,
       "Wind": 0.064
     },
     "2025-05": {
-      "Bioenergy": 0.077,
-      "Hydro": 0.0694,
-      "Solar": 0.7939,
+      "Bioenergy": 0.0769,
+      "Hydro": 0.0691,
+      "Solar": 0.7942,
       "Wind": 0.0598
     },
     "2025-06": {
-      "Bioenergy": 0.0767,
-      "Hydro": 0.0663,
-      "Solar": 0.7953,
-      "Wind": 0.0617
+      "Bioenergy": 0.0766,
+      "Hydro": 0.0657,
+      "Solar": 0.7961,
+      "Wind": 0.0616
     },
     "2025-07": {
-      "Bioenergy": 0.0665,
-      "Hydro": 0.0483,
-      "Solar": 0.8312,
-      "Wind": 0.054
+      "Bioenergy": 0.0664,
+      "Hydro": 0.0477,
+      "Solar": 0.8318,
+      "Wind": 0.0541
     }
   },
   "ID": {
@@ -41315,10 +41315,10 @@
       "Wind": 0.834
     },
     "2024-04": {
-      "Bioenergy": 0.018,
-      "Hydro": 0.1395,
-      "Solar": 0.0784,
-      "Wind": 0.7641
+      "Bioenergy": 0.0181,
+      "Hydro": 0.1394,
+      "Solar": 0.0786,
+      "Wind": 0.7639
     },
     "2024-05": {
       "Bioenergy": 0.027,
@@ -41377,38 +41377,38 @@
     "2025-02": {
       "Bioenergy": 0.0139,
       "Hydro": 0.0906,
-      "Solar": 0.037,
-      "Wind": 0.8586
+      "Solar": 0.0371,
+      "Wind": 0.8585
     },
     "2025-03": {
-      "Bioenergy": 0.0193,
-      "Hydro": 0.1031,
-      "Solar": 0.1001,
-      "Wind": 0.7775
+      "Bioenergy": 0.0192,
+      "Hydro": 0.103,
+      "Solar": 0.1005,
+      "Wind": 0.7773
     },
     "2025-04": {
       "Bioenergy": 0.0221,
-      "Hydro": 0.1068,
-      "Solar": 0.1555,
-      "Wind": 0.7155
+      "Hydro": 0.1066,
+      "Solar": 0.1563,
+      "Wind": 0.715
     },
     "2025-05": {
-      "Bioenergy": 0.0252,
-      "Hydro": 0.1381,
-      "Solar": 0.2285,
-      "Wind": 0.6082
+      "Bioenergy": 0.0251,
+      "Hydro": 0.1375,
+      "Solar": 0.2309,
+      "Wind": 0.6066
     },
     "2025-06": {
       "Bioenergy": 0.0214,
-      "Hydro": 0.1089,
-      "Solar": 0.1849,
-      "Wind": 0.6847
+      "Hydro": 0.1078,
+      "Solar": 0.1864,
+      "Wind": 0.6844
     },
     "2025-07": {
-      "Bioenergy": 0.0218,
-      "Hydro": 0.1057,
-      "Solar": 0.1846,
-      "Wind": 0.6879
+      "Bioenergy": 0.0216,
+      "Hydro": 0.1045,
+      "Solar": 0.1852,
+      "Wind": 0.6886
     }
   },
   "IL": {
@@ -44172,8 +44172,8 @@
     },
     "2024-04": {
       "Bioenergy": 0.1065,
-      "Hydro": 0.3803,
-      "Solar": 0.3124,
+      "Hydro": 0.3801,
+      "Solar": 0.3125,
       "Wind": 0.2008
     },
     "2024-05": {
@@ -44225,46 +44225,46 @@
       "Wind": 0.3619
     },
     "2025-01": {
-      "Bioenergy": 0.1357,
-      "Hydro": 0.3177,
-      "Solar": 0.1862,
-      "Wind": 0.3605
+      "Bioenergy": 0.1356,
+      "Hydro": 0.3176,
+      "Solar": 0.1863,
+      "Wind": 0.3604
     },
     "2025-02": {
       "Bioenergy": 0.1485,
       "Hydro": 0.3165,
-      "Solar": 0.3027,
-      "Wind": 0.2323
+      "Solar": 0.3028,
+      "Wind": 0.2322
     },
     "2025-03": {
-      "Bioenergy": 0.1242,
-      "Hydro": 0.247,
-      "Solar": 0.3641,
-      "Wind": 0.2648
+      "Bioenergy": 0.1241,
+      "Hydro": 0.2468,
+      "Solar": 0.3644,
+      "Wind": 0.2647
     },
     "2025-04": {
-      "Bioenergy": 0.1035,
-      "Hydro": 0.2832,
-      "Solar": 0.4125,
-      "Wind": 0.2008
+      "Bioenergy": 0.1034,
+      "Hydro": 0.283,
+      "Solar": 0.4129,
+      "Wind": 0.2007
     },
     "2025-05": {
-      "Bioenergy": 0.1018,
-      "Hydro": 0.284,
-      "Solar": 0.4129,
-      "Wind": 0.2013
+      "Bioenergy": 0.091,
+      "Hydro": 0.3308,
+      "Solar": 0.4097,
+      "Wind": 0.1684
     },
     "2025-06": {
-      "Bioenergy": 0.1012,
-      "Hydro": 0.2796,
-      "Solar": 0.4171,
-      "Wind": 0.2021
+      "Bioenergy": 0.084,
+      "Hydro": 0.3238,
+      "Solar": 0.4642,
+      "Wind": 0.128
     },
     "2025-07": {
-      "Bioenergy": 0.1025,
-      "Hydro": 0.2802,
-      "Solar": 0.4202,
-      "Wind": 0.1971
+      "Bioenergy": 0.0859,
+      "Hydro": 0.2842,
+      "Solar": 0.4615,
+      "Wind": 0.1685
     }
   },
   "JM": {
@@ -54167,10 +54167,10 @@
       "Wind": 0.5392
     },
     "2024-04": {
-      "Bioenergy": 0.0496,
-      "Hydro": 0.1927,
-      "Solar": 0.2417,
-      "Wind": 0.516
+      "Bioenergy": 0.0497,
+      "Hydro": 0.1925,
+      "Solar": 0.242,
+      "Wind": 0.5159
     },
     "2024-05": {
       "Bioenergy": 0.0478,
@@ -54223,44 +54223,44 @@
     "2025-01": {
       "Bioenergy": 0.0483,
       "Hydro": 0.1444,
-      "Solar": 0.0503,
-      "Wind": 0.757
+      "Solar": 0.0504,
+      "Wind": 0.7569
     },
     "2025-02": {
-      "Bioenergy": 0.0525,
-      "Hydro": 0.2123,
-      "Solar": 0.1427,
-      "Wind": 0.5925
+      "Bioenergy": 0.0524,
+      "Hydro": 0.2122,
+      "Solar": 0.143,
+      "Wind": 0.5923
     },
     "2025-03": {
       "Bioenergy": 0.0422,
-      "Hydro": 0.1075,
-      "Solar": 0.2054,
-      "Wind": 0.6449
+      "Hydro": 0.1074,
+      "Solar": 0.2057,
+      "Wind": 0.6447
     },
     "2025-04": {
-      "Bioenergy": 0.0199,
-      "Hydro": 0.0516,
-      "Solar": 0.3641,
-      "Wind": 0.5645
+      "Bioenergy": 0.0198,
+      "Hydro": 0.0515,
+      "Solar": 0.3643,
+      "Wind": 0.5644
     },
     "2025-05": {
       "Bioenergy": 0.0238,
-      "Hydro": 0.0804,
-      "Solar": 0.4584,
-      "Wind": 0.4375
+      "Hydro": 0.0802,
+      "Solar": 0.459,
+      "Wind": 0.437
     },
     "2025-06": {
       "Bioenergy": 0.0181,
-      "Hydro": 0.0596,
-      "Solar": 0.3845,
-      "Wind": 0.5378
+      "Hydro": 0.0592,
+      "Solar": 0.385,
+      "Wind": 0.5377
     },
     "2025-07": {
-      "Bioenergy": 0.0312,
-      "Hydro": 0.1272,
-      "Solar": 0.4913,
-      "Wind": 0.3503
+      "Bioenergy": 0.031,
+      "Hydro": 0.126,
+      "Solar": 0.4923,
+      "Wind": 0.3507
     }
   },
   "LU": {
@@ -54643,10 +54643,10 @@
       "Wind": 0.3881
     },
     "2024-04": {
-      "Bioenergy": 0.0791,
-      "Hydro": 0.2894,
-      "Solar": 0.2421,
-      "Wind": 0.3894
+      "Bioenergy": 0.0793,
+      "Hydro": 0.2888,
+      "Solar": 0.2426,
+      "Wind": 0.3892
     },
     "2024-05": {
       "Bioenergy": 0.1227,
@@ -54697,46 +54697,46 @@
       "Wind": 0.5134
     },
     "2025-01": {
-      "Bioenergy": 0.1766,
-      "Hydro": 0.2855,
-      "Solar": 0.092,
-      "Wind": 0.446
+      "Bioenergy": 0.1765,
+      "Hydro": 0.2854,
+      "Solar": 0.0922,
+      "Wind": 0.4458
     },
     "2025-02": {
-      "Bioenergy": 0.1097,
-      "Hydro": 0.3539,
-      "Solar": 0.1506,
-      "Wind": 0.3858
+      "Bioenergy": 0.1096,
+      "Hydro": 0.3536,
+      "Solar": 0.1512,
+      "Wind": 0.3855
     },
     "2025-03": {
-      "Bioenergy": 0.1616,
-      "Hydro": 0.2374,
-      "Solar": 0.2747,
-      "Wind": 0.3263
+      "Bioenergy": 0.1614,
+      "Hydro": 0.2369,
+      "Solar": 0.2758,
+      "Wind": 0.3259
     },
     "2025-04": {
-      "Bioenergy": 0.1304,
-      "Hydro": 0.2187,
-      "Solar": 0.3772,
-      "Wind": 0.2736
+      "Bioenergy": 0.13,
+      "Hydro": 0.218,
+      "Solar": 0.3789,
+      "Wind": 0.273
     },
     "2025-05": {
-      "Bioenergy": 0.1122,
-      "Hydro": 0.2067,
-      "Solar": 0.3903,
-      "Wind": 0.2908
+      "Bioenergy": 0.1117,
+      "Hydro": 0.2051,
+      "Solar": 0.3937,
+      "Wind": 0.2896
     },
     "2025-06": {
-      "Bioenergy": 0.1159,
-      "Hydro": 0.1952,
-      "Solar": 0.4254,
-      "Wind": 0.2636
+      "Bioenergy": 0.1157,
+      "Hydro": 0.1928,
+      "Solar": 0.4284,
+      "Wind": 0.2631
     },
     "2025-07": {
-      "Bioenergy": 0.0785,
-      "Hydro": 0.2132,
-      "Solar": 0.4512,
-      "Wind": 0.2571
+      "Bioenergy": 0.0781,
+      "Hydro": 0.2107,
+      "Solar": 0.4532,
+      "Wind": 0.258
     }
   },
   "LV": {
@@ -55186,33 +55186,33 @@
     },
     "2025-03": {
       "Bioenergy": 0.1007,
-      "Hydro": 0.6997,
-      "Solar": 0.1331,
+      "Hydro": 0.6996,
+      "Solar": 0.1332,
       "Wind": 0.0665
     },
     "2025-04": {
       "Bioenergy": 0.0812,
-      "Hydro": 0.6059,
-      "Solar": 0.229,
-      "Wind": 0.0838
+      "Hydro": 0.6056,
+      "Solar": 0.2296,
+      "Wind": 0.0837
     },
     "2025-05": {
-      "Bioenergy": 0.0757,
-      "Hydro": 0.6158,
-      "Solar": 0.2229,
+      "Bioenergy": 0.0756,
+      "Hydro": 0.6145,
+      "Solar": 0.2243,
       "Wind": 0.0856
     },
     "2025-06": {
       "Bioenergy": 0.0637,
-      "Hydro": 0.7373,
-      "Solar": 0.1731,
+      "Hydro": 0.7372,
+      "Solar": 0.1733,
       "Wind": 0.0259
     },
     "2025-07": {
-      "Bioenergy": 0.0548,
-      "Hydro": 0.6671,
-      "Solar": 0.229,
-      "Wind": 0.0491
+      "Bioenergy": 0.0547,
+      "Hydro": 0.6668,
+      "Solar": 0.2293,
+      "Wind": 0.0492
     }
   },
   "LY": {
@@ -56614,33 +56614,33 @@
     },
     "2025-03": {
       "Bioenergy": 0.0081,
-      "Hydro": 0.6355,
-      "Solar": 0.3197,
+      "Hydro": 0.6354,
+      "Solar": 0.3199,
       "Wind": 0.0366
     },
     "2025-04": {
-      "Bioenergy": 0.0088,
-      "Hydro": 0.6343,
-      "Solar": 0.3252,
+      "Bioenergy": 0.0087,
+      "Hydro": 0.634,
+      "Solar": 0.3256,
       "Wind": 0.0317
     },
     "2025-05": {
       "Bioenergy": 0.0082,
-      "Hydro": 0.6309,
-      "Solar": 0.3266,
+      "Hydro": 0.6298,
+      "Solar": 0.3276,
       "Wind": 0.0343
     },
     "2025-06": {
       "Bioenergy": 0.0076,
-      "Hydro": 0.6264,
-      "Solar": 0.3308,
-      "Wind": 0.0351
+      "Hydro": 0.6258,
+      "Solar": 0.3316,
+      "Wind": 0.035
     },
     "2025-07": {
-      "Bioenergy": 0.0076,
-      "Hydro": 0.6318,
-      "Solar": 0.3327,
-      "Wind": 0.0279
+      "Bioenergy": 0.0075,
+      "Hydro": 0.6314,
+      "Solar": 0.3331,
+      "Wind": 0.028
     }
   },
   "ME": {
@@ -57084,39 +57084,39 @@
     },
     "2025-02": {
       "Bioenergy": 0.0089,
-      "Hydro": 0.8121,
-      "Solar": 0.0157,
+      "Hydro": 0.812,
+      "Solar": 0.0158,
       "Wind": 0.1633
     },
     "2025-03": {
       "Bioenergy": 0.0045,
-      "Hydro": 0.7988,
-      "Solar": 0.0136,
+      "Hydro": 0.7987,
+      "Solar": 0.0138,
       "Wind": 0.1831
     },
     "2025-04": {
-      "Bioenergy": 0.0322,
-      "Hydro": 0.5733,
-      "Solar": 0.1634,
-      "Wind": 0.2311
+      "Bioenergy": 0.032,
+      "Hydro": 0.5721,
+      "Solar": 0.1653,
+      "Wind": 0.2306
     },
     "2025-05": {
-      "Bioenergy": 0.0292,
-      "Hydro": 0.4542,
-      "Solar": 0.2412,
-      "Wind": 0.2754
+      "Bioenergy": 0.0291,
+      "Hydro": 0.4513,
+      "Solar": 0.2452,
+      "Wind": 0.2743
     },
     "2025-06": {
-      "Bioenergy": 0.031,
-      "Hydro": 0.4539,
-      "Solar": 0.2743,
-      "Wind": 0.2407
+      "Bioenergy": 0.0309,
+      "Hydro": 0.4512,
+      "Solar": 0.2777,
+      "Wind": 0.2402
     },
     "2025-07": {
-      "Bioenergy": 0.0388,
-      "Hydro": 0.4494,
-      "Solar": 0.29,
-      "Wind": 0.2218
+      "Bioenergy": 0.0383,
+      "Hydro": 0.447,
+      "Solar": 0.292,
+      "Wind": 0.2228
     }
   },
   "MG": {
@@ -57976,8 +57976,8 @@
     },
     "2024-04": {
       "Bioenergy": 0.0541,
-      "Hydro": 0.6517,
-      "Solar": 0.163,
+      "Hydro": 0.6515,
+      "Solar": 0.1632,
       "Wind": 0.1312
     },
     "2024-05": {
@@ -58030,45 +58030,45 @@
     },
     "2025-01": {
       "Bioenergy": 0.0562,
-      "Hydro": 0.6678,
-      "Solar": 0.0923,
+      "Hydro": 0.6677,
+      "Solar": 0.0925,
       "Wind": 0.1837
     },
     "2025-02": {
       "Bioenergy": 0.0249,
-      "Hydro": 0.6323,
-      "Solar": 0.1428,
-      "Wind": 0.2
+      "Hydro": 0.6321,
+      "Solar": 0.1431,
+      "Wind": 0.1999
     },
     "2025-03": {
-      "Bioenergy": 0.0236,
-      "Hydro": 0.6078,
-      "Solar": 0.1669,
-      "Wind": 0.2017
+      "Bioenergy": 0.0235,
+      "Hydro": 0.6073,
+      "Solar": 0.1676,
+      "Wind": 0.2015
     },
     "2025-04": {
-      "Bioenergy": 0.0248,
-      "Hydro": 0.6054,
-      "Solar": 0.1882,
-      "Wind": 0.1816
+      "Bioenergy": 0.0247,
+      "Hydro": 0.6044,
+      "Solar": 0.1896,
+      "Wind": 0.1812
     },
     "2025-05": {
       "Bioenergy": 0.0227,
-      "Hydro": 0.597,
-      "Solar": 0.1967,
-      "Wind": 0.1836
+      "Hydro": 0.5941,
+      "Solar": 0.2001,
+      "Wind": 0.1831
     },
     "2025-06": {
-      "Bioenergy": 0.0211,
-      "Hydro": 0.5846,
-      "Solar": 0.2086,
-      "Wind": 0.1858
+      "Bioenergy": 0.021,
+      "Hydro": 0.5827,
+      "Solar": 0.2109,
+      "Wind": 0.1854
     },
     "2025-07": {
-      "Bioenergy": 0.0217,
-      "Hydro": 0.5982,
-      "Solar": 0.2091,
-      "Wind": 0.1711
+      "Bioenergy": 0.0214,
+      "Hydro": 0.5971,
+      "Solar": 0.2101,
+      "Wind": 0.1715
     }
   },
   "ML": {
@@ -61783,9 +61783,9 @@
       "Wind": 0.0929
     },
     "2024-04": {
-      "Bioenergy": 0.0252,
-      "Hydro": 0.172,
-      "Solar": 0.6815,
+      "Bioenergy": 0.0253,
+      "Hydro": 0.1717,
+      "Solar": 0.6817,
       "Wind": 0.1213
     },
     "2024-05": {
@@ -61838,45 +61838,45 @@
     },
     "2025-01": {
       "Bioenergy": 0.0397,
-      "Hydro": 0.2242,
-      "Solar": 0.5288,
+      "Hydro": 0.2241,
+      "Solar": 0.5289,
       "Wind": 0.2073
     },
     "2025-02": {
       "Bioenergy": 0.0361,
-      "Hydro": 0.2009,
-      "Solar": 0.6164,
-      "Wind": 0.1466
+      "Hydro": 0.2008,
+      "Solar": 0.6166,
+      "Wind": 0.1465
     },
     "2025-03": {
-      "Bioenergy": 0.0292,
-      "Hydro": 0.163,
-      "Solar": 0.6762,
-      "Wind": 0.1315
+      "Bioenergy": 0.0291,
+      "Hydro": 0.1627,
+      "Solar": 0.6769,
+      "Wind": 0.1313
     },
     "2025-04": {
-      "Bioenergy": 0.0262,
-      "Hydro": 0.156,
-      "Solar": 0.7229,
-      "Wind": 0.0949
+      "Bioenergy": 0.026,
+      "Hydro": 0.1556,
+      "Solar": 0.7236,
+      "Wind": 0.0947
     },
     "2025-05": {
-      "Bioenergy": 0.0214,
-      "Hydro": 0.1454,
-      "Solar": 0.7438,
-      "Wind": 0.0894
+      "Bioenergy": 0.0213,
+      "Hydro": 0.1445,
+      "Solar": 0.7448,
+      "Wind": 0.0893
     },
     "2025-06": {
-      "Bioenergy": 0.0198,
-      "Hydro": 0.1343,
-      "Solar": 0.7544,
-      "Wind": 0.0915
+      "Bioenergy": 0.0197,
+      "Hydro": 0.1326,
+      "Solar": 0.7564,
+      "Wind": 0.0913
     },
     "2025-07": {
-      "Bioenergy": 0.0203,
-      "Hydro": 0.1305,
-      "Solar": 0.7749,
-      "Wind": 0.0743
+      "Bioenergy": 0.02,
+      "Hydro": 0.1289,
+      "Solar": 0.7765,
+      "Wind": 0.0746
     }
   },
   "MU": {
@@ -67495,10 +67495,10 @@
       "Wind": 0.5322
     },
     "2024-04": {
-      "Bioenergy": 0.0544,
+      "Bioenergy": 0.0603,
       "Hydro": 0.0016,
-      "Solar": 0.3773,
-      "Wind": 0.5668
+      "Solar": 0.3934,
+      "Wind": 0.5448
     },
     "2024-05": {
       "Bioenergy": 0.0793,
@@ -67585,10 +67585,10 @@
       "Wind": 0.3578
     },
     "2025-07": {
-      "Bioenergy": 0.0448,
+      "Bioenergy": 0.0686,
       "Hydro": 0,
-      "Solar": 0.5973,
-      "Wind": 0.3578
+      "Solar": 0.6417,
+      "Wind": 0.2897
     }
   },
   "NO": {
@@ -73763,8 +73763,8 @@
     "2025-05": {
       "Bioenergy": 0.0607,
       "Hydro": 0.0437,
-      "Solar": 0.5503,
-      "Wind": 0.3453
+      "Solar": 0.5505,
+      "Wind": 0.3452
     },
     "2025-06": {
       "Bioenergy": 0.0476,
@@ -73773,9 +73773,9 @@
       "Wind": 0.4134
     },
     "2025-07": {
-      "Bioenergy": 0.0316,
-      "Hydro": 0.0368,
-      "Solar": 0.6167,
+      "Bioenergy": 0.0315,
+      "Hydro": 0.0367,
+      "Solar": 0.6168,
       "Wind": 0.3149
     }
   },
@@ -75643,8 +75643,8 @@
     "2025-01": {
       "Bioenergy": 0.0677,
       "Hydro": 0.3409,
-      "Solar": 0.1115,
-      "Wind": 0.4799
+      "Solar": 0.1116,
+      "Wind": 0.4798
     },
     "2025-02": {
       "Bioenergy": 0.0627,
@@ -75654,7 +75654,7 @@
     },
     "2025-03": {
       "Bioenergy": 0.0558,
-      "Hydro": 0.4247,
+      "Hydro": 0.4246,
       "Solar": 0.1555,
       "Wind": 0.3641
     },
@@ -75662,25 +75662,25 @@
       "Bioenergy": 0.0632,
       "Hydro": 0.4393,
       "Solar": 0.174,
-      "Wind": 0.3235
+      "Wind": 0.3234
     },
     "2025-05": {
       "Bioenergy": 0.0673,
-      "Hydro": 0.4121,
-      "Solar": 0.292,
+      "Hydro": 0.4119,
+      "Solar": 0.2923,
       "Wind": 0.2285
     },
     "2025-06": {
-      "Bioenergy": 0.0831,
-      "Hydro": 0.2584,
-      "Solar": 0.3795,
-      "Wind": 0.2791
+      "Bioenergy": 0.083,
+      "Hydro": 0.2575,
+      "Solar": 0.3806,
+      "Wind": 0.2789
     },
     "2025-07": {
-      "Bioenergy": 0.0819,
-      "Hydro": 0.1776,
-      "Solar": 0.3921,
-      "Wind": 0.3483
+      "Bioenergy": 0.0818,
+      "Hydro": 0.1768,
+      "Solar": 0.3928,
+      "Wind": 0.3487
     }
   },
   "PY": {
@@ -77547,44 +77547,44 @@
     "2025-01": {
       "Bioenergy": 0.0314,
       "Hydro": 0.5383,
-      "Solar": 0.1063,
+      "Solar": 0.1064,
       "Wind": 0.324
     },
     "2025-02": {
       "Bioenergy": 0.0305,
-      "Hydro": 0.5033,
-      "Solar": 0.1484,
+      "Hydro": 0.5032,
+      "Solar": 0.1485,
       "Wind": 0.3178
     },
     "2025-03": {
       "Bioenergy": 0.0262,
       "Hydro": 0.489,
-      "Solar": 0.1958,
-      "Wind": 0.289
+      "Solar": 0.1959,
+      "Wind": 0.2889
     },
     "2025-04": {
       "Bioenergy": 0.0179,
-      "Hydro": 0.5123,
-      "Solar": 0.2356,
-      "Wind": 0.2342
+      "Hydro": 0.5121,
+      "Solar": 0.2359,
+      "Wind": 0.2341
     },
     "2025-05": {
       "Bioenergy": 0.0155,
-      "Hydro": 0.518,
-      "Solar": 0.2579,
-      "Wind": 0.2085
+      "Hydro": 0.5176,
+      "Solar": 0.2584,
+      "Wind": 0.2084
     },
     "2025-06": {
       "Bioenergy": 0.0156,
-      "Hydro": 0.4695,
-      "Solar": 0.345,
-      "Wind": 0.1699
+      "Hydro": 0.4691,
+      "Solar": 0.3454,
+      "Wind": 0.1698
     },
     "2025-07": {
       "Bioenergy": 0.024,
-      "Hydro": 0.4086,
-      "Solar": 0.3802,
-      "Wind": 0.1871
+      "Hydro": 0.4082,
+      "Solar": 0.3805,
+      "Wind": 0.1873
     }
   },
   "RS": {
@@ -78023,7 +78023,7 @@
     "2025-01": {
       "Bioenergy": 0.0213,
       "Hydro": 0.8606,
-      "Solar": 0.002,
+      "Solar": 0.0021,
       "Wind": 0.116
     },
     "2025-02": {
@@ -78040,21 +78040,21 @@
     },
     "2025-04": {
       "Bioenergy": 0.0184,
-      "Hydro": 0.861,
-      "Solar": 0.005,
+      "Hydro": 0.8609,
+      "Solar": 0.0051,
       "Wind": 0.1156
     },
     "2025-05": {
       "Bioenergy": 0.0282,
-      "Hydro": 0.8198,
-      "Solar": 0.0375,
-      "Wind": 0.1146
+      "Hydro": 0.8184,
+      "Solar": 0.0389,
+      "Wind": 0.1145
     },
     "2025-06": {
-      "Bioenergy": 0.0493,
-      "Hydro": 0.782,
-      "Solar": 0.0385,
-      "Wind": 0.1303
+      "Bioenergy": 0.0492,
+      "Hydro": 0.7813,
+      "Solar": 0.0392,
+      "Wind": 0.1302
     },
     "2025-07": {
       "Bioenergy": 0.0579,
@@ -82728,9 +82728,9 @@
     },
     "2024-04": {
       "Bioenergy": 0.0218,
-      "Hydro": 0.723,
-      "Solar": 0.2161,
-      "Wind": 0.0391
+      "Hydro": 0.7228,
+      "Solar": 0.2162,
+      "Wind": 0.0392
     },
     "2024-05": {
       "Bioenergy": 0.014,
@@ -92326,8 +92326,8 @@
     },
     "2025-05": {
       "Bioenergy": 0.0487,
-      "Hydro": 0.4997,
-      "Solar": 0.2633,
+      "Hydro": 0.4996,
+      "Solar": 0.2634,
       "Wind": 0.1883
     },
     "2025-06": {
@@ -99918,45 +99918,45 @@
     },
     "2025-01": {
       "Bioenergy": 0.0473,
-      "Hydro": 0.396,
-      "Solar": 0.0525,
-      "Wind": 0.5041
+      "Hydro": 0.3959,
+      "Solar": 0.0529,
+      "Wind": 0.5039
     },
     "2025-02": {
-      "Bioenergy": 0.0587,
-      "Hydro": 0.4176,
-      "Solar": 0.1035,
-      "Wind": 0.4202
+      "Bioenergy": 0.0586,
+      "Hydro": 0.4173,
+      "Solar": 0.1042,
+      "Wind": 0.4199
     },
     "2025-03": {
-      "Bioenergy": 0.0236,
-      "Hydro": 0.4174,
-      "Solar": 0.0716,
-      "Wind": 0.4874
+      "Bioenergy": 0.0235,
+      "Hydro": 0.417,
+      "Solar": 0.0724,
+      "Wind": 0.487
     },
     "2025-04": {
-      "Bioenergy": 0.0322,
-      "Hydro": 0.5256,
-      "Solar": 0.1253,
-      "Wind": 0.317
+      "Bioenergy": 0.032,
+      "Hydro": 0.5245,
+      "Solar": 0.1272,
+      "Wind": 0.3163
     },
     "2025-05": {
       "Bioenergy": 0.0242,
-      "Hydro": 0.4195,
-      "Solar": 0.1153,
-      "Wind": 0.4409
+      "Hydro": 0.4173,
+      "Solar": 0.1193,
+      "Wind": 0.4393
     },
     "2025-06": {
-      "Bioenergy": 0.0287,
-      "Hydro": 0.4348,
-      "Solar": 0.1635,
-      "Wind": 0.373
+      "Bioenergy": 0.0286,
+      "Hydro": 0.4323,
+      "Solar": 0.1667,
+      "Wind": 0.3724
     },
     "2025-07": {
-      "Bioenergy": 0.0299,
-      "Hydro": 0.4455,
-      "Solar": 0.1618,
-      "Wind": 0.3628
+      "Bioenergy": 0.0295,
+      "Hydro": 0.4437,
+      "Solar": 0.1631,
+      "Wind": 0.3637
     }
   },
   "YE": {