History of london_transport
The changes to the source code of this entry in the repository, newest first, each with the differences it made to the entry's files. They are also listed on GitLab.
[entries] Lay out spatial networks with cfd_layout() without the SBM partition 9db8d77
Road, power grid, public transport, water and river networks and physical meshes override get_pos() with the default parameters of cfd_layout(), without grouping by the partition of the SBM fit.
diff --git a/entries/london_transport/__init__.py b/entries/london_transport/__init__.py
index 47e9fae..0d5da7e 100644
--- a/entries/london_transport/__init__.py
+++ b/entries/london_transport/__init__.py
@@ -55,3 +55,9 @@ def parse(alts=None):
fs = [stack.enter_context(open_upstream_file(name, fn, "rb")) for fn in fnames]
g = parse_graph(fs, fmt, directed=False)
yield alt, g
+
+
+def get_pos(g, sbm_fit):
+ # Spatial network: laid out with the default parameters of cfd_layout(),
+ # without the partition of the SBM fit
+ return cfd_layout(g)
[entries] Fix parse bugs and improve the metadata of existing entries c996a0e
From a review of the dataset descriptions against the upstream sources and papers, and from user reports: - parse fixes (wrong edge direction or directedness, shifted or misnamed properties, merged node identities, duplicated or missing edges and nodes, wrong types), e.g. arxiv_citation (the HepTh dates were a copy of the HepPh ones; now from the KDD Cup 2003 data), eu_procurements, foursquare_global, hiv_transmission, genetic_multiplex, gnutella (adds the 05 snapshot), roadnet, macaque_neural, python_dependency - descriptions rewritten from the upstream sources, documenting every property - corrected titles, citations and DOIs, licences (ustream_license typo, the data's own terms), tags and ICON ids - url lists for entries with several sources or dataset pages - SocioPatterns entries moved to the site's new data location, with the daily networks of sp_infectious and sp_primary_school - the Michael Fire entries marked as orphans (served from the mirror) - redundant type forcings removed after the graph-tool coercion fixes
diff --git a/entries/london_transport/__init__.py b/entries/london_transport/__init__.py
index 4110032..47e9fae 100644
--- a/entries/london_transport/__init__.py
+++ b/entries/london_transport/__init__.py
@@ -19,8 +19,14 @@
from .. import *
title = "London Transport Network"
-description = """Multiplex network with 3 edge types representing links within the three layers of London train stations: Underground, Overground and DLR.[^icon]
-[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
+description = """Multiplex network of the train stations of London, assembled by M. De Domenico and collaborators. The data were collected in 2013 from the official website of Transport for London (TfL) and manually cross-checked. Nodes are stations of the London Underground, London Overground and Docklands Light Railway (DLR), and edges connect consecutive stations along a line. The network has three layers: (1) the Underground, where the networks of all eleven Tube lines are aggregated into a single layer, (2) the Overground, and (3) the DLR. Edges are undirected.
+
+The network has the following properties:
+
+- `name`, `nodeLabel`: the station name (lowercase, without spaces, as in "bakerstreet").
+- `nodeLat`, `nodeLong`: the latitude and longitude of the station, in degrees.
+- `layer`: the layer of the edge, with 1 = Tube, 2 = Overground, 3 = DLR (see the graph property `layer_key`).
+- `weight`: the number of distinct lines connecting the two stations in that layer (e.g. two adjacent stations served by both the Circle and the District line have weight 2 in the Tube layer)."""
tags = ['Transportation', 'Public Transport', 'Multilayer', 'Weighted']
url = 'https://manliodedomenico.com/data.php'
citation = [('Manlio De Domenico, Albert Solé-Ribalta, Sergio Gómez, and Alex Arenas, "Navigability of interconnected networks under random failures." PNAS 111, 8351-8356 (2014)', 'https://doi.org/10.1073/pnas.1318469111')]
Update copyright information 73a4f0d
diff --git a/entries/london_transport/__init__.py b/entries/london_transport/__init__.py
index c860dc8..4110032 100644
--- a/entries/london_transport/__init__.py
+++ b/entries/london_transport/__init__.py
@@ -1,7 +1,7 @@
#! /usr/bin/env python
# -*- coding: utf-8 -*-
#
-# Copyright (C) 2020-2024 Tiago de Paula Peixoto <tiago@skewed.de>
+# Copyright (C) 2020-2026 Tiago de Paula Peixoto <tiago@skewed.de>
#
# This program is free software: you can redistribute it and/or modify it under
# the terms of the GNU Affero General Public License as published by the Free
Update copyright information 3d288ea
diff --git a/entries/london_transport/__init__.py b/entries/london_transport/__init__.py
index c1ba6b9..c860dc8 100644
--- a/entries/london_transport/__init__.py
+++ b/entries/london_transport/__init__.py
@@ -1,7 +1,7 @@
#! /usr/bin/env python
# -*- coding: utf-8 -*-
#
-# Copyright (C) 2020-2023 Tiago de Paula Peixoto <tiago@skewed.de>
+# Copyright (C) 2020-2024 Tiago de Paula Peixoto <tiago@skewed.de>
#
# This program is free software: you can redistribute it and/or modify it under
# the terms of the GNU Affero General Public License as published by the Free
Update copyright information 8d005ae
diff --git a/entries/london_transport/__init__.py b/entries/london_transport/__init__.py
index b62bab1..c1ba6b9 100644
--- a/entries/london_transport/__init__.py
+++ b/entries/london_transport/__init__.py
@@ -1,7 +1,7 @@
#! /usr/bin/env python
# -*- coding: utf-8 -*-
#
-# Copyright (C) 2021 Tiago de Paula Peixoto <tiago@skewed.de>
+# Copyright (C) 2020-2023 Tiago de Paula Peixoto <tiago@skewed.de>
#
# This program is free software: you can redistribute it and/or modify it under
# the terms of the GNU Affero General Public License as published by the Free
Update copyright info db2efcc
diff --git a/entries/london_transport/__init__.py b/entries/london_transport/__init__.py
index d7bc643..b62bab1 100644
--- a/entries/london_transport/__init__.py
+++ b/entries/london_transport/__init__.py
@@ -1,7 +1,7 @@
#! /usr/bin/env python
# -*- coding: utf-8 -*-
#
-# Copyright (C) 2020 Tiago de Paula Peixoto <tiago@skewed.de>
+# Copyright (C) 2021 Tiago de Paula Peixoto <tiago@skewed.de>
#
# This program is free software: you can redistribute it and/or modify it under
# the terms of the GNU Affero General Public License as published by the Free
Update comunelab's datasets ddccc3b
diff --git a/entries/london_transport/__init__.py b/entries/london_transport/__init__.py
index 1cf3281..d7bc643 100644
--- a/entries/london_transport/__init__.py
+++ b/entries/london_transport/__init__.py
@@ -22,12 +22,12 @@ title = "London Transport Network"
description = """Multiplex network with 3 edge types representing links within the three layers of London train stations: Underground, Overground and DLR.[^icon]
[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Transportation', 'Public Transport', 'Multilayer', 'Weighted']
-url = 'https://comunelab.fbk.eu/data.php'
+url = 'https://manliodedomenico.com/data.php'
citation = [('Manlio De Domenico, Albert Solé-Ribalta, Sergio Gómez, and Alex Arenas, "Navigability of interconnected networks under random failures." PNAS 111, 8351-8356 (2014)', 'https://doi.org/10.1073/pnas.1318469111')]
icon_hash = '56ce644ca6d70217090cdb98'
upstream_license = ("Open Data Commons Open Database License (ODbL)",
"https://opendatacommons.org/licenses/odbl/")
-upstream_prefix = 'https://comunelab.fbk.eu/data'
+upstream_prefix = 'https://manliodedomenico.com/data'
files = [('London_Multiplex_Transport.zip', None, 'comunelab')]
def fetch_upstream(force=False):
Update citations to use DOIs e878874
diff --git a/entries/london_transport/__init__.py b/entries/london_transport/__init__.py
index 5cfb26d..1cf3281 100644
--- a/entries/london_transport/__init__.py
+++ b/entries/london_transport/__init__.py
@@ -23,7 +23,7 @@ description = """Multiplex network with 3 edge types representing links within t
[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Transportation', 'Public Transport', 'Multilayer', 'Weighted']
url = 'https://comunelab.fbk.eu/data.php'
-citation = [('Manlio De Domenico, Albert Solé-Ribalta, Sergio Gómez, and Alex Arenas, "Navigability of interconnected networks under random failures." PNAS 111, 8351-8356 (2014)', 'http://www.pnas.org/content/early/2014/05/21/1318469111.abstract')]
+citation = [('Manlio De Domenico, Albert Solé-Ribalta, Sergio Gómez, and Alex Arenas, "Navigability of interconnected networks under random failures." PNAS 111, 8351-8356 (2014)', 'https://doi.org/10.1073/pnas.1318469111')]
icon_hash = '56ce644ca6d70217090cdb98'
upstream_license = ("Open Data Commons Open Database License (ODbL)",
"https://opendatacommons.org/licenses/odbl/")
Change license from GPLv3 to AGPLv3 d754be5
diff --git a/entries/london_transport/__init__.py b/entries/london_transport/__init__.py
index 13507dd..5cfb26d 100644
--- a/entries/london_transport/__init__.py
+++ b/entries/london_transport/__init__.py
@@ -3,18 +3,18 @@
#
# Copyright (C) 2020 Tiago de Paula Peixoto <tiago@skewed.de>
#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
+# This program is free software: you can redistribute it and/or modify it under
+# the terms of the GNU Affero General Public License as published by the Free
+# Software Foundation, either version 3 of the License, or (at your option) any
+# later version.
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more
+# details.
#
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
+# You should have received a copy of the GNU Affero General Public License along
+# with this program. If not, see <http://www.gnu.org/licenses/>.
from .. import *
Add explicit attribution to descriptions obtained from ICON 1645314
diff --git a/entries/london_transport/__init__.py b/entries/london_transport/__init__.py
index b97fe90..13507dd 100644
--- a/entries/london_transport/__init__.py
+++ b/entries/london_transport/__init__.py
@@ -19,7 +19,8 @@
from .. import *
title = "London Transport Network"
-description = "Multiplex network with 3 edge types representing links within the three layers of London train stations: Underground, Overground and DLR."
+description = """Multiplex network with 3 edge types representing links within the three layers of London train stations: Underground, Overground and DLR.[^icon]
+[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Transportation', 'Public Transport', 'Multilayer', 'Weighted']
url = 'https://comunelab.fbk.eu/data.php'
citation = [('Manlio De Domenico, Albert Solé-Ribalta, Sergio Gómez, and Alex Arenas, "Navigability of interconnected networks under random failures." PNAS 111, 8351-8356 (2014)', 'http://www.pnas.org/content/early/2014/05/21/1318469111.abstract')]
Initial commit cc85872
diff --git a/entries/london_transport/__init__.py b/entries/london_transport/__init__.py
new file mode 100644
index 0000000..b97fe90
--- /dev/null
+++ b/entries/london_transport/__init__.py
@@ -0,0 +1,50 @@
+#! /usr/bin/env python
+# -*- coding: utf-8 -*-
+#
+# Copyright (C) 2020 Tiago de Paula Peixoto <tiago@skewed.de>
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+from .. import *
+
+title = "London Transport Network"
+description = "Multiplex network with 3 edge types representing links within the three layers of London train stations: Underground, Overground and DLR."
+tags = ['Transportation', 'Public Transport', 'Multilayer', 'Weighted']
+url = 'https://comunelab.fbk.eu/data.php'
+citation = [('Manlio De Domenico, Albert Solé-Ribalta, Sergio Gómez, and Alex Arenas, "Navigability of interconnected networks under random failures." PNAS 111, 8351-8356 (2014)', 'http://www.pnas.org/content/early/2014/05/21/1318469111.abstract')]
+icon_hash = '56ce644ca6d70217090cdb98'
+upstream_license = ("Open Data Commons Open Database License (ODbL)",
+ "https://opendatacommons.org/licenses/odbl/")
+upstream_prefix = 'https://comunelab.fbk.eu/data'
+files = [('London_Multiplex_Transport.zip', None, 'comunelab')]
+
+def fetch_upstream(force=False):
+ return fetch_upstream_files(__name__.split(".")[-1], upstream_prefix, files,
+ force)
+
+@cache_network()
+@coerce_props()
+@annotate()
+def parse(alts=None):
+ global files
+ name = __name__.split(".")[-1]
+ for fnames, alt, fmt in files:
+ if alts is not None and alt not in alts:
+ continue
+ if isinstance(fnames, str):
+ fnames = [fnames]
+ with ExitStack() as stack:
+ fs = [stack.enter_context(open_upstream_file(name, fn, "rb")) for fn in fnames]
+ g = parse_graph(fs, fmt, directed=False)
+ yield alt, g