Merge d497114 into 8c36bf2

jump-dev · Oct 26, 2018 · f03be31 · f03be31
2 parents 8c36bf2 + d497114
commit f03be31
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/nlp.jl b/src/nlp.jl
@@ -369,7 +369,6 @@ function MOI.initialize(d::NLPEvaluator, requested_features::Vector{Symbol})
         d.subexpressions[k] = SubexpressionStorage(nldata.nlexpr[k].nd, nldata.nlexpr[k].const_values, num_variables_, d.subexpression_linearity, moi_index_to_consecutive_index)
         subex = d.subexpressions[k]
         d.subexpression_linearity[k] = subex.linearity
-        @assert subex.linearity != CONSTANT
         if d.want_hess
             empty!(coloring_storage)
             compute_gradient_sparsity!(coloring_storage,subex.nd)

diff --git a/test/nlp.jl b/test/nlp.jl
@@ -493,4 +493,15 @@
         @test h_view == h
     end
 
+    @testset "Constant expressions" begin
+        model = Model()
+        @variable(model, x)
+        @NLexpression(model, expr, 10)
+        @NLobjective(model, Min, expr + x)
+        d = JuMP.NLPEvaluator(model)
+        MOI.initialize(d, [:Grad])
+        grad = zeros(1)
+        MOI.eval_objective_gradient(d, grad, [2.0])
+        @test grad == [1.0]
+    end
 end