Cicular: new interface

Author: hexaeder

src/NetworkLayout.jl

@@ -36,7 +36,7 @@ include("buchheim.jl")
 include("spring.jl")
 include("stress.jl")
 include("spectral.jl")
-# include("circular.jl")
+include("circular.jl")
 # include("shell.jl")
 
 end

src/circular.jl

@@ -14,22 +14,16 @@ julia> g = simple_house_graph()
 julia> locs_x, locs_y = circular_layout(g)
 ```
 """
-module Circular
+struct Circular{Ptype} <: AbstractLayout{2,Ptype} end
 
-using GeometryBasics
+Circular(; Ptype=Float64) = Circular{Ptype}()
 
-function layout(adj_matrix::AbstractMatrix)
-    return layout!(adj_matrix)
-end
-
-function layout!(adj_matrix::AbstractMatrix)
+function layout(::Circular{Ptype}, adj_matrix) where {Ptype}
     if size(adj_matrix, 1) == 1
-        return Point{2,Float64}[Point(0.0, 0.0)]
+        return Point{2,Ptype}[Point(0.0, 0.0)]
     else
         # Discard the extra angle since it matches 0 radians.
-        θ = range(0, stop=2pi, length=size(adj_matrix, 1) + 1)[1:(end - 1)]
-        return Point{2,Float64}[(cos(o), sin(o)) for o in θ]
+        θ = range(0; stop=2pi, length=size(adj_matrix, 1) + 1)[1:(end - 1)]
+        return Point{2,Ptype}[(cos(o), sin(o)) for o in θ]
     end
 end
-
-end # end of module

test/runtests.jl

@@ -169,17 +169,20 @@ jagmesh_adj = jagmesh()
     end
 
     @testset "Testing Circular Layout Algorithm" begin
+        using NetworkLayout: Circular
         println("Circular wheel_graph")
         @testset "Testing wheel_graph" begin
             g = wheel_graph(10)
             adj_matrix = adjacency_matrix(g)
-            positions = @time Circular.layout(adj_matrix)
+            positions = @time Circular()(adj_matrix)
             @test typeof(positions) == Vector{Point{2,Float64}}
+            positions = @time Circular(Ptype=Float32)(adj_matrix)
+            @test typeof(positions) == Vector{Point{2,Float32}}
         end
         @testset "Testing Base Case" begin
             g = Graph(1)
             adj_matrix = adjacency_matrix(g)
-            positions = @time Circular.layout(adj_matrix)
+            positions = @time Circular()(adj_matrix)
             @test typeof(positions) == Vector{Point{2,Float64}}
         end
     end