From 478f6df77cb3f4a21f3815dc4e7a1503c1425536 Mon Sep 17 00:00:00 2001 From: Miles Lubin Date: Mon, 10 Jun 2013 00:38:10 -0400 Subject: [PATCH] fix quadratic objective support after renaming --- src/MathProg.jl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/MathProg.jl b/src/MathProg.jl index d94f5a8a376..3f97c5dc5f8 100644 --- a/src/MathProg.jl +++ b/src/MathProg.jl @@ -761,7 +761,7 @@ function solveMIP(m::Model) # undocumented support for quadratic MIPs with gurobi: if m.objIsQuad gurobisolver = getrawsolver(m.internalModel) - MathProgBase.mipsolver.add_qpterms!(gurobisolver, [v.col for v in m.objective.qvars1], [v.col for v in m.objective.qvars2], m.objective.qcoeffs) + MathProgBase.mipsolver.add_qpterms!(gurobisolver, [v.col for v in m.quadobj.qvars1], [v.col for v in m.quadobj.qvars2], m.quadobj.qcoeffs) end optimize(m.internalModel) @@ -775,7 +775,7 @@ function solveMIP(m::Model) if m.objSense == "max" m.objVal = -m.objVal end - m.objVal += !m.objIsQuad ? m.objective.constant : m.objective.aff.constant + m.objVal += m.objective.constant m.colVal = getsolution(m.internalModel) end