Apply suggestions from code review

Co-authored-by: Benjamin Lorenz <benlorenz@users.noreply.github.com>
oscar-system · Oct 1, 2021 · 9bc4c32 · 9bc4c32
1 parent 79bcd35
commit 9bc4c32
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/src/Polytopes/Polyhedron/constructors.jl b/src/Polytopes/Polyhedron/constructors.jl
@@ -39,7 +39,7 @@ Polyhedron(A::Union{Oscar.MatElem,AbstractMatrix}, b) = Polyhedron((A, b))
 
 function Polyhedron(I::Union{HalfspaceIterator, Tuple{<:Union{Oscar.MatElem, AbstractMatrix}, Any}}, E::Union{Nothing, HalfspaceIterator, Tuple{<:Union{Oscar.MatElem, AbstractMatrix}, Any}} = nothing; non_redundant::Bool = false)
     IM = -affine_matrix_for_polymake(I)
-    EM = isnothing(E) || _isempty(E) ? Polymake.Matrix{Polymake.Rational}(undef, 0, size(IM, 2)) : affine_matrix_for_polymake(E)
+    EM = isnothing(E) || _isempty_halfspace(E) ? Polymake.Matrix{Polymake.Rational}(undef, 0, size(IM, 2)) : affine_matrix_for_polymake(E)
 
     if non_redundant
         return Polyhedron(Polymake.polytope.Polytope{Polymake.Rational}(FACETS = IM, AFFINE_HULL = EM))

diff --git a/src/Polytopes/helpers.jl b/src/Polytopes/helpers.jl
@@ -13,8 +13,8 @@ function Polymake.Matrix{Polymake.Rational}(x::Union{Oscar.fmpq_mat,AbstractMatr
     return res
 end
 
-_isempty(x::Pair{<:Union{Oscar.MatElem, AbstractMatrix}, Any}) = isempty(x[1])
-_isempty(x) = isempty(x)
+_isempty_halfspace(x::Pair{<:Union{Oscar.MatElem, AbstractMatrix}, Any}) = isempty(x[1])
+_isempty_halfspace(x) = isempty(x)
 
 import Base: convert
 

diff --git a/test/Polytopes/Polyhedron.jl b/test/Polytopes/Polyhedron.jl
@@ -11,8 +11,7 @@
     square = cube(2)
     C1 = cube(2, 0, 1)
     Pos = Polyhedron([-1 0 0; 0 -1 0; 0 0 -1], [0,0,0])
-    # TODO:
-    # @test Polyhedron(([-1 0 0; 0 -1 0; 0 0 -1], [0,0,0]); non_redundant = true) == Pos
+    @test Polyhedron(([-1 0 0; 0 -1 0; 0 0 -1], [0,0,0]); non_redundant = true) == Pos
     L = Polyhedron([-1 0 0; 0 -1 0], [0,0])
     point = convex_hull([0 1 0])
     s = simplex(2)