Skip to content
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

Fix import error for models with events and 0 states #2112

Merged
merged 2 commits into from
May 26, 2023
Merged

Fix import error for models with events and 0 states #2112

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b846543
Fix import error for models with events and 0 states
dweindl May 24, 2023
cc540db
Merge branch 'develop' into fix_2109
dweindl May 25, 2023
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: 4 additions & 0 deletions python/sdist/amici/de_export.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1993,6 +1993,10 @@ def _compute_equation(self, name: str) -> None:
]

elif name == "deltasx":
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

wouldn't it be better to integrate with the code below, i.e. add a special case for self.num_states_solver() * self.num_par() == 0?

Copy link
Member Author

@dweindl dweindl May 25, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Generally, yes. But I didn't want to increase the nesting depth further. It's already a mess.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could reuse same initialization and return in case of self.num_states_solver() * self.num_par() == 0 since simplification doesn't do anything.

if self.num_states_solver() * self.num_par() == 0:
self._eqs[name] = []
return

event_eqs = []
for ie, event in enumerate(self._events):
tmp_eq = sp.zeros(self.num_states_solver(), self.num_par())
Expand Down