History of power
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/power/__init__.py b/entries/power/__init__.py
index 4ad5431..1fadc4f 100644
--- a/entries/power/__init__.py
+++ b/entries/power/__init__.py
@@ -48,6 +48,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/power/__init__.py b/entries/power/__init__.py
index e099f67..4ad5431 100644
--- a/entries/power/__init__.py
+++ b/entries/power/__init__.py
@@ -23,7 +23,7 @@ description = """Undirected network representing the topology of the high-voltag
tags = ['Technological', 'Power grid', 'Unweighted']
url = 'http://www-personal.umich.edu/~mejn/netdata/'
citation = [('D.J. Watts and S.H. Strogatz, "Collective dynamics of \'small-world\' networks." Nature 393, 440-442 (1998).', 'https://doi.org/10.1038/30918')]
-icon_hash = '56a85c8e26855e083a2f78a5'
+date_added = '2020-08-11'
upstream_prefix = 'http://www-personal.umich.edu/~mejn/netdata'
files = [('power.zip:power.gml', None, 'gml')]
[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/power/__init__.py b/entries/power/__init__.py
index 7f08516..e099f67 100644
--- a/entries/power/__init__.py
+++ b/entries/power/__init__.py
@@ -35,7 +35,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] 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/power/__init__.py b/entries/power/__init__.py
index bfe3b57..7f08516 100644
--- a/entries/power/__init__.py
+++ b/entries/power/__init__.py
@@ -46,3 +46,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/power/__init__.py b/entries/power/__init__.py
index 6ea7dda..bfe3b57 100644
--- a/entries/power/__init__.py
+++ b/entries/power/__init__.py
@@ -19,8 +19,7 @@
from .. import *
title = "Western US Power Grid"
-description = """A network representing the Western States Power Grid of the United States, in which nodes are transforms or power relay points and two nodes are connected if a power line runs between them.[^icon]
-[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
+description = """Undirected network representing the topology of the high-voltage power grid of the Western States of the United States, compiled by D. J. Watts and S. H. Strogatz, who used it as an example of a small-world network. Nodes are generators, transformers and substations, and an edge connects two nodes if they are connected by a high-voltage transmission line. The data were obtained from the network data collection of M. E. J. Newman, and the node IDs are the same as those used by Watts."""
tags = ['Technological', 'Power grid', 'Unweighted']
url = 'http://www-personal.umich.edu/~mejn/netdata/'
citation = [('D.J. Watts and S.H. Strogatz, "Collective dynamics of \'small-world\' networks." Nature 393, 440-442 (1998).', 'https://doi.org/10.1038/30918')]
Update copyright information 73a4f0d
diff --git a/entries/power/__init__.py b/entries/power/__init__.py
index 8d37bda..6ea7dda 100644
--- a/entries/power/__init__.py
+++ b/entries/power/__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/power/__init__.py b/entries/power/__init__.py
index 16b18c0..8d37bda 100644
--- a/entries/power/__init__.py
+++ b/entries/power/__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/power/__init__.py b/entries/power/__init__.py
index 150c314..16b18c0 100644
--- a/entries/power/__init__.py
+++ b/entries/power/__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/power/__init__.py b/entries/power/__init__.py
index c27436a..150c314 100644
--- a/entries/power/__init__.py
+++ b/entries/power/__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/power/__init__.py b/entries/power/__init__.py
index d4c91bb..c27436a 100644
--- a/entries/power/__init__.py
+++ b/entries/power/__init__.py
@@ -23,7 +23,7 @@ description = """A network representing the Western States Power Grid of the Uni
[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Technological', 'Power grid', 'Unweighted']
url = 'http://www-personal.umich.edu/~mejn/netdata/'
-citation = [('D.J. Watts and S.H. Strogatz, "Collective dynamics of \'small-world\' networks." Nature 393, 440-442 (1998).', 'http://www.nature.com/nature/journal/v393/n6684/abs/393440a0.html')]
+citation = [('D.J. Watts and S.H. Strogatz, "Collective dynamics of \'small-world\' networks." Nature 393, 440-442 (1998).', 'https://doi.org/10.1038/30918')]
icon_hash = '56a85c8e26855e083a2f78a5'
upstream_prefix = 'http://www-personal.umich.edu/~mejn/netdata'
files = [('power.zip:power.gml', None, 'gml')]
Change license from GPLv3 to AGPLv3 d754be5
diff --git a/entries/power/__init__.py b/entries/power/__init__.py
index 4ab95be..d4c91bb 100644
--- a/entries/power/__init__.py
+++ b/entries/power/__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/power/__init__.py b/entries/power/__init__.py
index fd63402..4ab95be 100644
--- a/entries/power/__init__.py
+++ b/entries/power/__init__.py
@@ -19,7 +19,8 @@
from .. import *
title = "Western US Power Grid"
-description = "A network representing the Western States Power Grid of the United States, in which nodes are transforms or power relay points and two nodes are connected if a power line runs between them."
+description = """A network representing the Western States Power Grid of the United States, in which nodes are transforms or power relay points and two nodes are connected if a power line runs between them.[^icon]
+[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Technological', 'Power grid', 'Unweighted']
url = 'http://www-personal.umich.edu/~mejn/netdata/'
citation = [('D.J. Watts and S.H. Strogatz, "Collective dynamics of \'small-world\' networks." Nature 393, 440-442 (1998).', 'http://www.nature.com/nature/journal/v393/n6684/abs/393440a0.html')]
Initial commit cc85872
diff --git a/entries/power/__init__.py b/entries/power/__init__.py
new file mode 100644
index 0000000..fd63402
--- /dev/null
+++ b/entries/power/__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 = "Western US Power Grid"
+description = "A network representing the Western States Power Grid of the United States, in which nodes are transforms or power relay points and two nodes are connected if a power line runs between them."
+tags = ['Technological', 'Power grid', 'Unweighted']
+url = 'http://www-personal.umich.edu/~mejn/netdata/'
+citation = [('D.J. Watts and S.H. Strogatz, "Collective dynamics of \'small-world\' networks." Nature 393, 440-442 (1998).', 'http://www.nature.com/nature/journal/v393/n6684/abs/393440a0.html')]
+icon_hash = '56a85c8e26855e083a2f78a5'
+upstream_prefix = 'http://www-personal.umich.edu/~mejn/netdata'
+files = [('power.zip:power.gml', None, 'gml')]
+
+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