Fixes for latest julia 0.7 (#36)

Author: carlobaldassi

.travis.yml

@@ -5,7 +5,8 @@ os:
 #  - osx
 julia:
   - 0.6
-#  - nightly
+  - 0.7
+  - nightly
 notifications:
   email: false
 git:

REQUIRE

@@ -1,2 +1,4 @@
 julia 0.6
 MathOptInterface 0.4 0.5
+Nullables
+Compat 0.59

appveyor.yml

@@ -2,6 +2,8 @@ environment:
   matrix:
   - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.6/julia-0.6-latest-win32.exe"
   - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.6/julia-0.6-latest-win64.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x86/0.7/julia-0.7-latest-win32.exe"
+  - JULIA_URL: "https://julialang-s3.julialang.org/bin/winnt/x64/0.7/julia-0.7-latest-win64.exe"
   - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x86/julia-latest-win32.exe"
   - JULIA_URL: "https://julialangnightlies-s3.julialang.org/bin/winnt/x64/julia-latest-win64.exe"
 

src/LinQuadOptInterface.jl

@@ -8,6 +8,10 @@
 __precompile__()
 module LinQuadOptInterface
 
+using Nullables
+using Compat
+using Compat.SparseArrays
+
 using MathOptInterface
 using MathOptInterface.Utilities
 

src/constraints/scalaraffine.jl

@@ -35,7 +35,7 @@ end
 
 function addlinearconstraint!(m::LinQuadOptimizer, func::Linear, sense::Cchar, rhs)
     if abs(func.constant) > eps(Float64)
-        warn("Constant in scalar function moved into set.")
+        Compat.@warn("Constant in scalar function moved into set.")
     end
     columns = [getcol(m, term.variable_index) for term in func.terms]
     coefficients = [term.coefficient for term in func.terms]
@@ -54,7 +54,7 @@ function MOI.addconstraints!(m::LinQuadOptimizer, func::Vector{Linear}, set::Vec
     @assert length(cfunc) == length(set)
     numrows = get_number_linear_constraints(m)
     addlinearconstraints!(m, cfunc, set)
-    crefs = Vector{LCI{S}}(length(cfunc))
+    crefs = Vector{LCI{S}}(undef, length(cfunc))
     for i in 1:length(cfunc)
         m.last_constraint_reference += 1
         ref = LCI{S}(m.last_constraint_reference)
@@ -69,7 +69,7 @@ function MOI.addconstraints!(m::LinQuadOptimizer, func::Vector{Linear}, set::Vec
 end
 
 function addlinearconstraints!(m::LinQuadOptimizer, func::Vector{Linear}, set::Vector{S}) where S <: LinSets
-    addlinearconstraints!(m, func, backend_type.(m,set), [_getrhs(s) for s in set])
+    addlinearconstraints!(m, func, backend_type.(Ref(m),set), [_getrhs(s) for s in set])
 end
 
 function addlinearconstraints!(m::LinQuadOptimizer, func::Vector{Linear}, set::Vector{IV})
@@ -79,15 +79,15 @@ function addlinearconstraints!(m::LinQuadOptimizer, func::Vector{Linear}, set::V
     nnz = 0
     for (i, f) in enumerate(func)
         if abs(f.constant) > eps(Float64)
-            warn("Constant in scalar function moved into set.")
+            Compat.@warn("Constant in scalar function moved into set.")
             lowerbounds[i] -= f.constant
             upperbounds[i] -= f.constant
         end
         nnz += length(f.terms)
     end
-    row_pointers = Vector{Int}(length(func))  # index of start of each row
-    columns = Vector{Int}(nnz)                # flattened columns for each function
-    coefficients  = Vector{Float64}(nnz)      # corresponding non-zeros
+    row_pointers = Vector{Int}(undef, length(func))  # index of start of each row
+    columns = Vector{Int}(undef, nnz)                # flattened columns for each function
+    coefficients  = Vector{Float64}(undef, nnz)      # corresponding non-zeros
     i = 1
     for (fi, f) in enumerate(func)
         row_pointers[fi] = i
@@ -106,14 +106,14 @@ function addlinearconstraints!(m::LinQuadOptimizer, func::Vector{Linear}, sense:
     nnz = 0
     for (i, f) in enumerate(func)
         if abs(f.constant) > eps(Float64)
-            warn("Constant in scalar function moved into set.")
+            Compat.@warn("Constant in scalar function moved into set.")
             rhs[i] -= f.constant
         end
         nnz += length(f.terms)
     end
-    row_pointers = Vector{Int}(length(func))  # index of start of each row
-    columns = Vector{Int}(nnz)                # flattened columns for each function
-    coefficients = Vector{Float64}(nnz)       # corresponding non-zeros
+    row_pointers = Vector{Int}(undef, length(func))  # index of start of each row
+    columns = Vector{Int}(undef, nnz)                # flattened columns for each function
+    coefficients = Vector{Float64}(undef, nnz)       # corresponding non-zeros
     i = 1
     for (row, f) in enumerate(func)
         row_pointers[row] = i

src/constraints/scalarquadratic.jl

@@ -30,7 +30,7 @@ end
 
 function addquadraticconstraint!(m::LinQuadOptimizer, f::Quad, sense::Cchar, rhs::Float64)
     if abs(f.constant) > 0
-        warn("Constant in quadratic function. Moving into set")
+        Compat.@warn("Constant in quadratic function. Moving into set")
     end
     quadratic_columns_1 = [getcol(m, term.variable_index_1) for term in f.quadratic_terms]
     quadratic_columns_2 = [getcol(m, term.variable_index_2) for term in f.quadratic_terms]

src/constraints/vectoraffine.jl

@@ -37,7 +37,7 @@ function addlinearconstraint!(m::LinQuadOptimizer, func::VecLin, sense::Cchar)
     # check that there is at least a RHS for each row
     @assert maximum(outputindex) <= length(func.constants)
     # loop through to get starting position of each row
-    row_pointers = Vector{Int}(length(func.constants))
+    row_pointers = Vector{Int}(undef, length(func.constants))
     row_pointers[1] = 1
     row = 1
     for i in 2:length(pidx)

src/constraints/vectorofvariables.jl

@@ -22,7 +22,7 @@ function MOI.addconstraint!(m::LinQuadOptimizer, func::VecVar, set::S) where S <
     rows = get_number_linear_constraints(m)
     n = MOI.dimension(set)
     add_linear_constraints!(m,
-        CSRMatrix{Float64}(collect(1:n), getcol.(m, func.variables), ones(n)),
+        CSRMatrix{Float64}(collect(1:n), getcol.(Ref(m), func.variables), ones(n)),
         fill(backend_type(m, set),n),
         zeros(n)
     )
@@ -86,7 +86,7 @@ end
 
 function MOI.addconstraint!(m::LinQuadOptimizer, v::VecVar, sos::S) where S <: Union{MOI.SOS1, MOI.SOS2}
     make_problem_type_integer(m)
-    add_sos_constraint!(m, getcol.(m, v.variables), sos.weights, backend_type(m, sos))
+    add_sos_constraint!(m, getcol.(Ref(m), v.variables), sos.weights, backend_type(m, sos))
     m.last_constraint_reference += 1
     ref = VVCI{S}(m.last_constraint_reference)
     dict = constrdict(m, ref)

src/mockoptimizer.jl

@@ -58,7 +58,7 @@ mutable struct MockLinQuadModel # <: LinQuadOptInterface.LinQuadOptimizer
     ray_primal_solution::Vector{Float64}
     ray_primal_solution_stored::Vector{Vector{Float64}}
 
-    function MockLinQuadModel(env::Void,str::String="defaultname")
+    function MockLinQuadModel(env::Nothing,str::String="defaultname")
         m = new()
 
         m.sense = :minimize
@@ -117,7 +117,7 @@ function unload(from,to,warn = true)
         return out
     else
         if warn
-            warn("cant solve this model no extra solution")
+            Compat.@warn("cant solve this model no extra solution")
         end
         return to
     end
@@ -215,10 +215,10 @@ mutable struct MockLinQuadOptimizer <: LQOI.LinQuadOptimizer
     params::Dict{String,Any}
     l_rows::Vector{Int}
     q_rows::Vector{Int}
-    MockLinQuadOptimizer(::Void) = new()
+    MockLinQuadOptimizer(::Nothing) = new()
 end
 
-LQOI.LinearQuadraticModel(::Type{MockLinQuadOptimizer},env::Void) = MockLinQuadModel(env,"defaultname")
+LQOI.LinearQuadraticModel(::Type{MockLinQuadOptimizer},env::Nothing) = MockLinQuadModel(env,"defaultname")
 
 function MockLinQuadOptimizer(;kwargs...)
 
@@ -275,15 +275,15 @@ backend_type(m::MockLinQuadOptimizer, ::Val{:Lowerbound}) = Cchar('L')
 function LQOI.change_variable_bounds!(instance::MockLinQuadOptimizer, colvec, valvec, sensevec)
 
     lb_len = count(x->x==Cchar('L'), sensevec)
-    LB_val = Array{Float64}(0)
+    LB_val = Array{Float64}(undef, 0)
     sizehint!(LB_val, lb_len)
-    LB_col = Array{Cint}(0)
+    LB_col = Array{Cint}(undef, 0)
     sizehint!(LB_col, lb_len)
 
     ub_len = count(x->x==Cchar('U'), sensevec)
-    UB_val = Array{Float64}(0)
+    UB_val = Array{Float64}(undef, 0)
     sizehint!(UB_val, ub_len)
-    UB_col = Array{Cint}(0)
+    UB_col = Array{Cint}(undef, 0)
     sizehint!(UB_col, ub_len)
 
     if lb_len + ub_len != length(sensevec)
@@ -337,7 +337,7 @@ function LQOI.add_linear_constraints!(instance::MockLinQuadOptimizer, A::CSRMatr
     cols = size(instance.inner.A)[2]
     push!(rowvec,length(colvec)+1)
 
-    An = full(SparseMatrixCSC(cols,rows,rowvec,colvec,coefvec)')
+    An = Array(SparseMatrixCSC(cols,rows,rowvec,colvec,coefvec)')
 
     instance.inner.A = vcat(instance.inner.A,An)
 
@@ -363,9 +363,9 @@ function LQOI.add_ranged_constraints!(instance::MockLinQuadOptimizer, A::CSRMatr
     cols = size(instance.inner.A)[2]
     push!(rowvec,length(colvec)+1)
 
-    # An = full(sparse(rowvec,colvec,coefvec,rows,cols))
+    # An = Array(sparse(rowvec,colvec,coefvec,rows,cols))
     # @show cols,rows,rowvec,colvec,coefvec
-    An = full(SparseMatrixCSC(cols,rows,rowvec,colvec,coefvec)')
+    An = Array(SparseMatrixCSC(cols,rows,rowvec,colvec,coefvec)')
 
     instance.inner.A = vcat(instance.inner.A,An)
 
@@ -531,7 +531,7 @@ function LQOI.add_quadratic_constraint!(instance::MockLinQuadOptimizer, cols, co
     @assert length(I) == length(J) == length(V)
 
     nvars = length(instance.inner.c)
-    Q = full(sparse(I,J,V,nvars,nvars))
+    Q = Array(sparse(I,J,V,nvars,nvars))
 
     a = zeros(nvars)
     for i in eachindex(cols)
@@ -557,7 +557,7 @@ end
 function LQOI.set_quadratic_objective!(instance::MockLinQuadOptimizer, I, J, V)
     @assert length(I) == length(J) == length(V)
     n = num_vars(instance.inner)
-    Q = full(sparse(I,J,V,n,n))
+    Q = Array(sparse(I,J,V,n,n))
     # scalediagonal!(V, I, J, 0.5)
     instance.inner.Qobj = Q
     # scalediagonal!(V, I, J, 2.0)

src/solve.jl

@@ -143,7 +143,7 @@ end
 MOI.canget(m::LinQuadOptimizer, ::MOI.VariablePrimal, ::Type{VarInd}) = true
 
 function MOI.get(m::LinQuadOptimizer, ::MOI.VariablePrimal, v::Vector{VarInd})
-    MOI.get.(m, MOI.VariablePrimal(), v)
+    MOI.get.(Ref(m), MOI.VariablePrimal(), v)
 end
 MOI.canget(m::LinQuadOptimizer, ::MOI.VariablePrimal, ::Type{Vector{VarInd}}) = true