Remove custom cosnstructors of underying graphs

Co-Authored-By: Pietro Monticone <[email protected]>
Co-Authored-By: Claudio Moroni <[email protected]>

Author: 3 people

src/graphs_extensions/metagraphs.jl

@@ -1,4 +1,4 @@
-"""
+#= """
     MetaGraph{T,U}()
 
 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
 
 MetaDiGraph with adjacency matrix `adjm`, vertex type `T` and adjacency matrix eltype `U`. The underlying graph is a SimpleDiGraph. 
 """
-MetaGraphs.MetaDiGraph{T,U}(adjm::Union{Matrix,SparseMatrixCSC}) where {T,U} =  MetaDiGraph{T,U}(SimpleDiGraph(adjm))
+MetaGraphs.MetaDiGraph{T,U}(adjm::Union{Matrix,SparseMatrixCSC}) where {T,U} =  MetaDiGraph{T,U}(SimpleDiGraph(adjm)) =#
 
 __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)))
 
@@ -86,7 +86,6 @@ MetaGraphs.get_prop(subgraph::S, v::MultilayerVertex, prop) where {S <:AbstractS
 """
 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,)
 
-#_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)]
 
 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}}
     (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

@@ -1,4 +1,4 @@
-"""
+#= """
 ValGraph(n_vertices::Int, n_edges::Int; T = Int64, kwargs...)
 
 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
 
 Random ValDiGraph with `n_vertices` vertices and `n_edges` edges and vertex type `T`. the underlying graph is a SimpleDiGraph. 
 """
-SimpleValueGraphs.ValGraph{T}(; kwargs...) where T =  ValGraph( SimpleGraph{T}(); kwargs... )
+SimpleValueGraphs.ValGraph{T}(; kwargs...) where T =  ValGraph( SimpleGraph{T}(); kwargs... ) =#
 
-# _vertices(g::SimpleValueGraphs.AbstractValGraph) = [(v, get_vertexval(g, v,:)) for v in vertices(g)]
 
 function __add_vertex!(g::SimpleValueGraphs.AbstractValGraph{T}; metadata::Union{Tuple,NamedTuple} = NamedTuple()) where {T <: Integer} 
     if isempty(metadata) 
@@ -79,9 +78,9 @@ function _add_edge!(g::SimpleValueGraphs.AbstractValGraph{T}, src::T, dst::T; we
     end
 end
 
-_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)) :
+_get_edge_weight(g::SimpleValueGraphs.AbstractValGraph{T}, src::T, dst::T, weighttype::Type{U} ) where {T, U <: Real} = one(U)
 
-_get_edge_metadata(g::SimpleValueGraphs.AbstractValGraph{T}, src::T, dst::T ) where T   = get_edgeval(g, src, dst, :) # NamedTuple()
+_get_edge_metadata(g::SimpleValueGraphs.AbstractValGraph{T}, src::T, dst::T ) where T   = get_edgeval(g, src, dst, :) 
 
 function _set_metadata!(g::SimpleValueGraphs.AbstractValGraph{T}, src::T, dst::T, metadata::Union{Tuple, NamedTuple}) where T
 

src/graphs_extensions/simpleweightedgraphs.jl

@@ -1,4 +1,4 @@
-# Some custom extensions of Graphs.jl and SimpleWeightedGraphs.jl
+#= # Some custom extensions of Graphs.jl and SimpleWeightedGraphs.jl
 """
     SimpleWeightedGraph(n_vertices::Integer, n_edges::Integer; T::Type = Int64, U::Type = Float64)
 
@@ -122,19 +122,10 @@ function SimpleWeightedGraphs.SimpleWeightedDiGraph{T,U}(
         end
     end
     return SimpleWeightedDiGraph{T,U}(adjm)
-end
+end =#
 
 Graphs.weights(g::G) where {T, G <: AbstractSimpleWeightedGraph{T}} = Graphs.weights(g)
 
-#= function _vertices(g::AbstractSimpleWeightedGraph{T}) where T 
-
-    _vs = vertices(g)
-    _nv = length(_vs)
-
-    return  zip(_vs,repeat([NamedTuple()], _nv))
-
-end
- =#
 
 function __add_vertex!(g::AbstractSimpleWeightedGraph{T}; metadata::Union{Tuple,NamedTuple} = NamedTuple()) where {T <: Integer}
     !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

@@ -37,7 +37,7 @@ const n_edges_missing_d =  rand(n_vertices_missing:(n_vertices_missing*(n_vertic
 missing_layer_d = Layer(:missing_layer_d, 
 sample(mvs_metadata, n_vertices_missing, replace = false), 
 n_edges_missing_d,
-MultilayerGraphs.ValDiGraph{vertextype}(;edgeval_types=(Float64, String, ),
+MultilayerGraphs.ValDiGraph(SimpleDiGraph{vertextype}();edgeval_types=(Float64, String, ),
                            edgeval_init=(s, d) -> (s+d, "missing vertex $(s+d)"),
                            vertexval_types=(String,),
                            vertexval_init=v -> ("$(v^2)",),),

test/abstractmultilayerugraph.jl

@@ -37,7 +37,7 @@ const n_edges_missing_u =  rand(n_vertices_missing:(n_vertices_missing*(n_vertic
 missing_layer_u = Layer(:missing_layer_u, 
 sample(mvs_metadata, n_vertices_missing, replace = false), 
 n_edges_missing_u,
-MultilayerGraphs.ValGraph{vertextype}(;edgeval_types=(Float64, String, ),
+MultilayerGraphs.ValGraph(SimpleGraph{vertextype}();edgeval_types=(Float64, String, ),
                            edgeval_init=(s, d) -> (s+d, "missing vertex $(s+d)"),
                            vertexval_types=(String,),
                            vertexval_init=v -> ("$(v^2)",),),

test/runtests.jl

@@ -44,7 +44,7 @@ _ne =  rand(_nv:(_nv*(_nv-1)) ÷ 2 )
 layer_vg = Layer(:layer_vg, 
                  sample(mvs_metadata, _nv, replace = false), 
                  _ne,
-                 MultilayerGraphs.ValGraph{vertextype}(;edgeval_types=(Float64, String, ),
+                 ValGraph(SimpleGraph{vertextype}();edgeval_types=(Float64, String, ),
                                             edgeval_init=(s, d) -> (s+d, "hi"),
                                             vertexval_types=(String,),
                                             vertexval_init=v -> ("$v",),),
@@ -57,7 +57,7 @@ layer_vg = Layer(:layer_vg,
 layer_vodg = Layer(:layer_vodg, 
                     sample(mvs_metadata, _nv, replace = false), 
                     _ne,
-                    MultilayerGraphs.ValOutDiGraph{vertextype}(;edgeval_types=(a = Float64,b = String, ),
+                    ValOutDiGraph(SimpleDiGraph{vertextype}();edgeval_types=(a = Float64,b = String, ),
                                                                 edgeval_init=(s, d) -> (a =s+d,b = "hi"),
                                                                 vertexval_types=(String,),
                                                                 vertexval_init=v -> ("$v",),),
@@ -68,7 +68,7 @@ layer_vodg = Layer(:layer_vodg,
 layer_vdg = Layer(:layer_vdg, 
                     sample(mvs_metadata, _nv, replace = false), 
                     _ne,
-                    MultilayerGraphs.ValDiGraph{vertextype}(;edgeval_types=(Float64, String, ),
+                    ValDiGraph(SimpleDiGraph{vertextype}();edgeval_types=(Float64, String, ),
                                                                 edgeval_init=(s, d) -> (s+d,"hi"),
                                                                 vertexval_types=(String,),
                                                                 vertexval_init=v -> ("$v",),),
@@ -91,7 +91,7 @@ _nv =  nv(layer_mg) + nv(layer_vg)
 _ne = rand(_nv:(_nv*(_nv-1))÷ 2)
 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}()
 
-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)",)) 
+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)",)) 
 
 interlayer_empty_sg_vg = empty_interlayer(layer_sg, layer_vg, SimpleGraph{vertextype}()) 
 
@@ -112,11 +112,11 @@ interlayer_mdg_vodg = Interlayer(layer_mdg, layer_vodg, _ne , MetaDiGraph{vertex
 
 _nv = nv(layer_vodg) + nv(layer_vdg)
 _ne = rand(_nv:(_nv*(_nv-1))÷ 2)
-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)",));
+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)",));
 
 _nv = nv(layer_sdg) + nv(layer_mdg)
 _ne = rand(_nv:(_nv*(_nv-1))÷ 2)
-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)",));
+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)",));
 
 interlayer_multiplex_sdg_vodg = multiplex_interlayer(layer_sdg, layer_vodg, SimpleDiGraph{vertextype}());