📦 🚑 Fixed a problem with multi-events + pandas version (#66)

Rebuilding production was incorrectly distributed in multiple events simulation,
leading to more capital being rebuilt than what was possible. This is now fixed.
Also, I loosened the restriction on pandas version.

Author: spjuhel

boario/model_base.py

@@ -1329,12 +1329,30 @@ def distribute_production(
             )
 
         elif h_reb:
-            house_shares = np.ones(house_reb_dem_tot_per_event.shape)
+            tot_reb_dem_divider = np.tile(
+                tot_rebuilding_demand_summed[:, np.newaxis],
+                (1, indus_reb_dem_tot_per_event.shape[1]),
+            )
+            house_shares = np.divide(
+                house_reb_dem_tot_per_event,
+                tot_reb_dem_divider,
+                out=np.zeros_like(house_reb_dem_tot_per_event),
+                where=tot_reb_dem_divider != 0,
+            )
             indus_shares = np.zeros(indus_reb_dem_tot_per_event.shape)
         elif ind_reb:
+            tot_reb_dem_divider = np.tile(
+                tot_rebuilding_demand_summed[:, np.newaxis],
+                (1, indus_reb_dem_tot_per_event.shape[1]),
+            )
+            indus_shares = np.divide(
+                indus_reb_dem_tot_per_event,
+                tot_reb_dem_divider,
+                out=np.zeros_like(indus_reb_dem_tot_per_event),
+                where=tot_reb_dem_divider != 0,
+            )
             house_shares = np.zeros(house_reb_dem_tot_per_event.shape)
-            indus_shares = np.ones(indus_reb_dem_tot_per_event.shape)
-            # logger.debug("indus_shares: {}".format(indus_shares.shape))
+
         else:
             return []
 

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "boario"
-version = "0.5.3"
+version = "0.5.4"
 description = "BoARIO : The Adaptative Regional Input Output model in python."
 authors = ["Samuel Juhel <pro@sjuhel.org>"]
 license = "GNU General Public License v3 or later (GPLv3+)"
@@ -14,7 +14,7 @@ dask = ">=2023"
 numpy = "<1.24"
 numpyencoder = "^0.3.0"
 odfpy = "^1.4.1"
-pandas = ">=1.5,<2.0"
+pandas = ">=1.5"
 progressbar2 = "^4.2.0"
 pyarrow = ">=11"
 pymrio = ">=0.4"