Merge pull request #23 from JuliaGraphs/sd/fixup_no_appveyor

fixup travis, remove appveyor, fix depwarns, move to GeometryBasics, use JuliaFormatter

Author: SimonDanisch

.JuliaFormatter.toml

@@ -0,0 +1,11 @@
+always_for_in = true
+always_use_return = true
+import_to_using = true
+margin = 110
+pipe_to_function_call = true
+remove_extra_newlines = true
+short_to_long_function_def = true
+style = "yas"
+whitespace_in_kwargs = false
+whitespace_ops_in_indices = true
+whitespace_typedefs = false

.gitignore

@@ -1,3 +1,4 @@
 *.jl.cov
 *.jl.*.cov
 *.jl.mem
+Manifest.toml

.travis.yml

@@ -2,23 +2,14 @@
 language: julia
 os:
   - linux
-  - osx
-
 julia:
-  - 0.7
-  - 1.0
+  - 1.3
+  - 1
   - nightly
-
 matrix:
   allow_failures:
     - julia: nightly
-
+if: branch = master OR tag IS present OR type = pull_request
 notifications:
   email: false
-
-# uncomment the following lines to override the default test script
-script:
-  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-  - julia -e 'using Pkg; Pkg.clone(pwd()); Pkg.build("NetworkLayout"); Pkg.clone("LightGraphs"); Pkg.test("NetworkLayout"; coverage=true)'
-after_success:
-  - julia -e 'using Pkg; cd(Pkg.dir("NetworkLayout")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(process_folder()); Codecov.submit(process_folder())'
+codecov: true

Project.toml

@@ -0,0 +1,21 @@
+name = "NetworkLayout"
+uuid = "46757867-2c16-5918-afeb-47bfcb05e46a"
+version = "0.3.0"
+
+[deps]
+GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
+LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+SparseArrays = "2f01184e-e22b-5df5-ae63-d93ebab69eaf"
+
+[compat]
+julia = "1"
+
+[extras]
+DelimitedFiles = "8bb1440f-4735-579b-a4ab-409b98df4dab"
+GeometryTypes = "4d00f742-c7ba-57c2-abde-4428a4b178cb"
+LightGraphs = "093fc24a-ae57-5d10-9952-331d41423f4d"
+LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[targets]
+test = ["LightGraphs", "Test", "DelimitedFiles", "GeometryTypes"]

REQUIRE

@@ -12,7 +12,7 @@ positions     co-ordinates of the layout
 """
 module Buchheim
 
-using GeometryTypes
+using GeometryBasics
 
 struct Tree{A<:AbstractVector,P<:AbstractVector,F}
     nodes::A
@@ -41,7 +41,7 @@ function Tree(tree::AbstractVector, nodesize)
 end
 
 function layout(t::AbstractVector; nodesize=ones(length(t)))
-    layout!(t, nodesize)
+    return layout!(t, nodesize)
 end
 
 function layout!(t::AbstractVector, nodesize)
@@ -54,7 +54,7 @@ end
 function parent(v, t::Tree)
     tree = t.nodes
     for i in 1:length(tree)
-        y = findall(x -> (x==v), tree[i])
+        y = findall(x -> (x == v), tree[i])
         if length(y) != 0
             return i
         end
@@ -67,28 +67,28 @@ function first_walk(v, t::Tree)
     mod = t.mod
     tree = t.nodes
     nodesize = t.nodesize
-    p = parent(v,t)
+    p = parent(v, t)
     if p != nothing
-        index = findall(x -> (x==v), tree[p])[1]
+        index = findall(x -> (x == v), tree[p])[1]
     else
         index = 1
     end
     if length(tree[v]) == 0
         if v != tree[p][1]
-          prelim[v] = prelim[tree[p][index-1]] + (nodesize[tree[p][index-1]])
+            prelim[v] = prelim[tree[p][index - 1]] + (nodesize[tree[p][index - 1]])
         else
-          prelim[v] = 0
+            prelim[v] = 0
         end
     else
         defaultAncestor = tree[v][1]
         for w in tree[v]
-            first_walk(w,t)
+            first_walk(w, t)
             defaultAncestor = apportion(w, defaultAncestor, t)
         end
         execute_shifts(v, t)
         midpoint = (prelim[tree[v][1]] + prelim[tree[v][end]]) / 2
         if index > 1
-            w = tree[p][index-1]
+            w = tree[p][index - 1]
             prelim[v] = prelim[w] + (nodesize[w] + 1.0)
             mod[v] = prelim[v] - midpoint
         else
@@ -106,28 +106,29 @@ function apportion(v::T, defaultAncestor::T, t::Tree) where {T}
     p = parent(v, t)
     nodesize = t.nodesize
     if p != nothing
-        index = findall(x-> (x==v), tree[p])[1]
+        index = findall(x -> (x == v), tree[p])[1]
     else
         index = 1
     end
     if index > 1
-        w = tree[p][index-1]
+        w = tree[p][index - 1]
         v_in_right = v_out_right = v
         v_in_left = w
         v_out_left = tree[parent(v_in_right, t)][1]
         s_in_right = mod[v_in_right]
         s_out_right = mod[v_out_right]
         s_in_left = mod[v_in_left]
         s_out_left = mod[v_out_left]
-        while next_right(v_in_left, t)!=0 && next_left(v_in_right, t)!=0
+        while next_right(v_in_left, t) != 0 && next_left(v_in_right, t) != 0
             v_in_left = next_right(v_in_left, t)
             v_in_right = next_left(v_in_right, t)
             v_out_left = next_left(v_out_left, t)
             v_out_right = next_right(v_out_right, t)
             ancestor[v_out_right] = v
-            shift = (prelim[v_in_left] + s_in_left) - (prelim[v_in_right] + s_in_right) + (nodesize[v_in_left])
+            shift = (prelim[v_in_left] + s_in_left) - (prelim[v_in_right] + s_in_right) +
+                    (nodesize[v_in_left])
             if shift > 0
-                move_subtree(find_ancestor(v_in_left, v, defaultAncestor,t), v,shift, t)
+                move_subtree(find_ancestor(v_in_left, v, defaultAncestor, t), v, shift, t)
                 s_in_right += shift
                 s_out_right += shift
             end
@@ -140,7 +141,7 @@ function apportion(v::T, defaultAncestor::T, t::Tree) where {T}
             thread[v_out_right] = next_right(v_in_left, t)
             mod[v_out_right] += s_in_left - s_out_right
         else
-            if next_left(v_in_right,t) != 0 && next_left(v_out_left,t) == 0
+            if next_left(v_in_right, t) != 0 && next_left(v_out_left, t) == 0
                 thread[v_out_left] = next_left(v_in_right, t)
                 mod[v_out_left] += s_in_right - s_out_left
                 defaultAncestor = v
@@ -152,7 +153,7 @@ end
 
 function number(v, t::Tree)
     p = parent(v, t)
-    index = findall(x -> (x==v), t.nodes[p])[1]
+    index = findall(x -> (x == v), t.nodes[p])[1]
     return index
 end
 
@@ -169,22 +170,22 @@ function move_subtree(w_left::T, w_right::T, shift::Float64, t::Tree) where {T}
     shifttree[w_right] += shift
     change[w_left] += shift / subtrees
     prelim[w_right] += shift
-    mod[w_right] += shift
+    return mod[w_right] += shift
 end
 
 function second_walk(v, m::Float64, depth::Float64, t::Tree)
     prelim = t.prelim
     mod = t.mod
     positions = t.positions
     nodesize = t.nodesize
-    positions[v] = Point(prelim[v]+m, -depth)
+    positions[v] = Point(prelim[v] + m, -depth)
     if length(t.nodes[v]) != 0
         maxdist = maximum([nodesize[i] for i in t.nodes[v]])
     else
         maxdist = 0
     end
     for w in t.nodes[v]
-        second_walk(w, m+mod[v], Float64(depth + 1 + maxdist), t)
+        second_walk(w, m + mod[v], Float64(depth + 1 + maxdist), t)
     end
 end
 

appveyor.yml

@@ -16,18 +16,18 @@ julia> locs_x, locs_y = circular_layout(g)
 """
 module Circular
 
-using GeometryTypes
+using GeometryBasics
 
 function layout(adj_matrix::AbstractMatrix)
-    layout!(adj_matrix)
+    return layout!(adj_matrix)
 end
 
 function layout!(adj_matrix::AbstractMatrix)
-    if size(adj_matrix,1) == 1
+    if size(adj_matrix, 1) == 1
         return Point{2,Float64}[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]
+        θ = range(0, stop=2pi, length=size(adj_matrix, 1) + 1)[1:(end - 1)]
         return Point{2,Float64}[(cos(o), sin(o)) for o in θ]
     end
 end