Skip to content

Commit 9724ebb

Browse files
InterdisciplinaryPhysicsTeamClaudMorpitmonticone
committed
Format all scripts
Co-Authored-By: Claudio Moroni <43729990+ClaudMor@users.noreply.github.com> Co-Authored-By: Pietro Monticone <38562595+pitmonticone@users.noreply.github.com>
1 parent 17467bb commit 9724ebb

18 files changed

+1037
-980
lines changed

src/MultilayerGraphs.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,4 +204,4 @@ include("multilayerdigraph.jl")
204204
include("utilities.jl")
205205
include("tensorsfactorizations.jl")
206206

207-
end
207+
end

src/abstractmultilayerdigraph.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -409,7 +409,7 @@ function get_subgraph(
409409
layer_1_multilayervertices,
410410
layer_2_multilayervertices,
411411
unique(edge_list),
412-
descriptor
412+
descriptor,
413413
)
414414
end
415415

src/abstractmultilayergraph.jl

Lines changed: 40 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1200,25 +1200,52 @@ function to_string(x::AbstractMultilayerGraph)
12001200
unionall_type = typeof(x).name.wrapper
12011201
parameters = typeof(x).parameters
12021202

1203-
layers_names = name.(x.layers)
1204-
layers_underlying_graphs = typeof.(graph.(x.layers))
1205-
1206-
layers_table = pretty_table(String, hcat(layers_names, layers_underlying_graphs); title = "### LAYERS", header = (["NAME", "UNDERLYING GRAPH"]), alignment = :c, header_alignment = :c, header_crayon = crayon"yellow bold", hlines = :all)
1203+
layers_names = name.(x.layers)
1204+
layers_underlying_graphs = typeof.(graph.(x.layers))
1205+
1206+
layers_table = pretty_table(
1207+
String,
1208+
hcat(layers_names, layers_underlying_graphs);
1209+
title="### LAYERS",
1210+
header=(["NAME", "UNDERLYING GRAPH"]),
1211+
alignment=:c,
1212+
header_alignment=:c,
1213+
header_crayon=crayon"yellow bold",
1214+
hlines=:all,
1215+
)
12071216

12081217
interlayers_names = name.(values(x.interlayers))
1209-
interlayers_underlying_graphs = typeof.(graph.(values(x.interlayers)))
1218+
interlayers_underlying_graphs = typeof.(graph.(values(x.interlayers)))
12101219
interlayer_layer_1s = getproperty.(values(x.interlayers), Ref(:layer_1))
12111220
interlayer_layer_2s = getproperty.(values(x.interlayers), Ref(:layer_2))
1212-
interlayer_tranfers = getproperty.(values(x.interlayers), Ref(:transfer_vertex_metadata))
1213-
1214-
interlayers_table = pretty_table(String, hcat(interlayers_names, interlayer_layer_1s, interlayer_layer_2s, interlayers_underlying_graphs, interlayer_tranfers ); title = "### INTERLAYERS", header = (["NAME", "LAYER 1", "LAYER 2", "UNDERLYING GRAPH", "TRANSFER VERTEX METADATA"]), alignment = :c, header_alignment = :c, header_crayon = crayon"yellow bold", hlines = :all)
1221+
interlayer_tranfers =
1222+
getproperty.(values(x.interlayers), Ref(:transfer_vertex_metadata))
1223+
1224+
interlayers_table = pretty_table(
1225+
String,
1226+
hcat(
1227+
interlayers_names,
1228+
interlayer_layer_1s,
1229+
interlayer_layer_2s,
1230+
interlayers_underlying_graphs,
1231+
interlayer_tranfers,
1232+
);
1233+
title="### INTERLAYERS",
1234+
header=([
1235+
"NAME", "LAYER 1", "LAYER 2", "UNDERLYING GRAPH", "TRANSFER VERTEX METADATA"
1236+
]),
1237+
alignment=:c,
1238+
header_alignment=:c,
1239+
header_crayon=crayon"yellow bold",
1240+
hlines=:all,
1241+
)
12151242

1216-
"""
1217-
`$unionall_type` with vertex type `$(parameters[1])` and weight type `$(parameters[2])`.
1243+
return """
1244+
`$unionall_type` with vertex type `$(parameters[1])` and weight type `$(parameters[2])`.
12181245
1219-
$layers_table
1246+
$layers_table
12201247
1221-
$interlayers_table
1222-
"""
1248+
$interlayers_table
1249+
"""
12231250
end
12241251
Base.show(io::IO, x::AbstractMultilayerGraph) = print(io, to_string(x))

src/abstractmultilayerugraph.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,6 @@ function get_subgraph(
274274

275275
_vertices = get_rich_mv.(Ref(mg), vs)
276276

277-
278277
edge_list = MultilayerEdge{U}[]
279278

280279
for (src_v, halfedges_from_src) in zip(vs, getindex.(Ref(mg.fadjlist), vs))
@@ -367,7 +366,7 @@ function get_subgraph(
367366
layer_1_multilayervertices,
368367
layer_2_multilayervertices,
369368
unique(edge_list),
370-
descriptor
369+
descriptor,
371370
)
372371
end
373372

src/graphs_extensions/metagraphs.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,9 @@ function _add_edge!(
6363
) where {T<:Integer,W<:Union{<:Real,Nothing}}
6464
(isnothing(weight) || weight == 1.0) ||
6565
@warn "Trying to add a weighted edge to an unweighted graph of type $(typeof(g)). Weight $weight will be ignored."
66-
return add_edge!(g, src, dst, Dict(Symbol(pair.first) => pair.second for pair in pairs(metadata) )) #Symbol(string(key)) => value for (key, value) in pairs(metadata)
66+
return add_edge!(
67+
g, src, dst, Dict(Symbol(pair.first) => pair.second for pair in pairs(metadata))
68+
) #Symbol(string(key)) => value for (key, value) in pairs(metadata)
6769
end
6870

6971
function _get_edge_weight(

src/multilayerdigraph.jl

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,9 @@ function MultilayerDiGraph(
171171

172172
n = nv(empty_multilayerdigraph)
173173

174-
indegree_sequence,outdegree_sequence = sample_digraphical_degree_sequences(indegree_distribution,outdegree_distribution,n)
174+
indegree_sequence, outdegree_sequence = sample_digraphical_degree_sequences(
175+
indegree_distribution, outdegree_distribution, n
176+
)
175177

176178
return MultilayerDiGraph(
177179
empty_multilayerdigraph,

src/multilayeredge.jl

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,23 +36,31 @@ end
3636
3737
Convert to `MultilayerEdge{Nothing}(src, dst, nothing, NamedTuple())`.
3838
"""
39-
MultilayerEdge(src::AbstractMultilayerVertex, dst::AbstractMultilayerVertex) = MultilayerEdge{Nothing}(src, dst, nothing, NamedTuple())
40-
39+
function MultilayerEdge(src::AbstractMultilayerVertex, dst::AbstractMultilayerVertex)
40+
return MultilayerEdge{Nothing}(src, dst, nothing, NamedTuple())
41+
end
4142

4243
"""
4344
MultilayerEdge(src::AbstractMultilayerVertex, dst::AbstractMultilayerVertex, weight::U) where {U <: Real}
4445
4546
Convert to `MultilayerEdge{U}(src, dst, weight, NamedTuple())`.
4647
"""
47-
MultilayerEdge(src::AbstractMultilayerVertex, dst::AbstractMultilayerVertex, weight::U) where {U<:Real} = MultilayerEdge{U}(src, dst, weight, NamedTuple())
48-
48+
function MultilayerEdge(
49+
src::AbstractMultilayerVertex, dst::AbstractMultilayerVertex, weight::U
50+
) where {U<:Real}
51+
return MultilayerEdge{U}(src, dst, weight, NamedTuple())
52+
end
4953

5054
"""
5155
MultilayerEdge(src::AbstractMultilayerVertex, dst::AbstractMultilayerVertex, metadata::NamedTuple)
5256
5357
Convert to `MultilayerEdge{Nothing}(src, dst, nothing, metadata)`.
5458
"""
55-
MultilayerEdge(src::AbstractMultilayerVertex, dst::AbstractMultilayerVertex, metadata::NamedTuple) = MultilayerEdge{Nothing}(src, dst, nothing, metadata)
59+
function MultilayerEdge(
60+
src::AbstractMultilayerVertex, dst::AbstractMultilayerVertex, metadata::NamedTuple
61+
)
62+
return MultilayerEdge{Nothing}(src, dst, nothing, metadata)
63+
end
5664

5765
"""
5866
ME

src/multilayergraph.jl

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,10 @@ function Graphs.add_edge!(
102102
#= # Should we modify weight and metadata or should we return false? This may be something to decide ecosystem-wise
103103
set_weight!(mg, src, dst, _weight)
104104
set_metadata!(mg, src, dst, _metadata) =#
105-
@debug "Edge already exists" me [edge for edge in edges(mg) if node(src(edge)) == Node("node_1") && node(dst(edge)) == Node("node_1")]
105+
@debug "Edge already exists" me [
106+
edge for edge in edges(mg) if
107+
node(src(edge)) == Node("node_1") && node(dst(edge)) == Node("node_1")
108+
]
106109
return false
107110
end
108111
end
@@ -177,7 +180,6 @@ function MultilayerGraph(
177180
),
178181
)
179182

180-
181183
empty_multilayergraph = MultilayerGraph(
182184
empty_layers,
183185
empty_interlayers;
@@ -187,7 +189,7 @@ function MultilayerGraph(
187189

188190
n = nv(empty_multilayergraph)
189191

190-
degree_sequence = sample_graphical_degree_sequence(degree_distribution,n)
192+
degree_sequence = sample_graphical_degree_sequence(degree_distribution, n)
191193

192194
return MultilayerGraph(
193195
empty_multilayergraph, degree_sequence; allow_self_loops=false, perform_checks=false

src/subgraphs/abstractdescriptor.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,5 @@ An abstract tyep representing an abstract notion of subgraph descriptor
55
"""
66
abstract type AbstractDescriptor{T<:Integer,U<:Real,G<:AbstractGraph{T}} end
77

8-
name(x::AbstractDescriptor) = x.name
9-
graph(x::AbstractDescriptor) = x.null_graph
8+
name(x::AbstractDescriptor) = x.name
9+
graph(x::AbstractDescriptor) = x.null_graph

src/subgraphs/abstractsubgraph.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ function add_edge_standard!(
284284
weight::W=nothing,
285285
metadata::Union{Tuple,NamedTuple}=NamedTuple(),
286286
) where {T,U<:Real,W<:Union{U,Nothing},S<:AbstractSubGraph{T,U}}
287-
# @debug "" subgraph src dst weight metadata
287+
# @debug "" subgraph src dst weight metadata
288288
return add_edge!(
289289
subgraph,
290290
get_v(subgraph, src),

0 commit comments

Comments
 (0)