Merge pull request #73 from SCIP-Interfaces/rs/mpb_tests

add more tests (in particular from MathProgBase)

Author: rschwarz

.travis.yml

@@ -17,3 +17,7 @@ notifications:
 script:
   - echo "**** running Docker"
   - docker run --env-file travis_docker_env.list -t -a STDOUT -a STDIN -a STDERR -v $PWD:/mnt leethargo/scip-julia /mnt/travis_docker_test_script.sh $TRAVIS_JULIA_VERSION
+after_success:
+  # push coverage results to Coveralls, .cov files were copied back by script above
+  - echo "**** submitting coverage information"
+  - julia -e 'using Pkg; Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder()); Codecov.submit(Codecov.process_folder())'

README.md

@@ -2,6 +2,8 @@
 Julia interface to [SCIP](http://scip.zib.de) solver.
 
 [![Build Status](https://travis-ci.org/SCIP-Interfaces/SCIP.jl.svg?branch=master)](https://travis-ci.org/SCIP-Interfaces/SCIP.jl)
+[![Coverage Status](https://coveralls.io/repos/github/SCIP-Interfaces/SCIP.jl/badge.svg?branch=master)](https://coveralls.io/github/SCIP-Interfaces/SCIP.jl?branch=master)
+[![codecov](https://codecov.io/gh/SCIP-Interfaces/SCIP.jl/branch/master/graph/badge.svg)](https://codecov.io/gh/SCIP-Interfaces/SCIP.jl)
 
 ## Related Projects
 

src/mpb_interface.jl

@@ -246,13 +246,13 @@ MathProgBase.getnodecount(m::SCIPLinearQuadraticModel) = error("Not implemented
 
 function MathProgBase.addsos1!(m::SCIPLinearQuadraticModel, idx, weight)
     nidx = Cint(length(idx))
-    cidx = convert(Vector{Cint}, idx - 1)
+    cidx = convert(Vector{Cint}, idx .- 1)
     _addSOS1(m, nidx, cidx, weight, Ptr{Cint}(C_NULL))
 end
 
 function MathProgBase.addsos2!(m::SCIPLinearQuadraticModel, idx, weight)
     nidx = Cint(length(idx))
-    cidx = convert(Vector{Cint}, idx - 1)
+    cidx = convert(Vector{Cint}, idx .- 1)
     _addSOS2(m, nidx, cidx, weight, Ptr{Cint}(C_NULL))
 end
 
@@ -286,8 +286,10 @@ function MathProgBase.addquadconstr!(m::SCIPLinearQuadraticModel, linearidx, lin
         crhs = rhs
     end
     _addQuadCons(m, Cint(length(linearidx)), convert(Vector{Cint}, linearidx .- 1),
-                 linearval, Cint(length(quadrowidx)), convert(Vector{Cint}, quadrowidx .- 1),
-                 convert(Vector{Cint}, quadcolidx .- 1), quadval, clhs, crhs, Ptr{Cint}(C_NULL))
+                 convert(Vector{Cdouble}, linearval), Cint(length(quadrowidx)),
+                 convert(Vector{Cint}, quadrowidx .- 1),
+                 convert(Vector{Cint}, quadcolidx .- 1), quadval, clhs, crhs,
+                 Ptr{Cint}(C_NULL))
 end
 
 MathProgBase.getquadconstrsolution(m::SCIPLinearQuadraticModel) = error("Not implemented for SCIP.jl")
@@ -419,7 +421,7 @@ end
 
 function MathProgBase.cbaddsolution!(d::SCIPHeurCallbackData)
     # check for unspecified values (NaN)
-    if findfirst(isnan, d.sol) == 0
+    if findfirst(isnan, d.sol) == nothing
         # add solution that was filled from cbsetsolutionvalue
         _heurAddSolution(d.csip_heurdata, d.sol)
     else

test/REQUIRE

@@ -1,2 +1 @@
-JuMP 0.16 0.19
-OffsetArrays 0.8
+JuMP