History of zebras
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/zebras/__init__.py b/entries/zebras/__init__.py
index 837ab3d..762ee59 100644
--- a/entries/zebras/__init__.py
+++ b/entries/zebras/__init__.py
@@ -30,7 +30,7 @@ The network has the following properties:
tags = ['Social', 'Animal', 'Weighted', 'Metadata']
url = 'https://web.archive.org/web/20210115130726/http://moreno.ss.uci.edu/data.html#zebra'
citation = [('S. R. Sundaresan et al., "Network metrics reveal differences in social organization between two fission-fusion species, Grevy\'s zebra and onager." Oecologia 151(1), 140-149 (2007)', 'https://doi.org/10.1007/s00442-006-0553-6')]
-icon_hash = '57349654461efe0c7a678326'
+date_added = '2020-08-11'
upstream_license = None
upstream_prefix = 'https://web.archive.org/web/20210115130726id_/http://moreno.ss.uci.edu'
files = [(('zebra.dat', 'zebatt.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/zebras/__init__.py b/entries/zebras/__init__.py
index 6fc9b67..837ab3d 100644
--- a/entries/zebras/__init__.py
+++ b/entries/zebras/__init__.py
@@ -25,8 +25,8 @@ An undirected edge (i, j) indicates that zebras i and j were seen together at le
The network has the following properties:
-- Nodes: `status`, the reproductive class of the zebra (1: lactating female, 2: non-lactating female, 3: male).
-- Edges: `weight`, 1 if the pair appeared together at least once, or 2 if the pair showed a statistically significant tendency to appear together."""
+- (Node) `status`: the reproductive class of the zebra (1: lactating female, 2: non-lactating female, 3: male).
+- (Edge) `weight`: 1 if the pair appeared together at least once, or 2 if the pair showed a statistically significant tendency to appear together."""
tags = ['Social', 'Animal', 'Weighted', 'Metadata']
url = 'https://web.archive.org/web/20210115130726/http://moreno.ss.uci.edu/data.html#zebra'
citation = [('S. R. Sundaresan et al., "Network metrics reveal differences in social organization between two fission-fusion species, Grevy\'s zebra and onager." Oecologia 151(1), 140-149 (2007)', 'https://doi.org/10.1007/s00442-006-0553-6')]
[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/zebras/__init__.py b/entries/zebras/__init__.py
index 197e265..6fc9b67 100644
--- a/entries/zebras/__init__.py
+++ b/entries/zebras/__init__.py
@@ -45,7 +45,6 @@ def fetch_upstream(force=False):
@coerce_props(vforce={"status": "int"})
@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/zebras/__init__.py b/entries/zebras/__init__.py
index c5d0c15..197e265 100644
--- a/entries/zebras/__init__.py
+++ b/entries/zebras/__init__.py
@@ -19,21 +19,30 @@
from .. import *
title = "Zebras (2002)"
-description = """Social interactions among a group of wild Grevy's zebras (Equus grevyi), observed in Mpala Ranch in Kenya in 2002. Metadata (UCINET version) provides animal sex and lactation status.[^icon]
-[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
-tags = ['Social', 'Animal', 'Unweighted', 'Metadata']
-url = 'http://konect.cc/networks/moreno_zebra'
+description = """Associations among 28 wild Grevy's zebras (Equus grevyi) in Kenya, from the study of S. R. Sundaresan, I. R. Fischhoff, J. Dushoff and D. I. Rubenstein (2007) comparing the social organization of Grevy's zebras and onagers. The authors show that Grevy's zebras form tightly knit cliques that occasionally associate with each other, and that females tend to form bonds with others in the same reproductive state. 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.
+
+An undirected edge (i, j) indicates that zebras i and j were seen together at least once during the study. One zebra was never seen with another one, and is an isolated node.
+
+The network has the following properties:
+
+- Nodes: `status`, the reproductive class of the zebra (1: lactating female, 2: non-lactating female, 3: male).
+- Edges: `weight`, 1 if the pair appeared together at least once, or 2 if the pair showed a statistically significant tendency to appear together."""
+tags = ['Social', 'Animal', 'Weighted', 'Metadata']
+url = 'https://web.archive.org/web/20210115130726/http://moreno.ss.uci.edu/data.html#zebra'
citation = [('S. R. Sundaresan et al., "Network metrics reveal differences in social organization between two fission-fusion species, Grevy\'s zebra and onager." Oecologia 151(1), 140-149 (2007)', 'https://doi.org/10.1007/s00442-006-0553-6')]
icon_hash = '57349654461efe0c7a678326'
-upstream_prefix = 'http://konect.cc/files'
-files = [('download.tsv.moreno_zebra.tar.bz2', None, 'konect')]
+upstream_license = None
+upstream_prefix = 'https://web.archive.org/web/20210115130726id_/http://moreno.ss.uci.edu'
+files = [(('zebra.dat', 'zebatt.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()
+@coerce_props(vforce={"status": "int"})
@annotate()
def parse(alts=None):
global files
@@ -44,6 +53,12 @@ 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, da = ds
+ A = d["data"][0]
+ assert (A == A.T).all() and da["nr"] == d["nr"]
+ g = matrix_graph(d["data"], False)
+ g.vp.status = g.new_vp("int", vals=da["data"][0][:, 0].astype("int"))
yield alt, g
Update copyright information 73a4f0d
diff --git a/entries/zebras/__init__.py b/entries/zebras/__init__.py
index 423d344..c5d0c15 100644
--- a/entries/zebras/__init__.py
+++ b/entries/zebras/__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/zebras/__init__.py b/entries/zebras/__init__.py
index 09daa0d..423d344 100644
--- a/entries/zebras/__init__.py
+++ b/entries/zebras/__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/zebras/__init__.py b/entries/zebras/__init__.py
index f213162..09daa0d 100644
--- a/entries/zebras/__init__.py
+++ b/entries/zebras/__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/zebras/__init__.py b/entries/zebras/__init__.py
index 04d2c88..f213162 100644
--- a/entries/zebras/__init__.py
+++ b/entries/zebras/__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/zebras/__init__.py b/entries/zebras/__init__.py
index 03dfc71..04d2c88 100644
--- a/entries/zebras/__init__.py
+++ b/entries/zebras/__init__.py
@@ -26,7 +26,6 @@ url = 'http://konect.cc/networks/moreno_zebra'
citation = [('S. R. Sundaresan et al., "Network metrics reveal differences in social organization between two fission-fusion species, Grevy\'s zebra and onager." Oecologia 151(1), 140-149 (2007)', 'https://doi.org/10.1007/s00442-006-0553-6')]
icon_hash = '57349654461efe0c7a678326'
upstream_prefix = 'http://konect.cc/files'
-orphan = True
files = [('download.tsv.moreno_zebra.tar.bz2', None, 'konect')]
def fetch_upstream(force=False):
Update citations to use DOIs e878874
diff --git a/entries/zebras/__init__.py b/entries/zebras/__init__.py
index 45d5bb9..03dfc71 100644
--- a/entries/zebras/__init__.py
+++ b/entries/zebras/__init__.py
@@ -23,7 +23,7 @@ description = """Social interactions among a group of wild Grevy's zebras (Equus
[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Social', 'Animal', 'Unweighted', 'Metadata']
url = 'http://konect.cc/networks/moreno_zebra'
-citation = [('S. R. Sundaresan et al., "Network metrics reveal differences in social organization between two fission-fusion species, Grevy\'s zebra and onager." Oecologia 151(1), 140-149 (2007)', 'https://www.princeton.edu/~equids/images/gz_ong_static.pdf')]
+citation = [('S. R. Sundaresan et al., "Network metrics reveal differences in social organization between two fission-fusion species, Grevy\'s zebra and onager." Oecologia 151(1), 140-149 (2007)', 'https://doi.org/10.1007/s00442-006-0553-6')]
icon_hash = '57349654461efe0c7a678326'
upstream_prefix = 'http://konect.cc/files'
orphan = True
Add support for 'orphan' datasets and tag konect entries e330b80
diff --git a/entries/zebras/__init__.py b/entries/zebras/__init__.py
index 3f51681..45d5bb9 100644
--- a/entries/zebras/__init__.py
+++ b/entries/zebras/__init__.py
@@ -26,6 +26,7 @@ url = 'http://konect.cc/networks/moreno_zebra'
citation = [('S. R. Sundaresan et al., "Network metrics reveal differences in social organization between two fission-fusion species, Grevy\'s zebra and onager." Oecologia 151(1), 140-149 (2007)', 'https://www.princeton.edu/~equids/images/gz_ong_static.pdf')]
icon_hash = '57349654461efe0c7a678326'
upstream_prefix = 'http://konect.cc/files'
+orphan = True
files = [('download.tsv.moreno_zebra.tar.bz2', None, 'konect')]
def fetch_upstream(force=False):
Change license from GPLv3 to AGPLv3 d754be5
diff --git a/entries/zebras/__init__.py b/entries/zebras/__init__.py
index 2362d5f..3f51681 100644
--- a/entries/zebras/__init__.py
+++ b/entries/zebras/__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/zebras/__init__.py b/entries/zebras/__init__.py
index e163632..2362d5f 100644
--- a/entries/zebras/__init__.py
+++ b/entries/zebras/__init__.py
@@ -19,7 +19,8 @@
from .. import *
title = "Zebras (2002)"
-description = "Social interactions among a group of wild Grevy's zebras (Equus grevyi), observed in Mpala Ranch in Kenya in 2002. Metadata (UCINET version) provides animal sex and lactation status."
+description = """Social interactions among a group of wild Grevy's zebras (Equus grevyi), observed in Mpala Ranch in Kenya in 2002. Metadata (UCINET version) provides animal sex and lactation status.[^icon]
+[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Social', 'Animal', 'Unweighted', 'Metadata']
url = 'http://konect.cc/networks/moreno_zebra'
citation = [('S. R. Sundaresan et al., "Network metrics reveal differences in social organization between two fission-fusion species, Grevy\'s zebra and onager." Oecologia 151(1), 140-149 (2007)', 'https://www.princeton.edu/~equids/images/gz_ong_static.pdf')]
Initial commit cc85872
diff --git a/entries/zebras/__init__.py b/entries/zebras/__init__.py
new file mode 100644
index 0000000..e163632
--- /dev/null
+++ b/entries/zebras/__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 = "Zebras (2002)"
+description = "Social interactions among a group of wild Grevy's zebras (Equus grevyi), observed in Mpala Ranch in Kenya in 2002. Metadata (UCINET version) provides animal sex and lactation status."
+tags = ['Social', 'Animal', 'Unweighted', 'Metadata']
+url = 'http://konect.cc/networks/moreno_zebra'
+citation = [('S. R. Sundaresan et al., "Network metrics reveal differences in social organization between two fission-fusion species, Grevy\'s zebra and onager." Oecologia 151(1), 140-149 (2007)', 'https://www.princeton.edu/~equids/images/gz_ong_static.pdf')]
+icon_hash = '57349654461efe0c7a678326'
+upstream_prefix = 'http://konect.cc/files'
+files = [('download.tsv.moreno_zebra.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