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

Ensemble refactor #153

Merged
merged 39 commits into from
Dec 12, 2023
Merged

Ensemble refactor #153

merged 39 commits into from
Dec 12, 2023

Conversation

jClugstor
Copy link
Collaborator

No description provided.

@jClugstor
Copy link
Collaborator Author

I think I based this branch on another branch, which is why it has all of those commits that are already in main in there. I tried rebasing but it got weird very quickly :( . Anyway, the last 5 commits are the relevant ones in this case.

Comment on lines 221 to 228
obj::JSON3.Object = JSON3.Object() # untouched JSON from request sent by HMI
id::String = "sciml-$(UUIDs.uuid4())" # matches DataServiceModel :id
route::String = "unknown" # :simulate, :calibrate, etc.
model::Union{Nothing, JSON3.Object} = nothing # ASKEM Model Representation (AMR)
models::Union{Nothing, Vector{JSON3.Object}} = nothing # Multiple models (in AMR)
timespan::Union{Nothing, NTuple{2, Float64}} = nothing # (start, end)
df::Union{Nothing, DataFrame} = nothing # dataset (calibrate only)
result::Any = nothing # store result of job
Copy link
Collaborator

Choose a reason for hiding this comment

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

What is the diff here? I don't see any changes, right?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I think I changed something here, then changed it back, but didn't change the spacing back. I'll fix that.

@jClugstor jClugstor merged commit dafde6f into DARPA-ASKEM:main Dec 12, 2023
2 checks passed
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.

2 participants