Merge pull request #151 from JuliaPolyhedra/bl/ddverbose

🚸 Add verbose option for double description

Author: blegat

REQUIRE

@@ -1,6 +1,6 @@
 julia 0.7
 StaticArrays 0.5
 MathProgBase 0.5.10 0.8
-JuMP 0.16
+JuMP 0.16 0.19
 GeometryTypes 0.4
 RecipesBase 0.2

src/doubledescription.jl

@@ -37,7 +37,45 @@ Double description method revisited
 """
 function doubledescription end
 
-function doubledescription(h::HRepresentation)
+function print_v_summary(v::VRep)
+    print("$(npoints(v)) points, $(nrays(v)) rays and $(nlines(v)) lines")
+end
+
+function intersect_and_remove_redundancy(v, hs, h; verbose=0)
+    if eltype(hs) <: HalfSpace
+        str = "halfspace"
+    else
+        str = "hyperplane"
+    end
+    for (i, hel) in enumerate(hs)
+        if verbose >= 1
+            println("Intersecting $str $i/$(length(hs))")
+        end
+        v_int = v ∩ hel
+        if verbose >= 3
+            print("Removing duplicates: ")
+            print_v_summary(v_int)
+            println(".")
+        end
+        # removeduplicates is cheaper than removevredundancy since the latter
+        # needs to go through all the hrep element
+        v_dup = removeduplicates(v_int)
+        if verbose >= 3
+            print("Removing redundancy: ")
+            print_v_summary(v_dup)
+            println(".")
+        end
+        v = removevredundancy(v_dup, h)
+        if verbose >= 2
+            print("After intersection:  ")
+            print_v_summary(v)
+            println(".")
+        end
+    end
+    return v
+end
+
+function doubledescription(h::HRepresentation; kws...)
     # The redundancy of V-elements are measured using
     # the number of hyperplane they are in. If there are
     # redundant hyperplanes, it does not matter since no point
@@ -49,27 +87,15 @@ function doubledescription(h::HRepresentation)
     h = removeduplicates(h)
     v = dualfullspace(h)
     checkvconsistency(v)
-    for hp in hyperplanes(h)
-        #v = removeduplicates(v ∩ hel)
-        # removeduplicates is cheaper than removevredundancy since the latter
-        # needs to go through all the hrep element
-        v = removevredundancy(removeduplicates(v ∩ hp), h)
-        #v = removevredundancy(v ∩ hel, h)
-    end
-    for hs in halfspaces(h)
-        #v = removeduplicates(v ∩ hel)
-        # removeduplicates is cheaper than removevredundancy since the latter
-        # needs to go through all the hrep element
-        v = removevredundancy(removeduplicates(v ∩ hs), h)
-        #v = removevredundancy(v ∩ hel, h)
-    end
-    v
+    v = intersect_and_remove_redundancy(v, hyperplanes(h), h; kws...)
+    v = intersect_and_remove_redundancy(v, halfspaces(h), h; kws...)
+    return v
 end
 
-function doubledescription(v::VRepresentation{T}) where {T}
+function doubledescription(v::VRepresentation{T}; kws...) where {T}
     checkvconsistency(v)
     lv = convert(LiftedVRepresentation{T, Matrix{T}}, v)
     R = -lv.R
-    vl = doubledescription(MixedMatHRep{T}(R, zeros(T, size(R, 1)), lv.linset))
+    vl = doubledescription(MixedMatHRep{T}(R, zeros(T, size(R, 1)), lv.linset); kws...)
     LiftedHRepresentation{T}(vl.R, vl.Rlinset)
 end