Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add more tests (in particular from MathProgBase) #73

Merged
merged 20 commits into from
Oct 24, 2018
Merged

add more tests (in particular from MathProgBase) #73

Changes from 1 commit
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
59242b3
rm tests from JuMP
rschwarz Oct 24, 2018
9a236e2
rm test mixintprog (duplicate from MPB)
rschwarz Oct 24, 2018
7fd94e6
add all MPB tests (optimistically)
rschwarz Oct 24, 2018
dff02ce
disable linprog tests
rschwarz Oct 24, 2018
f0d2534
f
rschwarz Oct 24, 2018
acb9baa
disable some quadratic tests
rschwarz Oct 24, 2018
f073987
fix: addquadconstr! with explicit conversion to Vector{Cdouble}
rschwarz Oct 24, 2018
bde9eb2
disable NLP tests
rschwarz Oct 24, 2018
3e97e90
disable linproginterface tests
rschwarz Oct 24, 2018
3dca874
suppress warnings in some older tests
rschwarz Oct 24, 2018
38ecb9b
group into testsets
rschwarz Oct 24, 2018
76eae24
add first test from CSIP suite
rschwarz Oct 24, 2018
a571b89
add many more tests from CSIP suite
rschwarz Oct 24, 2018
fc14e01
fix: explicit broadcast (.-)
rschwarz Oct 24, 2018
3026d89
add SOS tests from CSIP
rschwarz Oct 24, 2018
de1df8a
fix: compare findfirst with nothing, not 0
rschwarz Oct 24, 2018
5f0d3e7
add remaining (relevant) tests from CSIP
rschwarz Oct 24, 2018
4b22926
travis: add test coverage info
rschwarz Oct 24, 2018
3e88640
README: add coverage badges
rschwarz Oct 24, 2018
658da35
travis: add `using Pkg` to coverage
rschwarz Oct 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: explicit broadcast (.-)
  • Loading branch information
@rschwarz
rschwarz committed Oct 24, 2018
commit fc14e01d374d1b2710ee4bbb789618e69e3aaf83
4 changes: 2 additions & 2 deletions src/mpb_interface.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down