Skip to content

Correct set alignment #86

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

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Correct set alignment #86

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions src/osemosys_step/main_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,15 +504,20 @@ def apply_option_data(original: pd.DataFrame, option: pd.DataFrame) -> pd.DataFr
pd.DataFrame
dataframe with option values applied
"""
if not (original.columns.to_list()) == (option.columns.to_list()):
expected_columns = original.columns.tolist()
available_columns = [x for x in option if x in expected_columns]
if not all(x in expected_columns for x in available_columns):
logger.error(f"columns for original are {original.columns} and columns to apply are {option.columns}")
logger.error("Exiting...")
sys.exit()
option = option[list(original)] # align column headers
df = pd.concat([original, option])
subset = list(df)
subset.remove("VALUE") # For dropping duplicates
df = df.drop_duplicates(keep="last", subset=subset).reset_index(drop=True)
if original.empty:
df = option
else:
df = pd.concat([original, option])
sets = list(df)
sets.remove("VALUE") # For dropping duplicates
df = df.drop_duplicates(keep="last", subset=sets).reset_index(drop=True)
return df

def get_res_cap_next_steps(step: int, n_steps: int, data_path: str, actual_yrs_in_steps: Dict) -> pd.DataFrame:
Expand Down
Loading