History of sp_high_school_new
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/sp_high_school_new/__init__.py b/entries/sp_high_school_new/__init__.py
index 6fbc595..ecfcf90 100644
--- a/entries/sp_high_school_new/__init__.py
+++ b/entries/sp_high_school_new/__init__.py
@@ -33,7 +33,7 @@ The networks have the following properties:
tags = ['Social', 'Offline', 'Unweighted', 'Temporal', 'Metadata']
url = 'https://sociopatterns.org/datasets/high-school-dynamic-contact-networks/'
citation = [('J. Fournet & A. Barrat, "Contact patterns among high school students." PLoS ONE 9(9), e107878 (2014).', 'https://doi.org/10.1371/journal.pone.0107878')]
-icon_hash = '56a85c8e26855e083a2f789d'
+date_added = '2020-08-11'
upstream_license = ("Creative Commons Attribution-NonCommercial-ShareAlike",
"http://creativecommons.org/licenses/by-nc-sa/3.0/")
upstream_prefix = 'https://sociopatterns.org/assets/data'
[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/sp_high_school_new/__init__.py b/entries/sp_high_school_new/__init__.py
index b2cc237..6fbc595 100644
--- a/entries/sp_high_school_new/__init__.py
+++ b/entries/sp_high_school_new/__init__.py
@@ -26,10 +26,10 @@ description = r"""Temporal networks of face-to-face proximity contacts among stu
The networks have the following properties:
-- `id`: the anonymous identifier of the person.
-- `class`: the class of the student (e.g. `PC*`, `MP*1`, `PSI*`), or `teacher` (`2011` only).
-- `gender`: the gender (`M` or `F`).
-- `time`: the end of the 20-second interval $[t - 20\,\text{s}, t]$ during which the contact was active, in seconds. For `2012` it is a UNIX timestamp; for `2011` it is measured from an unspecified reference time."""
+- (Node) `id`: the anonymous identifier of the person.
+- (Node) `class`: the class of the student (e.g. `PC*`, `MP*1`, `PSI*`), or `teacher` (`2011` only).
+- (Node) `gender`: the gender (`M` or `F`).
+- (Edge) `time`: the end of the 20-second interval $[t - 20\,\text{s}, t]$ during which the contact was active, in seconds. For `2012` it is a UNIX timestamp; for `2011` it is measured from an unspecified reference time."""
tags = ['Social', 'Offline', 'Unweighted', 'Temporal', 'Metadata']
url = 'https://sociopatterns.org/datasets/high-school-dynamic-contact-networks/'
citation = [('J. Fournet & A. Barrat, "Contact patterns among high school students." PLoS ONE 9(9), e107878 (2014).', 'https://doi.org/10.1371/journal.pone.0107878')]
[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/sp_high_school_new/__init__.py b/entries/sp_high_school_new/__init__.py
index e09f5b8..b2cc237 100644
--- a/entries/sp_high_school_new/__init__.py
+++ b/entries/sp_high_school_new/__init__.py
@@ -48,7 +48,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/sp_high_school_new/__init__.py b/entries/sp_high_school_new/__init__.py
index ed56cf5..e09f5b8 100644
--- a/entries/sp_high_school_new/__init__.py
+++ b/entries/sp_high_school_new/__init__.py
@@ -19,23 +19,26 @@
from .. import *
title = "High school dynamic contacts (2011-2012)"
-description = """These datasets contain the temporal network of contacts between students in a high school in Marseilles, France. The first dataset gives the contacts of the students of three classes during 4 days in Dec. 2011, and the second corresponds to the contacts of the students of 5 classes during 7 days (from a Monday to the Tuesday of the following week) in Nov. 2012.[^icon]
+description = r"""Temporal networks of face-to-face proximity contacts among students of a high school (the "classes préparatoires" Lycée Thiers) in Marseilles, France, measured by the SocioPatterns collaboration with wearable sensors. Nodes are persons, and each edge is a contact between two persons active during a 20-second interval of the data collection, so that a pair of persons is connected by one edge per interval in which they were in contact.
-Each Contact list file contains a tab-separated list representing the active contacts during 20-second intervals of the data collection. Each line has the form “t i j Ci Cj”, where i and j are the anonymous IDs of the persons in contact, Ci and Cj are their classes, and the interval during which this contact was active is [t – 20s, t]. If multiple contacts are active in a given interval, you will see multiple lines starting with the same value of t. Time is measured in seconds (for the 2012 data, it is expressed in UNIX ctime).
+- `2011`: students of three classes and some of their teachers, during 4 days in December 2011.
+- `2012`: students of five classes, during 7 days (from a Monday to the Tuesday of the following week) in November 2012.
-Each metadata file contains a tab-separated list in which each line of the form “i Ci Gi” gives class Ci and gender Gi of the person having ID i.
+The networks have the following properties:
-[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project.
-"""
+- `id`: the anonymous identifier of the person.
+- `class`: the class of the student (e.g. `PC*`, `MP*1`, `PSI*`), or `teacher` (`2011` only).
+- `gender`: the gender (`M` or `F`).
+- `time`: the end of the 20-second interval $[t - 20\,\text{s}, t]$ during which the contact was active, in seconds. For `2012` it is a UNIX timestamp; for `2011` it is measured from an unspecified reference time."""
tags = ['Social', 'Offline', 'Unweighted', 'Temporal', 'Metadata']
-url = 'http://www.sociopatterns.org/datasets/high-school-dynamic-contact-networks/'
+url = 'https://sociopatterns.org/datasets/high-school-dynamic-contact-networks/'
citation = [('J. Fournet & A. Barrat, "Contact patterns among high school students." PLoS ONE 9(9), e107878 (2014).', 'https://doi.org/10.1371/journal.pone.0107878')]
icon_hash = '56a85c8e26855e083a2f789d'
-ustream_license = ("Creative Commons Attribution-NonCommercial-ShareAlike",
+upstream_license = ("Creative Commons Attribution-NonCommercial-ShareAlike",
"http://creativecommons.org/licenses/by-nc-sa/3.0/")
-upstream_prefix = 'http://www.sociopatterns.org/wp-content/uploads'
-files = [(('2014/08/highschool_2011.csv.gz', '2015/09/metadata_2011.txt'), '2011', None),
- (('2014/08/highschool_2012.csv.gz', '2015/09/metadata_2012.txt'), '2012', None)]
+upstream_prefix = 'https://sociopatterns.org/assets/data'
+files = [(('highschool_2011.csv.gz', 'highschool_2011_metadata.txt'), '2011', None),
+ (('highschool_2012.csv.gz', 'highschool_2012_metadata.txt'), '2012', None)]
def fetch_upstream(force=False):
return fetch_upstream_files(__name__.split(".")[-1], upstream_prefix, files,
Update copyright information 73a4f0d
diff --git a/entries/sp_high_school_new/__init__.py b/entries/sp_high_school_new/__init__.py
index 9c31928..ed56cf5 100644
--- a/entries/sp_high_school_new/__init__.py
+++ b/entries/sp_high_school_new/__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/sp_high_school_new/__init__.py b/entries/sp_high_school_new/__init__.py
index 618ebd9..9c31928 100644
--- a/entries/sp_high_school_new/__init__.py
+++ b/entries/sp_high_school_new/__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/sp_high_school_new/__init__.py b/entries/sp_high_school_new/__init__.py
index a1f6da9..618ebd9 100644
--- a/entries/sp_high_school_new/__init__.py
+++ b/entries/sp_high_school_new/__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
sp_high_school, sp_high_school_new, sp_primary_school: fix node ids f5db9a9
diff --git a/entries/sp_high_school_new/__init__.py b/entries/sp_high_school_new/__init__.py
index 75406da..a1f6da9 100644
--- a/entries/sp_high_school_new/__init__.py
+++ b/entries/sp_high_school_new/__init__.py
@@ -73,6 +73,7 @@ def parse(alts=None):
v = int(row[0])
if v not in vs:
vs[v] = g.add_vertex()
+ g.vp.id[vs[v]] = v
v = vs[v]
g.vp["class"][v] = row[1]
g.vp["gender"][v] = row[2]
sp_high_school: fix metadata parsing 3e8a532
diff --git a/entries/sp_high_school_new/__init__.py b/entries/sp_high_school_new/__init__.py
index bd6ff86..75406da 100644
--- a/entries/sp_high_school_new/__init__.py
+++ b/entries/sp_high_school_new/__init__.py
@@ -75,7 +75,7 @@ def parse(alts=None):
vs[v] = g.add_vertex()
v = vs[v]
g.vp["class"][v] = row[1]
- g.vp["class"][v] = row[2]
+ g.vp["gender"][v] = row[2]
g = Graph(g, vorder=g.vp.id)
yield alt, g
Update copyright info db2efcc
diff --git a/entries/sp_high_school_new/__init__.py b/entries/sp_high_school_new/__init__.py
index 71f2c2d..bd6ff86 100644
--- a/entries/sp_high_school_new/__init__.py
+++ b/entries/sp_high_school_new/__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/sp_high_school_new/__init__.py b/entries/sp_high_school_new/__init__.py
index 6e5fe7c..71f2c2d 100644
--- a/entries/sp_high_school_new/__init__.py
+++ b/entries/sp_high_school_new/__init__.py
@@ -29,7 +29,7 @@ Each metadata file contains a tab-separated list in which each line of the form
"""
tags = ['Social', 'Offline', 'Unweighted', 'Temporal', 'Metadata']
url = 'http://www.sociopatterns.org/datasets/high-school-dynamic-contact-networks/'
-citation = [('J. Fournet & A. Barrat, "Contact patterns among high school students." PLoS ONE 9(9), e107878 (2014).', 'http://journals.plos.org/plosone/article?id=10.1371/journal.pone.0107878')]
+citation = [('J. Fournet & A. Barrat, "Contact patterns among high school students." PLoS ONE 9(9), e107878 (2014).', 'https://doi.org/10.1371/journal.pone.0107878')]
icon_hash = '56a85c8e26855e083a2f789d'
ustream_license = ("Creative Commons Attribution-NonCommercial-ShareAlike",
"http://creativecommons.org/licenses/by-nc-sa/3.0/")
Change license from GPLv3 to AGPLv3 d754be5
diff --git a/entries/sp_high_school_new/__init__.py b/entries/sp_high_school_new/__init__.py
index 933d764..6e5fe7c 100644
--- a/entries/sp_high_school_new/__init__.py
+++ b/entries/sp_high_school_new/__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/sp_high_school_new/__init__.py b/entries/sp_high_school_new/__init__.py
index 8cac44b..933d764 100644
--- a/entries/sp_high_school_new/__init__.py
+++ b/entries/sp_high_school_new/__init__.py
@@ -19,11 +19,14 @@
from .. import *
title = "High school dynamic contacts (2011-2012)"
-description = """These datasets contain the temporal network of contacts between students in a high school in Marseilles, France. The first dataset gives the contacts of the students of three classes during 4 days in Dec. 2011, and the second corresponds to the contacts of the students of 5 classes during 7 days (from a Monday to the Tuesday of the following week) in Nov. 2012.
+description = """These datasets contain the temporal network of contacts between students in a high school in Marseilles, France. The first dataset gives the contacts of the students of three classes during 4 days in Dec. 2011, and the second corresponds to the contacts of the students of 5 classes during 7 days (from a Monday to the Tuesday of the following week) in Nov. 2012.[^icon]
-Each Contact list file contains a tab-separated list representing the active contacts during 20-second intervals of the data collection. Each line has the form “t i j Ci Cj“, where i and j are the anonymous IDs of the persons in contact, Ci and Cj are their classes, and the interval during which this contact was active is [ t – 20s, t ]. If multiple contacts are active in a given interval, you will see multiple lines starting with the same value of t. Time is measured in seconds (for the 2012 data, it is expressed in UNIX ctime).
+Each Contact list file contains a tab-separated list representing the active contacts during 20-second intervals of the data collection. Each line has the form “t i j Ci Cj”, where i and j are the anonymous IDs of the persons in contact, Ci and Cj are their classes, and the interval during which this contact was active is [t – 20s, t]. If multiple contacts are active in a given interval, you will see multiple lines starting with the same value of t. Time is measured in seconds (for the 2012 data, it is expressed in UNIX ctime).
-Each metadata file contains a tab-separated list in which each line of the form “i Ci Gi” gives class Ci and gender Gi of the person having ID i."""
+Each metadata file contains a tab-separated list in which each line of the form “i Ci Gi” gives class Ci and gender Gi of the person having ID i.
+
+[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project.
+"""
tags = ['Social', 'Offline', 'Unweighted', 'Temporal', 'Metadata']
url = 'http://www.sociopatterns.org/datasets/high-school-dynamic-contact-networks/'
citation = [('J. Fournet & A. Barrat, "Contact patterns among high school students." PLoS ONE 9(9), e107878 (2014).', 'http://journals.plos.org/plosone/article?id=10.1371/journal.pone.0107878')]
Initial commit cc85872
diff --git a/entries/sp_high_school_new/__init__.py b/entries/sp_high_school_new/__init__.py
new file mode 100644
index 0000000..8cac44b
--- /dev/null
+++ b/entries/sp_high_school_new/__init__.py
@@ -0,0 +1,78 @@
+#! /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 = "High school dynamic contacts (2011-2012)"
+description = """These datasets contain the temporal network of contacts between students in a high school in Marseilles, France. The first dataset gives the contacts of the students of three classes during 4 days in Dec. 2011, and the second corresponds to the contacts of the students of 5 classes during 7 days (from a Monday to the Tuesday of the following week) in Nov. 2012.
+
+Each Contact list file contains a tab-separated list representing the active contacts during 20-second intervals of the data collection. Each line has the form “t i j Ci Cj“, where i and j are the anonymous IDs of the persons in contact, Ci and Cj are their classes, and the interval during which this contact was active is [ t – 20s, t ]. If multiple contacts are active in a given interval, you will see multiple lines starting with the same value of t. Time is measured in seconds (for the 2012 data, it is expressed in UNIX ctime).
+
+Each metadata file contains a tab-separated list in which each line of the form “i Ci Gi” gives class Ci and gender Gi of the person having ID i."""
+tags = ['Social', 'Offline', 'Unweighted', 'Temporal', 'Metadata']
+url = 'http://www.sociopatterns.org/datasets/high-school-dynamic-contact-networks/'
+citation = [('J. Fournet & A. Barrat, "Contact patterns among high school students." PLoS ONE 9(9), e107878 (2014).', 'http://journals.plos.org/plosone/article?id=10.1371/journal.pone.0107878')]
+icon_hash = '56a85c8e26855e083a2f789d'
+ustream_license = ("Creative Commons Attribution-NonCommercial-ShareAlike",
+ "http://creativecommons.org/licenses/by-nc-sa/3.0/")
+upstream_prefix = 'http://www.sociopatterns.org/wp-content/uploads'
+files = [(('2014/08/highschool_2011.csv.gz', '2015/09/metadata_2011.txt'), '2011', None),
+ (('2014/08/highschool_2012.csv.gz', '2015/09/metadata_2012.txt'), '2012', None)]
+
+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, "r")) for fn in fnames]
+ reader = csv.reader(fs[0], delimiter="\t")
+ def get_edges():
+ for rows in reader:
+ t, u, v = [int(x) for x in rows[:3]]
+ yield u, v, t
+ g = Graph(directed=False)
+ g.ep.time = g.new_ep("int")
+ g.vp.id = g.add_edge_list(get_edges(), hashed=True,
+ hash_type="int", eprops=[g.ep.time])
+
+ vs = {g.vp.id[v] : v for v in g.vertices()}
+
+ g.vp["class"] = g.new_vp("string")
+ g.vp["gender"] = g.new_vp("string")
+ reader = csv.reader(fs[1], delimiter="\t")
+ for row in reader:
+ v = int(row[0])
+ if v not in vs:
+ vs[v] = g.add_vertex()
+ v = vs[v]
+ g.vp["class"][v] = row[1]
+ g.vp["class"][v] = row[2]
+
+ g = Graph(g, vorder=g.vp.id)
+ yield alt, g