Merge a2394f6 into 0d281d0

jump-dev · Aug 27, 2018 · 92fd62e · 92fd62e
2 parents 0d281d0 + a2394f6
commit 92fd62e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/JuMP.jl b/src/JuMP.jl
@@ -372,6 +372,12 @@ else
 end
 Base.isempty(::AbstractJuMPScalar) = false
 
+# Check if two arrays of AbstractJuMPScalars are equal. Useful for testing.
+function isequal_canonical(x::AbstractArray{<:JuMP.AbstractJuMPScalar},
+                           y::AbstractArray{<:JuMP.AbstractJuMPScalar})
+    return size(x) == size(y) && all(JuMP.isequal_canonical.(x, y))
+end
+
 """
     AbstractShape
 

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -22,12 +22,6 @@ const MOI = MathOptInterface
 const MOIT = MOI.Test
 const MOIU = MOI.Utilities
 
-# TODO: This should be defined in JuMP source with the other versions of
-# isequal_canonical.
-function JuMP.isequal_canonical(x::AbstractArray{<:JuMP.AbstractJuMPScalar}, y::AbstractArray{<:JuMP.AbstractJuMPScalar})
-    size(x) == size(y) && all(JuMP.isequal_canonical.(x, y))
-end
-
 macro test_expression(expr)
     esc(quote
             @test JuMP.isequal_canonical(@expression(m, $expr), $expr)