[WIP] - Support ODEs as equations in JumpSystem #3181
+217
−50
Conversation
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
isaacsas
commented
Nov 4, 2024
src/systems/jumps/jumpsystem.jl
Outdated
Comment on lines
493
to
500
| osys = ODESystem(equations(sys).x[4], get_iv(sys), unknowns(sys), parameters(sys); | ||
| observed = observed(sys), name = nameof(sys), description = description(sys), | ||
| systems = get_systems(sys), defaults = defaults(sys), | ||
| discrete_events = discrete_events(sys), | ||
| parameter_dependencies = parameter_dependencies(sys), | ||
| metadata = get_metadata(sys), gui_metadata = get_gui_metadata(sys)) | ||
| osys = complete(osys) | ||
| return ODEProblem(osys, u0map, tspan, parammap; check_length, kwargs...) |
There was a problem hiding this comment.
This seemed like the best way to handle generating the underlying ODEProblem, but happy to consider alternative approaches if anyone has feedback.
|
@ChrisRackauckas where should callbacks be handled here, the ODEProblem or the JumpProblem? (And actually, I'm not even sure in the lower-level interface what is supposed to be done within JumpProcesses -- are passing some callbacks to both problems and/or just the wrapped ODEProblem allowed and supposed to work?) |
|
For now I've made it that continuous events are passed to the generated ODEProblem but discrete events go via the JumpProblem. This will need some tests to check that works consistently. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Note this assumes a user has properly classified their jumps (i.e. they haven't made something a constant rate jump that has a condition that depends on a variable rate jump variable and/or an ODE modified variable).