logo Netzschleuder network catalog, repository, and centrifuge

History of euroroad

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() by Tiago de Paula Peixoto cc3bcb0
Changed: none
diff --git a/entries/euroroad/__init__.py b/entries/euroroad/__init__.py
index 55a5eeb..62c0d50 100644
--- a/entries/euroroad/__init__.py
+++ b/entries/euroroad/__init__.py
@@ -51,6 +51,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 by Tiago de Paula Peixoto 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/euroroad/__init__.py b/entries/euroroad/__init__.py
index 3e06289..55a5eeb 100644
--- a/entries/euroroad/__init__.py
+++ b/entries/euroroad/__init__.py
@@ -27,7 +27,7 @@ The network has the following properties:
 tags = ['Transportation', 'Roads', 'Unweighted', 'Multigraph', 'Metadata']
 url = 'http://wwwlovre.appspot.com/support.jsp'
 citation = [('L. Šubelj, M. Bajec, "Robust network community detection using balanced propagation." The European Physical Journal B 81(3), 353-362 (2011)', 'https://doi.org/10.1140/epjb/e2011-10979-2')]
-icon_hash = '57f2dbae8cf714f319c3912c'
+date_added = '2020-08-11'
 upstream_license = None
 upstream_prefix = 'http://wwwlovre.appspot.com/resources/research/networks'
 files = [('bpa/euroroad.net', None, None)]
[entries] Prefix the properties in the descriptions with (Node), (Edge) or (Graph) by Tiago de Paula Peixoto 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/euroroad/__init__.py b/entries/euroroad/__init__.py
index 695cbe9..3e06289 100644
--- a/entries/euroroad/__init__.py
+++ b/entries/euroroad/__init__.py
@@ -23,7 +23,7 @@ description = """The network of the international E-road network, a numbering sy
 
 The network has the following properties:
 
-- `name`: the name of the city."""
+- (Node) `name`: the name of the city."""
 tags = ['Transportation', 'Roads', 'Unweighted', 'Multigraph', 'Metadata']
 url = 'http://wwwlovre.appspot.com/support.jsp'
 citation = [('L. Šubelj, M. Bajec, "Robust network community detection using balanced propagation." The European Physical Journal B 81(3), 353-362 (2011)', 'https://doi.org/10.1140/epjb/e2011-10979-2')]
[entries] Remove unneeded code from the entries by Tiago de Paula Peixoto 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/euroroad/__init__.py b/entries/euroroad/__init__.py
index 38a9de6..695cbe9 100644
--- a/entries/euroroad/__init__.py
+++ b/entries/euroroad/__init__.py
@@ -40,7 +40,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 by Tiago de Paula Peixoto 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/euroroad/__init__.py b/entries/euroroad/__init__.py
index 8fdbf37..38a9de6 100644
--- a/entries/euroroad/__init__.py
+++ b/entries/euroroad/__init__.py
@@ -19,7 +19,7 @@
 from .. import *
 
 title = "Euroroad network (2011)"
-description = """The network of the international E-road network, a numbering system for main roads in Europe (and some neighbouring countries) defined by the United Nations Economic Commission for Europe. The network was compiled by L. Šubelj and M. Bajec from the description of the E-roads in Wikipedia. Nodes are the cities listed along the E-roads and an edge connects two cities that are consecutive on some E-road. Some pairs of cities are connected by more than one edge (50 pairs), which presumably correspond to road segments shared by several E-roads, although this is not documented upstream; the E-road numbers are not included. Three cities have no connections (Mariehamn, Kapellskär and Civitavecchia), presumably because they are joined to the network only by ferry routes. The network is undirected and unweighted.
+description = """The network of the international E-road network, a numbering system for main roads in Europe (and some neighboring countries) defined by the United Nations Economic Commission for Europe. The network was compiled by L. Šubelj and M. Bajec from the description of the E-roads in Wikipedia. Nodes are the cities listed along the E-roads and an edge connects two cities that are consecutive on some E-road. Some pairs of cities are connected by more than one edge (50 pairs), which presumably correspond to road segments shared by several E-roads, although this is not documented upstream; the E-road numbers are not included. Three cities have no connections (Mariehamn, Kapellskär and Civitavecchia), presumably because they are joined to the network only by ferry routes. The network is undirected and unweighted.
 
 The network has the following properties:
 
[entries] Lay out spatial networks with cfd_layout() without the SBM partition by Tiago de Paula Peixoto 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/euroroad/__init__.py b/entries/euroroad/__init__.py
index d475364..8fdbf37 100644
--- a/entries/euroroad/__init__.py
+++ b/entries/euroroad/__init__.py
@@ -49,3 +49,9 @@ def parse(alts=None):
                              "network")
         g = pajek_graph(net, 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] Move KONECT-derived entries to their original sources by Tiago de Paula Peixoto 45943ea
The entries now download the data from where KONECT obtained them (live
or via the Wayback Machine), gaining the metadata KONECT dropped (names,
identifiers, timestamps, attributes), with descriptions and citations
rewritten from the original sources:

- Ma'ayan lab collection: faa_routes, foodweb_little_rock (taxon names
  were assigned to the wrong nodes), interactome_pdz, interactome_figeys,
  interactome_stelzl, interactome_vidal
- Pajek collection and primary sources: word_assoc (from the Edinburgh
  Associative Thesaurus; KONECT dropped all counts >= 10), foldoc,
  new_guinea_tribes
- bitriad: elite, ceo_club (adds the CEO KONECT's copy lacked)
- Lovro Subelj: cora, euroroad (adds isolated cities and parallel roads)
- SNAP: elec (all votes, with elections and nominators)
- Zenodo: wiki_talk (user ids and roles)
- MPI-SWS: flickr_growth, facebook_wall (edges now point from poster to
  wall owner, as documented), wikipedia_growth (full timestamps)
- Other sources: prosper, jester, reactome (the 2014
  release KONECT used), unicodelang (CLDR 27), wordnet (WordNet 3.1),
  chicago_road (TNTP ChicagoRegional)
diff --git a/entries/euroroad/__init__.py b/entries/euroroad/__init__.py
index 42126ec..d475364 100644
--- a/entries/euroroad/__init__.py
+++ b/entries/euroroad/__init__.py
@@ -19,14 +19,18 @@
 from .. import *
 
 title = "Euroroad network (2011)"
-description = """A network of international \"E-roads,\" mostly in Europe. Vertices represent cities and edges represents roads. Metadata includes names of cities.[^icon]
-[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
-tags = ['Transportation', 'Roads', 'Unweighted', 'Metadata']
-url = 'http://konect.cc/networks/subelj_euroroad'
-citation = [('L. Šubelj & M. Bajec. "Robust network community detection using balanced propagation." The European Physical Journal B 81(3), 353-362 (2011).', 'https://doi.org/10.1140/epjb/e2011-10979-2')]
+description = """The network of the international E-road network, a numbering system for main roads in Europe (and some neighbouring countries) defined by the United Nations Economic Commission for Europe. The network was compiled by L. Šubelj and M. Bajec from the description of the E-roads in Wikipedia. Nodes are the cities listed along the E-roads and an edge connects two cities that are consecutive on some E-road. Some pairs of cities are connected by more than one edge (50 pairs), which presumably correspond to road segments shared by several E-roads, although this is not documented upstream; the E-road numbers are not included. Three cities have no connections (Mariehamn, Kapellskär and Civitavecchia), presumably because they are joined to the network only by ferry routes. The network is undirected and unweighted.
+
+The network has the following properties:
+
+- `name`: the name of the city."""
+tags = ['Transportation', 'Roads', 'Unweighted', 'Multigraph', 'Metadata']
+url = 'http://wwwlovre.appspot.com/support.jsp'
+citation = [('L. Šubelj, M. Bajec, "Robust network community detection using balanced propagation." The European Physical Journal B 81(3), 353-362 (2011)', 'https://doi.org/10.1140/epjb/e2011-10979-2')]
 icon_hash = '57f2dbae8cf714f319c3912c'
-upstream_prefix = 'http://konect.cc/files'
-files = [('download.tsv.subelj_euroroad.tar.bz2', None, 'konect')]
+upstream_license = None
+upstream_prefix = 'http://wwwlovre.appspot.com/resources/research/networks'
+files = [('bpa/euroroad.net', None, None)]
 
 def fetch_upstream(force=False):
     return fetch_upstream_files(__name__.split(".")[-1], upstream_prefix, files,
@@ -41,9 +45,7 @@ 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=False)
+        net = get_pajek_item(load_pajek(name, fnames, encoding="utf-8"),
+                             "network")
+        g = pajek_graph(net, directed=False)
         yield alt, g
Update copyright information by Tiago de Paula Peixoto 73a4f0d
diff --git a/entries/euroroad/__init__.py b/entries/euroroad/__init__.py
index 4207381..42126ec 100644
--- a/entries/euroroad/__init__.py
+++ b/entries/euroroad/__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 by Tiago de Paula Peixoto 3d288ea
diff --git a/entries/euroroad/__init__.py b/entries/euroroad/__init__.py
index e3147da..4207381 100644
--- a/entries/euroroad/__init__.py
+++ b/entries/euroroad/__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 by Tiago de Paula Peixoto 8d005ae
diff --git a/entries/euroroad/__init__.py b/entries/euroroad/__init__.py
index 3827b81..e3147da 100644
--- a/entries/euroroad/__init__.py
+++ b/entries/euroroad/__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 by Tiago de Paula Peixoto db2efcc
diff --git a/entries/euroroad/__init__.py b/entries/euroroad/__init__.py
index 0727e29..3827b81 100644
--- a/entries/euroroad/__init__.py
+++ b/entries/euroroad/__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
Un-orphan KONECT datasets by Tiago de Paula Peixoto 894eba5
KONECT has been brought back from the dead for the time being.
diff --git a/entries/euroroad/__init__.py b/entries/euroroad/__init__.py
index 5ac070b..0727e29 100644
--- a/entries/euroroad/__init__.py
+++ b/entries/euroroad/__init__.py
@@ -26,7 +26,6 @@ url = 'http://konect.cc/networks/subelj_euroroad'
 citation = [('L. Šubelj & M. Bajec. "Robust network community detection using balanced propagation." The European Physical Journal B 81(3), 353-362 (2011).', 'https://doi.org/10.1140/epjb/e2011-10979-2')]
 icon_hash = '57f2dbae8cf714f319c3912c'
 upstream_prefix = 'http://konect.cc/files'
-orphan = True
 files = [('download.tsv.subelj_euroroad.tar.bz2', None, 'konect')]
 
 def fetch_upstream(force=False):
Update citations to use DOIs by Tiago de Paula Peixoto e878874
diff --git a/entries/euroroad/__init__.py b/entries/euroroad/__init__.py
index 5ce5c88..5ac070b 100644
--- a/entries/euroroad/__init__.py
+++ b/entries/euroroad/__init__.py
@@ -23,7 +23,7 @@ description = """A network of international \"E-roads,\" mostly in Europe. Verti
 [^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
 tags = ['Transportation', 'Roads', 'Unweighted', 'Metadata']
 url = 'http://konect.cc/networks/subelj_euroroad'
-citation = [('L. Šubelj & M. Bajec. "Robust network community detection using balanced propagation." The European Physical Journal B 81(3), 353-362 (2011).', 'http://wwwlovre.appspot.com/publications.jsp?show=bpa#bpa')]
+citation = [('L. Šubelj & M. Bajec. "Robust network community detection using balanced propagation." The European Physical Journal B 81(3), 353-362 (2011).', 'https://doi.org/10.1140/epjb/e2011-10979-2')]
 icon_hash = '57f2dbae8cf714f319c3912c'
 upstream_prefix = 'http://konect.cc/files'
 orphan = True
Add support for 'orphan' datasets and tag konect entries by Tiago de Paula Peixoto e330b80
diff --git a/entries/euroroad/__init__.py b/entries/euroroad/__init__.py
index feaa241..5ce5c88 100644
--- a/entries/euroroad/__init__.py
+++ b/entries/euroroad/__init__.py
@@ -26,6 +26,7 @@ url = 'http://konect.cc/networks/subelj_euroroad'
 citation = [('L. Šubelj & M. Bajec. "Robust network community detection using balanced propagation." The European Physical Journal B 81(3), 353-362 (2011).', 'http://wwwlovre.appspot.com/publications.jsp?show=bpa#bpa')]
 icon_hash = '57f2dbae8cf714f319c3912c'
 upstream_prefix = 'http://konect.cc/files'
+orphan = True
 files = [('download.tsv.subelj_euroroad.tar.bz2', None, 'konect')]
 
 def fetch_upstream(force=False):
Change license from GPLv3 to AGPLv3 by Tiago de Paula Peixoto d754be5
diff --git a/entries/euroroad/__init__.py b/entries/euroroad/__init__.py
index b7c0acf..feaa241 100644
--- a/entries/euroroad/__init__.py
+++ b/entries/euroroad/__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 by Tiago de Paula Peixoto 1645314
diff --git a/entries/euroroad/__init__.py b/entries/euroroad/__init__.py
index d1e8a0d..b7c0acf 100644
--- a/entries/euroroad/__init__.py
+++ b/entries/euroroad/__init__.py
@@ -19,7 +19,8 @@
 from .. import *
 
 title = "Euroroad network (2011)"
-description = "A network of international \"E-roads,\" mostly in Europe. Vertices represent cities and edges represents roads. Metadata includes names of cities."
+description = """A network of international \"E-roads,\" mostly in Europe. Vertices represent cities and edges represents roads. Metadata includes names of cities.[^icon]
+[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
 tags = ['Transportation', 'Roads', 'Unweighted', 'Metadata']
 url = 'http://konect.cc/networks/subelj_euroroad'
 citation = [('L. Šubelj & M. Bajec. "Robust network community detection using balanced propagation." The European Physical Journal B 81(3), 353-362 (2011).', 'http://wwwlovre.appspot.com/publications.jsp?show=bpa#bpa')]
Initial commit by Tiago de Paula Peixoto cc85872
diff --git a/entries/euroroad/__init__.py b/entries/euroroad/__init__.py
new file mode 100644
index 0000000..d1e8a0d
--- /dev/null
+++ b/entries/euroroad/__init__.py
@@ -0,0 +1,48 @@
+#! /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 = "Euroroad network (2011)"
+description = "A network of international \"E-roads,\" mostly in Europe. Vertices represent cities and edges represents roads. Metadata includes names of cities."
+tags = ['Transportation', 'Roads', 'Unweighted', 'Metadata']
+url = 'http://konect.cc/networks/subelj_euroroad'
+citation = [('L. Šubelj & M. Bajec. "Robust network community detection using balanced propagation." The European Physical Journal B 81(3), 353-362 (2011).', 'http://wwwlovre.appspot.com/publications.jsp?show=bpa#bpa')]
+icon_hash = '57f2dbae8cf714f319c3912c'
+upstream_prefix = 'http://konect.cc/files'
+files = [('download.tsv.subelj_euroroad.tar.bz2', None, 'konect')]
+
+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