Merge pull request #41 from JuliaOpt/cb/fixdepwarns

Fix deprecation warnings on Julia 0.6

Author: mlubin

REQUIRE

@@ -1,3 +1,4 @@
 julia 0.5
 GLPK 0.2.8
 MathProgBase 0.5 0.7
+Compat 0.17.0

src/GLPKInterfaceBase.jl

@@ -1,5 +1,6 @@
 module GLPKInterfaceBase
 
+using Compat
 import GLPK
 
 importall MathProgBase.SolverInterface
@@ -28,7 +29,7 @@ export
     getrawsolver
 
 
-abstract GLPKMathProgModel <: AbstractLinearQuadraticModel
+@compat abstract type GLPKMathProgModel <: AbstractLinearQuadraticModel end
 
 function loadproblem!(lpm::GLPKMathProgModel, filename::AbstractString)
     if endswith(filename, ".mps") || endswith(filename, ".mps.gz")
@@ -393,7 +394,7 @@ function addvar!(lpm::GLPKMathProgModel, rowidx::Vector, rowcoef::Vector, collb:
     return
 end
 
-function delvars!(lpm::GLPKMathProgModel, idx::Vector) 
+function delvars!(lpm::GLPKMathProgModel, idx::Vector)
     GLPK.std_basis(lpm.inner)
     GLPK.del_cols(lpm.inner, length(idx), idx)
 end
@@ -423,7 +424,7 @@ function addconstr!(lpm::GLPKMathProgModel, colidx::Vector, colcoef::Vector, row
     return
 end
 
-function delconstrs!(lpm::GLPKMathProgModel, idx::Vector) 
+function delconstrs!(lpm::GLPKMathProgModel, idx::Vector)
     GLPK.std_basis(lpm.inner)
     GLPK.del_rows(lpm.inner, length(idx), idx)
 end

src/GLPKInterfaceLP.jl

@@ -1,5 +1,7 @@
 module GLPKInterfaceLP
 
+using Compat
+
 import GLPK
 importall MathProgBase.SolverInterface
 importall ..GLPKInterfaceBase
@@ -394,7 +396,7 @@ function getunboundedray(lpm::GLPKMathProgModelLP)
             ri > m && (ray[ri - m] = rv)
         end
 
-        if (GLPK.get_obj_dir(lp) == GLPK.MAX) $ (get_dual(lp, k) > 0)
+        if (GLPK.get_obj_dir(lp) == GLPK.MAX) ⊻ (get_dual(lp, k) > 0)
             scale!(ray, -1.0)
         end
     else