Merge pull request #97 from matbesancon/defaultrow

Default row argument for graph creation, removing debug lines

Author: ChrisRackauckas

.travis.yml

@@ -5,6 +5,7 @@ os:
   - osx
 julia:
   - 1.3
+  - 1.4
   - nightly
 matrix:
   allow_failures:

Project.toml

@@ -10,7 +10,6 @@ Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
 DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
 FiniteDiff = "6a86dc24-6348-571c-b903-95158fe2bd41"
 ForwardDiff = "f6369f11-7733-5829-9624-2563aa707210"
-InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
 LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 Requires = "ae029012-a4dd-5104-9daa-d747884805df"

src/coloring/matrix2graph.jl

@@ -1,12 +1,12 @@
 """
-        matrix2graph(sparse_matrix)
+        matrix2graph(sparse_matrix, [partition_by_rows::Bool=true])
 
 A utility function to generate a graph from input
 sparse matrix, columns are represented with vertices
 and 2 vertices are connected with an edge only if
 the two columns are mutually orthogonal.
 """
-function matrix2graph(sparse_matrix::SparseMatrixCSC{<:Number, Int}, partition_by_rows::Bool)
+function matrix2graph(sparse_matrix::SparseMatrixCSC{<:Number, Int}, partition_by_rows::Bool=true)
 
     dropzeros!(sparse_matrix)
     (rows_index, cols_index, _) = findnz(sparse_matrix)

test/test_ad.jl

@@ -4,7 +4,6 @@ using SparseArrays, Test
 using LinearAlgebra
 using BlockBandedMatrices
 using StaticArrays
-using InteractiveUtils: @which
 
 fcalls = 0
 function f(dx,x)
@@ -119,7 +118,6 @@ _J1 = forwarddiff_color_jacobian(oopf, x, colorvec = repeat(1:3,10), sparsity =
 @info "4th passed"
 
 fcalls = 0
-@info "which $(@which forwarddiff_color_jacobian(staticf, SVector{30}(x), colorvec = repeat(1:3,10), sparsity = _J, jac_prototype = SMatrix{30,30}(_J)))"
 _J1 = forwarddiff_color_jacobian(staticf, SVector{30}(x), colorvec = repeat(1:3,10), sparsity = _J, jac_prototype = SMatrix{30,30}(_J))
 @test _J1 ≈ J
 @test fcalls == 1