History of fao_trade
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] 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/fao_trade/__init__.py b/entries/fao_trade/__init__.py
index 1e03f89..a41b7f0 100644
--- a/entries/fao_trade/__init__.py
+++ b/entries/fao_trade/__init__.py
@@ -29,7 +29,7 @@ The network has the following properties:
tags = ['Economic', 'Trade', 'Weighted', 'Multilayer']
url = 'https://manliodedomenico.com/data.php'
citation = [('M. De Domenico, V. Nicosia, A. Arenas and V. Latora, "Structural reducibility of multilayer networks". Nature Communications 6, 6864 (2015)', 'https://doi.org/10.1038/ncomms7864')]
-icon_hash = '56e9da14a6d70217090cdf15'
+date_added = '2020-08-11'
upstream_license = ('Open Data Commons Open Database License (ODbL)', 'https://opendatacommons.org/licenses/odbl/')
upstream_prefix = 'https://manliodedomenico.com/data'
files = [('FAO_Multiplex_Trade.zip', None, 'comunelab')]
[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/fao_trade/__init__.py b/entries/fao_trade/__init__.py
index f5a90bc..1e03f89 100644
--- a/entries/fao_trade/__init__.py
+++ b/entries/fao_trade/__init__.py
@@ -23,9 +23,9 @@ description = r"""A multiplex network of the worldwide trade of food and agricul
The network has the following properties:
-- `name` and `nodeLabel`: name of the country.
-- `layer` (edges): the product (layer), numbered 1 to 364; the graph property `layer_key` maps these numbers to product names.
-- `weight` (edges): weight of the trade relationship, an integer (units not documented)."""
+- (Node) `name` and `nodeLabel`: name of the country.
+- (Edge) `layer` (edges): the product (layer), numbered 1 to 364; the graph property `layer_key` maps these numbers to product names.
+- (Edge) `weight` (edges): weight of the trade relationship, an integer (units not documented)."""
tags = ['Economic', 'Trade', 'Weighted', 'Multilayer']
url = 'https://manliodedomenico.com/data.php'
citation = [('M. De Domenico, V. Nicosia, A. Arenas and V. Latora, "Structural reducibility of multilayer networks". Nature Communications 6, 6864 (2015)', 'https://doi.org/10.1038/ncomms7864')]
[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/fao_trade/__init__.py b/entries/fao_trade/__init__.py
index 61073a5..f5a90bc 100644
--- a/entries/fao_trade/__init__.py
+++ b/entries/fao_trade/__init__.py
@@ -42,7 +42,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] 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/fao_trade/__init__.py b/entries/fao_trade/__init__.py
index b033c66..61073a5 100644
--- a/entries/fao_trade/__init__.py
+++ b/entries/fao_trade/__init__.py
@@ -19,13 +19,18 @@
from .. import *
title = "FAO Multiplex Trade Network"
-description = """Multiplex network representing trade relationships between countries from the Food and Agricultural Organization of the United Nations. Countries are nodes and edge types represent import/export of varying products. Data hosted by Manlio De Domenico.[^icon]
-[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
+description = r"""A multiplex network of the worldwide trade of food and agricultural products among countries in 2010, assembled by M. De Domenico and collaborators from data of the Food and Agriculture Organization of the United Nations (FAO). Nodes are countries (214), and each of the 364 layers corresponds to a specific product (e.g. "Cheese, whole cow milk", "Cigarettes", "Cotton lint"); a directed, weighted edge in layer $\ell$ represents an import/export relationship of that product between two countries. The direction convention (exporter to importer or the reverse) and the units of the weights are not documented by the source. The analysis in the cited paper used a subset of these layers.
+
+The network has the following properties:
+
+- `name` and `nodeLabel`: name of the country.
+- `layer` (edges): the product (layer), numbered 1 to 364; the graph property `layer_key` maps these numbers to product names.
+- `weight` (edges): weight of the trade relationship, an integer (units not documented)."""
tags = ['Economic', 'Trade', 'Weighted', 'Multilayer']
url = 'https://manliodedomenico.com/data.php'
citation = [('M. De Domenico, V. Nicosia, A. Arenas and V. Latora, "Structural reducibility of multilayer networks". Nature Communications 6, 6864 (2015)', 'https://doi.org/10.1038/ncomms7864')]
icon_hash = '56e9da14a6d70217090cdf15'
-ustream_license = ('Open Data Commons Open Database License (ODbL)', 'https://opendatacommons.org/licenses/odbl/')
+upstream_license = ('Open Data Commons Open Database License (ODbL)', 'https://opendatacommons.org/licenses/odbl/')
upstream_prefix = 'https://manliodedomenico.com/data'
files = [('FAO_Multiplex_Trade.zip', None, 'comunelab')]
Update copyright information 73a4f0d
diff --git a/entries/fao_trade/__init__.py b/entries/fao_trade/__init__.py
index f905f79..b033c66 100644
--- a/entries/fao_trade/__init__.py
+++ b/entries/fao_trade/__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/fao_trade/__init__.py b/entries/fao_trade/__init__.py
index f806326..f905f79 100644
--- a/entries/fao_trade/__init__.py
+++ b/entries/fao_trade/__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/fao_trade/__init__.py b/entries/fao_trade/__init__.py
index 349a217..f806326 100644
--- a/entries/fao_trade/__init__.py
+++ b/entries/fao_trade/__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/fao_trade/__init__.py b/entries/fao_trade/__init__.py
index 15859dd..349a217 100644
--- a/entries/fao_trade/__init__.py
+++ b/entries/fao_trade/__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/fao_trade/__init__.py b/entries/fao_trade/__init__.py
index df39aa1..15859dd 100644
--- a/entries/fao_trade/__init__.py
+++ b/entries/fao_trade/__init__.py
@@ -22,11 +22,11 @@ title = "FAO Multiplex Trade Network"
description = """Multiplex network representing trade relationships between countries from the Food and Agricultural Organization of the United Nations. Countries are nodes and edge types represent import/export of varying products. Data hosted by Manlio De Domenico.[^icon]
[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Economic', 'Trade', 'Weighted', 'Multilayer']
-url = 'https://comunelab.fbk.eu/data.php'
+url = 'https://manliodedomenico.com/data.php'
citation = [('M. De Domenico, V. Nicosia, A. Arenas and V. Latora, "Structural reducibility of multilayer networks". Nature Communications 6, 6864 (2015)', 'https://doi.org/10.1038/ncomms7864')]
icon_hash = '56e9da14a6d70217090cdf15'
ustream_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 = [('FAO_Multiplex_Trade.zip', None, 'comunelab')]
def fetch_upstream(force=False):
Update citations to use DOIs e878874
diff --git a/entries/fao_trade/__init__.py b/entries/fao_trade/__init__.py
index 2b77ecd..df39aa1 100644
--- a/entries/fao_trade/__init__.py
+++ b/entries/fao_trade/__init__.py
@@ -23,7 +23,7 @@ description = """Multiplex network representing trade relationships between coun
[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Economic', 'Trade', 'Weighted', 'Multilayer']
url = 'https://comunelab.fbk.eu/data.php'
-citation = [('M. De Domenico, V. Nicosia, A. Arenas and V. Latora, "Structural reducibility of multilayer networks". Nature Communications 6, 6864 (2015)', 'http://www.nature.com/ncomms/2015/150423/ncomms7864/abs/ncomms7864.html')]
+citation = [('M. De Domenico, V. Nicosia, A. Arenas and V. Latora, "Structural reducibility of multilayer networks". Nature Communications 6, 6864 (2015)', 'https://doi.org/10.1038/ncomms7864')]
icon_hash = '56e9da14a6d70217090cdf15'
ustream_license = ('Open Data Commons Open Database License (ODbL)', 'https://opendatacommons.org/licenses/odbl/')
upstream_prefix = 'https://comunelab.fbk.eu/data'
Change license from GPLv3 to AGPLv3 d754be5
diff --git a/entries/fao_trade/__init__.py b/entries/fao_trade/__init__.py
index 8067b0d..2b77ecd 100644
--- a/entries/fao_trade/__init__.py
+++ b/entries/fao_trade/__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/fao_trade/__init__.py b/entries/fao_trade/__init__.py
index 8334b19..8067b0d 100644
--- a/entries/fao_trade/__init__.py
+++ b/entries/fao_trade/__init__.py
@@ -19,7 +19,8 @@
from .. import *
title = "FAO Multiplex Trade Network"
-description = "Multiplex network representing trade relationships between countries from the Food and Agricultural Organization of the United Nations. Countries are nodes and edge types represent import/export of varying products. Data hosted by Manlio De Domenico."
+description = """Multiplex network representing trade relationships between countries from the Food and Agricultural Organization of the United Nations. Countries are nodes and edge types represent import/export of varying products. Data hosted by Manlio De Domenico.[^icon]
+[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Economic', 'Trade', 'Weighted', 'Multilayer']
url = 'https://comunelab.fbk.eu/data.php'
citation = [('M. De Domenico, V. Nicosia, A. Arenas and V. Latora, "Structural reducibility of multilayer networks". Nature Communications 6, 6864 (2015)', 'http://www.nature.com/ncomms/2015/150423/ncomms7864/abs/ncomms7864.html')]
Initial commit cc85872
diff --git a/entries/fao_trade/__init__.py b/entries/fao_trade/__init__.py
new file mode 100644
index 0000000..8334b19
--- /dev/null
+++ b/entries/fao_trade/__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 = "FAO Multiplex Trade Network"
+description = "Multiplex network representing trade relationships between countries from the Food and Agricultural Organization of the United Nations. Countries are nodes and edge types represent import/export of varying products. Data hosted by Manlio De Domenico."
+tags = ['Economic', 'Trade', 'Weighted', 'Multilayer']
+url = 'https://comunelab.fbk.eu/data.php'
+citation = [('M. De Domenico, V. Nicosia, A. Arenas and V. Latora, "Structural reducibility of multilayer networks". Nature Communications 6, 6864 (2015)', 'http://www.nature.com/ncomms/2015/150423/ncomms7864/abs/ncomms7864.html')]
+icon_hash = '56e9da14a6d70217090cdf15'
+ustream_license = ('Open Data Commons Open Database License (ODbL)', 'https://opendatacommons.org/licenses/odbl/')
+upstream_prefix = 'https://comunelab.fbk.eu/data'
+files = [('FAO_Multiplex_Trade.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=True)
+ yield alt, g