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

fix: merge_strategy() is an instance, not a type #164

Merged
merged 3 commits into from
Dec 28, 2022
Merged

fix: merge_strategy() is an instance, not a type #164

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
f0b50dc
merge_strategy is an instance not a type
kalmarek Nov 23, 2022
273a118
unused type parameters: silence warnings
kalmarek Nov 23, 2022
514f55a
bump to 0.8.7
kalmarek Nov 23, 2022
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 Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name = "COSMO"
uuid = "1e616198-aa4e-51ec-90a2-23f7fbd31d8d"
authors = ["Michael <[email protected]>"]
version = "0.8.6"
version = "0.8.7"

[deps]
AMD = "14f7f29c-3bd6-536c-9a0b-7339e30b5a3e"
Expand Down
4 changes: 2 additions & 2 deletions src/accelerator_interface.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ end
check_activation!(ws::Workspace, activation_reason::AccuracyActivation, num_iter::Int64) = nothing


function check_activation!(ws::Workspace, activation_reason::AccuracyActivation, r::ResultInfo) where {T <: AbstractFloat}
function check_activation!(ws::Workspace, activation_reason::AccuracyActivation, r::ResultInfo)
if !ws.accelerator_active
tol = activation_reason.start_accuracy

Expand All @@ -45,7 +45,7 @@ function check_activation!(ws::Workspace, activation_reason::AccuracyActivation,
end
end

check_activation!(ws::Workspace, activation_reason::Union{IterActivation, ImmediateActivation}, r::ResultInfo) where {T <: AbstractFloat}= nothing
check_activation!(ws::Workspace, activation_reason::Union{IterActivation, ImmediateActivation}, r::ResultInfo) = nothing


"""
Expand Down
2 changes: 1 addition & 1 deletion src/types.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ mutable struct SparsityPattern
# clique merging only if more than one clique present
if sntree.num > 1
merge_cliques!(sntree)
elseif merge_strategy <: AbstractGraphBasedMerge
elseif merge_strategy isa AbstractGraphBasedMerge
# if no merging attempt happens for a clique graph, we still have to convert the snd and sep back to Array{Array{Int}, 1}
# for consistency
sntree.snd = sort.(collect.(sntree.snd))
Expand Down