Skip to content

136 support higher pandas versions #137

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
FelixStege merged 3 commits into from
Mar 6, 2026
Merged

136 support higher pandas versions #137

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f2ca2ee
Update base.py
FelixStege Mar 6, 2026
34a621e
Update supervisory_control.py
FelixStege Mar 6, 2026
cd4edff
Update besmod.py
FelixStege Mar 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions bes-rules/bes_rules/simulation_based_optimization/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,8 @@ def mp_obj(self, x, *args):
if result_kpis is None:
_log_df.loc[self._instance_counter + idx] = np.NAN
else:
_log_df.loc[self._instance_counter + idx, result_kpis.keys()] = result_kpis.values()
_log_df.loc[self._instance_counter + idx, filtered_parameters[idx].keys()] = filtered_parameters[idx].values()
_log_df.loc[self._instance_counter + idx, result_kpis.keys()] = list(result_kpis.values())
_log_df.loc[self._instance_counter + idx, filtered_parameters[idx].keys()] = list(filtered_parameters[idx].values())

# Add objectives
for obj in self.config.objectives:
Expand Down
2 changes: 1 addition & 1 deletion bes-rules/bes_rules/simulation_based_optimization/besmod.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ def simulate(self, parameters, log_df):
else file_path_mat
)
log_df.loc[idx_to_use, "model_name"] = self.config.simulation.model_name.replace("\n", "")
log_df.loc[idx_to_use, single_parameters.keys()] = single_parameters.values()
log_df.loc[idx_to_use, single_parameters.keys()] = list(single_parameters.values())

logger.info(f"Simulating {len(parameters)} combinations")
results = self.sim_api.simulate(
Expand Down
2 changes: 1 addition & 1 deletion bes-rules/bes_rules/simulation_based_optimization/supervisory_control.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def simulate(self, parameters, log_df):
func_kwargs = []
for idx, design_parameters in enumerate(parameters):
# Add parameters to df
log_df.loc[self._instance_counter + idx, design_parameters.keys()] = design_parameters.values()
log_df.loc[self._instance_counter + idx, design_parameters.keys()] = list(design_parameters.values())
path = self.get_log_path().parent.joinpath(self.get_result_file_name_for_idx(idx) + ".xlsx")

# Size PV accordingly
Expand Down