diff --git a/src/JuMP.jl b/src/JuMP.jl index 7f688451351..cea3cc2289d 100644 --- a/src/JuMP.jl +++ b/src/JuMP.jl @@ -77,7 +77,7 @@ type Model colCat::Vector{Symbol} # Variable cones of the form, e.g. (:SDP, 1:9) - varCones::Vector{Tuple{Symbol,Any}} + varCones::Vector{@compat Tuple{Symbol,Any}} # Solution data objVal @@ -144,7 +144,7 @@ function Model(;solver=UnsetSolver()) Float64[], # colLower Float64[], # colUpper Symbol[], # colCat - Vector{Tuple{Symbol,Any}}[], # varCones + Vector{@compat Tuple{Symbol,Any}}[], # varCones 0, # objVal Float64[], # colVal Float64[], # redCosts @@ -496,7 +496,9 @@ end typealias AffExpr GenericAffExpr{Float64,Variable} AffExpr() = zero(AffExpr) +# TODO: remove these when no longer supporting v0.3 AffExpr(x::Union(Number,Variable)) = convert(AffExpr, x) +AffExpr(x::AffExpr) = x Base.isempty(a::AffExpr) = (length(a.vars) == 0 && a.constant == 0.) Base.convert(::Type{AffExpr}, v::Variable) = AffExpr([v], [1.], 0.)