History of windsurfers
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/windsurfers/__init__.py b/entries/windsurfers/__init__.py
index 4c261ed..6096cc1 100644
--- a/entries/windsurfers/__init__.py
+++ b/entries/windsurfers/__init__.py
@@ -35,7 +35,7 @@ tags = ['Social', 'Offline', 'Weighted', 'Metadata']
url = 'https://web.archive.org/web/20210115130726/http://moreno.ss.uci.edu/data.html#beach'
citation = [('L. Freeman, S. Freeman, & A. Michaelson, "On human social intelligence." J. Social and Biological Structures 11(4), 415-425 (1988)', 'https://doi.org/10.1016/0140-1750(88)90080-2'),
('L. C. Freeman, S. C. Freeman, A. G. Michaelson, "How humans see social groups: A test of the Sailer-Gaulin models." Journal of Quantitative Anthropology 1, 229-238 (1989)', 'https://scholar.google.com/scholar?q=Freeman+Michaelson+%22How+humans+see+social+groups%22')]
-icon_hash = '57cf1f1c67351c5e0ccd7a10'
+date_added = '2020-08-11'
upstream_license = None
upstream_prefix = 'https://web.archive.org/web/20210115130726id_/http://moreno.ss.uci.edu'
files = [('beach.dat', 'interaction', None), ('beach.dat', 'closeness', 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/windsurfers/__init__.py b/entries/windsurfers/__init__.py
index a9c3408..4c261ed 100644
--- a/entries/windsurfers/__init__.py
+++ b/entries/windsurfers/__init__.py
@@ -28,8 +28,9 @@ The two relations are given as separate networks, with the same nodes in the sam
The networks have the following properties:
-- `interaction`: Nodes: `diagonal`, the diagonal entry of the interaction matrix (its meaning is not documented). Edges: `weight`, the number of observed interactions.
-- `closeness`: Edges: `weight`, the perceived closeness (between 0.333 and 1)."""
+- (Node) `diagonal` (`interaction`): the diagonal entry of the interaction matrix (its meaning is not documented).
+- (Edge) `weight` (`interaction`): the number of observed interactions.
+- (Edge) `weight` (`closeness`): the perceived closeness (between 0.333 and 1)."""
tags = ['Social', 'Offline', 'Weighted', 'Metadata']
url = 'https://web.archive.org/web/20210115130726/http://moreno.ss.uci.edu/data.html#beach'
citation = [('L. Freeman, S. Freeman, & A. Michaelson, "On human social intelligence." J. Social and Biological Structures 11(4), 415-425 (1988)', 'https://doi.org/10.1016/0140-1750(88)90080-2'),
[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/windsurfers/__init__.py b/entries/windsurfers/__init__.py
index 56733ba..a9c3408 100644
--- a/entries/windsurfers/__init__.py
+++ b/entries/windsurfers/__init__.py
@@ -49,7 +49,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/windsurfers/__init__.py b/entries/windsurfers/__init__.py
index cc7ee4a..56733ba 100644
--- a/entries/windsurfers/__init__.py
+++ b/entries/windsurfers/__init__.py
@@ -19,18 +19,31 @@
from .. import *
title = "Windsurfers network (1986)"
-description = """A network of interpersonal contacts among windsurfers in southern California during the Fall of 1986. The edge weights indicate the perception of social affiliations majored by the tasks in which each individual was asked to sort cards with other surfer’s name in the order of closeness.[^icon]
-[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
-tags = ['Social', 'Offline', 'Weighted']
-url = 'http://konect.cc/networks/moreno_beach'
-citation = [('L. Freeman, S. Freeman, & A. Michaelson, "On human social intelligence." J. Social and Biological Structures 11(4), 415-425 (1988)', 'https://doi.org/10.1016/0140-1750(88)90080-2')]
+description = """Interpersonal contacts among 43 windsurfers on a beach in southern California, studied by L. C. Freeman, S. C. Freeman and A. G. Michaelson in the fall of 1986. The windsurfing community was fairly clearly divided into at least two sub-communities, whose members tended to limit their interactions to fellow group members. The 43 individuals were observed for 31 days, and all interpersonal contacts among them were recorded. After the end of the observations, all of them were interviewed about their perception of social affiliations: each subject performed a sequence of card sorting tasks that assigned an index of the perceived closeness of every individual on the beach to each of the other individuals. 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.
+
+The two relations are given as separate networks, with the same nodes in the same order:
+
+- `interaction`: an undirected edge (i, j) indicates that individuals i and j were observed interacting. (In the source matrix, the row of the last individual is empty, although the corresponding column is not; the matrix is symmetrized here.)
+- `closeness`: an undirected edge (i, j) indicates a nonzero perceived closeness between i and j, as aggregated in the source matrix (how the closeness indices of the different subjects were combined is not documented). This network is almost complete.
+
+The networks have the following properties:
+
+- `interaction`: Nodes: `diagonal`, the diagonal entry of the interaction matrix (its meaning is not documented). Edges: `weight`, the number of observed interactions.
+- `closeness`: Edges: `weight`, the perceived closeness (between 0.333 and 1)."""
+tags = ['Social', 'Offline', 'Weighted', 'Metadata']
+url = 'https://web.archive.org/web/20210115130726/http://moreno.ss.uci.edu/data.html#beach'
+citation = [('L. Freeman, S. Freeman, & A. Michaelson, "On human social intelligence." J. Social and Biological Structures 11(4), 415-425 (1988)', 'https://doi.org/10.1016/0140-1750(88)90080-2'),
+ ('L. C. Freeman, S. C. Freeman, A. G. Michaelson, "How humans see social groups: A test of the Sailer-Gaulin models." Journal of Quantitative Anthropology 1, 229-238 (1989)', 'https://scholar.google.com/scholar?q=Freeman+Michaelson+%22How+humans+see+social+groups%22')]
icon_hash = '57cf1f1c67351c5e0ccd7a10'
-upstream_prefix = 'http://konect.cc/files'
-files = [('download.tsv.moreno_beach.tar.bz2', None, 'konect')]
+upstream_license = None
+upstream_prefix = 'https://web.archive.org/web/20210115130726id_/http://moreno.ss.uci.edu'
+files = [('beach.dat', 'interaction', None), ('beach.dat', 'closeness', 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 +57,20 @@ 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=False)
+ 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"] == ["bb", "bc"]
+ if alt == "interaction":
+ A = d["data"][0].copy()
+ diag = numpy.diag(A).astype("int")
+ numpy.fill_diagonal(A, 0)
+ A = numpy.maximum(A, A.T)
+ g = matrix_graph([A], False)
+ g.vp.diagonal = g.new_vp("int", vals=diag)
+ else:
+ A = d["data"][1]
+ assert (A == A.T).all() and not numpy.diag(A).any()
+ g = matrix_graph([A], False, wtype="double")
yield alt, g
Update copyright information 73a4f0d
diff --git a/entries/windsurfers/__init__.py b/entries/windsurfers/__init__.py
index a9109f3..cc7ee4a 100644
--- a/entries/windsurfers/__init__.py
+++ b/entries/windsurfers/__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/windsurfers/__init__.py b/entries/windsurfers/__init__.py
index e0cff10..a9109f3 100644
--- a/entries/windsurfers/__init__.py
+++ b/entries/windsurfers/__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/windsurfers/__init__.py b/entries/windsurfers/__init__.py
index af9c026..e0cff10 100644
--- a/entries/windsurfers/__init__.py
+++ b/entries/windsurfers/__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/windsurfers/__init__.py b/entries/windsurfers/__init__.py
index 40ac445..af9c026 100644
--- a/entries/windsurfers/__init__.py
+++ b/entries/windsurfers/__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/windsurfers/__init__.py b/entries/windsurfers/__init__.py
index 872a558..40ac445 100644
--- a/entries/windsurfers/__init__.py
+++ b/entries/windsurfers/__init__.py
@@ -26,7 +26,6 @@ url = 'http://konect.cc/networks/moreno_beach'
citation = [('L. Freeman, S. Freeman, & A. Michaelson, "On human social intelligence." J. Social and Biological Structures 11(4), 415-425 (1988)', 'https://doi.org/10.1016/0140-1750(88)90080-2')]
icon_hash = '57cf1f1c67351c5e0ccd7a10'
upstream_prefix = 'http://konect.cc/files'
-orphan = True
files = [('download.tsv.moreno_beach.tar.bz2', None, 'konect')]
def fetch_upstream(force=False):
Update citations to use DOIs e878874
diff --git a/entries/windsurfers/__init__.py b/entries/windsurfers/__init__.py
index f3acf49..872a558 100644
--- a/entries/windsurfers/__init__.py
+++ b/entries/windsurfers/__init__.py
@@ -23,7 +23,7 @@ description = """A network of interpersonal contacts among windsurfers in southe
[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Social', 'Offline', 'Weighted']
url = 'http://konect.cc/networks/moreno_beach'
-citation = [('L. Freeman, S. Freeman, & A. Michaelson, "On human social intelligence." J. Social and Biological Structures 11(4), 415-425 (1988)', 'http://www.sciencedirect.com/science/article/pii/0140175088900802')]
+citation = [('L. Freeman, S. Freeman, & A. Michaelson, "On human social intelligence." J. Social and Biological Structures 11(4), 415-425 (1988)', 'https://doi.org/10.1016/0140-1750(88)90080-2')]
icon_hash = '57cf1f1c67351c5e0ccd7a10'
upstream_prefix = 'http://konect.cc/files'
orphan = True
Add support for 'orphan' datasets and tag konect entries e330b80
diff --git a/entries/windsurfers/__init__.py b/entries/windsurfers/__init__.py
index dfa640b..f3acf49 100644
--- a/entries/windsurfers/__init__.py
+++ b/entries/windsurfers/__init__.py
@@ -26,6 +26,7 @@ url = 'http://konect.cc/networks/moreno_beach'
citation = [('L. Freeman, S. Freeman, & A. Michaelson, "On human social intelligence." J. Social and Biological Structures 11(4), 415-425 (1988)', 'http://www.sciencedirect.com/science/article/pii/0140175088900802')]
icon_hash = '57cf1f1c67351c5e0ccd7a10'
upstream_prefix = 'http://konect.cc/files'
+orphan = True
files = [('download.tsv.moreno_beach.tar.bz2', None, 'konect')]
def fetch_upstream(force=False):
Change license from GPLv3 to AGPLv3 d754be5
diff --git a/entries/windsurfers/__init__.py b/entries/windsurfers/__init__.py
index c6a9907..dfa640b 100644
--- a/entries/windsurfers/__init__.py
+++ b/entries/windsurfers/__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/windsurfers/__init__.py b/entries/windsurfers/__init__.py
index ba4ed5f..c6a9907 100644
--- a/entries/windsurfers/__init__.py
+++ b/entries/windsurfers/__init__.py
@@ -19,7 +19,8 @@
from .. import *
title = "Windsurfers network (1986)"
-description = "A network of interpersonal contacts among windsurfers in southern California during the Fall of 1986. The edge weights indicate the perception of social affiliations majored by the tasks in which each individual was asked to sort cards with other surfer’s name in the order of closeness."
+description = """A network of interpersonal contacts among windsurfers in southern California during the Fall of 1986. The edge weights indicate the perception of social affiliations majored by the tasks in which each individual was asked to sort cards with other surfer’s name in the order of closeness.[^icon]
+[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Social', 'Offline', 'Weighted']
url = 'http://konect.cc/networks/moreno_beach'
citation = [('L. Freeman, S. Freeman, & A. Michaelson, "On human social intelligence." J. Social and Biological Structures 11(4), 415-425 (1988)', 'http://www.sciencedirect.com/science/article/pii/0140175088900802')]
Initial commit cc85872
diff --git a/entries/windsurfers/__init__.py b/entries/windsurfers/__init__.py
new file mode 100644
index 0000000..ba4ed5f
--- /dev/null
+++ b/entries/windsurfers/__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 = "Windsurfers network (1986)"
+description = "A network of interpersonal contacts among windsurfers in southern California during the Fall of 1986. The edge weights indicate the perception of social affiliations majored by the tasks in which each individual was asked to sort cards with other surfer’s name in the order of closeness."
+tags = ['Social', 'Offline', 'Weighted']
+url = 'http://konect.cc/networks/moreno_beach'
+citation = [('L. Freeman, S. Freeman, & A. Michaelson, "On human social intelligence." J. Social and Biological Structures 11(4), 415-425 (1988)', 'http://www.sciencedirect.com/science/article/pii/0140175088900802')]
+icon_hash = '57cf1f1c67351c5e0ccd7a10'
+upstream_prefix = 'http://konect.cc/files'
+files = [('download.tsv.moreno_beach.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=False)
+ yield alt, g