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

Refactor classification to have additional keyword arguments #147

Closed
wants to merge 3 commits into from
Closed

Refactor classification to have additional keyword arguments #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
814b281
Refactor classification and transformation functions with additional …
oameye Jan 8, 2024
e3703d1
Also work for functions
oameye Jan 8, 2024
1d1dafd
forgot anothert kwarg
oameye Jan 8, 2024
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
12 changes: 6 additions & 6 deletions src/classification.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,20 +20,20 @@ classify_solutions!(res, "sqrt(u1^2 + v1^2) > 1.0" , "large_amplitude")
```

"""
function classify_solutions!(res::Result, func::Union{String, Function}, name::String; physical=true)
values = classify_solutions(res, func; physical=physical)
function classify_solutions!(res::Result, func::Union{String, Function}, name::String; physical=true, kwargs...)
values = classify_solutions(res, func; physical=physical, kwargs...)
res.classes[name] = values
end


function classify_solutions(res::Result, func; physical=true)
function classify_solutions(res::Result, func; physical=true, kwargs...)
func = isa(func, Function) ? func : _build_substituted(func, res)
if physical
f_comp(soln) = _is_physical(soln) && func(real.(soln))
transform_solutions(res, f_comp)
f_comp(soln; kwargs...) = _is_physical(soln) && func(real.(soln); kwargs...)
transform_solutions(res, f_comp; kwargs...)

else
transform_solutions(res, func)
transform_solutions(res, func; kwargs...)
end
end

Expand Down
6 changes: 3 additions & 3 deletions src/transform_solutions.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ Takes a `Result` object and a string `f` representing a Symbolics.jl expression.
Returns an array with the values of `f` evaluated for the respective solutions.
Additional substitution rules can be specified in `rules` in the format `("a" => val)` or `(a => val)`
"""
function transform_solutions(res::Result, func; branches = 1:branch_count(res))
function transform_solutions(res::Result, func; branches = 1:branch_count(res), kwargs...)
# preallocate an array for the numerical values, rewrite parts of it
# when looping through the solutions
pars = res.swept_parameters |> values |> collect
n_vars = length(get_variables(res))
n_pars = length(pars)

vtype = isa(Base.invokelatest(func, rand(ComplexF64, n_vars+n_pars)), Bool) ? BitVector : Vector{ComplexF64}
vtype = isa(Base.invokelatest(func, rand(ComplexF64, n_vars+n_pars); kwargs...), Bool) ? BitVector : Vector{ComplexF64}
transformed = _similar(vtype, res; branches=branches)

batches = Iterators.partition(CartesianIndices(res.solutions), ceil(Int, length(res.solutions)/Threads.nthreads()))
Expand All @@ -30,7 +30,7 @@ function transform_solutions(res::Result, func; branches = 1:branch_count(res))
end
for (k, branch) in enumerate(branches)
_vals[1:n_vars] .= res.solutions[idx][branch]
transformed[idx][k] = Base.invokelatest(func, _vals) # beware, func may be mutating
transformed[idx][k] = Base.invokelatest(func, _vals; kwargs...) # beware, func may be mutating
end
end
end
Expand Down
Loading