Skip to content

Commit

Permalink
Switch back to Pavito
Browse files Browse the repository at this point in the history
  • Loading branch information
@blegat
blegat committed Aug 11, 2020
1 parent 0069251 commit 38892ed
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 18 deletions.
2 changes: 2 additions & 0 deletions .travis.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ os:
julia:
- 1.0
- 1
before_script:
- julia -e 'using Pkg; Pkg.add(PackageSpec(name="Pavito", rev="master"))'
jobs:
allow_failures:
- julia: nightly
Expand Down
3 changes: 2 additions & 1 deletion Project.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,9 @@ Cbc = "9961bab8-2fa3-5c5a-9d89-47fab24efd76"
GLPK = "60bf3e95-4087-53dc-ae20-288a0d20c6a6"
Ipopt = "b6b21f68-93f8-5de0-b562-5493be1d77c9"
Juniper = "2ddba703-00a4-53a7-87a5-e8b9971dde84"
Pavito = "cd433a01-47d1-575d-afb7-6db927ee8d8f"
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

[targets]
test = ["Cbc", "GLPK", "Ipopt", "Juniper", "Pkg", "Test"]
test = ["Cbc", "GLPK", "Ipopt", "Juniper", "Pavito", "Pkg", "Test"]
34 changes: 17 additions & 17 deletions test/algorithm.jl
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
@testset " Validation Test || AMP-TMC || basic solve || examples/nlp1.jl" begin

test_solver = optimizer_with_attributes(Alpine.Optimizer, "nlp_solver" => IPOPT,
"mip_solver" => JUNIPER,
"mip_solver" => PAVITO,
"bilinear_convexhull" => false,
"monomial_convexhull" => false,
"presolve_bt" => false,
Expand Down Expand Up @@ -85,7 +85,7 @@ end
@testset " Validation Test || PBT-AMP-TMC || basic solve || examples/nlp3.jl" begin

test_solver = optimizer_with_attributes(Alpine.Optimizer, "nlp_solver" => IPOPT,
"mip_solver" => JUNIPER,
"mip_solver" => PAVITO,
"bilinear_convexhull" => false,
"loglevel" =>100,
"maxiter" => 2,
Expand All @@ -105,7 +105,7 @@ end

@testset " Validation Test || AMP-CONV || basic solve || examples/nlp1.jl" begin
test_solver = optimizer_with_attributes(Alpine.Optimizer, "nlp_solver" => IPOPT,
"mip_solver" => JUNIPER,
"mip_solver" => PAVITO,
"bilinear_convexhull" => true,
"monomial_convexhull" => true,
"presolve_bt" => false,
Expand Down Expand Up @@ -138,7 +138,7 @@ end
@testset " Validation Test || AMP || basic solve || examples/circle.jl" begin
test_solver=optimizer_with_attributes(Alpine.Optimizer,
"nlp_solver" => IPOPT,
"mip_solver" => JUNIPER,
"mip_solver" => PAVITO,
"disc_abs_width_tol" => 1e-2,
"disc_ratio" => 8,
"maxiter" => 6,
Expand All @@ -155,7 +155,7 @@ end

@testset " Validation Test || AMP || basic solve || examples/circleN.jl" begin
test_solver=optimizer_with_attributes(Alpine.Optimizer, "nlp_solver" => IPOPT,
"mip_solver" => JUNIPER,
"mip_solver" => PAVITO,
"disc_abs_width_tol" => 1e-2,
"disc_ratio" => 8,
presolve_bt = false,
Expand All @@ -170,7 +170,7 @@ end

@testset " Validation Test || AMP-CONV-FACET || basic solve || examples/nlp1.jl" begin
test_solver = optimizer_with_attributes(Alpine.Optimizer, "nlp_solver" => IPOPT,
"mip_solver" => JUNIPER,
"mip_solver" => PAVITO,
"bilinear_convexhull" => true,
"monomial_convexhull" => true,
"presolve_bt" => false,
Expand Down Expand Up @@ -423,7 +423,7 @@ end
end

@testset "Operator :: bmpl && binlin && binprod solve test I" begin
test_solver=optimizer_with_attributes(Alpine.Optimizer, "minlp_solver" => JUNIPER,
test_solver=optimizer_with_attributes(Alpine.Optimizer, "minlp_solver" => PAVITO,
"nlp_solver" => IPOPT,
"mip_solver" => CBC,
"presolve_bt" => false,
Expand All @@ -447,7 +447,7 @@ end
end

@testset "Operator :: bmpl && binlin && binprod solve test II" begin
test_solver=optimizer_with_attributes(Alpine.Optimizer, "minlp_solver" => JUNIPER,
test_solver=optimizer_with_attributes(Alpine.Optimizer, "minlp_solver" => PAVITO,
"nlp_solver" => IPOPT,
"mip_solver" => CBC,
"presolve_bt" => false,
Expand Down Expand Up @@ -483,7 +483,7 @@ end

@testset "Embedding Test || AMP-CONV || basic solve || examples/nlp1.jl" begin
test_solver = optimizer_with_attributes(Alpine.Optimizer, "nlp_solver" => IPOPT,
"mip_solver" => JUNIPER,
"mip_solver" => PAVITO,
"bilinear_convexhull" => true,
"monomial_convexhull" => true,
"presolve_bt" => false,
Expand All @@ -500,7 +500,7 @@ end

@testset "Embedding Test || AMP || special problem || ... " begin
test_solver=optimizer_with_attributes(Alpine.Optimizer, "nlp_solver" => IPOPT,
"mip_solver" => JUNIPER,
"mip_solver" => PAVITO,
"disc_abs_width_tol" => 1e-2,
"disc_ratio" => 8,
"maxiter" => 6,
Expand All @@ -518,7 +518,7 @@ end

@testset "Embedding IBS Test || AMP-CONV || basic solve || examples/nlp1.jl" begin
test_solver = optimizer_with_attributes(Alpine.Optimizer, "nlp_solver" => IPOPT,
"mip_solver" => JUNIPER,
"mip_solver" => PAVITO,
"bilinear_convexhull" => true,
"monomial_convexhull" => true,
"presolve_bt" => false,
Expand Down Expand Up @@ -554,7 +554,7 @@ end

@testset "Embedding IBS Test || AMP || special problem || ... " begin
test_solver=optimizer_with_attributes(Alpine.Optimizer, "nlp_solver" => IPOPT,
"mip_solver" => JUNIPER,
"mip_solver" => PAVITO,
"disc_abs_width_tol" => 1e-2,
"disc_ratio" => 8,
"maxiter" => 6,
Expand All @@ -573,7 +573,7 @@ end

@testset "Embedding LINK Test || AMP-CONV || basic solve || examples/nlp1.jl" begin
test_solver = optimizer_with_attributes(Alpine.Optimizer, "nlp_solver" => IPOPT,
"mip_solver" => JUNIPER,
"mip_solver" => PAVITO,
"bilinear_convexhull" => true,
"monomial_convexhull" => true,
"presolve_bt" => false,
Expand Down Expand Up @@ -609,7 +609,7 @@ end

@testset "Embedding LINK Test || AMP || special problem || ... " begin
test_solver=optimizer_with_attributes(Alpine.Optimizer, "nlp_solver" => IPOPT,
"mip_solver" => JUNIPER,
"mip_solver" => PAVITO,
"disc_abs_width_tol" => 1e-2,
"disc_ratio" => 8,
"maxiter" => 6,
Expand Down Expand Up @@ -640,7 +640,7 @@ end

@testset " Algorithm Logic Test || blend029_gl || 3 iterations || Infeasible Case" begin

test_solver=optimizer_with_attributes(Alpine.Optimizer, "minlp_solver" => JUNIPER,
test_solver=optimizer_with_attributes(Alpine.Optimizer, "minlp_solver" => PAVITO,
"nlp_solver" => IPOPT,
"mip_solver" => CBC,
"presolve_bp" => true,
Expand All @@ -659,7 +659,7 @@ end

@testset "Convex Model Solve" begin
test_solver=optimizer_with_attributes(Alpine.Optimizer, "nlp_solver" => IPOPT,
"mip_solver" => JUNIPER,
"mip_solver" => PAVITO,
"maxiter" => 1,
"presolve_bt" => false,
"loglevel" =>100)
Expand All @@ -684,7 +684,7 @@ end

@testset "Algorithm Test with binprod terms" begin

test_solver = optimizer_with_attributes(Alpine.Optimizer, "minlp_solver" => JUNIPER,
test_solver = optimizer_with_attributes(Alpine.Optimizer, "minlp_solver" => PAVITO,
"nlp_solver" => IPOPT,
"mip_solver" => CBC,
"bilinear_convexhull" => true,
Expand Down
1 change: 1 addition & 0 deletions test/runtests.jl
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ const IPOPT_SB = optimizer_with_attributes(Ipopt.Optimizer, MOI.Silent() => true
const IPOPT_9999 = optimizer_with_attributes(Ipopt.Optimizer, MOI.Silent() => true, "max_iter" => 9999)
const CBC = optimizer_with_attributes(Cbc.Optimizer, MOI.Silent() => true)
const JUNIPER = optimizer_with_attributes(Juniper.Optimizer, MOI.Silent() => true, "mip_solver" => CBC, "nl_solver" => IPOPT_SB)
const PAVITO = optimizer_with_attributes(Pavito.Optimizer, MOI.Silent() => true, "mip_solver" => CBC, "cont_solver" => IPOPT_SB)



Expand Down

0 comments on commit 38892ed

Please sign in to comment.