Merge branch 'master' into rs/delref

rschwarz · rschwarz · commit d6482f9f6bde · 2020-05-15T21:35:12.000+02:00
diff --git a/.travis.yml b/.travis.yml
@@ -1,30 +1,32 @@
 # Documentation: http://docs.travis-ci.com/user/languages/julia/
 language: julia
 os: linux
-dist: xenial
+dist: bionic
 addons:
   apt:
     packages:
     - libblas3
     - libc6
     - libgcc1
-    - libgfortran3
+    - libgfortran4
     - libgmp10
-    - libgsl2
+    - libgsl23
     - liblapack3
+    - libquadmath0
     - libstdc++6
+    - libtbb2
     - zlib1g
 sudo: true
 julia:
-  - 1.3
+  - 1.4
 notifications:
   email: false
 git:
   depth: 99999999
 before_install:
-  - export VERSION=6.0.1
+  - export VERSION=7.0.0
   - wget http://scip.zib.de/download/release/SCIPOptSuite-$VERSION-Linux.deb
   - sudo dpkg -i SCIPOptSuite-$VERSION-Linux.deb
   - export SCIPOPTDIR=/usr
 after_success:
-  - julia -e 'VERSION != v"1.1" && exit(0); using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
+  - julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'
diff --git a/Project.toml b/Project.toml
@@ -26,17 +26,17 @@ CairoMakie = "^0.1.2"
 Combinatorics = "^1.0.0"
 DataStructures = "^0.17.10"
 Distances = "^0.8.2"
-GLPK = "^0.11.0"
+GLPK = "^0.13.0"
 JSON = "^0.21.0"
-JuMP = "^0.20.0"
+JuMP = "^0.21.2"
 LightGraphs = "^1.3.0"
-MathOptInterface = "^0.9.12"
-SCIP = "^0.9.4"
-SCS = "^0.6.0"
+MathOptInterface = "^0.9.13"
+SCIP = "^0.9.5"
+SCS = "^0.6.6"
 StaticArrays = "^0.12.1"
 Triangulate = "^0.4.3"
 Unitful = "^1.0.0"
-julia = "^1.3.0"
+julia = "^1.4.0"
 
 [extras]
 GLPK = "60bf3e95-4087-53dc-ae20-288a0d20c6a6"
diff --git a/examples/debug_cuts.jl b/examples/debug_cuts.jl
@@ -16,8 +16,7 @@ topo = Topology([Node(t...) for t in [(0,22), (0,0), (25,22), (25,0), (45,22), (
 
 inst = Instance(nodes, demand, bounds, diams, ploss_coeff_nice)
 
-_glpk = JuMP.with_optimizer(GLPK.Optimizer)
-solver = GndStr.IterGBD(_glpk, _glpk, addnogoods=false, maxiter=10)
+solver = GndStr.IterGBD(GLPK.Optimizer, GLPK.Optimizer, addnogoods=false, maxiter=10)
 result = optimize(inst, topo, solver);
 
 @show result.status
diff --git a/examples/lns_boundcmp.jl b/examples/lns_boundcmp.jl
@@ -21,7 +21,7 @@ bounds = fill(Bounds(40, 80), 4)
 diams = map(Diameter, [1, 2], [1, 2])
 inst = Instance(terminals, demand, bounds, diams, ploss_coeff_nice)
 
-_scip = JuMP.with_optimizer(SCIP.Optimizer, limits_gap=0.001)
+_scip = JuMP.optimizer_with_attributes(SCIP.Optimizer, "limits/gap" => 0.001)
 
 function pipedim()
     println("### Pipe Dimensioning LP model, path topology ###")
diff --git a/examples/minlp_callbacks.jl b/examples/minlp_callbacks.jl
@@ -8,7 +8,7 @@ mutable struct Problem
 end
 
 function make_model(nonlin=false)::Problem
-    m = Model(solver=SCIP.Optimizer(display_verblevel=3))
+    m = Model(SCIP.Optimizer)
 
     @variable(m, x[1:9], Bin)
     @variable(m, -1 ≤ y[1:9] ≤ 1)
diff --git a/examples/warmstart_boundcmp.jl b/examples/warmstart_boundcmp.jl
@@ -24,8 +24,11 @@ fstw = Topology(nodes, [Arc(5,6), Arc(5,1), Arc(2,5), Arc(3,6), Arc(6,4)])
 
 # instead of calling `optimize` we do the steps manually
 
-scip = JuMP.with_optimizer(
-    SCIP.Optimizer, limits_gap=0.01, heuristics_completesol_maxunknownrate=1.0)
+scip = JuMP.optimizer_with_attributes(
+    SCIP.Optimizer,
+    "limits/gap" => 0.01,
+    "heuristics/completesol/maxunknownrate" => 1.0
+)
 solver = JuncLoc.NLP(scip)
 model, x, y, L, l, π = PipeLayout.JuncLoc.make_nlp(inst, fstw, solver)
 
diff --git a/experiments/config/gs_dd_gbdcb_both.jl b/experiments/config/gs_dd_gbdcb_both.jl
@@ -3,8 +3,12 @@ using SCIP
 using GLPK
 
 solver = GndStr.CallbackGBD(
-    JuMP.with_optimizer(SCIP.Optimizer, display_width=139, limits_memory=5000.0),
-    JuMP.with_optimizer(GLPK.Optimizer),
+    JuMP.optimizer_with_attributes(
+        SCIP.Optimizer,
+        "display/width" => 139,
+        "limits/memory" => 5000.0
+    ),
+    GLPK.Optimizer,
     addnogoods=true,
     addcritpath=true,
     timelimit=3600.0)
diff --git a/experiments/config/gs_dd_itergbd_both.jl b/experiments/config/gs_dd_itergbd_both.jl
@@ -3,8 +3,12 @@ using SCIP
 using GLPK
 
 solver = GndStr.IterGBD(
-    JuMP.with_optimizer(SCIP.Optimizer, display_width=139, limits_memory=5000.0),
-    JuMP.with_optimizer(GLPK.Optimizer),
+    JuMP.optimizer_with_attributes(
+        SCIP.Optimizer,
+        "display/width" => 139,
+        "limits/memory" => 5000.0
+    ),
+    GLPK.Optimizer,
     addnogoods=true,
     addcritpath=true,
     maxiter=Int(1e9),
diff --git a/experiments/config/gs_dd_itergbd_critpath.jl b/experiments/config/gs_dd_itergbd_critpath.jl
@@ -3,8 +3,12 @@ using SCIP
 using GLPK
 
 solver = GndStr.IterGBD(
-    JuMP.with_optimizer(SCIP.Optimizer, display_width=139, limits_memory=5000.0),
-    JuMP.with_optimizer(GLPK.Optimizer),
+    JuMP.optimizer_with_attributes(
+        SCIP.Optimizer,
+        "display/width" => 139,
+        "limits/memory" => 5000.0
+    ),
+    GLPK.Optimizer,
     addnogoods=false,
     addcritpath=true,
     maxiter=Int(1e9),
diff --git a/experiments/config/gs_dd_itergbd_nogoods.jl b/experiments/config/gs_dd_itergbd_nogoods.jl
@@ -3,8 +3,12 @@ using SCIP
 using GLPK
 
 solver = GndStr.IterGBD(
-    JuMP.with_optimizer(SCIP.Optimizer, display_width=139, limits_memory=5000.0),
-    JuMP.with_optimizer(GLPK.Optimizer),
+    JuMP.optimizer_with_attributes(
+        SCIP.Optimizer,
+        "display/width" => 139,
+        "limits/memory" => 5000.0
+    ),
+    GLPK.Optimizer,
     addnogoods=true,
     addcritpath=false,
     maxiter=Int(1e9),
diff --git a/experiments/config/gs_dd_itertopo.jl b/experiments/config/gs_dd_itertopo.jl
@@ -2,7 +2,15 @@ using JuMP
 using SCIP
 
 solver = GndStr.IterTopo(
-    JuMP.with_optimizer(SCIP.Optimizer, display_width=139, limits_memory=5000.0),
-    JuMP.with_optimizer(SCIP.Optimizer, display_width=139, limits_memory=5000.0),
+    JuMP.optimizer_with_attributes(
+        SCIP.Optimizer,
+        "display/width" => 139,
+        "limits/memory" => 5000.0
+    ),
+    JuMP.optimizer_with_attributes(
+        SCIP.Optimizer,
+        "display/width" => 139,
+        "limits/memory" => 5000.0
+    ),
     maxiter=Int(1e9),
     timelimit=3600.0)
diff --git a/experiments/config/gs_dd_minlp.jl b/experiments/config/gs_dd_minlp.jl
@@ -2,6 +2,10 @@ using JuMP
 using SCIP
 
 solver = GndStr.MINLP(
-    JuMP.with_optimizer(SCIP.Optimizer, display_width=139, limits_memory=5000.0),
+    JuMP.optimizer_with_attributes(
+        SCIP.Optimizer,
+        "display/width" => 139,
+        "limits/memory" => 5000.0
+    ),
     timelimit=3600.0,
     writemodels=true)
diff --git a/experiments/config/gs_dd_topocb.jl b/experiments/config/gs_dd_topocb.jl
@@ -2,6 +2,14 @@ using JuMP
 using SCIP
 
 solver = GndStr.CallbackTopo(
-    JuMP.with_optimizer(SCIP.Optimizer, display_width=139, limits_memory=5000.0),
-    JuMP.with_optimizer(SCIP.Optimizer, display_width=139, limits_memory=5000.0),
+    JuMP.optimizer_with_attributes(
+        SCIP.Optimizer,
+        "display/width" => 139,
+        "limits/memory" => 5000.0
+    ),
+    JuMP.optimizer_with_attributes(
+        SCIP.Optimizer,
+        "display/width" => 139,
+        "limits/memory" => 5000.0
+    ),
     timelimit=3600.0)
diff --git a/src/models/gndstruct_discdiam/cbtopo.jl b/src/models/gndstruct_discdiam/cbtopo.jl
@@ -5,8 +5,8 @@ Discrete Diameters.
 Solver object to store parameter values.
 """
 struct CallbackTopo <: GroundStructureSolver
-    mastersolver::JuMP.OptimizerFactory
-    subsolver::JuMP.OptimizerFactory
+    mastersolver
+    subsolver
     timelimit::Float64 # seconds
     writemodels::Bool
 
diff --git a/src/models/gndstruct_discdiam/gbdsubhdlr.jl b/src/models/gndstruct_discdiam/gbdsubhdlr.jl
@@ -3,7 +3,7 @@ Constraint handler solving the GBD subproblem (fixed z).
 """
 mutable struct GBDSubHdlr <: SCIP.AbstractConstraintHandler
     scip::SCIP.Optimizer # of master problem
-    subsolver::JuMP.OptimizerFactory # for subproblems
+    subsolver            # for subproblems
     finaltime::Float64 # seconds
     addcritpath::Bool
     addnogoods::Bool
diff --git a/src/models/gndstruct_discdiam/itergbd.jl b/src/models/gndstruct_discdiam/itergbd.jl
@@ -9,8 +9,8 @@ struct IterGBD <: GroundStructureSolver
     maxiter::Int
     timelimit::Float64 # seconds
     writemodels::Bool
-    mastersolver::JuMP.OptimizerFactory
-    subsolver::JuMP.OptimizerFactory
+    mastersolver
+    subsolver
 
     function IterGBD(mastersolver, subsolver;
                      addnogoods=false, addcritpath=true, maxiter::Int=100,
@@ -45,8 +45,7 @@ struct Master
 end
 
 "Build model for master problem (ground structure with discrete diameters)."
-function make_master(inst::Instance, topo::Topology,
-                     optimizer::JuMP.OptimizerFactory)
+function make_master(inst::Instance, topo::Topology, optimizer)
     nodes, nnodes = topo.nodes, length(topo.nodes)
     arcs, narcs = topo.arcs, length(topo.arcs)
     terms, nterms = inst.nodes, length(inst.nodes)
@@ -71,7 +70,7 @@ function make_master(inst::Instance, topo::Topology,
     maxflow = 0.5 * sum(abs.(inst.demand))
 
     # always use direct mode for SCIP
-    model = JuMP.direct_model(optimizer())
+    model = JuMP.direct_model(MOI.instantiate(optimizer))
 
     # select arcs from topology with y
     @variable(model, y[1:narcs], Bin)
@@ -117,8 +116,7 @@ Build model for subproblem (ground structure with discrete diameters).
 Corresponds to the domain relaxation with pressure loss overestimation, which
 can be turned off via the flag `relaxed`.
 """
-function make_sub(inst::Instance, topo::Topology, cand::CandSol,
-                  optimizer::JuMP.OptimizerFactory;
+function make_sub(inst::Instance, topo::Topology, cand::CandSol, optimizer;
                   relaxed::Bool=true)
     nodes, nnodes = topo.nodes, length(topo.nodes)
     arcs, narcs = topo.arcs, length(topo.arcs)
@@ -196,7 +194,7 @@ where x_i and y_j take values 0 or 1, with exactly one term active per sum.
 The coefficients a, b, c are returned.
 """
 function linear_overest(values::Matrix{Float64}, cand_i::Int, cand_j::Int,
-                        optimizer::JuMP.OptimizerFactory)
+                        optimizer)
     m, n = size(values)
 
     @assert 1 <= cand_i <= m
diff --git a/src/models/gndstruct_discdiam/itertopo.jl b/src/models/gndstruct_discdiam/itertopo.jl
@@ -6,8 +6,8 @@ Solver object to store parameter values.
 struct IterTopo <: GroundStructureSolver
     maxiter::Int
     timelimit::Float64 # seconds
-    mastersolver::JuMP.OptimizerFactory
-    subsolver::JuMP.OptimizerFactory
+    mastersolver
+    subsolver
     writemodels::Bool
 
     function IterTopo(mastersolver, subsolver;
@@ -22,8 +22,7 @@ Build master model using only arc selection y and flows q.
 This is used to enumerate (embedded) topologies, each of which is evaluated with
 a "semi-subproblem". Returns model and variables y, q.
 """
-function make_semimaster(inst::Instance, topo::Topology,
-                         optimizer::JuMP.OptimizerFactory)
+function make_semimaster(inst::Instance, topo::Topology, optimizer)
     nodes, nnodes = topo.nodes, length(topo.nodes)
     arcs, narcs = topo.arcs, length(topo.arcs)
     terms, nterms = inst.nodes, length(inst.nodes)
@@ -47,7 +46,7 @@ function make_semimaster(inst::Instance, topo::Topology,
     maxflow = 0.5 * sum(abs.(inst.demand))
 
     # always use direct mode with SCIP
-    model = JuMP.direct_model(optimizer())
+    model = JuMP.direct_model(MOI.instantiate(optimizer))
 
     # select arcs from topology with y
     @variable(model, y[1:narcs], Bin)
@@ -87,8 +86,7 @@ be used
 
 Returns model, list of candidate arcs and (sparse) variables z
 """
-function make_semisub(inst::Instance, topo::Topology, cand::CandSol,
-                      optimizer::JuMP.OptimizerFactory)
+function make_semisub(inst::Instance, topo::Topology, cand::CandSol, optimizer)
     nnodes = length(topo.nodes)
     arcs = topo.arcs
     termidx = termindex(topo.nodes, inst.nodes)
diff --git a/src/models/gndstruct_discdiam/minlp.jl b/src/models/gndstruct_discdiam/minlp.jl
@@ -1,5 +1,5 @@
 struct MINLP <: GroundStructureSolver
-    solver::JuMP.OptimizerFactory # to solve MINLP model
+    solver             # to solve MINLP model
     contz::Bool
     timelimit::Float64 # seconds
     writemodels::Bool
@@ -15,8 +15,7 @@ Build MINLP model for instance on given ground structure.
 To be solved with given MPB solver (capable of NLP).
 Use continuous variables 0 ≤ z ≤ 1 if `contz` is true.
 """
-function make_minlp(inst::Instance, topo::Topology,
-                    optimizer::JuMP.OptimizerFactory; contz=false)
+function make_minlp(inst::Instance, topo::Topology, optimizer; contz=false)
     nodes, nnodes = topo.nodes, length(topo.nodes)
     arcs, narcs = topo.arcs, length(topo.arcs)
     terms, nterms = inst.nodes, length(inst.nodes)
@@ -56,7 +55,7 @@ function make_minlp(inst::Instance, topo::Topology,
     C = inst.ploss_coeff * L
 
     # always use SCIP directly
-    model = JuMP.direct_model(optimizer())
+    model = JuMP.direct_model(MOI.instantiate(optimizer))
 
     # select arcs from topology
     @variable(model, y[1:narcs], Bin)
diff --git a/src/models/gndstruct_discdiam/semisubhdlr.jl b/src/models/gndstruct_discdiam/semisubhdlr.jl
@@ -3,7 +3,7 @@ Constraint handler solving the semi-subproblem (fixed y, binary z).
 """
 mutable struct SemiSubHdlr <: SCIP.AbstractConstraintHandler
     scip::SCIP.Optimizer
-    solver::JuMP.OptimizerFactory
+    solver
     finaltime::Float64 # seconds
     counter::Int
     primal_bound::Float64
diff --git a/src/models/junctionlocation/nlp.jl b/src/models/junctionlocation/nlp.jl
@@ -1,5 +1,5 @@
 struct NLP <: JunctionLocationSolver
-    optimizer::JuMP.OptimizerFactory # for underlying NLP model
+    optimizer          # for underlying NLP model
     timelimit::Float64 # seconds
 
     function NLP(solver; timelimit=Inf)
diff --git a/src/models/pipedimensioning.jl b/src/models/pipedimensioning.jl
@@ -15,10 +15,10 @@ struct Result
 end
 
 struct LP <: PipeDimensioningSolver
-    lpsolver::JuMP.OptimizerFactory
+    lpsolver
 end
 
-function make_model(inst::Instance, topo::Topology, optimizer::JuMP.OptimizerFactory)
+function make_model(inst::Instance, topo::Topology, optimizer)
     nnodes = length(inst.nodes)
     length(topo.nodes) == nnodes ||
         throw(ArgumentError("Steiner nodes not allowed"))
diff --git a/test/models/gndstruct_discdiam_cb.jl b/test/models/gndstruct_discdiam_cb.jl
@@ -1,5 +1,5 @@
-_scip = JuMP.with_optimizer(SCIP.Optimizer, display_verblevel=0)
-_glpk = JuMP.with_optimizer(GLPK.Optimizer)
+_scip = JuMP.optimizer_with_attributes(SCIP.Optimizer, "display/verblevel" => 0)
+_glpk = GLPK.Optimizer
 
 @testset "Solve semi decomposition with nogoods on y (callback)" begin
     #       7    9      even arc numbers for
diff --git a/test/models/gndstruct_discdiam_iter.jl b/test/models/gndstruct_discdiam_iter.jl
@@ -1,5 +1,5 @@
-_scip = JuMP.with_optimizer(SCIP.Optimizer, display_verblevel=0)
-_glpk = JuMP.with_optimizer(GLPK.Optimizer)
+_scip = JuMP.optimizer_with_attributes(SCIP.Optimizer, "display/verblevel" => 0)
+_glpk = GLPK.Optimizer
 
 @testset "solve master problem: ground structure, discrete diameters" begin
     #       7    9      even arc numbers for
diff --git a/test/models/gndstruct_discdiam_minlp.jl b/test/models/gndstruct_discdiam_minlp.jl
@@ -1,4 +1,4 @@
-_scip = JuMP.with_optimizer(SCIP.Optimizer, display_verblevel=0)
+_scip = JuMP.optimizer_with_attributes(SCIP.Optimizer, "display/verblevel" => 0)
 
 @testset "run MINLP model" begin
     #       7    9      even arc numbers for
diff --git a/test/models/junctionlocation.jl b/test/models/junctionlocation.jl
diff --git a/test/models/junctionlocation_nlp.jl b/test/models/junctionlocation_nlp.jl
diff --git a/test/models/pipedimensioning.jl b/test/models/pipedimensioning.jl
