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

switch to HiGHS solver #32

Merged
merged 4 commits into from
Apr 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
name = "LayeredLayouts"
uuid = "f4a74d36-062a-4d48-97cd-1356bad1de4e"
authors = ["Frames White <oxinabox@ucc.asn.au> and contributors"]
version = "0.2.5"
version = "0.2.6"

[deps]
Cbc = "9961bab8-2fa3-5c5a-9d89-47fab24efd76"
Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"
ECOS = "e2685f51-7e38-5353-a97d-a921fd2c8199"
Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
HiGHS = "87dc4568-4c63-4d18-b0c0-bb2238e4078b"
IterTools = "c8e1da08-722c-5040-9ed9-7db0dc04731e"
JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"

[compat]
Cbc = "0.7,0.8,0.9,1"
sjkelly marked this conversation as resolved.
Show resolved Hide resolved
ECOS = "0.12.1,0.13,0.14,1"
Graphs = "1.4"
HiGHS = "1"
IterTools = "1.3"
JuMP = "0.21.3, 0.22, 0.23, 1"
julia = "1"
Expand Down
2 changes: 1 addition & 1 deletion src/LayeredLayouts.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module LayeredLayouts
using Dates
using JuMP
using ECOS
using Cbc
using HiGHS
using IterTools: IterTools
using Graphs
using Random
Expand Down
2 changes: 1 addition & 1 deletion src/zarate.jl
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ In 2018 IEEE Pacific Visualization Symposium (PacificVis) (pp. 135-139). IEEE.
"""
Base.@kwdef struct Zarate <: AbstractLayout
time_limit::Dates.Period = Dates.Second(0)
ordering_solver::Any = optimizer_with_attributes(Cbc.Optimizer, "randomSeed"=>1, "randomCbcSeed"=>1)
ordering_solver::Any = optimizer_with_attributes(HiGHS.Optimizer, "random_seed" => 1)
arranging_solver::Any = ECOS.Optimizer
sjkelly marked this conversation as resolved.
Show resolved Hide resolved
end

Expand Down
Binary file modified test/references/Zarate/direct/sankey_3twos.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified test/references/Zarate/paths/sankey_3twos.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.