Merge pull request #19 from JuliaPolyhedra/kwconstr

Remove keywork constructor
JuliaPolyhedra · Jul 27, 2017 · d4bd403 · d4bd403
2 parents 2397460 + 6f95932
commit d4bd403
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/matrix.jl b/src/matrix.jl
@@ -170,9 +170,6 @@ end
 function CDDInequalityMatrix{N, T, S}(eqs, ineqs) where {N, T, S}
     CDDInequalityMatrix(initmatrix(true, eqs, ineqs))
 end
-function CDDInequalityMatrix{N, T, S}(; eqs=nothing, ineqs=nothing) where {N, T, S}
-    CDDInequalityMatrix{N, T, S}(eqs, ineqs)
-end
 
 nhreps(matrix::CDDInequalityMatrix) = length(matrix)
 neqs(matrix::CDDInequalityMatrix) = dd_set_card(unsafe_load(matrix.matrix).linset)
@@ -294,9 +291,6 @@ end
 function CDDGeneratorMatrix{N,T,S}(points, rays) where {N, T, S}
     CDDGeneratorMatrix(initmatrix(false, rays, points))
 end
-function CDDGeneratorMatrix{N,T,S}(; rays=nothing, points=nothing) where {N, T, S}
-    CDDGeneratorMatrix{N, T, S}(points, rays)
-end
 
 nvreps(matrix::CDDGeneratorMatrix) = length(matrix)
 function npoints(matrix::CDDGeneratorMatrix)

diff --git a/src/polyhedron.jl b/src/polyhedron.jl
@@ -128,6 +128,14 @@ function Polyhedra.polyhedron{N}(repit::Union{Representation{N},HRepIterator{N},
   T = polytypeforprecision(lib.precision)
   CDDPolyhedron{N, T}(repit)
 end
+function Polyhedrapolyhedron{N}(hps::EqIterator{N}, hss::IneqIterator{N}, lib::CDDLibrary)
+  T = polytypeforprecision(lib.precision)
+  CDDPolyhedron{N, T}(hps, hss)
+end
+function Polyhedrapolyhedron{N}(ps::PointIterator{N}, rs::RayIterator{N}, lib::CDDLibrary)
+  T = polytypeforprecision(lib.precision)
+  CDDPolyhedron{N, T}(ps, rs)
+end
 function Polyhedra.polyhedron(lib::CDDLibrary; eqs=nothing, ineqs=nothing, points=nothing, rays=nothing)
   its = [eqs, ineqs, points, rays]
   i = findfirst(x -> !(x === nothing), its)