diff --git a/src/containers.jl b/src/containers.jl index 2d68998cdf1..737bf6f92aa 100644 --- a/src/containers.jl +++ b/src/containers.jl @@ -6,7 +6,7 @@ include("JuMPArray.jl") validarrayindexset(::Base.OneTo) = true -validarrayindexset(r::UnitRange) = start(r) == 1 +validarrayindexset(r::UnitRange) = first(r) == 1 validarrayindexset(s) = false """ diff --git a/src/operators.jl b/src/operators.jl index 30cc7b16386..b8916d72db1 100644 --- a/src/operators.jl +++ b/src/operators.jl @@ -52,7 +52,7 @@ Base.:*(lhs::AbstractJuMPScalar) = lhs # make this more generic so extensions do Base.:+(lhs::AbstractVariableRef, rhs::Number) = (+)( rhs,lhs) Base.:-(lhs::AbstractVariableRef, rhs::Number) = (+)(-rhs,lhs) Base.:*(lhs::AbstractVariableRef, rhs::Number) = (*)(rhs,lhs) -Base.:/(lhs::AbstractVariableRef, rhs::Number) = (*)(1./rhs,lhs) +Base.:/(lhs::AbstractVariableRef, rhs::Number) = (*)(1.0/rhs,lhs) # AbstractVariableRef--AbstractVariableRef Base.:+(lhs::V, rhs::V) where V <: AbstractVariableRef = GenericAffExpr(0.0, lhs => 1.0, rhs => 1.0) Base.:-(lhs::V, rhs::V) where V <: AbstractVariableRef = GenericAffExpr(0.0, lhs => 1.0, rhs => -1.0)