Skip to content

Fix error when simulated data is a float and not a matrix #140

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
rolfjl merged 1 commit into from
Mar 11, 2026
Merged

Fix error when simulated data is a float and not a matrix #140

Show file tree
Hide file tree
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
5 changes: 4 additions & 1 deletion pipt/misc_tools/data_tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,10 @@ def en_pred_to_pred_data(en_pred):
if has_data:
member_list = []
for el in en_pred:
member_data = el[ind][typ][:, np.newaxis]
if not isinstance(el[ind][typ],np.ndarray):
member_data = np.array([el[ind][typ]])[:, np.newaxis]
else:
member_data = el[ind][typ][:, np.newaxis]
member_list.append(member_data)

data_type_dict[typ] = np.concatenate(tuple(member_list), axis=1)
Expand Down
8 changes: 4 additions & 4 deletions popt/cost_functions/ecalc_npv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,10 @@ def ecalc_npv(pred_data, **kwargs):
Qgp.append([])
Qwp.append([])
Qwi.append([])
Qop[l].append(np.squeeze(pred_data[i][l]['fopt']) - np.squeeze(pred_data[i - 1][l]['fopt']))
Qgp[l].append(np.squeeze(pred_data[i][l]['fgpt']) - np.squeeze(pred_data[i - 1][l]['fgpt']))
Qwp[l].append(np.squeeze(pred_data[i][l]['fwpt']) - np.squeeze(pred_data[i - 1][l]['fwpt']))
Qwi[l].append(np.squeeze(pred_data[i][l]['fwit']) - np.squeeze(pred_data[i - 1][l]['fwit']))
Qop[l].append(np.squeeze(pred_data[i][l]['FOPT']) - np.squeeze(pred_data[i - 1][l]['FOPT']))
Qgp[l].append(np.squeeze(pred_data[i][l]['FGPT']) - np.squeeze(pred_data[i - 1][l]['FGPT']))
Qwp[l].append(np.squeeze(pred_data[i][l]['FWPT']) - np.squeeze(pred_data[i - 1][l]['FWPT']))
Qwi[l].append(np.squeeze(pred_data[i][l]['FWIT']) - np.squeeze(pred_data[i - 1][l]['FWIT']))
Dd.append((report[1][i] - report[1][i - 1]).days)
T.append((report[1][i] - report[1][0]).days)

Expand Down
8 changes: 4 additions & 4 deletions popt/cost_functions/npv.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,10 @@ def npv(pred_data, **kwargs):

values = []
for i in np.arange(1, len(pred_data)):
Qop = np.squeeze(pred_data[i]['fopt']) - np.squeeze(pred_data[i - 1]['fopt'])
Qgp = np.squeeze(pred_data[i]['fgpt']) - np.squeeze(pred_data[i - 1]['fgpt'])
Qwp = np.squeeze(pred_data[i]['fwpt']) - np.squeeze(pred_data[i - 1]['fwpt'])
Qwi = np.squeeze(pred_data[i]['fwit']) - np.squeeze(pred_data[i - 1]['fwit'])
Qop = np.squeeze(pred_data[i]['FOPT']) - np.squeeze(pred_data[i - 1]['FOPT'])
Qgp = np.squeeze(pred_data[i]['FGPT']) - np.squeeze(pred_data[i - 1]['FGPT'])
Qwp = np.squeeze(pred_data[i]['FWPT']) - np.squeeze(pred_data[i - 1]['FWPT'])
Qwi = np.squeeze(pred_data[i]['FWIT']) - np.squeeze(pred_data[i - 1]['FWIT'])
delta_days = (report[1][i] - report[1][0]).days

val = (Qop * npv_const['wop'] + Qgp * npv_const['wgp'] - Qwp * npv_const['wwp'] - Qwi * npv_const['wwi']) / (
Expand Down
Loading