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

Jump to bottom

Parse strings in distribution definitions #104

Closed
wants to merge 2 commits into from
Closed

Parse strings in distribution definitions #104

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
02c018a
Parse strings in distribution definitions
ChrisRackauckas Jul 19, 2023
c5ebcd9
fix filename
joshday Jul 19, 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
2 changes: 1 addition & 1 deletion src/SimulationService.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@ function complete(o::OperationRequest)
tds_url = "$(TDS_URL[])/simulations/$(o.id)/upload-url?filename=$filename"
s3_url = get_json(tds_url).url
HTTP.put(s3_url, header; body=body)
update(o; status = "complete", completed_time = timestamp(), result_files = [s3_url])
update(o; status = "complete", completed_time = timestamp(), result_files = [filename])
end


Expand Down
16 changes: 15 additions & 1 deletion src/operations.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,21 @@ function amr_get(amr::JSON3.Object, sys::ODESystem, ::Val{:priors})
@info "Invalid distribution type! Distribution type was $(p.distribution.type)"
end

dist = EasyModelAnalysis.Distributions.Uniform(p.distribution.parameters.minimum, p.distribution.parameters.maximum)
minval = if p.distribution.parameters.minimum isa Number
p.distribution.parameters.minimum
elseif p.distribution.parameters.minimum isa AbstractString
@info "String in distribution minimum: $(p.distribution.parameters.minimum)"
parse(Float64, p.distribution.parameters.minimum)
end

maxval = if p.distribution.parameters.maximum isa Number
p.distribution.parameters.maximum
elseif p.distribution.parameters.maximum isa AbstractString
@info "String in distribution maximum: $(p.distribution.parameters.maximum)"
parse(Float64, p.distribution.parameters.maximum)
end

dist = EasyModelAnalysis.Distributions.Uniform(minval, maxval)
paramlist[findfirst(x->x==Symbol(p.id),namelist)] => dist
end
end
Expand Down
Loading