Merge pull request #18 from JuliaPolyhedra/bl/jumpv0.21

Update to JuMP v0.21
JuliaPolyhedra · Feb 20, 2020 · 1553167 · 1553167
2 parents 50898d7 + 043a1df
commit 1553167
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Project.toml b/Project.toml
@@ -15,7 +15,7 @@ SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
 
 [compat]
-Polyhedra = "0.5"
+Polyhedra = "0.6"
 julia = "1"
 
 [extras]

diff --git a/src/polyhedron.jl b/src/polyhedron.jl
@@ -1,6 +1,6 @@
 mutable struct Library <: Polyhedra.Library
     precision::Symbol
-    solver::Polyhedra.SolverOrNot
+    solver
 
     function Library(precision::Symbol=:float, solver=nothing)
         if !(precision in [:float, :exact])
@@ -21,16 +21,16 @@ mutable struct Polyhedron{T} <: Polyhedra.Polyhedron{T}
     vrep::Union{VRepT{T}, Nothing}
     noredundantinequality::Bool
     noredundantgenerator::Bool
-    solver::Polyhedra.SolverOrNot
+    solver
 end
 
-function Polyhedron{T}(hrep::HRepresentation, solver::Polyhedra.SolverOrNot) where {T}
+function Polyhedron{T}(hrep::HRepresentation, solver) where {T}
     Polyhedron{T}(convert(HRepT{T}, hrep), nothing, false, false, solver)
 end
-function Polyhedron{T}(vrep::VRepresentation, solver::Polyhedra.SolverOrNot) where {T}
+function Polyhedron{T}(vrep::VRepresentation, solver) where {T}
     Polyhedron{T}(nothing, convert(VRepT{T}, vrep), false, false, solver)
 end
-#function Polyhedron{T}(rep::Representation, solver::Polyhedra.SolverOrNot) where {T}
+#function Polyhedron{T}(rep::Representation, solver) where {T}
 #    return Polyhedron{T}(Polyhedra.change_coefficient_type(rep, T), solver)
 #end