diff --git a/.travis.yml b/.travis.yml index be4459d..89de129 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,7 +3,6 @@ os: - linux - osx julia: - - 0.6 - 0.7 - 1.0 notifications: @@ -16,6 +15,6 @@ addons: - libgmp-dev - libglpk-dev before_script: - - julia -e 'if VERSION >= v"0.7-"; using Pkg; Pkg.add(PackageSpec(name="JuMP", rev="master")); Pkg.add(PackageSpec(url="https://github.com/JuliaStochOpt/ParameterJuMP.jl.git")); else Pkg.add("JuMP"); Pkg.checkout("JuMP"); Pkg.clone("https://github.com/JuliaStochOpt/ParameterJuMP.jl.git"); end' + - julia -e 'using Pkg; Pkg.add(PackageSpec(name="JuMP", rev="master")); Pkg.add(PackageSpec(url="https://github.com/JuliaStochOpt/ParameterJuMP.jl.git"))' after_success: - julia -e 'cd(Pkg.dir("StructJuMP")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())' diff --git a/README.md b/README.md index 39a699b..62def8d 100644 --- a/README.md +++ b/README.md @@ -13,10 +13,10 @@ i.e. JuMP v0.18.x, to try this package with JuMP v0.18, simply do ``` The development of this package for JuMP v0.18.x is done in the `release-0.1` branch. -The `master` branch of this package works with the JuMP v0.19-alpha. To try this -package with JuMP v0.19-alpha, do: +The `master` branch of this package works with the JuMP development version. To +try this package with JuMP master, do: ```julia -] add JuMP#v0.19-alpha +] add JuMP#master ] add StructJuMP#master ``` diff --git a/REQUIRE b/REQUIRE index 7da6123..4732888 100644 --- a/REQUIRE +++ b/REQUIRE @@ -1,5 +1,4 @@ -julia 0.6 +julia 0.7 MathOptInterface 0.6 JuMP 0.18.2+ ParameterJuMP -Compat 0.70 diff --git a/src/Benders_pmap.jl b/src/Benders_pmap.jl index 74114af..90af1fe 100644 --- a/src/Benders_pmap.jl +++ b/src/Benders_pmap.jl @@ -30,15 +30,15 @@ function optimize(model::ParametrizedModel) variable_value = Dict{JuMP.VariableRef, Float64}() if feasible for vref in values(model.variable_map) - variable_value[vref] = JuMP.result_value(vref) + variable_value[vref] = JuMP.value(vref) end for θ in values(model.θ) - variable_value[θ] = JuMP.result_value(θ) + variable_value[θ] = JuMP.value(θ) end end parameter_dual = Dict{Parameter, Float64}() for parameter in values(model.parameter_map) - parameter_dual[parameter] = JuMP.result_dual(parameter) + parameter_dual[parameter] = JuMP.dual(parameter) end Solution(feasible, objective_value, variable_value, parameter_dual) end diff --git a/src/StructJuMP.jl b/src/StructJuMP.jl index d60d1b0..388a2b8 100644 --- a/src/StructJuMP.jl +++ b/src/StructJuMP.jl @@ -2,8 +2,6 @@ module StructJuMP export StructuredModel -using Compat - using MathOptInterface const MOI = MathOptInterface @@ -19,7 +17,7 @@ end mutable struct StructuredModel <: JuMP.AbstractModel # Structured data - parent::Union{StructuredModel, Compat.Nothing} + parent::Union{StructuredModel, Nothing} children::Dict{Int, StructuredModel} probability::Dict{Int, Float64} num_scen::Int @@ -74,7 +72,7 @@ getprobability(model::StructuredModel) = model.probability num_scenarios(model::StructuredModel) = model.num_scen default_probability(model::StructuredModel) = 1 / num_scenarios(model) -default_probability(::Compat.Nothing) = 1.0 +default_probability(::Nothing) = 1.0 #### Model #### @@ -85,9 +83,7 @@ struct StructuredVariableRef <: JuMP.AbstractVariableRef model::StructuredModel # `model` owning the variable idx::Int # Index in `model.variables` end -if VERSION >= v"0.7-" - Base.broadcastable(v::StructuredVariableRef) = Ref(v) -end +Base.broadcastable(v::StructuredVariableRef) = Ref(v) Base.copy(v::StructuredVariableRef) = v Base.:(==)(v::StructuredVariableRef, w::StructuredVariableRef) = v.model === w.model && v.idx == w.idx JuMP.owner_model(v::StructuredVariableRef) = v.model diff --git a/test/benderstest.jl b/test/benderstest.jl index c712147..b06efa6 100644 --- a/test/benderstest.jl +++ b/test/benderstest.jl @@ -2,8 +2,7 @@ using StructJuMP using ECOS using GLPK -using Compat -using Compat.Test +using Test #misocp_solver = CbcSolver() misocp_solver = with_optimizer(GLPK.Optimizer) diff --git a/test/examples_smoketest.jl b/test/examples_smoketest.jl index 4bdc51c..d2cf9cf 100644 --- a/test/examples_smoketest.jl +++ b/test/examples_smoketest.jl @@ -1,4 +1,4 @@ -using Compat, Compat.Test +using Test include("../examples/easy_test.jl") diff --git a/test/farmer.jl b/test/farmer.jl index 3a04cd5..6e5acbf 100644 --- a/test/farmer.jl +++ b/test/farmer.jl @@ -1,5 +1,4 @@ -using Compat -using Compat.Test +using Test using GLPK diff --git a/test/printhook.jl b/test/printhook.jl index 84dac6e..91b7d70 100644 --- a/test/printhook.jl +++ b/test/printhook.jl @@ -1,5 +1,4 @@ -using Compat -using Compat.Test +using Test using StructJuMP