History of moreno_sheep
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] 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/moreno_sheep/__init__.py b/entries/moreno_sheep/__init__.py
index cf95b71..e9bac31 100644
--- a/entries/moreno_sheep/__init__.py
+++ b/entries/moreno_sheep/__init__.py
@@ -19,21 +19,30 @@
from .. import *
title = "Bighorn sheep (1984)"
-description = """Dominance interactions among a group of female bighorn sheep (Ovis canadensis) from the National Bison Range in western Montana USA, over a 27 month period ending in 1984. Edge weights represent the frequency of interaction. Metadata gives the sheep ages, roughly.[^icon]
-[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
+description = """Dominance interactions (wins and losses) among 28 female bighorn sheep (Ovis canadensis) on the National Bison Range in western Montana (USA), observed by C. C. Hass in 1984. 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 sheep i was observed dominating sheep j.
+
+The network has the following properties:
+
+- Nodes: `name`, the identifier of the sheep; `age`, the age of the sheep in years (sheep with an age of 9 are at least 9 years old, and may be older).
+- Edges: `weight`, the number of occasions on which i was observed dominating j."""
tags = ['Social', 'Animal', 'Weighted', 'Metadata']
-url = 'http://konect.cc/networks/moreno_sheep'
+url = 'https://web.archive.org/web/20210115130726/http://moreno.ss.uci.edu/data.html#sheep'
citation = [('C. C. Hass. "Social status in female bighorn sheep (Ovis canadensis): Expression, development and reproductive correlates." J. of Zoology 225(3), 509-523 (1991)', 'https://doi.org/10.1111/j.1469-7998.1991.tb03832.x')]
icon_hash = '5734a190461efe0c7a678332'
-upstream_prefix = 'http://konect.cc/files'
-files = [('download.tsv.moreno_sheep.tar.bz2', None, 'konect')]
+upstream_license = None
+upstream_prefix = 'https://web.archive.org/web/20210115130726id_/http://moreno.ss.uci.edu'
+files = [(('sheep.dat', 'sheep_ages.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={"name": "string"})
@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=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, da = ds
+ assert d["rows"] == da["rows"]
+ g = matrix_graph(d["data"], True)
+ g.vp.name = g.new_vp("string", vals=d["rows"])
+ g.vp.age = g.new_vp("int", vals=da["data"][0][:, 0].astype("int"))
yield alt, g
Update copyright information 73a4f0d
diff --git a/entries/moreno_sheep/__init__.py b/entries/moreno_sheep/__init__.py
index c13d52c..cf95b71 100644
--- a/entries/moreno_sheep/__init__.py
+++ b/entries/moreno_sheep/__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/moreno_sheep/__init__.py b/entries/moreno_sheep/__init__.py
index 305d764..c13d52c 100644
--- a/entries/moreno_sheep/__init__.py
+++ b/entries/moreno_sheep/__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/moreno_sheep/__init__.py b/entries/moreno_sheep/__init__.py
index b1ac91e..305d764 100644
--- a/entries/moreno_sheep/__init__.py
+++ b/entries/moreno_sheep/__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/moreno_sheep/__init__.py b/entries/moreno_sheep/__init__.py
index ca6fe90..b1ac91e 100644
--- a/entries/moreno_sheep/__init__.py
+++ b/entries/moreno_sheep/__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/moreno_sheep/__init__.py b/entries/moreno_sheep/__init__.py
index 8bfd0d1..ca6fe90 100644
--- a/entries/moreno_sheep/__init__.py
+++ b/entries/moreno_sheep/__init__.py
@@ -26,7 +26,6 @@ url = 'http://konect.cc/networks/moreno_sheep'
citation = [('C. C. Hass. "Social status in female bighorn sheep (Ovis canadensis): Expression, development and reproductive correlates." J. of Zoology 225(3), 509-523 (1991)', 'https://doi.org/10.1111/j.1469-7998.1991.tb03832.x')]
icon_hash = '5734a190461efe0c7a678332'
upstream_prefix = 'http://konect.cc/files'
-orphan = True
files = [('download.tsv.moreno_sheep.tar.bz2', None, 'konect')]
def fetch_upstream(force=False):
Update citations to use DOIs e878874
diff --git a/entries/moreno_sheep/__init__.py b/entries/moreno_sheep/__init__.py
index 61f5b31..8bfd0d1 100644
--- a/entries/moreno_sheep/__init__.py
+++ b/entries/moreno_sheep/__init__.py
@@ -23,7 +23,7 @@ description = """Dominance interactions among a group of female bighorn sheep (O
[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Social', 'Animal', 'Weighted', 'Metadata']
url = 'http://konect.cc/networks/moreno_sheep'
-citation = [('C. C. Hass. "Social status in female bighorn sheep (Ovis canadensis): Expression, development and reproductive correlates." J. of Zoology 225(3), 509-523 (1991)', 'http://onlinelibrary.wiley.com/doi/10.1111/j.1469-7998.1991.tb03832.x/abstract')]
+citation = [('C. C. Hass. "Social status in female bighorn sheep (Ovis canadensis): Expression, development and reproductive correlates." J. of Zoology 225(3), 509-523 (1991)', 'https://doi.org/10.1111/j.1469-7998.1991.tb03832.x')]
icon_hash = '5734a190461efe0c7a678332'
upstream_prefix = 'http://konect.cc/files'
orphan = True
Add support for 'orphan' datasets and tag konect entries e330b80
diff --git a/entries/moreno_sheep/__init__.py b/entries/moreno_sheep/__init__.py
index 6d8064c..61f5b31 100644
--- a/entries/moreno_sheep/__init__.py
+++ b/entries/moreno_sheep/__init__.py
@@ -26,6 +26,7 @@ url = 'http://konect.cc/networks/moreno_sheep'
citation = [('C. C. Hass. "Social status in female bighorn sheep (Ovis canadensis): Expression, development and reproductive correlates." J. of Zoology 225(3), 509-523 (1991)', 'http://onlinelibrary.wiley.com/doi/10.1111/j.1469-7998.1991.tb03832.x/abstract')]
icon_hash = '5734a190461efe0c7a678332'
upstream_prefix = 'http://konect.cc/files'
+orphan = True
files = [('download.tsv.moreno_sheep.tar.bz2', None, 'konect')]
def fetch_upstream(force=False):
Change license from GPLv3 to AGPLv3 d754be5
diff --git a/entries/moreno_sheep/__init__.py b/entries/moreno_sheep/__init__.py
index f5c2f78..6d8064c 100644
--- a/entries/moreno_sheep/__init__.py
+++ b/entries/moreno_sheep/__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/moreno_sheep/__init__.py b/entries/moreno_sheep/__init__.py
index 6a649e3..f5c2f78 100644
--- a/entries/moreno_sheep/__init__.py
+++ b/entries/moreno_sheep/__init__.py
@@ -19,7 +19,8 @@
from .. import *
title = "Bighorn sheep (1984)"
-description = "Dominance interactions among a group of female bighorn sheep (Ovis canadensis) from the National Bison Range in western Montana USA, over a 27 month period ending in 1984. Edge weights represent the frequency of interaction. Metadata gives the sheep ages, roughly."
+description = """Dominance interactions among a group of female bighorn sheep (Ovis canadensis) from the National Bison Range in western Montana USA, over a 27 month period ending in 1984. Edge weights represent the frequency of interaction. Metadata gives the sheep ages, roughly.[^icon]
+[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Social', 'Animal', 'Weighted', 'Metadata']
url = 'http://konect.cc/networks/moreno_sheep'
citation = [('C. C. Hass. "Social status in female bighorn sheep (Ovis canadensis): Expression, development and reproductive correlates." J. of Zoology 225(3), 509-523 (1991)', 'http://onlinelibrary.wiley.com/doi/10.1111/j.1469-7998.1991.tb03832.x/abstract')]
Initial commit cc85872
diff --git a/entries/moreno_sheep/__init__.py b/entries/moreno_sheep/__init__.py
new file mode 100644
index 0000000..6a649e3
--- /dev/null
+++ b/entries/moreno_sheep/__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 = "Bighorn sheep (1984)"
+description = "Dominance interactions among a group of female bighorn sheep (Ovis canadensis) from the National Bison Range in western Montana USA, over a 27 month period ending in 1984. Edge weights represent the frequency of interaction. Metadata gives the sheep ages, roughly."
+tags = ['Social', 'Animal', 'Weighted', 'Metadata']
+url = 'http://konect.cc/networks/moreno_sheep'
+citation = [('C. C. Hass. "Social status in female bighorn sheep (Ovis canadensis): Expression, development and reproductive correlates." J. of Zoology 225(3), 509-523 (1991)', 'http://onlinelibrary.wiley.com/doi/10.1111/j.1469-7998.1991.tb03832.x/abstract')]
+icon_hash = '5734a190461efe0c7a678332'
+upstream_prefix = 'http://konect.cc/files'
+files = [('download.tsv.moreno_sheep.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