Skip to content

Commit 6ed35e7

Browse files
author
Vincent Landau
committed
add show method, some cleanup
1 parent 41203df commit 6ed35e7

File tree

4 files changed

+38
-3
lines changed

4 files changed

+38
-3
lines changed

src/SpatialGraphs.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ include("structs.jl")
66
include("graph_interface.jl")
77
include("rastergraphs.jl")
88
include("utils.jl")
9+
include("show.jl")
10+
911
## Types and Structs
1012
export AbstractSpatialGraph, AbstractRasterGraph, SimpleRasterGraph,
1113
SimpleRasterDiGraph, WeightedRasterGraph, WeightedRasterDiGraph

src/graph_interface.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ nv(g::AbstractSpatialGraph) = nv(g.graph)
1515
ne(g::AbstractSpatialGraph) = ne(g.graph)
1616
vertices(g::AbstractSpatialGraph) = vertices(g.graph)
1717
edges(g::AbstractSpatialGraph) = edges(g.graph)
18-
Base.eltype(g::AbstractSpatialGraph) = eltype(g.graph)
18+
eltype(g::AbstractSpatialGraph) = eltype(g.graph)
1919
edgetype(g::AbstractSpatialGraph) = edgetype(g.graph)
2020
has_edge(g::AbstractSpatialGraph, s, d) = has_edge(g.graph, s, d)
2121
has_vertex(g::AbstractSpatialGraph, v) = has_vertex(g.graph, v)
2222
inneighbors(g::AbstractSpatialGraph, v) = inneighbors(g.graph, v)
2323
outneighbors(g::AbstractSpatialGraph, v) = outneighbors(g.graph, v)
2424
is_directed(g::AbstractSpatialGraph) = is_directed(g.graph)
25-
Base.zero(g::AbstractSpatialGraph) = zero(g.graph)
25+
zero(g::AbstractSpatialGraph) = zero(g.graph)
2626
add_edge!(g::AbstractSpatialGraph, a::Integer, b::Integer, c::Number) = add_edge!(g.graph, a, b, c)
2727

2828
### SimpleWeightedGraphs

src/show.jl

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
import Base: show
2+
3+
function show(io::IO, g::AbstractRasterGraph)
4+
printstyled("$(typeof(g))\n", color=:blue)
5+
printstyled(" graph", color=:red)
6+
print(": $(typeof(g.graph)) with $(nv(g)) vertices and $(ne(g)) edges\n")
7+
8+
printstyled(" vertex_raster", color=:red)
9+
print(
10+
": $(string(nameof(typeof(g.vertex_raster))))" *
11+
"{$(eltype(g.vertex_raster)), $(length(dims(g.vertex_raster)))}"
12+
)
13+
printstyled(" with dimensions:\n", color=:light_black)
14+
15+
x_dim = dims(g.vertex_raster, XDim)
16+
y_dim = dims(g.vertex_raster, YDim)
17+
printstyled(" X", color=:cyan)
18+
print(
19+
": range($(minimum(x_dim)), $(maximum(x_dim)), step=$(x_dim.val[2] - x_dim.val[1]))\n"
20+
21+
)
22+
printstyled(" Y", color=:cyan)
23+
print(
24+
": range($(minimum(y_dim)), $(maximum(y_dim)), step=$(y_dim.val[2] - y_dim.val[1]))"
25+
)
26+
if (hasdim(g.vertex_raster, Band))
27+
band_dim = dims(g.vertex_raster, Band)
28+
printstyled("\n Band", color=:cyan)
29+
print(
30+
": $(minimum(band_dim)):$(maximum(band_dim))"
31+
)
32+
end
33+
end

test/rastergraphs.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using ArchGDAL, GeoData, LightGraphs, SimpleWeightedGraphs, SpatialGraphs
1+
using GeoData, LightGraphs, SimpleWeightedGraphs, SpatialGraphs, Test
22
A_array = Array{Float64}(undef, (3, 4, 1))
33
A_array[:,:,:] = [1, 3, 2, 0.5, 10, 8, 5, -9999, 3, 1, 2, 6]
44

0 commit comments

Comments
 (0)