Merge 84379a3 into 2f268b1

jump-dev · Nov 20, 2018 · 18b27a2 · 18b27a2
2 parents 2f268b1 + 84379a3
commit 18b27a2
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/src/aff_expr.jl b/src/aff_expr.jl
@@ -262,7 +262,9 @@ value(a::GenericAffExpr) = value(a, value)
 # the same model.
 function MOI.ScalarAffineFunction(a::AffExpr)
     assert_isfinite(a)
-    terms = map(t -> MOI.ScalarAffineTerm(t[1], index(t[2])), linear_terms(a))
+    terms = MOI.ScalarAffineTerm{Float64}[MOI.ScalarAffineTerm(t[1],
+                                                               index(t[2]))
+                                          for t in linear_terms(a)]
     return MOI.ScalarAffineFunction(terms, a.constant)
 end
 moi_function(a::GenericAffExpr) = MOI.ScalarAffineFunction(a)
@@ -282,7 +284,7 @@ function jump_function(model::AbstractModel, f::MOI.ScalarAffineFunction)
     return AffExpr(model, f)
 end
 function jump_function(model::AbstractModel, f::MOI.VectorAffineFunction)
-    return map(f -> AffExpr(model, f), MOIU.eachscalar(f))
+    return AffExpr[AffExpr(model, f) for f in MOIU.eachscalar(f)]
 end
 
 """

diff --git a/src/quad_expr.jl b/src/quad_expr.jl
@@ -208,9 +208,11 @@ GenericQuadExpr{C, V}() where {C, V} = zero(GenericQuadExpr{C, V})
 
 function MOI.ScalarQuadraticFunction(q::QuadExpr)
     assert_isfinite(q)
-    qterms = map(t -> MOI.ScalarQuadraticTerm(t[2] == t[3] ? 2t[1] : t[1],
-                                              index(t[2]),
-                                              index(t[3])), quadterms(q))
+    qterms = MOI.ScalarQuadraticTerm{Float64}[MOI.ScalarQuadraticTerm(
+                                               t[2] == t[3] ? 2t[1] : t[1],
+                                               index(t[2]),
+                                               index(t[3]))
+                                               for t in quadterms(q)]
     moi_aff = MOI.ScalarAffineFunction(q.aff)
     return MOI.ScalarQuadraticFunction(moi_aff.terms,
                                        qterms, moi_aff.constant)

diff --git a/src/variables.jl b/src/variables.jl
@@ -240,7 +240,7 @@ function moi_function(variables::Vector{<:AbstractVariableRef})
     return MOI.VectorOfVariables(variables)
 end
 function jump_function(model::AbstractModel, variables::MOI.VectorOfVariables)
-    return map(v -> VariableRef(model, v), variables.variables)
+    return VariableRef[VariableRef(model, v) for v in variables.variables]
 end
 
 VariableRef(m::Model, f::MOI.SingleVariable) = VariableRef(m, f.variable)