-
-
Notifications
You must be signed in to change notification settings - Fork 271
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
f17077f
commit f677039
Showing
2 changed files
with
33 additions
and
6 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
from cadCAD.tools.execution import easy_run | ||
from cadCAD.tools.profiling import profile_run | ||
from cadCAD.tools.utils import generic_suf | ||
from cadCAD.tools.utils import generic_suf, add_parameter_labels |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,17 +1,44 @@ | ||
from cadCAD.types import * | ||
import pandas as pd | ||
|
||
def generic_suf(variable: str, | ||
signal: str='') -> StateUpdateFunction: | ||
|
||
def generic_suf(variable: str, signal: str = "") -> StateUpdateFunction: | ||
""" | ||
Generate a State Update Function that assigns the signal value to the | ||
Generate a State Update Function that assigns the signal value to the | ||
given variable. By default, the signal has the same identifier as the | ||
variable. | ||
""" | ||
if signal is '': | ||
if signal is "": | ||
signal = variable | ||
else: | ||
pass | ||
|
||
def suf(_1, _2, _3, _4, signals: PolicyOutput) -> StateUpdateTuple: | ||
return (variable, signals[signal]) | ||
return suf | ||
|
||
return suf | ||
|
||
|
||
def add_parameter_labels(configs: list, df: pd.DataFrame) -> pd.DataFrame: | ||
"""Utility function to add the parameters to a dataframe after processing | ||
Args: | ||
configs (list): The configurations of the simulations | ||
df (pd.DataFrame): Simulation dataframe | ||
Returns: | ||
pd.DataFrame: Simulation dataframe with labels | ||
""" | ||
|
||
# Find the relevant parameters | ||
sim_params = pd.DataFrame([x.sim_config["M"] for x in configs]) | ||
sim_params[["subset", "simulation", "run"]] = [ | ||
[x.subset_id, x.simulation_id, x.run_id] for x in configs | ||
] | ||
# Fix because run_id is 0 indexed, but cadCAD dataframe is 1 indexed for runs | ||
sim_params["run"] += 1 | ||
|
||
# Join | ||
sim_params = sim_params.set_index(["subset", "simulation", "run"]) | ||
df = df.join(sim_params, on=["subset", "simulation", "run"]) | ||
return df |