Improve DenseNautyGraph implementation

Project.toml

@@ -7,20 +7,28 @@ version = "0.5.1"
 Graphs = "86223c79-3864-5bf0-83f7-82e725a168b6"
 LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
 SHA = "ea8e919c-243c-51af-8825-aaa63cd721ce"
-SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
 nauty_jll = "55c6dc9b-343a-50ca-8ff2-b71adb3733d5"
 
 [compat]
+Aqua = "0.8"
 Graphs = "1.9"
+Interfaces = "0.3"
+JET = "0.4, 0.9, 0.10"
+LinearAlgebra = "1"
+Pkg = "1"
+Random = "1"
 SHA = "0.7, 1"
-SparseArrays = "1.6"
+Test = "1"
 julia = "1.6"
 nauty_jll = "2.8.9"
 
 [extras]
-BenchmarkTools = "6e4b80f9-dd63-53aa-95a3-0cdb28fa8baf"
+Aqua = "4c88cf16-eb10-579e-8560-4a9242c79595"
+Interfaces = "85a1e053-f937-4924-92a5-1367d23b7b87"
+JET = "c3a54625-cd67-489e-a8e7-0a5a0ff4e31b"
+Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
 Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
 
 [targets]
-test = ["Test", "Random", "BenchmarkTools"]
+test = ["Aqua", "JET", "Test", "Random", "Pkg", "Interfaces"]

src/NautyGraphs.jl

@@ -1,34 +1,35 @@
 module NautyGraphs
 
-using Graphs, SparseArrays, LinearAlgebra, SHA
+using Graphs, LinearAlgebra, SHA
+using Graphs.SimpleGraphs: SimpleEdgeIter
 import nauty_jll
 
-const libnauty = nauty_jll.libnautyTL
-const WORDSIZE = 64
-const WordType = Culong
-#const WordType = WORDSIZE == 32 ? Cuint : WORDSIZE == 64 ? Culong : error("only wordsize 32 or 64 supported") 
 const Cbool = Cint
 const HashType = UInt
 
-include("densenautygraphs.jl")
+abstract type AbstractNautyGraph{T} <: AbstractGraph{T} end
+
 include("utils.jl")
-include("bitutils.jl")
+include("graphset.jl")
+include("densenautygraph.jl")
 include("nauty.jl")
 
 const NautyGraph = DenseNautyGraph{false}
 const NautyDiGraph = DenseNautyGraph{true}
 
 function __init__()
     # global default options to nauty carry a pointer reference that needs to be initialized at runtime
-    libnauty_dispatch = cglobal((:dispatch_graph, libnauty), Cvoid)
-    DEFAULT_OPTIONS.dispatch = libnauty_dispatch
+    DEFAULTOPTIONS16.dispatch = cglobal((:dispatch_graph, libnauty(UInt16)), Cvoid)
+    DEFAULTOPTIONS32.dispatch = cglobal((:dispatch_graph, libnauty(UInt32)), Cvoid)
+    DEFAULTOPTIONS64.dispatch = cglobal((:dispatch_graph, libnauty(UInt64)), Cvoid)
     return
 end
 
 export
     AbstractNautyGraph,
     NautyGraph,
     NautyDiGraph,
+    DenseNautyGraph,
     AutomorphismGroup,
     labels,
     nauty,