Ar/quad coefficients (#213)

* Correct quadratic term and add test

* Update test/jump.jl

Co-authored-by: Mathieu Besançon <[email protected]>

Author: AlexRobson

Project.toml

@@ -1,7 +1,7 @@
 name = "DiffOpt"
 uuid = "930fe3bc-9c6b-11ea-2d94-6184641e85e7"
 authors = ["Akshay Sharma", "Mathieu Besançon", "Joaquim Dias Garcia", "Benoît Legat"]
-version = "0.3.1"
+version = "0.3.2"
 
 [deps]
 BlockDiagonals = "0a1fb500-61f7-11e9-3c65-f5ef3456f9f0"

src/jump_moi_overloads.jl

@@ -240,12 +240,12 @@ function JuMP.coefficient(func::MOItoJuMP, var_ref::JuMP.VariableRef)
     return JuMP.coefficient(func.func, JuMP.index(var_ref))
 end
 function quad_sym_half(func::MOItoJuMP, var1_ref::JuMP.VariableRef, var2_ref::JuMP.VariableRef)
-    check_belongs_to_model(var1_ref, func.model)
-    return quad_sym_half(func.func, JuMP.index(vi1), JuMP.index(var2_ref))
+    check_belongs_to_model.([var1_ref, var2_ref], Ref(func.model))
+    return quad_sym_half(func.func, JuMP.index(var1_ref), JuMP.index(var2_ref))
 end
 function JuMP.coefficient(func::MOItoJuMP, var1_ref::JuMP.VariableRef, var2_ref::JuMP.VariableRef)
-    check_belongs_to_model(var2_ref, func.model)
-    return JuMP.coefficient(func.func, JuMP.index(vi1), JuMP.index(var2_ref))
+    check_belongs_to_model.([var1_ref, var2_ref], Ref(func.model))
+    return JuMP.coefficient(func.func, JuMP.index(var1_ref), JuMP.index(var2_ref))
 end
 function Base.convert(::Type{JuMP.GenericAffExpr{T,JuMP.VariableRef}}, func::MOItoJuMP) where {T}
     return JuMP.GenericAffExpr{T,JuMP.VariableRef}(func.model, convert(MOI.ScalarAffineFunction{T}, func.func))

test/jump.jl

@@ -68,8 +68,16 @@ end
 
     DiffOpt.backward(model)
 
-    grad = JuMP.constant(MOI.get(model, DiffOpt.BackwardOutConstraint(), ctr_le[]))
-    @test grad ≈ -1.0  atol=ATOL rtol=RTOL
+    grad_constraint = JuMP.constant(MOI.get(model, DiffOpt.BackwardOutConstraint(), ctr_le[]))
+    @test grad_constraint ≈ -1.0  atol=ATOL rtol=RTOL
+
+    # Test some overloads from https://github.com/jump-dev/DiffOpt.jl/issues/211
+    grad_obj = MOI.get(model, DiffOpt.BackwardOutObjective())
+    @test JuMP.coefficient(grad_obj, x[1], x[2]) ≈ 
+        DiffOpt.quad_sym_half.(grad_obj, x[1], x[2]) atol=ATOL rtol=RTOL
+
+    @test DiffOpt.quad_sym_half(grad_obj, x[1], x[1]) ≈ 
+        2 * JuMP.coefficient(grad_obj, x[1], x[1]) atol=ATOL rtol=RTOL
 
     # TODO: this simple show fails
     # @show ctr_le