History of paris_transportation
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 the spatial networks with hfd_layout() instead of cfd_layout() cc3bcb0
Changed: none
diff --git a/entries/paris_transportation/__init__.py b/entries/paris_transportation/__init__.py
index 60c080b..e6680a4 100644
--- a/entries/paris_transportation/__init__.py
+++ b/entries/paris_transportation/__init__.py
@@ -86,6 +86,6 @@ def parse(alts=None):
def get_pos(g, sbm_fit):
- # Spatial network: laid out with the default parameters of cfd_layout(),
+ # Spatial network: laid out with the default parameters of hfd_layout(),
# without the partition of the SBM fit
- return cfd_layout(g)
+ return hfd_layout(g)
[entries] Add the date when each entry was added, and remove icon_hash beff7c9
The dates are those of the commits that first added the entries' files (2020-08-11 for the entries of the initial commit); renamed entries keep the date of their first name. Changed: none
diff --git a/entries/paris_transportation/__init__.py b/entries/paris_transportation/__init__.py
index bd98687..60c080b 100644
--- a/entries/paris_transportation/__init__.py
+++ b/entries/paris_transportation/__init__.py
@@ -34,7 +34,7 @@ The network has the following properties:
tags = ['Transportation', 'Public Transport', 'Multilayer', 'Unweighted']
url = 'https://github.com/ComplexNetTSP/MultilayerParis'
citation = [('F. Asgari et al., "CT-Mapper: Mapping sparse multimodal cellular trajectories using a multilayer transportation network." Computer Communications 95, 69-81 (2016)', 'https://doi.org/10.1016/j.comcom.2016.04.014')]
-icon_hash = '5864391ba411221d0e7c3e5d'
+date_added = '2020-08-11'
upstream_license = None
upstream_prefix = 'https://raw.githubusercontent.com/ComplexNetTSP/MultilayerParis/master'
files = [(('edge/edge.csv', 'vertex/vertex.csv'), None, 'csv')]
[entries] Prefix the properties in the descriptions with (Node), (Edge) or (Graph) bc3dbbd
The lists of properties at the end of the descriptions marked edge properties with "Edge" but left node properties unmarked, or grouped them in "Nodes: `a`, ...; `b`, ..." items, so the kind of a property was often unclear. Every item now starts with (Node), (Edge) or (Graph), followed by the property names, a colon and the explanation, one item per property or group of properties; qualifications (kinds of nodes, networks) follow the names in parentheses. Properties that were only named got a short explanation, and a few items that named the wrong kind of property were corrected.
diff --git a/entries/paris_transportation/__init__.py b/entries/paris_transportation/__init__.py
index 0958195..bd98687 100644
--- a/entries/paris_transportation/__init__.py
+++ b/entries/paris_transportation/__init__.py
@@ -26,11 +26,11 @@ The network was parsed from the upstream node and edge lists. (The upstream Grap
The network has the following properties:
-- `name` (nodes): the node ID in the source data.
-- `type` (nodes): the layer of the node, one of "road", "train", "metro" or "tram".
-- `lat`, `lon`: the latitude and longitude of the node, in degrees (the corresponding columns are swapped in the source).
-- `type` (edges): the layer of the edge, one of "road", "train", "metro", "tram" or "crosslayer".
-- `name` (edges): the name of the road (e.g. "D1", "A86") or of the transit line (e.g. "RER A", "M7"), or "None"."""
+- (Node) `name`: the node ID in the source data.
+- (Node) `type`: the layer of the node, one of "road", "train", "metro" or "tram".
+- (Node) `lat`, `lon`: the latitude and longitude of the node, in degrees (the corresponding columns are swapped in the source).
+- (Edge) `type`: the layer of the edge, one of "road", "train", "metro", "tram" or "crosslayer".
+- (Edge) `name`: the name of the road (e.g. "D1", "A86") or of the transit line (e.g. "RER A", "M7"), or "None"."""
tags = ['Transportation', 'Public Transport', 'Multilayer', 'Unweighted']
url = 'https://github.com/ComplexNetTSP/MultilayerParis'
citation = [('F. Asgari et al., "CT-Mapper: Mapping sparse multimodal cellular trajectories using a multilayer transportation network." Computer Communications 95, 69-81 (2016)', 'https://doi.org/10.1016/j.comcom.2016.04.014')]
[entries] Remove unneeded code from the entries 2c69f19
Unneeded "global files" statements, unused imports and variables, f-strings without placeholders, duplicate keys in foodweb_little_rock (keeping the order and the values used), and the second definition of get_lines() in twitter_higgs. Nothing changes in the networks or descriptions. Changed: none
diff --git a/entries/paris_transportation/__init__.py b/entries/paris_transportation/__init__.py
index a047cbf..0958195 100644
--- a/entries/paris_transportation/__init__.py
+++ b/entries/paris_transportation/__init__.py
@@ -47,7 +47,6 @@ def fetch_upstream(force=False):
@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:
[entries] Use American spelling in the descriptions 802d564
British spellings in the titles and descriptions of 69 entries (e.g. labelled, organisation, millimetres, centres, anonymised, neighbours, analysed, modelled, colour, licence) are replaced by the American ones. Proper names keep their spelling (Otago Harbour, the Centre for Water Systems, the Centre jeunesse de Montréal, the Dutch Ministry of Defence), as do quoted upstream terms, citations, and property names.
diff --git a/entries/paris_transportation/__init__.py b/entries/paris_transportation/__init__.py
index 3149271..a047cbf 100644
--- a/entries/paris_transportation/__init__.py
+++ b/entries/paris_transportation/__init__.py
@@ -22,7 +22,7 @@ import csv
title = "Paris Transportation (2016)"
description = """Multilayer transportation network of the Île-de-France region (Paris and its suburbs), constructed by F. Asgari and collaborators at Télécom SudParis to map sparse cellular phone trajectories onto transportation routes. It combines the road network, from the French National Geographic Institute (IGN), with the RER commuter rail, metro and tramway networks, from OpenStreetMap. Each node is a road intersection, a train station, a metro station or a tram station, and edges connect consecutive nodes along a road or line. Cross-layer edges connect nodes of different layers where a transition between transport modes is possible (e.g. between a station and a nearby road intersection). Edges marked as two-way in the source are represented by two directed edges, one in each direction, and one-way edges by a single edge from the first to the second endpoint listed in the source (the source does not distinguish one-way streets digitized against their direction of travel, so the direction of some one-way edges may be reversed). A few pairs of nodes are connected by more than one edge, and there are 3 self-loops.
-The network was parsed from the upstream node and edge lists. (The upstream GraphML file is broken: there each edge connects a node to an additional node without attributes, whose identifier is the ID of the edge, because the columns of the edge list are mislabelled; the endpoints of each edge are in its first two columns, and the column labelled as the target contains the edge ID.)
+The network was parsed from the upstream node and edge lists. (The upstream GraphML file is broken: there each edge connects a node to an additional node without attributes, whose identifier is the ID of the edge, because the columns of the edge list are mislabelled; the endpoints of each edge are in its first two columns, and the column labeled as the target contains the edge ID.)
The network has the following properties:
[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/paris_transportation/__init__.py b/entries/paris_transportation/__init__.py
index 1eb8207..3149271 100644
--- a/entries/paris_transportation/__init__.py
+++ b/entries/paris_transportation/__init__.py
@@ -84,3 +84,9 @@ def parse(alts=None):
g.ep.type[e] = row[4]
g.ep.name[e] = row[5]
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/paris_transportation/__init__.py b/entries/paris_transportation/__init__.py
index 52aea41..1eb8207 100644
--- a/entries/paris_transportation/__init__.py
+++ b/entries/paris_transportation/__init__.py
@@ -17,17 +17,27 @@
# with this program. If not, see <http://www.gnu.org/licenses/>.
from .. import *
+import csv
title = "Paris Transportation (2016)"
-description = """A multiplex transportation network of Ile-de-France, jointly representing the road network, train network, and subway network. Nodes are intersections, rail stations or metro stations. Different modes of transportation are given by different layers. Within-layer edges represent direct transference by a particular mode of transportation, and between-layer edges represent the conjunction of those layers at that node.[^icon]
-[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
+description = """Multilayer transportation network of the Île-de-France region (Paris and its suburbs), constructed by F. Asgari and collaborators at Télécom SudParis to map sparse cellular phone trajectories onto transportation routes. It combines the road network, from the French National Geographic Institute (IGN), with the RER commuter rail, metro and tramway networks, from OpenStreetMap. Each node is a road intersection, a train station, a metro station or a tram station, and edges connect consecutive nodes along a road or line. Cross-layer edges connect nodes of different layers where a transition between transport modes is possible (e.g. between a station and a nearby road intersection). Edges marked as two-way in the source are represented by two directed edges, one in each direction, and one-way edges by a single edge from the first to the second endpoint listed in the source (the source does not distinguish one-way streets digitized against their direction of travel, so the direction of some one-way edges may be reversed). A few pairs of nodes are connected by more than one edge, and there are 3 self-loops.
+
+The network was parsed from the upstream node and edge lists. (The upstream GraphML file is broken: there each edge connects a node to an additional node without attributes, whose identifier is the ID of the edge, because the columns of the edge list are mislabelled; the endpoints of each edge are in its first two columns, and the column labelled as the target contains the edge ID.)
+
+The network has the following properties:
+
+- `name` (nodes): the node ID in the source data.
+- `type` (nodes): the layer of the node, one of "road", "train", "metro" or "tram".
+- `lat`, `lon`: the latitude and longitude of the node, in degrees (the corresponding columns are swapped in the source).
+- `type` (edges): the layer of the edge, one of "road", "train", "metro", "tram" or "crosslayer".
+- `name` (edges): the name of the road (e.g. "D1", "A86") or of the transit line (e.g. "RER A", "M7"), or "None"."""
tags = ['Transportation', 'Public Transport', 'Multilayer', 'Unweighted']
url = 'https://github.com/ComplexNetTSP/MultilayerParis'
citation = [('F. Asgari et al., "CT-Mapper: Mapping sparse multimodal cellular trajectories using a multilayer transportation network." Computer Communications 95, 69-81 (2016)', 'https://doi.org/10.1016/j.comcom.2016.04.014')]
icon_hash = '5864391ba411221d0e7c3e5d'
-ustream_license = None
-upstream_prefix = 'https://raw.githubusercontent.com/ComplexNetTSP/MultilayerParis/master/graphml'
-files = [('multigraph.graphml', None, 'graphml')]
+upstream_license = None
+upstream_prefix = 'https://raw.githubusercontent.com/ComplexNetTSP/MultilayerParis/master'
+files = [(('edge/edge.csv', 'vertex/vertex.csv'), None, 'csv')]
def fetch_upstream(force=False):
return fetch_upstream_files(__name__.split(".")[-1], upstream_prefix, files,
@@ -42,9 +52,35 @@ def parse(alts=None):
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=True)
+ fe, fv = [stack.enter_context(open_upstream_file(name, fn, "r"))
+ for fn in fnames]
+ g = Graph(directed=True)
+ g.vp.name = g.new_vp("string")
+ g.vp.type = g.new_vp("string")
+ g.vp.lat = g.new_vp("double")
+ g.vp.lon = g.new_vp("double")
+ vs = {}
+ for row in csv.reader(fv):
+ if row[0].startswith("#"):
+ continue
+ v = vs[row[0]] = g.add_vertex()
+ g.vp.name[v] = row[0]
+ # the columns labelled "Lat" and "Lon" are swapped
+ g.vp.lon[v] = float(row[1])
+ g.vp.lat[v] = float(row[2])
+ g.vp.type[v] = row[3]
+ g.ep.type = g.new_ep("string")
+ g.ep.name = g.new_ep("string")
+ for row in csv.reader(fe):
+ if row[0].startswith("#"):
+ continue
+ # columns: source node, target node, edge ID, direction,
+ # layer, name (the header mislabels the first three)
+ u, v = vs[row[0]], vs[row[1]]
+ ends = [(u, v), (v, u)] if row[3] == "TwoWay" else [(u, v)]
+ for s, t in ends:
+ e = g.add_edge(s, t)
+ g.ep.type[e] = row[4]
+ g.ep.name[e] = row[5]
yield alt, g
Update copyright information 73a4f0d
diff --git a/entries/paris_transportation/__init__.py b/entries/paris_transportation/__init__.py
index 0d389ed..52aea41 100644
--- a/entries/paris_transportation/__init__.py
+++ b/entries/paris_transportation/__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/paris_transportation/__init__.py b/entries/paris_transportation/__init__.py
index 2e6bdd5..0d389ed 100644
--- a/entries/paris_transportation/__init__.py
+++ b/entries/paris_transportation/__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/paris_transportation/__init__.py b/entries/paris_transportation/__init__.py
index f706ca3..2e6bdd5 100644
--- a/entries/paris_transportation/__init__.py
+++ b/entries/paris_transportation/__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/paris_transportation/__init__.py b/entries/paris_transportation/__init__.py
index 88d02c2..f706ca3 100644
--- a/entries/paris_transportation/__init__.py
+++ b/entries/paris_transportation/__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 citations to use DOIs e878874
diff --git a/entries/paris_transportation/__init__.py b/entries/paris_transportation/__init__.py
index 5b03795..88d02c2 100644
--- a/entries/paris_transportation/__init__.py
+++ b/entries/paris_transportation/__init__.py
@@ -23,7 +23,7 @@ description = """A multiplex transportation network of Ile-de-France, jointly re
[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Transportation', 'Public Transport', 'Multilayer', 'Unweighted']
url = 'https://github.com/ComplexNetTSP/MultilayerParis'
-citation = [('F. Asgari et al., "CT-Mapper: Mapping sparse multimodal cellular trajectories using a multilayer transportation network." Computer Communications 95, 69-81 (2016)', 'http://dx.doi.org/10.1016/j.comcom.2016.04.014')]
+citation = [('F. Asgari et al., "CT-Mapper: Mapping sparse multimodal cellular trajectories using a multilayer transportation network." Computer Communications 95, 69-81 (2016)', 'https://doi.org/10.1016/j.comcom.2016.04.014')]
icon_hash = '5864391ba411221d0e7c3e5d'
ustream_license = None
upstream_prefix = 'https://raw.githubusercontent.com/ComplexNetTSP/MultilayerParis/master/graphml'
Change license from GPLv3 to AGPLv3 d754be5
diff --git a/entries/paris_transportation/__init__.py b/entries/paris_transportation/__init__.py
index 98f7976..5b03795 100644
--- a/entries/paris_transportation/__init__.py
+++ b/entries/paris_transportation/__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/paris_transportation/__init__.py b/entries/paris_transportation/__init__.py
index 7f780bd..98f7976 100644
--- a/entries/paris_transportation/__init__.py
+++ b/entries/paris_transportation/__init__.py
@@ -19,7 +19,8 @@
from .. import *
title = "Paris Transportation (2016)"
-description = "A multiplex transportation network of Ile-de-France, jointly representing the road network, train network, and subway network. Nodes are intersections, rail stations or metro stations. Different modes of transportation are given by different layers. Within-layer edges represent direct transference by a particular mode of transportation, and between-layer edges represent the conjunction of those layers at that node."
+description = """A multiplex transportation network of Ile-de-France, jointly representing the road network, train network, and subway network. Nodes are intersections, rail stations or metro stations. Different modes of transportation are given by different layers. Within-layer edges represent direct transference by a particular mode of transportation, and between-layer edges represent the conjunction of those layers at that node.[^icon]
+[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Transportation', 'Public Transport', 'Multilayer', 'Unweighted']
url = 'https://github.com/ComplexNetTSP/MultilayerParis'
citation = [('F. Asgari et al., "CT-Mapper: Mapping sparse multimodal cellular trajectories using a multilayer transportation network." Computer Communications 95, 69-81 (2016)', 'http://dx.doi.org/10.1016/j.comcom.2016.04.014')]
Initial commit cc85872
diff --git a/entries/paris_transportation/__init__.py b/entries/paris_transportation/__init__.py
new file mode 100644
index 0000000..7f780bd
--- /dev/null
+++ b/entries/paris_transportation/__init__.py
@@ -0,0 +1,49 @@
+#! /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 = "Paris Transportation (2016)"
+description = "A multiplex transportation network of Ile-de-France, jointly representing the road network, train network, and subway network. Nodes are intersections, rail stations or metro stations. Different modes of transportation are given by different layers. Within-layer edges represent direct transference by a particular mode of transportation, and between-layer edges represent the conjunction of those layers at that node."
+tags = ['Transportation', 'Public Transport', 'Multilayer', 'Unweighted']
+url = 'https://github.com/ComplexNetTSP/MultilayerParis'
+citation = [('F. Asgari et al., "CT-Mapper: Mapping sparse multimodal cellular trajectories using a multilayer transportation network." Computer Communications 95, 69-81 (2016)', 'http://dx.doi.org/10.1016/j.comcom.2016.04.014')]
+icon_hash = '5864391ba411221d0e7c3e5d'
+ustream_license = None
+upstream_prefix = 'https://raw.githubusercontent.com/ComplexNetTSP/MultilayerParis/master/graphml'
+files = [('multigraph.graphml', None, 'graphml')]
+
+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=True)
+ yield alt, g