History of internet_top_pop

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.

2026-11-03 [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/internet_top_pop/__init__.py b/entries/internet_top_pop/__init__.py
index 32cf398..3c9dc4b 100644
--- a/entries/internet_top_pop/__init__.py
+++ b/entries/internet_top_pop/__init__.py
@@ -46,7 +46,7 @@ The networks have the following properties (not all are present in every network
 tags = ['Technological', 'Communication', 'Unweighted', 'Multigraph', 'Metadata']
 url = 'https://github.com/mroughan/InternetTopologyZoo'
 citation = [('S. Knight, et al. "The Internet Topology Zoo." IEEE Journal on Selected Areas in Communications 29(9), 1765-1775 (2011)', 'https://doi.org/10.1109/JSAC.2011.111002')]
-icon_hash = '5981f3f2549f067e026495b5'
+date_added = '2020-08-11'
 upstream_license = None
 # The Topology Zoo site is no longer online; the same GraphML files are in
 # the project's repository on GitHub (pinned to a commit)

2026-11-03 [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/internet_top_pop/__init__.py b/entries/internet_top_pop/__init__.py
index 9577632..32cf398 100644
--- a/entries/internet_top_pop/__init__.py
+++ b/entries/internet_top_pop/__init__.py
@@ -23,17 +23,26 @@ description = r"""Network topologies of 261 backbone and regional computer netwo
 
 The networks have the following properties (not all are present in every network):
 
-- `label`: the name of the node, usually its city.
-- `Latitude`, `Longitude` and `Country`: geographic location of the node, obtained by geocoding.
-- `Internal`: 1 if the node is part of the network, 0 if it is an external node (e.g. a connection to another network).
-- `type`: the node type as given in the source map (e.g. "PoP").
-- `hyperedge`: 1 if the node represents a shared link connecting several nodes (a hyperedge), rather than a location.
-- `geocode_id`, `geocode_country`, `geocode_append`, `doubted`, `x`, `y`: auxiliary node attributes present in a few networks (used for geocoding, or copied from the source).
-- `LinkLabel`, `LinkNote`, `LinkType` (edges): the label, note and type (e.g. "OC-192", "Fiber") of the link, as given in the source.
-- `LinkSpeed`, `LinkSpeedUnits` and `LinkSpeedRaw` (edges): the link capacity, its unit prefix (K, M or G) and its value in bits per second (0 if unknown).
-- `LinkStatus`, `description`, `label` (edges): additional link information present in a few networks.
-- `id`, `key`: internal identifiers of nodes and edges.
-- Graph properties describe each network: `Network` (name), `NetworkDate` and `DateObtained`, `DateType` (current, historic or dynamic), `Source` (URL of the source map), `Provenance` (primary or secondary source), `Type` (`REN` for research and education networks, `COM` for commercial), `Layer` (e.g. IP or fiber), `GeoLocation` and `GeoExtent` (geographic coverage), flags (0/1) classifying the network (`Backbone`, `Customer`, `Transit`, `Access`, `Commercial`, `Testbed`, `IX`, `Developed`), and `Note`."""
+- (Node) `label`: the name of the node, usually its city.
+- (Node) `Latitude`, `Longitude` and `Country`: geographic location of the node, obtained by geocoding.
+- (Node) `Internal`: 1 if the node is part of the network, 0 if it is an external node (e.g. a connection to another network).
+- (Node) `type`: the node type as given in the source map (e.g. "PoP").
+- (Node) `hyperedge`: 1 if the node represents a shared link connecting several nodes (a hyperedge), rather than a location.
+- (Node) `geocode_id`, `geocode_country`, `geocode_append`, `doubted`, `x`, `y`: auxiliary node attributes present in a few networks (used for geocoding, or copied from the source).
+- (Edge) `LinkLabel`, `LinkNote`, `LinkType` (edges): the label, note and type (e.g. "OC-192", "Fiber") of the link, as given in the source.
+- (Edge) `LinkSpeed`, `LinkSpeedUnits` and `LinkSpeedRaw` (edges): the link capacity, its unit prefix (K, M or G) and its value in bits per second (0 if unknown).
+- (Edge) `LinkStatus`, `description`, `label` (edges): additional link information present in a few networks.
+- (Edge) `id`, `key`: internal identifiers of nodes and edges.
+- (Graph) `Network`: the name of the network.
+- (Graph) `NetworkDate`, `DateObtained`: the date of the network, and the date when it was obtained.
+- (Graph) `DateType`: current, historic or dynamic.
+- (Graph) `Source`: the URL of the source map.
+- (Graph) `Provenance`: primary or secondary source.
+- (Graph) `Type`: `REN` for research and education networks, `COM` for commercial.
+- (Graph) `Layer`: e.g. IP or fiber.
+- (Graph) `GeoLocation`, `GeoExtent`: the geographic coverage.
+- (Graph) `Backbone`, `Customer`, `Transit`, `Access`, `Commercial`, `Testbed`, `IX`, `Developed`: flags (0/1) classifying the network.
+- (Graph) `Note`: a note on the network."""
 tags = ['Technological', 'Communication', 'Unweighted', 'Multigraph', 'Metadata']
 url = 'https://github.com/mroughan/InternetTopologyZoo'
 citation = [('S. Knight, et al. "The Internet Topology Zoo." IEEE Journal on Selected Areas in Communications 29(9), 1765-1775 (2011)', 'https://doi.org/10.1109/JSAC.2011.111002')]

2026-11-02 [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/internet_top_pop/__init__.py b/entries/internet_top_pop/__init__.py
index be68376..9577632 100644
--- a/entries/internet_top_pop/__init__.py
+++ b/entries/internet_top_pop/__init__.py
@@ -98,7 +98,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:

2026-10-26 [entries] Move unavailable upstream sources to verified alternatives by Tiago de Paula Peixoto 2137af6

The upstream sources of these entries are gone, moved, or refuse automated
downloads; each now downloads the same data (byte-identical to the cached
files, or for board_directors, identical apart from line endings) from:

- add_health: the Wayback Machine (Moreno's site, as its sibling entries)
- board_directors: T. Opsahl's site (opsahl.co.uk)
- copenhagen, cow_signed_relations, fullerene_structures,
  german_power_grid: figshare's API (its downloader refuses the server)
- drosophila_flybi: the same address, without a doubled slash
- dutch_criticism: V. Batagelj's repository of Pajek data on GitHub
- fly_larva: the copy of the supplementary files in Europe PMC
- foursquare: the authors' Google Drive file
- game_thrones, microsoft_concept, un_migrations: pinned Wayback Machine
  snapshots
- internet_top_pop: the Topology Zoo repository on GitHub
- scotus_majority: Harvard Dataverse and Wayback Machine snapshots

diff --git a/entries/internet_top_pop/__init__.py b/entries/internet_top_pop/__init__.py
index 8916387..be68376 100644
--- a/entries/internet_top_pop/__init__.py
+++ b/entries/internet_top_pop/__init__.py
@@ -35,11 +35,13 @@ The networks have the following properties (not all are present in every network
 - `id`, `key`: internal identifiers of nodes and edges.
 - Graph properties describe each network: `Network` (name), `NetworkDate` and `DateObtained`, `DateType` (current, historic or dynamic), `Source` (URL of the source map), `Provenance` (primary or secondary source), `Type` (`REN` for research and education networks, `COM` for commercial), `Layer` (e.g. IP or fiber), `GeoLocation` and `GeoExtent` (geographic coverage), flags (0/1) classifying the network (`Backbone`, `Customer`, `Transit`, `Access`, `Commercial`, `Testbed`, `IX`, `Developed`), and `Note`."""
 tags = ['Technological', 'Communication', 'Unweighted', 'Multigraph', 'Metadata']
-url = 'http://www.topology-zoo.org/dataset.html'
+url = 'https://github.com/mroughan/InternetTopologyZoo'
 citation = [('S. Knight, et al. "The Internet Topology Zoo." IEEE Journal on Selected Areas in Communications 29(9), 1765-1775 (2011)', 'https://doi.org/10.1109/JSAC.2011.111002')]
 icon_hash = '5981f3f2549f067e026495b5'
 upstream_license = None
-upstream_prefix = 'http://www.topology-zoo.org/files'
+# The Topology Zoo site is no longer online; the same GraphML files are in
+# the project's repository on GitHub (pinned to a commit)
+upstream_prefix = 'https://raw.githubusercontent.com/mroughan/InternetTopologyZoo/51118849b99534f01010d885d66321433a7eef9e'
 net_names = ["Aarnet", "Abilene", "Abvt", "Aconet", "Agis", "Ai3", "Airtel",
              "Amres", "Ans", "Arn", "Arnes", "Arpanet196912", "Arpanet19706", "Arpanet19719",
              "Arpanet19723", "Arpanet19728", "AsnetAm", "Atmnet", "AttMpls", "Azrena",
@@ -84,7 +86,7 @@ net_names = ["Aarnet", "Abilene", "Abvt", "Aconet", "Agis", "Ai3", "Airtel",
              "Uninet", "Uninett2010", "Uninett2011", "Uran", "UsCarrier", "UsSignal",
              "Uunet", "Vinaren", "VisionNet", "VtlWavenet2008", "VtlWavenet2011", "WideJpn",
              "Xeex", "Xspedius", "York", "Zamren"]
-files = [(f"archive.zip:{n}.graphml", n, "graphml") for n in net_names]
+files = [(f"graphml/{n}.graphml", n, "graphml") for n in net_names]

2026-10-26 [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/internet_top_pop/__init__.py b/entries/internet_top_pop/__init__.py
index bd525ef..8916387 100644
--- a/entries/internet_top_pop/__init__.py
+++ b/entries/internet_top_pop/__init__.py
@@ -19,7 +19,7 @@
 from .. import *
 
 title = "Internet topology (PoP level) (1969-2012)"
-description = r"""Network topologies of 261 backbone and regional computer networks from around the world, from the Internet Topology Zoo project of S. Knight and collaborators at the University of Adelaide. The topologies were transcribed manually from maps and descriptions published by the network operators (or, in a minority of cases, from secondary sources), and most correspond to the Point of Presence (PoP) level, i.e. nodes are the locations (typically cities) where the network has equipment, and edges are the links between them. Some networks are instead described at the physical (fibre) level. They include research and education networks (e.g. `Geant2012`, `Abilene`) and commercial networks (e.g. `Cogentco`, `Sprint`). Most snapshots are from 2006-2012, but historical networks are also included, such as several snapshots of ARPANET from 1969 to 1972 (e.g. `Arpanet196912` for December 1969); several networks are available at different dates, indicated by a suffix in the name (e.g. `Garr201201`). The networks are undirected and may contain parallel edges between the same pair of nodes.
+description = r"""Network topologies of 261 backbone and regional computer networks from around the world, from the Internet Topology Zoo project of S. Knight and collaborators at the University of Adelaide. The topologies were transcribed manually from maps and descriptions published by the network operators (or, in a minority of cases, from secondary sources), and most correspond to the Point of Presence (PoP) level, i.e. nodes are the locations (typically cities) where the network has equipment, and edges are the links between them. Some networks are instead described at the physical (fiber) level. They include research and education networks (e.g. `Geant2012`, `Abilene`) and commercial networks (e.g. `Cogentco`, `Sprint`). Most snapshots are from 2006-2012, but historical networks are also included, such as several snapshots of ARPANET from 1969 to 1972 (e.g. `Arpanet196912` for December 1969); several networks are available at different dates, indicated by a suffix in the name (e.g. `Garr201201`). The networks are undirected and may contain parallel edges between the same pair of nodes.
 
 The networks have the following properties (not all are present in every network):
 
@@ -33,7 +33,7 @@ The networks have the following properties (not all are present in every network
 - `LinkSpeed`, `LinkSpeedUnits` and `LinkSpeedRaw` (edges): the link capacity, its unit prefix (K, M or G) and its value in bits per second (0 if unknown).
 - `LinkStatus`, `description`, `label` (edges): additional link information present in a few networks.
 - `id`, `key`: internal identifiers of nodes and edges.
-- Graph properties describe each network: `Network` (name), `NetworkDate` and `DateObtained`, `DateType` (current, historic or dynamic), `Source` (URL of the source map), `Provenance` (primary or secondary source), `Type` (`REN` for research and education networks, `COM` for commercial), `Layer` (e.g. IP or fibre), `GeoLocation` and `GeoExtent` (geographic coverage), flags (0/1) classifying the network (`Backbone`, `Customer`, `Transit`, `Access`, `Commercial`, `Testbed`, `IX`, `Developed`), and `Note`."""
+- Graph properties describe each network: `Network` (name), `NetworkDate` and `DateObtained`, `DateType` (current, historic or dynamic), `Source` (URL of the source map), `Provenance` (primary or secondary source), `Type` (`REN` for research and education networks, `COM` for commercial), `Layer` (e.g. IP or fiber), `GeoLocation` and `GeoExtent` (geographic coverage), flags (0/1) classifying the network (`Backbone`, `Customer`, `Transit`, `Access`, `Commercial`, `Testbed`, `IX`, `Developed`), and `Note`."""
 tags = ['Technological', 'Communication', 'Unweighted', 'Multigraph', 'Metadata']
 url = 'http://www.topology-zoo.org/dataset.html'
 citation = [('S. Knight, et al. "The Internet Topology Zoo." IEEE Journal on Selected Areas in Communications 29(9), 1765-1775 (2011)', 'https://doi.org/10.1109/JSAC.2011.111002')]

2026-10-25 [entries] Fix parse bugs and improve the metadata of existing entries by Tiago de Paula Peixoto 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/internet_top_pop/__init__.py b/entries/internet_top_pop/__init__.py
index 5b07d4f..bd525ef 100644
--- a/entries/internet_top_pop/__init__.py
+++ b/entries/internet_top_pop/__init__.py
@@ -19,13 +19,26 @@
 from .. import *
 
 title = "Internet topology (PoP level) (1969-2012)"
-description = """Assorted snapshots of internet graph at the Point of Presence (PoP) level (which lies between the IP and AS levels), collected from around the world and at various times. The earliest snapshots are for ARPANET (1969-1972), with a few more from pre-2000. Most are from 2006 onward. Metadata include link type or speed, longitudes, and latitudes of nodes, URL, and date of record.[^icon]
-[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
+description = r"""Network topologies of 261 backbone and regional computer networks from around the world, from the Internet Topology Zoo project of S. Knight and collaborators at the University of Adelaide. The topologies were transcribed manually from maps and descriptions published by the network operators (or, in a minority of cases, from secondary sources), and most correspond to the Point of Presence (PoP) level, i.e. nodes are the locations (typically cities) where the network has equipment, and edges are the links between them. Some networks are instead described at the physical (fibre) level. They include research and education networks (e.g. `Geant2012`, `Abilene`) and commercial networks (e.g. `Cogentco`, `Sprint`). Most snapshots are from 2006-2012, but historical networks are also included, such as several snapshots of ARPANET from 1969 to 1972 (e.g. `Arpanet196912` for December 1969); several networks are available at different dates, indicated by a suffix in the name (e.g. `Garr201201`). The networks are undirected and may contain parallel edges between the same pair of nodes.
+
+The networks have the following properties (not all are present in every network):
+
+- `label`: the name of the node, usually its city.
+- `Latitude`, `Longitude` and `Country`: geographic location of the node, obtained by geocoding.
+- `Internal`: 1 if the node is part of the network, 0 if it is an external node (e.g. a connection to another network).
+- `type`: the node type as given in the source map (e.g. "PoP").
+- `hyperedge`: 1 if the node represents a shared link connecting several nodes (a hyperedge), rather than a location.
+- `geocode_id`, `geocode_country`, `geocode_append`, `doubted`, `x`, `y`: auxiliary node attributes present in a few networks (used for geocoding, or copied from the source).
+- `LinkLabel`, `LinkNote`, `LinkType` (edges): the label, note and type (e.g. "OC-192", "Fiber") of the link, as given in the source.
+- `LinkSpeed`, `LinkSpeedUnits` and `LinkSpeedRaw` (edges): the link capacity, its unit prefix (K, M or G) and its value in bits per second (0 if unknown).
+- `LinkStatus`, `description`, `label` (edges): additional link information present in a few networks.
+- `id`, `key`: internal identifiers of nodes and edges.
+- Graph properties describe each network: `Network` (name), `NetworkDate` and `DateObtained`, `DateType` (current, historic or dynamic), `Source` (URL of the source map), `Provenance` (primary or secondary source), `Type` (`REN` for research and education networks, `COM` for commercial), `Layer` (e.g. IP or fibre), `GeoLocation` and `GeoExtent` (geographic coverage), flags (0/1) classifying the network (`Backbone`, `Customer`, `Transit`, `Access`, `Commercial`, `Testbed`, `IX`, `Developed`), and `Note`."""
 tags = ['Technological', 'Communication', 'Unweighted', 'Multigraph', 'Metadata']
 url = 'http://www.topology-zoo.org/dataset.html'
 citation = [('S. Knight, et al. "The Internet Topology Zoo." IEEE Journal on Selected Areas in Communications 29(9), 1765-1775 (2011)', 'https://doi.org/10.1109/JSAC.2011.111002')]
 icon_hash = '5981f3f2549f067e026495b5'
-ustream_license = None
+upstream_license = None
 upstream_prefix = 'http://www.topology-zoo.org/files'
 net_names = ["Aarnet", "Abilene", "Abvt", "Aconet", "Agis", "Ai3", "Airtel",
              "Amres", "Ans", "Arn", "Arnes", "Arpanet196912", "Arpanet19706", "Arpanet19719",

2026-10-24 Update copyright information by Tiago de Paula Peixoto 73a4f0d

diff --git a/entries/internet_top_pop/__init__.py b/entries/internet_top_pop/__init__.py
index b8e5a43..5b07d4f 100644
--- a/entries/internet_top_pop/__init__.py
+++ b/entries/internet_top_pop/__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

2024-05-27 Update copyright information by Tiago de Paula Peixoto 3d288ea

diff --git a/entries/internet_top_pop/__init__.py b/entries/internet_top_pop/__init__.py
index ae5e629..b8e5a43 100644
--- a/entries/internet_top_pop/__init__.py
+++ b/entries/internet_top_pop/__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

2023-02-19 Update copyright information by Tiago de Paula Peixoto 8d005ae

diff --git a/entries/internet_top_pop/__init__.py b/entries/internet_top_pop/__init__.py
index 6f3bd6d..ae5e629 100644
--- a/entries/internet_top_pop/__init__.py
+++ b/entries/internet_top_pop/__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

2021-06-22 Update copyright info by Tiago de Paula Peixoto db2efcc

diff --git a/entries/internet_top_pop/__init__.py b/entries/internet_top_pop/__init__.py
index fa0489a..6f3bd6d 100644
--- a/entries/internet_top_pop/__init__.py
+++ b/entries/internet_top_pop/__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

2020-11-28 Update citations to use DOIs by Tiago de Paula Peixoto e878874

diff --git a/entries/internet_top_pop/__init__.py b/entries/internet_top_pop/__init__.py
index cc23e95..fa0489a 100644
--- a/entries/internet_top_pop/__init__.py
+++ b/entries/internet_top_pop/__init__.py
@@ -23,7 +23,7 @@ description = """Assorted snapshots of internet graph at the Point of Presence (
 [^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
 tags = ['Technological', 'Communication', 'Unweighted', 'Multigraph', 'Metadata']
 url = 'http://www.topology-zoo.org/dataset.html'
-citation = [('S. Knight, et al. "The Internet Topology Zoo." IEEE Journal on Selected Areas in Communications 29(9), 1765-1775 (2011)', 'http://www.topology-zoo.org/publications/topology_zoo.pdf')]
+citation = [('S. Knight, et al. "The Internet Topology Zoo." IEEE Journal on Selected Areas in Communications 29(9), 1765-1775 (2011)', 'https://doi.org/10.1109/JSAC.2011.111002')]
 icon_hash = '5981f3f2549f067e026495b5'
 ustream_license = None
 upstream_prefix = 'http://www.topology-zoo.org/files'

2020-09-15 Change license from GPLv3 to AGPLv3 by Tiago de Paula Peixoto d754be5

diff --git a/entries/internet_top_pop/__init__.py b/entries/internet_top_pop/__init__.py
index 8a867f7..cc23e95 100644
--- a/entries/internet_top_pop/__init__.py
+++ b/entries/internet_top_pop/__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 *

2020-09-13 Add explicit attribution to descriptions obtained from ICON by Tiago de Paula Peixoto 1645314

diff --git a/entries/internet_top_pop/__init__.py b/entries/internet_top_pop/__init__.py
index 9e8120e..8a867f7 100644
--- a/entries/internet_top_pop/__init__.py
+++ b/entries/internet_top_pop/__init__.py
@@ -19,7 +19,8 @@
 from .. import *
 
 title = "Internet topology (PoP level) (1969-2012)"
-description = "Assorted snapshots of internet graph at the Point of Presence (PoP) level (which lies between the IP and AS levels), collected from around the world and at various times. The earliest snapshots are for ARPANET (1969-1972), with a few more from pre-2000. Most are from 2006 onward. Metadata include link type or speed, longitudes, and latitudes of nodes, URL, and date of record."
+description = """Assorted snapshots of internet graph at the Point of Presence (PoP) level (which lies between the IP and AS levels), collected from around the world and at various times. The earliest snapshots are for ARPANET (1969-1972), with a few more from pre-2000. Most are from 2006 onward. Metadata include link type or speed, longitudes, and latitudes of nodes, URL, and date of record.[^icon]
+[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
 tags = ['Technological', 'Communication', 'Unweighted', 'Multigraph', 'Metadata']
 url = 'http://www.topology-zoo.org/dataset.html'
 citation = [('S. Knight, et al. "The Internet Topology Zoo." IEEE Journal on Selected Areas in Communications 29(9), 1765-1775 (2011)', 'http://www.topology-zoo.org/publications/topology_zoo.pdf')]

2020-08-11 Initial commit by Tiago de Paula Peixoto cc85872

diff --git a/entries/internet_top_pop/__init__.py b/entries/internet_top_pop/__init__.py
new file mode 100644
index 0000000..9e8120e
--- /dev/null
+++ b/entries/internet_top_pop/__init__.py
@@ -0,0 +1,97 @@
+#! /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 = "Internet topology (PoP level) (1969-2012)"
+description = "Assorted snapshots of internet graph at the Point of Presence (PoP) level (which lies between the IP and AS levels), collected from around the world and at various times. The earliest snapshots are for ARPANET (1969-1972), with a few more from pre-2000. Most are from 2006 onward. Metadata include link type or speed, longitudes, and latitudes of nodes, URL, and date of record."
+tags = ['Technological', 'Communication', 'Unweighted', 'Multigraph', 'Metadata']
+url = 'http://www.topology-zoo.org/dataset.html'
+citation = [('S. Knight, et al. "The Internet Topology Zoo." IEEE Journal on Selected Areas in Communications 29(9), 1765-1775 (2011)', 'http://www.topology-zoo.org/publications/topology_zoo.pdf')]
+icon_hash = '5981f3f2549f067e026495b5'
+ustream_license = None
+upstream_prefix = 'http://www.topology-zoo.org/files'
+net_names = ["Aarnet", "Abilene", "Abvt", "Aconet", "Agis", "Ai3", "Airtel",
+             "Amres", "Ans", "Arn", "Arnes", "Arpanet196912", "Arpanet19706", "Arpanet19719",
+             "Arpanet19723", "Arpanet19728", "AsnetAm", "Atmnet", "AttMpls", "Azrena",
+             "Bandcon", "Basnet", "Bbnplanet", "Bellcanada", "Bellsouth", "Belnet2003",
+             "Belnet2004", "Belnet2005", "Belnet2006", "Belnet2007", "Belnet2008",
+             "Belnet2009", "Belnet2010", "BeyondTheNetwork", "Bics", "Biznet", "Bren",
+             "BsonetEurope", "BtAsiaPac", "BtEurope", "BtLatinAmerica", "BtNorthAmerica",
+             "Canerie", "Carnet", "Cernet", "Cesnet1993", "Cesnet1997", "Cesnet1999",
+             "Cesnet2001", "Cesnet200304", "Cesnet200511", "Cesnet200603", "Cesnet200706",
+             "Cesnet201006", "Chinanet", "Claranet", "Cogentco", "Colt", "Columbus",
+             "Compuserve", "CrlNetworkServices", "Cudi", "Cwix", "Cynet", "Darkstrand",
+             "Dataxchange", "Deltacom", "DeutscheTelekom", "Dfn", "DialtelecomCz", "Digex",
+             "Easynet", "Eenet", "EliBackbone", "Epoch", "Ernet", "Esnet", "Eunetworks",
+             "Evolink", "Fatman", "Fccn", "Forthnet", "Funet", "Gambia", "Garr199901",
+             "Garr199904", "Garr199905", "Garr200109", "Garr200112", "Garr200212",
+             "Garr200404", "Garr200902", "Garr200908", "Garr200909", "Garr200912",
+             "Garr201001", "Garr201003", "Garr201004", "Garr201005", "Garr201007",
+             "Garr201008", "Garr201010", "Garr201012", "Garr201101", "Garr201102",
+             "Garr201103", "Garr201104", "Garr201105", "Garr201107", "Garr201108",
+             "Garr201109", "Garr201110", "Garr201111", "Garr201112", "Garr201201", "Gblnet",
+             "Geant2001", "Geant2009", "Geant2010", "Geant2012", "Getnet", "Globalcenter",
+             "Globenet", "Goodnet", "Grena", "Gridnet", "Grnet", "GtsCe", "GtsCzechRepublic",
+             "GtsHungary", "GtsPoland", "GtsRomania", "GtsSlovakia", "Harnet", "Heanet",
+             "HiberniaCanada", "HiberniaGlobal", "HiberniaIreland", "HiberniaNireland",
+             "HiberniaUk", "HiberniaUs", "Highwinds", "HostwayInternational",
+             "HurricaneElectric", "Ibm", "Iij", "Iinet", "Ilan", "Integra", "Intellifiber",
+             "Internetmci", "Internode", "Interoute", "Intranetwork", "Ion",
+             "IowaStatewideFiberMap", "Iris", "Istar", "Itnet", "Janetbackbone",
+             "JanetExternal", "Janetlense", "Jgn2Plus", "Karen", "Kdl", "KentmanApr2007",
+             "KentmanAug2005", "KentmanFeb2008", "KentmanJan2011", "KentmanJul2005",
+             "Kreonet", "LambdaNet", "Latnet", "Layer42", "Litnet", "Marnet", "Marwan",
+             "Missouri", "Mren", "Myren", "Napnet", "Navigata", "Netrail", "NetworkUsa",
+             "Nextgen", "Niif", "Noel", "Nordu1989", "Nordu1997", "Nordu2005", "Nordu2010",
+             "Nsfcnet", "Nsfnet", "Ntelos", "Ntt", "Oteglobe", "Oxford", "Pacificwave",
+             "Packetexchange", "Padi", "Palmetto", "Peer1", "Pern", "PionierL1", "PionierL3",
+             "Psinet", "Quest", "RedBestel", "Rediris", "Renam", "Renater1999",
+             "Renater2001", "Renater2004", "Renater2006", "Renater2008", "Renater2010",
+             "Restena", "Reuna", "Rhnet", "Rnp", "Roedunet", "RoedunetFibre", "Sago",
+             "Sanet", "Sanren", "Savvis", "Shentel", "Sinet", "Singaren", "Spiralight",
+             "Sprint", "Sunet", "Surfnet", "Switch", "SwitchL3", "Syringa", "TataNld",
+             "Telcove", "Telecomserbia", "Tinet", "TLex", "Tw", "Twaren", "Ulaknet", "UniC",
+             "Uninet", "Uninett2010", "Uninett2011", "Uran", "UsCarrier", "UsSignal",
+             "Uunet", "Vinaren", "VisionNet", "VtlWavenet2008", "VtlWavenet2011", "WideJpn",
+             "Xeex", "Xspedius", "York", "Zamren"]
+files = [(f"archive.zip:{n}.graphml", n, "graphml") for n in net_names]
+
+
+
+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)
+            del g.vp["_graphml_vertex_id"]
+            del g.ep["_graphml_edge_id"]
+        yield alt, g