Merge pull request #34 from matbesancon/prealloc-matrix

Prealloc matrix

Author: blegat

.travis.yml

@@ -6,6 +6,7 @@ os:
 julia:
   - 1.0
   - 1.1
+  - 1.2
 addons:
   apt_packages:
     - libgmp-dev

Project.toml

@@ -18,11 +18,13 @@ julia = "1"
 [extras]
 Combinatorics = "861a8166-3701-5b0c-9a16-15d98fcdc6aa"
 GLPK = "60bf3e95-4087-53dc-ae20-288a0d20c6a6"
+GeometryTypes = "4d00f742-c7ba-57c2-abde-4428a4b178cb"
 JuMP = "4076af6c-e467-56ae-b986-b466b2749572"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
-Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
-GeometryTypes = "4d00f742-c7ba-57c2-abde-4428a4b178cb"
+SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Combinatorics", "GLPK", "LinearAlgebra", "Test", "JuMP", "RecipesBase", "GeometryTypes"]
+test = ["Combinatorics", "GLPK", "LinearAlgebra", "Test", "JuMP", "RecipesBase", "GeometryTypes", "SparseArrays", "StaticArrays"]

src/conversion.jl

@@ -1,6 +1,7 @@
 export enumtomat, generatorproducer
+
 function generatorproducer(m::RepMatrix)
-    Channel() do c
+    Channel(; ctype = Vector{Rational{BigInt}}) do c
         # code from here is borrowed from lrs_main
         if !(m.status in [:AtNoBasis, :AtFirstBasis, :Empty])
             error("I am not at first basis")
@@ -13,7 +14,11 @@ function generatorproducer(m::RepMatrix)
         if m.lin !== nothing # FIXME should I do that if m.status is :Empty ?
             L = getmat(m.lin)
             for i in 1:size(L, 1)
-                put!(c, L[i, :])
+                @static if VERSION >= v"1.1"
+                    put!(c, L[i, :])
+                else
+                    put!(c, convert(Vector{Rational{BigInt}}, L[i, :]))
+                end
             end
         end
 
@@ -27,7 +32,11 @@ function generatorproducer(m::RepMatrix)
                 for col in 0:getd(m)
                     output = getsolution(m, col)
                     if output !== nothing
-                        put!(c, output)
+                        @static if VERSION >= v"1.1"
+                            put!(c, output)
+                        else
+                            put!(c, convert(Vector{Rational{BigInt}}, output))
+                        end
                     end
                 end
                 if !getnextbasis(m)
@@ -37,12 +46,18 @@ function generatorproducer(m::RepMatrix)
         end
     end
 end
+
 function enumtomat(m::RepMatrix)
-    M = Matrix{Rational{BigInt}}(undef, 0, fulldim(m)+1)
-    for output in generatorproducer(m)
-        M = [M; output']
+    rows = Vector{Vector{Rational{BigInt}}}(undef, 0)
+    sizehint!(rows, fulldim(m)) # heuristic size hint
+    for row in generatorproducer(m)
+        push!(rows, row)
+    end
+    M = Matrix{Rational{BigInt}}(undef, length(rows), fulldim(m)+1)
+    for i in eachindex(rows)
+        M[i,:] .= rows[i]
     end
-    M
+    return M
 end
 
 function Base.convert(::Type{LiftedHRepresentation{Rational{BigInt}}}, m::VMatrix)

src/matrix.jl

@@ -47,7 +47,7 @@ end
 
 function fillmatrix(inequality::Bool, P::Ptr{Clrs_dic}, Q::Ptr{Clrs_dat}, itr::Polyhedra.ElemIt, offset::Int)
     for (i, item) in enumerate(itr)
-        a = vec(coord(lift(item)))
+        a = convert(Vector{Rational{BigInt}}, vec(coord(lift(item))))
         setrow(P, Q, offset+i, inequality ? -a : a, !islin(item))
     end
 end