Fixes for Julia v1.0

.travis.yml

@@ -5,11 +5,9 @@ os:
 julia:
   - 0.6
   - 0.7
+  - 1.0
 notifications:
   email: false
-script:
-  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-  - julia -e 'Pkg.clone(pwd()); Pkg.build("ECOS"); Pkg.test("ECOS"; coverage=true)'
 after_success:
   - julia -e 'cd(Pkg.dir("ECOS")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())'
   - julia -e 'cd(Pkg.dir("ECOS")); Pkg.add("Coverage"); using Coverage; Codecov.submit(Codecov.process_folder())'

REQUIRE

@@ -3,4 +3,4 @@ BinDeps
 MathProgBase 0.5 0.8
 MathOptInterface 0.5.1 0.6
 @osx Homebrew
-Compat 0.63
+Compat 0.68

appveyor.yml

@@ -2,6 +2,7 @@ environment:
   matrix:
   - julia_version: 0.6
   - julia_version: 0.7
+  - julia_version: 1.0
 
 platform:
   - x86 # 32-bit

src/MOIWrapper.jl

@@ -61,14 +61,19 @@ end
 mutable struct Optimizer <: MOI.AbstractOptimizer
     cone::ConeData
     maxsense::Bool
-    data::Union{Void, ModelData} # only non-Void between MOI.copy! and MOI.optimize!
+    data::Union{Nothing, ModelData} # only non-Nothing between MOI.copy! and MOI.optimize!
     sol::Solution
     options
     function Optimizer(; kwargs...)
         new(ConeData(), false, nothing, Solution(), kwargs)
     end
 end
 
+if VERSION >= v"0.7-"
+    # TODO remove when updating to MOI v0.6
+    Base.broadcastable(optimizer::Optimizer) = Ref(optimizer)
+end
+
 function MOI.isempty(instance::Optimizer)
     !instance.maxsense && instance.data === nothing
 end
@@ -214,12 +219,12 @@ function MOIU.loadconstraint!(instance::Optimizer, ci, f::MOI.VectorAffineFuncti
     else
         instance.cone.ineqnrows[offset] = length(rows)
     end
-    i = offset + rows
+    i = offset .+ rows
     # The ECOS format is b - Ax ∈ cone
     # so minus=false for b and minus=true for A
     b, Is, Js, Vs = matrix(instance, s)
-    b[i] = scalecoef(rows, orderval(f.constants, s), false, s)
-    append!(Is, offset + orderidx(I, s))
+    b[i] .= scalecoef(rows, orderval(f.constants, s), false, s)
+    append!(Is, offset .+ orderidx(I, s))
     append!(Js, J)
     append!(Vs, scalecoef(I, V, true, s))
 end
@@ -343,7 +348,7 @@ end
 function MOI.get(instance::Optimizer, ::MOI.VariablePrimal, vi::VI)
     instance.sol.primal[vi.value]
 end
-MOI.get(instance::Optimizer, a::MOI.VariablePrimal, vi::Vector{VI}) = MOI.get.(instance, a, vi)
+MOI.get(instance::Optimizer, a::MOI.VariablePrimal, vi::Vector{VI}) = MOI.get.(instance, Ref(a), vi)
 # setconstant: Retrieve set constant stored in `ConeData` during `copy!`
 setconstant(instance::Optimizer, offset, ::CI{<:MOI.AbstractFunction, <:MOI.EqualTo}) = instance.cone.eqsetconstant[offset]
 setconstant(instance::Optimizer, offset, ::CI) = instance.cone.ineqsetconstant[offset]
@@ -360,7 +365,7 @@ end
 function MOI.get(instance::Optimizer, ::MOI.ConstraintPrimal, ci::CI{<:MOI.AbstractFunction, S}) where S <: MOI.AbstractSet
     offset = constroffset(instance, ci)
     rows = constrrows(instance, ci)
-    _unshift(instance, offset, scalecoef(rows, reorderval(instance.sol.slack[offset + rows], S), false, S), ci)
+    _unshift(instance, offset, scalecoef(rows, reorderval(instance.sol.slack[offset .+ rows], S), false, S), ci)
 end
 
 function MOI.canget(instance::Optimizer, ::MOI.DualStatus)
@@ -390,7 +395,7 @@ _dual(instance, ci::CI) = instance.sol.dual_ineq
 function MOI.get(instance::Optimizer, ::MOI.ConstraintDual, ci::CI{<:MOI.AbstractFunction, S}) where S <: MOI.AbstractSet
     offset = constroffset(instance, ci)
     rows = constrrows(instance, ci)
-    scalecoef(rows, reorderval(_dual(instance, ci)[offset + rows], S), false, S)
+    scalecoef(rows, reorderval(_dual(instance, ci)[offset .+ rows], S), false, S)
 end
 
 MOI.canget(instance::Optimizer, ::MOI.ResultCount) = true

src/MPBWrapper.jl

@@ -375,7 +375,7 @@ function MPB.loadproblem!(m::ECOSMathProgModel, c, A, b, constr_cones, var_cones
             append!(exp_rows, [idxs[1],idxs[3],idxs[2]])
 
             # override update_row_map to handle the permutation
-            m.row_map_type[idxs] = :ExpPrimal
+            m.row_map_type[idxs] .= :ExpPrimal
             m.row_map_ind[idxs[1]] = neq_cur_ind
             m.row_map_ind[idxs[3]] = neq_cur_ind+1
             m.row_map_ind[idxs[2]] = neq_cur_ind+2

test/MPBWrapper.jl

@@ -12,8 +12,16 @@
 end
 
 import ECOS
+
+import MathProgBase
+@static if VERSION >= v"0.7-"
+    const MPB_test_path = joinpath(dirname(pathof(MathProgBase)), "..", "test")
+else
+    const MPB_test_path = joinpath(Pkg.dir("MathProgBase"), "test")
+end
+
 @testset "Run the conic interface test from MathProgBase.jl" begin
-    include(joinpath(Pkg.dir("MathProgBase"),"test","conicinterface.jl"))
+    include(joinpath(MPB_test_path, "conicinterface.jl"))
     coniclineartest(ECOS.ECOSSolver(), duals=true)
     conicSOCtest(ECOS.ECOSSolver(), duals=true)
     @static if !Compat.Sys.iswindows()
@@ -25,6 +33,6 @@ import ECOS
         conicEXPtest(ECOS.ECOSSolver(), duals=true)
     end
 
-    include(joinpath(Pkg.dir("MathProgBase"),"test","quadprog.jl"))
+    include(joinpath(MPB_test_path, "quadprog.jl"))
     socptest(ECOS.ECOSSolver())
 end