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.

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

Integration of DAE module #93

Draft
wants to merge 10 commits into
base: master
Choose a base branch
from
Draft

Integration of DAE module #93

wants to merge 10 commits into from

Conversation

j-koch
Copy link
Collaborator

@j-koch j-koch commented Oct 2, 2023

  • updates GeneralNetworkedODE class for syntax compatible with DAEs
  • new GeneralNetworkedAE class for handling algebraic variable updates
  • new integrator - EulerDAE
  • New examples to demonstrate DAE, including black-box neural DAEs
  • updated NetworkODE examples to conform to new syntax

@drgona
Copy link
Contributor

drgona commented Oct 4, 2023

Failed test:
FAILED test_ode.py::test_random_network - TypeError: SourceSink.init() got an unexpected keyword argument 'state_names'

I suggest the DAE example in the script contains only the DAE part and not the black box NODE.
https://github.com/pnnl/neuromancer/blob/dae_update/examples/ODEs/Part_7_DAE.py
And lets break it into two examples: balck-box DAE and gray-box DAE.

I suggest we create an abstract DAESystem class to serve a similar purpose as ODESystem - no network stuff.
https://github.com/pnnl/neuromancer/blob/master/src/neuromancer/dynamics/ode.py#L53

As of now the API is unnecessarily complicated for the simple example. This is a consequence of working with the GeneralNetworkedODE class.

If designed correctly, we should not need new integrator classes such as EulerDAE.

I believe we should create the following classes:

  • ODESystem: base abstract class for ODE systems (black to white box)
  • DAESystem: base abstract class for DAE systems (black to white box)
  • GeneralNetworkedODE: networked ODE systems
  • GeneralNetworkedDAE: networked DAEsystems - i.e., we need to merge GeneralNetworkedODE with GeneralNetworkedAE

@madelynshapiro madelynshapiro marked this pull request as draft October 16, 2023 19:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants