fix conflict

Author: matbesancon

src/functions.jl

@@ -579,17 +579,16 @@ function VectorAffineFunction{T}(f::VectorOfVariables) where {T}
 end
 
 function VectorAffineFunction(
-    elements::AbstractVector{ScalarAffineFunction{T}},
+    rows::AbstractVector{ScalarAffineFunction{T}}
 ) where {T}
-    terms = Vector{VectorAffineTerm{T}}()
-    constants = Vector{T}()
-    for (idx, saf) in enumerate(elements)
-        push!(constants, saf.constant)
-        for term in saf.terms
-            push!(terms, VectorAffineTerm(idx, term))
+    ret = VectorAffineFunction{T}(VectorAffineTerm{T}[], T[])
+    for (row, f) in enumerate(rows)
+        push!(ret.constants, f.constant)
+        for term in f.terms
+            push!(ret.terms, VectorAffineTerm(row, term))
         end
     end
-    return VectorAffineFunction{T}(terms, constants)
+    return ret
 end
 
 """

test/functions.jl

@@ -131,10 +131,16 @@ end
 
 function test_vectoraffinefunction_creation()
     x = MOI.VariableIndex(1)
-    f = MOI.VectorAffineFunction([1.0 * x, 2.0 * x])
-    @test f.constants == [0.0, 0.0]
-    @test f.terms[1].scalar_term.coefficient == 1.0
-    @test f.terms[2].scalar_term.coefficient == 2.0
+    f = MOI.VectorAffineFunction([1.0 * x + 2.0, 3.0 * x + 4.0])
+    g = MOI.VectorAffineFunction(
+        MOI.VectorAffineTerm{Float64}[
+            MOI.VectorAffineTerm(1, MOI.ScalarAffineTerm(1.0, x)),
+            MOI.VectorAffineTerm(2, MOI.ScalarAffineTerm(3.0, x)),
+        ],
+        [2.0, 4.0],
+    )
+    @test f ≈ g
+    return
 end
 
 function test_isapprox_VectorOfVariables()