Skip to content

Commit 261a772

Browse files
InterdisciplinaryPhysicsTeampitmonticoneClaudMor
committed
Remove custom cosnstructors of underying graphs
Co-Authored-By: Pietro Monticone <38562595+pitmonticone@users.noreply.github.com> Co-Authored-By: Claudio Moroni <43729990+ClaudMor@users.noreply.github.com>
1 parent 3998302 commit 261a772

File tree

6 files changed

+16
-27
lines changed

6 files changed

+16
-27
lines changed

‎src/graphs_extensions/metagraphs.jl‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
"""
1+
#= """
22
MetaGraph{T,U}()
33
44
Empty MetaGraph with vertex type `T` and adjacency matrix eltype `U`. The underlying graph is a SimpleGraph.
@@ -54,7 +54,7 @@ MetaGraphs.MetaGraph{T,U}(adjm::Union{Matrix,SparseMatrixCSC}) where {T,U} = Me
5454
5555
MetaDiGraph with adjacency matrix `adjm`, vertex type `T` and adjacency matrix eltype `U`. The underlying graph is a SimpleDiGraph.
5656
"""
57-
MetaGraphs.MetaDiGraph{T,U}(adjm::Union{Matrix,SparseMatrixCSC}) where {T,U} = MetaDiGraph{T,U}(SimpleDiGraph(adjm))
57+
MetaGraphs.MetaDiGraph{T,U}(adjm::Union{Matrix,SparseMatrixCSC}) where {T,U} = MetaDiGraph{T,U}(SimpleDiGraph(adjm)) =#
5858

5959
__add_vertex!(g::AbstractMetaGraph{T}; metadata::Union{Tuple,NamedTuple} = NamedTuple()) where {T <: Integer} = add_vertex!(g, Dict(Symbol(pair.first) => pair.second for pair in pairs(metadata)))
6060

@@ -86,7 +86,6 @@ MetaGraphs.get_prop(subgraph::S, v::MultilayerVertex, prop) where {S <:AbstractS
8686
"""
8787
MetaGraphs.get_prop(subgraph::S, s::MultilayerVertex, d::MultilayerVertex, prop) where {S <:AbstractSubGraph} = get_prop(subgraph.graph, get_v(subgraph,s), get_v(subgraph,d), prop,)
8888

89-
#_vertices(g::AbstractMetaGraph) = [(v, NamedTuple(props(g,v))) for v in vertices(g)] #[(v, (prop = get_prop(g,v) for prop in keys(props(g,v)))) for v in vertices(g)]
9089

9190
function _add_edge!(g::AbstractMetaGraph{T}, src::T, dst::T; weight::W = nothing, metadata::Union{Tuple,NamedTuple} = NamedTuple()) where {T <: Integer, W<: Union{<: Real, Nothing}}
9291
(isnothing(weight) || weight == 1.0) || @warn "Trying to add a weighted edge to an unweighted graph of type $(typeof(g)). Weight $weight will be ignored."

‎src/graphs_extensions/simplevaluegraphs.jl‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
"""
1+
#= """
22
ValGraph(n_vertices::Int, n_edges::Int; T = Int64, kwargs...)
33
44
Random ValGraph with `n_vertices` vertices and `n_edges` edges and vertex type `T`. the underlying graph is a SimpleGraph.
@@ -38,9 +38,8 @@ ValDiGraph{T}(; kwargs...) where T
3838
3939
Random ValDiGraph with `n_vertices` vertices and `n_edges` edges and vertex type `T`. the underlying graph is a SimpleDiGraph.
4040
"""
41-
SimpleValueGraphs.ValGraph{T}(; kwargs...) where T = ValGraph( SimpleGraph{T}(); kwargs... )
41+
SimpleValueGraphs.ValGraph{T}(; kwargs...) where T = ValGraph( SimpleGraph{T}(); kwargs... ) =#
4242

43-
# _vertices(g::SimpleValueGraphs.AbstractValGraph) = [(v, get_vertexval(g, v,:)) for v in vertices(g)]
4443

4544
function __add_vertex!(g::SimpleValueGraphs.AbstractValGraph{T}; metadata::Union{Tuple,NamedTuple} = NamedTuple()) where {T <: Integer}
4645
if isempty(metadata)
@@ -79,9 +78,9 @@ function _add_edge!(g::SimpleValueGraphs.AbstractValGraph{T}, src::T, dst::T; we
7978
end
8079
end
8180

82-
_get_edge_weight(g::SimpleValueGraphs.AbstractValGraph{T}, src::T, dst::T, weighttype::Type{U} ) where {T, U <: Real} = one(U) # hasedgekey(g, :weight) ? U(get_edgeval(g, src, dst, :weight)) :
81+
_get_edge_weight(g::SimpleValueGraphs.AbstractValGraph{T}, src::T, dst::T, weighttype::Type{U} ) where {T, U <: Real} = one(U)
8382

84-
_get_edge_metadata(g::SimpleValueGraphs.AbstractValGraph{T}, src::T, dst::T ) where T = get_edgeval(g, src, dst, :) # NamedTuple()
83+
_get_edge_metadata(g::SimpleValueGraphs.AbstractValGraph{T}, src::T, dst::T ) where T = get_edgeval(g, src, dst, :)
8584

8685
function _set_metadata!(g::SimpleValueGraphs.AbstractValGraph{T}, src::T, dst::T, metadata::Union{Tuple, NamedTuple}) where T
8786

‎src/graphs_extensions/simpleweightedgraphs.jl‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Some custom extensions of Graphs.jl and SimpleWeightedGraphs.jl
1+
#= # Some custom extensions of Graphs.jl and SimpleWeightedGraphs.jl
22
"""
33
SimpleWeightedGraph(n_vertices::Integer, n_edges::Integer; T::Type = Int64, U::Type = Float64)
44
@@ -122,19 +122,10 @@ function SimpleWeightedGraphs.SimpleWeightedDiGraph{T,U}(
122122
end
123123
end
124124
return SimpleWeightedDiGraph{T,U}(adjm)
125-
end
125+
end =#
126126

127127
Graphs.weights(g::G) where {T, G <: AbstractSimpleWeightedGraph{T}} = Graphs.weights(g)
128128

129-
#= function _vertices(g::AbstractSimpleWeightedGraph{T}) where T
130-
131-
_vs = vertices(g)
132-
_nv = length(_vs)
133-
134-
return zip(_vs,repeat([NamedTuple()], _nv))
135-
136-
end
137-
=#
138129

139130
function __add_vertex!(g::AbstractSimpleWeightedGraph{T}; metadata::Union{Tuple,NamedTuple} = NamedTuple()) where {T <: Integer}
140131
!isempty(metadata) && println("Trying to add a vertex with metadata to a graph of type $(typeof(g)). Metadata $(metadata) will be ignored.")

‎test/abstractmultilayerdigraph.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const n_edges_missing_d = rand(n_vertices_missing:(n_vertices_missing*(n_vertic
3737
missing_layer_d = Layer(:missing_layer_d,
3838
sample(mvs_metadata, n_vertices_missing, replace = false),
3939
n_edges_missing_d,
40-
MultilayerGraphs.ValDiGraph{vertextype}(;edgeval_types=(Float64, String, ),
40+
MultilayerGraphs.ValDiGraph(SimpleDiGraph{vertextype}();edgeval_types=(Float64, String, ),
4141
edgeval_init=(s, d) -> (s+d, "missing vertex $(s+d)"),
4242
vertexval_types=(String,),
4343
vertexval_init=v -> ("$(v^2)",),),

‎test/abstractmultilayerugraph.jl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ const n_edges_missing_u = rand(n_vertices_missing:(n_vertices_missing*(n_vertic
3737
missing_layer_u = Layer(:missing_layer_u,
3838
sample(mvs_metadata, n_vertices_missing, replace = false),
3939
n_edges_missing_u,
40-
MultilayerGraphs.ValGraph{vertextype}(;edgeval_types=(Float64, String, ),
40+
MultilayerGraphs.ValGraph(SimpleGraph{vertextype}();edgeval_types=(Float64, String, ),
4141
edgeval_init=(s, d) -> (s+d, "missing vertex $(s+d)"),
4242
vertexval_types=(String,),
4343
vertexval_init=v -> ("$(v^2)",),),

‎test/runtests.jl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ _ne = rand(_nv:(_nv*(_nv-1)) ÷ 2 )
4444
layer_vg = Layer(:layer_vg,
4545
sample(mvs_metadata, _nv, replace = false),
4646
_ne,
47-
MultilayerGraphs.ValGraph{vertextype}(;edgeval_types=(Float64, String, ),
47+
ValGraph(SimpleGraph{vertextype}();edgeval_types=(Float64, String, ),
4848
edgeval_init=(s, d) -> (s+d, "hi"),
4949
vertexval_types=(String,),
5050
vertexval_init=v -> ("$v",),),
@@ -57,7 +57,7 @@ layer_vg = Layer(:layer_vg,
5757
layer_vodg = Layer(:layer_vodg,
5858
sample(mvs_metadata, _nv, replace = false),
5959
_ne,
60-
MultilayerGraphs.ValOutDiGraph{vertextype}(;edgeval_types=(a = Float64,b = String, ),
60+
ValOutDiGraph(SimpleDiGraph{vertextype}();edgeval_types=(a = Float64,b = String, ),
6161
edgeval_init=(s, d) -> (a =s+d,b = "hi"),
6262
vertexval_types=(String,),
6363
vertexval_init=v -> ("$v",),),
@@ -68,7 +68,7 @@ layer_vodg = Layer(:layer_vodg,
6868
layer_vdg = Layer(:layer_vdg,
6969
sample(mvs_metadata, _nv, replace = false),
7070
_ne,
71-
MultilayerGraphs.ValDiGraph{vertextype}(;edgeval_types=(Float64, String, ),
71+
ValDiGraph(SimpleDiGraph{vertextype}();edgeval_types=(Float64, String, ),
7272
edgeval_init=(s, d) -> (s+d,"hi"),
7373
vertexval_types=(String,),
7474
vertexval_init=v -> ("$v",),),
@@ -91,7 +91,7 @@ _nv = nv(layer_mg) + nv(layer_vg)
9191
_ne = rand(_nv:(_nv*(_nv-1))÷ 2)
9292
interlayer_mg_vg = Interlayer(layer_mg, layer_vg, _ne, MetaGraph{vertextype, _weighttype}(); default_edge_metadata = (x,y) -> (mymetadata = rand(),), transfer_vertex_metadata = true ) #SimpleWeightedGraph{Int64, Float64}()
9393

94-
interlayer_multiplex_sg_mg = multiplex_interlayer(layer_sg, layer_mg, ValGraph{vertextype}(; edgeval_types=(from_to = String,), edgeval_init=(s, d) -> (from_to = "from_$(s)_to_$(d)")); default_edge_metadata = (x,y) -> (from_to = "from_$(x)_to_$(y)",))
94+
interlayer_multiplex_sg_mg = multiplex_interlayer(layer_sg, layer_mg, ValGraph(SimpleGraph{vertextype}(); edgeval_types=(from_to = String,), edgeval_init=(s, d) -> (from_to = "from_$(s)_to_$(d)")); default_edge_metadata = (x,y) -> (from_to = "from_$(x)_to_$(y)",))
9595

9696
interlayer_empty_sg_vg = empty_interlayer(layer_sg, layer_vg, SimpleGraph{vertextype}())
9797

@@ -112,11 +112,11 @@ interlayer_mdg_vodg = Interlayer(layer_mdg, layer_vodg, _ne , MetaDiGraph{vertex
112112

113113
_nv = nv(layer_vodg) + nv(layer_vdg)
114114
_ne = rand(_nv:(_nv*(_nv-1))÷ 2)
115-
interlayer_vodg_vdg = Interlayer(layer_vodg, layer_vdg, _ne, ValOutDiGraph{vertextype}(; edgeval_types=(from_to = String,), edgeval_init=(s, d) -> (from_to = "from_$(s)_to_$(d)",)); default_edge_metadata = (x,y) -> (from_to = "from_$(x)_to_$(y)",));
115+
interlayer_vodg_vdg = Interlayer(layer_vodg, layer_vdg, _ne, ValOutDiGraph(SimpleDiGraph{vertextype}(); edgeval_types=(from_to = String,), edgeval_init=(s, d) -> (from_to = "from_$(s)_to_$(d)",)); default_edge_metadata = (x,y) -> (from_to = "from_$(x)_to_$(y)",));
116116

117117
_nv = nv(layer_sdg) + nv(layer_mdg)
118118
_ne = rand(_nv:(_nv*(_nv-1))÷ 2)
119-
interlayer_sdg_mdg = Interlayer(layer_sdg, layer_mdg, _ne, ValDiGraph{vertextype}(; edgeval_types=(from_to = String,), edgeval_init=(s, d) -> (from_to = "from_$(s)_to_$(d)",)); default_edge_metadata = (x,y) -> (from_to = "from_$(x)_to_$(y)",));
119+
interlayer_sdg_mdg = Interlayer(layer_sdg, layer_mdg, _ne, ValDiGraph(SimpleDiGraph{vertextype}(); edgeval_types=(from_to = String,), edgeval_init=(s, d) -> (from_to = "from_$(s)_to_$(d)",)); default_edge_metadata = (x,y) -> (from_to = "from_$(x)_to_$(y)",));
120120

121121
interlayer_multiplex_sdg_vodg = multiplex_interlayer(layer_sdg, layer_vodg, SimpleDiGraph{vertextype}());
122122

0 commit comments

Comments
 (0)