History of as_skitter
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/as_skitter/__init__.py b/entries/as_skitter/__init__.py
index 651a3e9..19df954 100644
--- a/entries/as_skitter/__init__.py
+++ b/entries/as_skitter/__init__.py
@@ -23,7 +23,7 @@ description = """An Internet topology graph obtained from traceroute measurement
tags = ['Technological', 'Communication', 'Unweighted']
url = 'http://snap.stanford.edu/data/as-skitter.html'
citation = [('"The CAIDA UCSD Macroscopic Skitter Topology Dataset"', 'https://www.caida.org/tools/measurement/skitter/')]
-icon_hash = '57212e0e461efe0c7a6753b8'
+date_added = '2020-08-11'
upstream_license = None
upstream_prefix = 'https://snap.stanford.edu/data'
files = [('as-skitter.txt.gz', None, 'snap')]
[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/as_skitter/__init__.py b/entries/as_skitter/__init__.py
index cabe09f..651a3e9 100644
--- a/entries/as_skitter/__init__.py
+++ b/entries/as_skitter/__init__.py
@@ -36,7 +36,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/as_skitter/__init__.py b/entries/as_skitter/__init__.py
index 8ddc268..cabe09f 100644
--- a/entries/as_skitter/__init__.py
+++ b/entries/as_skitter/__init__.py
@@ -19,13 +19,12 @@
from .. import *
title = "Skitter IP graph (2005)"
-description = """An aggregate snapshot of the Internet Protocol (IP) graph, as measured by the traceroute tool on CAIDA's skitter infrastructure, in 2005.[^icon]
-[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
+description = """An Internet topology graph obtained from traceroute measurements carried out daily during 2005 by CAIDA's skitter infrastructure, in which monitors at several scattered locations probed paths to about a million destinations. Nodes correspond to hosts or routers identified along the measured paths, and an undirected edge connects two nodes that were observed as adjacent hops. The aggregate graph was compiled by J. Leskovec and collaborators (SNAP); nodes are identified only by anonymous numeric identifiers, and the network has no node or edge properties."""
tags = ['Technological', 'Communication', 'Unweighted']
url = 'http://snap.stanford.edu/data/as-skitter.html'
citation = [('"The CAIDA UCSD Macroscopic Skitter Topology Dataset"', 'https://www.caida.org/tools/measurement/skitter/')]
icon_hash = '57212e0e461efe0c7a6753b8'
-ustream_license = None
+upstream_license = None
upstream_prefix = 'https://snap.stanford.edu/data'
files = [('as-skitter.txt.gz', None, 'snap')]
Update copyright information 73a4f0d
diff --git a/entries/as_skitter/__init__.py b/entries/as_skitter/__init__.py
index 060392c..8ddc268 100644
--- a/entries/as_skitter/__init__.py
+++ b/entries/as_skitter/__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/as_skitter/__init__.py b/entries/as_skitter/__init__.py
index 9f78646..060392c 100644
--- a/entries/as_skitter/__init__.py
+++ b/entries/as_skitter/__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/as_skitter/__init__.py b/entries/as_skitter/__init__.py
index 993c8a0..9f78646 100644
--- a/entries/as_skitter/__init__.py
+++ b/entries/as_skitter/__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/as_skitter/__init__.py b/entries/as_skitter/__init__.py
index e44cc40..993c8a0 100644
--- a/entries/as_skitter/__init__.py
+++ b/entries/as_skitter/__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/as_skitter/__init__.py b/entries/as_skitter/__init__.py
index cd8595f..e44cc40 100644
--- a/entries/as_skitter/__init__.py
+++ b/entries/as_skitter/__init__.py
@@ -23,7 +23,7 @@ description = """An aggregate snapshot of the Internet Protocol (IP) graph, as m
[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Technological', 'Communication', 'Unweighted']
url = 'http://snap.stanford.edu/data/as-skitter.html'
-citation = [('The CAIDA UCSD Macroscopic Skitter Topology Dataset - 2005, http://www.caida.org/tools/measurements/skitter (2005)', 'https://www.caida.org/tools/measurement/skitter/')]
+citation = [('"The CAIDA UCSD Macroscopic Skitter Topology Dataset"', 'https://www.caida.org/tools/measurement/skitter/')]
icon_hash = '57212e0e461efe0c7a6753b8'
ustream_license = None
upstream_prefix = 'https://snap.stanford.edu/data'
Change license from GPLv3 to AGPLv3 d754be5
diff --git a/entries/as_skitter/__init__.py b/entries/as_skitter/__init__.py
index d5a4b79..cd8595f 100644
--- a/entries/as_skitter/__init__.py
+++ b/entries/as_skitter/__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/as_skitter/__init__.py b/entries/as_skitter/__init__.py
index b91b62a..d5a4b79 100644
--- a/entries/as_skitter/__init__.py
+++ b/entries/as_skitter/__init__.py
@@ -19,7 +19,8 @@
from .. import *
title = "Skitter IP graph (2005)"
-description = "An aggregate snapshot of the Internet Protocol (IP) graph, as measured by the traceroute tool on CAIDA's skitter infrastructure, in 2005."
+description = """An aggregate snapshot of the Internet Protocol (IP) graph, as measured by the traceroute tool on CAIDA's skitter infrastructure, in 2005.[^icon]
+[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Technological', 'Communication', 'Unweighted']
url = 'http://snap.stanford.edu/data/as-skitter.html'
citation = [('The CAIDA UCSD Macroscopic Skitter Topology Dataset - 2005, http://www.caida.org/tools/measurements/skitter (2005)', 'https://www.caida.org/tools/measurement/skitter/')]
Initial commit cc85872
diff --git a/entries/as_skitter/__init__.py b/entries/as_skitter/__init__.py
new file mode 100644
index 0000000..b91b62a
--- /dev/null
+++ b/entries/as_skitter/__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 = "Skitter IP graph (2005)"
+description = "An aggregate snapshot of the Internet Protocol (IP) graph, as measured by the traceroute tool on CAIDA's skitter infrastructure, in 2005."
+tags = ['Technological', 'Communication', 'Unweighted']
+url = 'http://snap.stanford.edu/data/as-skitter.html'
+citation = [('The CAIDA UCSD Macroscopic Skitter Topology Dataset - 2005, http://www.caida.org/tools/measurements/skitter (2005)', 'https://www.caida.org/tools/measurement/skitter/')]
+icon_hash = '57212e0e461efe0c7a6753b8'
+ustream_license = None
+upstream_prefix = 'https://snap.stanford.edu/data'
+files = [('as-skitter.txt.gz', None, 'snap')]
+
+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