History of highschool
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/highschool/__init__.py b/entries/highschool/__init__.py
index 1d934c5..583e3e7 100644
--- a/entries/highschool/__init__.py
+++ b/entries/highschool/__init__.py
@@ -30,7 +30,7 @@ The network has the following properties:
tags = ['Social', 'Offline', 'Weighted', 'Temporal']
url = 'https://web.archive.org/web/20210115130726/http://moreno.ss.uci.edu/data.html#high'
citation = [('J. S. Coleman, "Introduction to Mathematical Sociology." Free Press, New York (1964)', 'http://www.abebooks.com/Introduction-Mathematical-Sociology-COLEMAN-James-S/189127582/bd')]
-icon_hash = '57e188198cf714f319c38bd9'
+date_added = '2020-08-11'
upstream_license = None
upstream_prefix = 'https://web.archive.org/web/20210115130726id_/http://moreno.ss.uci.edu'
files = [('highschl.dat', None, None)]
[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/highschool/__init__.py b/entries/highschool/__init__.py
index c7e4cc5..1d934c5 100644
--- a/entries/highschool/__init__.py
+++ b/entries/highschool/__init__.py
@@ -25,7 +25,8 @@ A directed edge (i, j) indicates that boy i named boy j in at least one of the t
The network has the following properties:
-- Edges: `weight`, the number of surveys in which i named j (1 or 2); `fall_1957` and `spring_1958`, whether i named j in the survey of fall 1957 and spring 1958, respectively."""
+- (Edge) `weight`: the number of surveys in which i named j (1 or 2).
+- (Edge) `fall_1957` and `spring_1958`: whether i named j in the survey of fall 1957 and spring 1958, respectively."""
tags = ['Social', 'Offline', 'Weighted', 'Temporal']
url = 'https://web.archive.org/web/20210115130726/http://moreno.ss.uci.edu/data.html#high'
citation = [('J. S. Coleman, "Introduction to Mathematical Sociology." Free Press, New York (1964)', 'http://www.abebooks.com/Introduction-Mathematical-Sociology-COLEMAN-James-S/189127582/bd')]
[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/highschool/__init__.py b/entries/highschool/__init__.py
index 3b2da5e..c7e4cc5 100644
--- a/entries/highschool/__init__.py
+++ b/entries/highschool/__init__.py
@@ -44,7 +44,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] Move more KONECT-derived entries to their original sources bf9dc0e
The entries now download the data from where KONECT obtained them (live, or via the Wayback Machine), using the same release as KONECT where it is still available, and gain the metadata KONECT dropped; descriptions and citations are rewritten from the original sources: - Linton Freeman's UCINET data page: bible_nouns, bison, cattle, hens, highschool, kangaroo, macaques, moreno_sheep, physician_trust (the three relations and the physicians' attributes), rhesus_monkey, train_terrorists, windsurfers (now the networks `interaction` and `closeness`), college_freshmen, crime, interactome_yeast (from the primary source), moreno_taro (undirected), residence_hall, zebras - other pages, archived: contiguous_usa, advogato, google, github, digg_reply, twitter, bookcrossing, dbtropes_feature (without KONECT's spurious "ItemName" tropes) - movielens_100k (in fact the MovieLens 10M tag assignments) - dblp release 2017-05-02: dblp_author_paper, dblp_cite, dblp_coauthor - DBpedia 3.9: dbpedia_country, dbpedia_genre, dbpedia_location, dbpedia_occupation, dbpedia_producer, dbpedia_recordlabel, dbpedia_starring, dbpedia_team, dbpedia_writer, dbpedia_all, dbpedia_link - Discogs releases dump of October 2015: discogs_affiliation, discogs_genre and discogs_label (now with genre and style networks)
diff --git a/entries/highschool/__init__.py b/entries/highschool/__init__.py
index 25d957c..3b2da5e 100644
--- a/entries/highschool/__init__.py
+++ b/entries/highschool/__init__.py
@@ -19,18 +19,26 @@
from .. import *
title = "Illinois high school students (1958)"
-description = """A network of friendships among male students in a small high school in Illinois from 1958. An arc points from student i to student j if i named j as a friend, in either of two identical surveys (from Fall and Spring semesters). Edge weights are the number of surveys in which the friendship was named.[^icon]
-[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
-tags = ['Social', 'Offline', 'Weighted']
-url = 'http://konect.cc/networks/moreno_highschool'
-citation = [('J. S. Coleman. "Introduction to Mathematical Sociology." London Free Press Glencoe (1964)', 'http://www.abebooks.com/Introduction-Mathematical-Sociology-COLEMAN-James-S/189127582/bd')]
+description = """Friendships among the 73 boys of a small high school in Illinois, from the research reported by J. S. Coleman (1964). In the fall of 1957 and in the spring of 1958, the boys were asked: "What fellows here in school do you go around with most often?" The data were distributed by L. C. Freeman on his network data page at the University of California, Irvine (no longer online), from which this version was obtained via the Internet Archive.
+
+A directed edge (i, j) indicates that boy i named boy j in at least one of the two surveys. Three boys neither named nor were named by anyone, and are isolated nodes.
+
+The network has the following properties:
+
+- Edges: `weight`, the number of surveys in which i named j (1 or 2); `fall_1957` and `spring_1958`, whether i named j in the survey of fall 1957 and spring 1958, respectively."""
+tags = ['Social', 'Offline', 'Weighted', 'Temporal']
+url = 'https://web.archive.org/web/20210115130726/http://moreno.ss.uci.edu/data.html#high'
+citation = [('J. S. Coleman, "Introduction to Mathematical Sociology." Free Press, New York (1964)', 'http://www.abebooks.com/Introduction-Mathematical-Sociology-COLEMAN-James-S/189127582/bd')]
icon_hash = '57e188198cf714f319c38bd9'
-upstream_prefix = 'http://konect.cc/files'
-files = [('download.tsv.moreno_highschool.tar.bz2', None, 'konect')]
+upstream_license = None
+upstream_prefix = 'https://web.archive.org/web/20210115130726id_/http://moreno.ss.uci.edu'
+files = [('highschl.dat', None, None)]
def fetch_upstream(force=False):
- return fetch_upstream_files(__name__.split(".")[-1], upstream_prefix, files,
- force)
+ # The Wayback Machine refuses connections or fails when rate-limited, so
+ # retry with increasing pauses (files already fetched are skipped)
+ return retry_download(fetch_upstream_files, __name__.split(".")[-1],
+ upstream_prefix, files, force)
@cache_network()
@coerce_props()
@@ -44,6 +52,15 @@ def parse(alts=None):
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)
+ fs = [stack.enter_context(open_upstream_file(name, fn, "rb"))
+ for fn in fnames]
+ ds = [read_dl(f, pad=False) for f in fs]
+ d = ds[0]
+ assert d["levels"] == ["TIME 1", "TIME 2"]
+ T1, T2 = d["data"] != 0
+ g = matrix_graph([(T1 | T2).astype("int")], True, wtype=None)
+ s, t = g.get_edges().T
+ g.ep.weight = g.new_ep("int", vals=T1[s, t].astype("int") + T2[s, t])
+ g.ep.fall_1957 = g.new_ep("bool", vals=T1[s, t])
+ g.ep.spring_1958 = g.new_ep("bool", vals=T2[s, t])
yield alt, g
Update copyright information 73a4f0d
diff --git a/entries/highschool/__init__.py b/entries/highschool/__init__.py
index 3e04db4..25d957c 100644
--- a/entries/highschool/__init__.py
+++ b/entries/highschool/__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/highschool/__init__.py b/entries/highschool/__init__.py
index 882d8fb..3e04db4 100644
--- a/entries/highschool/__init__.py
+++ b/entries/highschool/__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/highschool/__init__.py b/entries/highschool/__init__.py
index a1042f4..882d8fb 100644
--- a/entries/highschool/__init__.py
+++ b/entries/highschool/__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/highschool/__init__.py b/entries/highschool/__init__.py
index 930e464..a1042f4 100644
--- a/entries/highschool/__init__.py
+++ b/entries/highschool/__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
Un-orphan KONECT datasets 894eba5
KONECT has been brought back from the dead for the time being.
diff --git a/entries/highschool/__init__.py b/entries/highschool/__init__.py
index f656120..930e464 100644
--- a/entries/highschool/__init__.py
+++ b/entries/highschool/__init__.py
@@ -26,7 +26,6 @@ url = 'http://konect.cc/networks/moreno_highschool'
citation = [('J. S. Coleman. "Introduction to Mathematical Sociology." London Free Press Glencoe (1964)', 'http://www.abebooks.com/Introduction-Mathematical-Sociology-COLEMAN-James-S/189127582/bd')]
icon_hash = '57e188198cf714f319c38bd9'
upstream_prefix = 'http://konect.cc/files'
-orphan = True
files = [('download.tsv.moreno_highschool.tar.bz2', None, 'konect')]
def fetch_upstream(force=False):
Add support for 'orphan' datasets and tag konect entries e330b80
diff --git a/entries/highschool/__init__.py b/entries/highschool/__init__.py
index 930e464..f656120 100644
--- a/entries/highschool/__init__.py
+++ b/entries/highschool/__init__.py
@@ -26,6 +26,7 @@ url = 'http://konect.cc/networks/moreno_highschool'
citation = [('J. S. Coleman. "Introduction to Mathematical Sociology." London Free Press Glencoe (1964)', 'http://www.abebooks.com/Introduction-Mathematical-Sociology-COLEMAN-James-S/189127582/bd')]
icon_hash = '57e188198cf714f319c38bd9'
upstream_prefix = 'http://konect.cc/files'
+orphan = True
files = [('download.tsv.moreno_highschool.tar.bz2', None, 'konect')]
def fetch_upstream(force=False):
Change license from GPLv3 to AGPLv3 d754be5
diff --git a/entries/highschool/__init__.py b/entries/highschool/__init__.py
index 8cd1663..930e464 100644
--- a/entries/highschool/__init__.py
+++ b/entries/highschool/__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/highschool/__init__.py b/entries/highschool/__init__.py
index cd391b2..8cd1663 100644
--- a/entries/highschool/__init__.py
+++ b/entries/highschool/__init__.py
@@ -19,7 +19,8 @@
from .. import *
title = "Illinois high school students (1958)"
-description = "A network of friendships among male students in a small high school in Illinois from 1958. An arc points from student i to student j if i named j as a friend, in either of two identical surveys (from Fall and Spring semesters). Edge weights are the number of surveys in which the friendship was named."
+description = """A network of friendships among male students in a small high school in Illinois from 1958. An arc points from student i to student j if i named j as a friend, in either of two identical surveys (from Fall and Spring semesters). Edge weights are the number of surveys in which the friendship was named.[^icon]
+[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Social', 'Offline', 'Weighted']
url = 'http://konect.cc/networks/moreno_highschool'
citation = [('J. S. Coleman. "Introduction to Mathematical Sociology." London Free Press Glencoe (1964)', 'http://www.abebooks.com/Introduction-Mathematical-Sociology-COLEMAN-James-S/189127582/bd')]
Initial commit cc85872
diff --git a/entries/highschool/__init__.py b/entries/highschool/__init__.py
new file mode 100644
index 0000000..cd391b2
--- /dev/null
+++ b/entries/highschool/__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 = "Illinois high school students (1958)"
+description = "A network of friendships among male students in a small high school in Illinois from 1958. An arc points from student i to student j if i named j as a friend, in either of two identical surveys (from Fall and Spring semesters). Edge weights are the number of surveys in which the friendship was named."
+tags = ['Social', 'Offline', 'Weighted']
+url = 'http://konect.cc/networks/moreno_highschool'
+citation = [('J. S. Coleman. "Introduction to Mathematical Sociology." London Free Press Glencoe (1964)', 'http://www.abebooks.com/Introduction-Mathematical-Sociology-COLEMAN-James-S/189127582/bd')]
+icon_hash = '57e188198cf714f319c38bd9'
+upstream_prefix = 'http://konect.cc/files'
+files = [('download.tsv.moreno_highschool.tar.bz2', None, 'konect')]
+
+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