Merge pull request #159 from JuliaPolyhedra/bl/typed_default_solver

Add type parameter to default_solver

Author: blegat

src/center.jl

@@ -7,7 +7,7 @@ using JuMP
 Return a tuple with the center and radius of the largest euclidean ball contained in the polyhedron `p`.
 Throws an error if the polyhedron is empty or if the radius is infinite.
 """
-function hchebyshevcenter(p::HRep, solver=Polyhedra.default_solver(p))
+function hchebyshevcenter(p::HRep, solver=Polyhedra.default_solver(p; T=Float64)) # Need Float64 for `norm(a, 2)`
     model = JuMP.Model(solver)
     c = JuMP.@variable(model, [1:fulldim(p)])
     for hp in hyperplanes(p)
@@ -61,12 +61,12 @@ end
 
 If `p` is a H-representation or is a polyhedron for which the H-representation has already been computed, calls `hchebyshevcenter`, otherwise, call `vchebyshevcenter`.
 """
-function chebyshevcenter(p::Polyhedron, solver=Polyhedra.default_solver(p))
+function chebyshevcenter(p::Polyhedron, solver=Polyhedra.default_solver(p; T=Float64))
     if hrepiscomputed(p)
         hchebyshevcenter(p, solver)
     else
         vchebyshevcenter(p, solver)
     end
 end
-chebyshevcenter(p::HRepresentation, solver=Polyhedra.default_solver(p)) = hchebyshevcenter(p, solver)
-chebyshevcenter(p::VRepresentation, solver=Polyhedra.default_solver(p)) = vchebyshevcenter(p, solver)
+chebyshevcenter(p::HRepresentation, solver=Polyhedra.default_solver(p; T=Float64)) = hchebyshevcenter(p, solver)
+chebyshevcenter(p::VRepresentation, solver=Polyhedra.default_solver(p; T=Float64)) = vchebyshevcenter(p, solver)

src/default.jl

@@ -74,11 +74,11 @@ function library end
 
 Returns a default linear programming solver for the polyhedron `p` (e.g. CDD has an internal solver which is used by default).
 """
-default_solver(p::Rep) = nothing
-function default_solver(p::Rep, ps::Rep...)
-    s = default_solver(p)
+default_solver(p::Rep; kws...) = nothing
+function default_solver(p::Rep, ps::Rep...; kws...)
+    s = default_solver(p; kws...)
     if s === nothing
-        return default_solver(ps...)
+        return default_solver(ps...; kws...)
     else
         return s
     end

src/defaultlibrary.jl

@@ -38,7 +38,7 @@ end
 
 FullDim(p::DefaultPolyhedron) = FullDim_rep(p.hrep, p.vrep)
 library(::Union{DefaultPolyhedron{T}, Type{<:DefaultPolyhedron{T}}}) where {T} = DefaultLibrary{T}()
-default_solver(p::DefaultPolyhedron) = p.solver
+default_solver(p::DefaultPolyhedron; T = nothing) = p.solver
 supportssolver(::Type{<:DefaultPolyhedron}) = true
 
 hvectortype(::Type{<:DefaultPolyhedron{T, HRepT}}) where {T, HRepT} = hvectortype(HRepT)