fix #523

jump-dev · Aug 11, 2015 · 4b4c463 · 4b4c463 · joehuchette · Aug 11, 2015
1 parent 74f5ed4
commit 4b4c463
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/nlp.jl b/src/nlp.jl
@@ -540,7 +540,7 @@ function _buildInternalModel_nlp(m::Model, traits)
     MathProgBase.loadnonlinearproblem!(m.internalModel, m.numCols, numConstr, m.colLower, m.colUpper, [linrowlb;quadrowlb;nlrowlb], [linrowub;quadrowub;nlrowub], m.objSense, d)
     if traits.int
         if applicable(MathProgBase.setvartype!, m.internalModel, m.colCat)
-            MathProgBase.setvartype!(m.internalModel, m.colCat)
+            MathProgBase.setvartype!(m.internalModel, vartypes_without_fixed(m))
         else
             error("Solver does not support discrete variables")
         end

diff --git a/test/nonlinear.jl b/test/nonlinear.jl
@@ -425,10 +425,11 @@ MathProgBase.optimize!(m::DummyNLPModel) = nothing
 MathProgBase.status(m::DummyNLPModel) = :Optimal
 MathProgBase.getobjval(m::DummyNLPModel) = NaN
 MathProgBase.getsolution(m::DummyNLPModel) = [1.0,1.0]
+MathProgBase.setvartype!(m::DummyNLPModel,vartype) = @fact any(vartype .== :Fixed) --> false
 function test_nl_mpb()
     m = Model(solver=DummyNLPSolver())
-    @defVar(m, x)
-    @defVar(m, y)
+    @defVar(m, x == 1)
+    @defVar(m, y, Bin)
     @setObjective(m, Min, -x+y)
     @addConstraint(m, 2x+y <= 1)
     @addConstraint(m, 2x+y <= 0)