History of moreno_taro
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/moreno_taro/__init__.py b/entries/moreno_taro/__init__.py
index 890df9e..9592c9e 100644
--- a/entries/moreno_taro/__init__.py
+++ b/entries/moreno_taro/__init__.py
@@ -26,7 +26,7 @@ tags = ['Social', 'Offline', 'Unweighted']
url = 'https://web.archive.org/web/20210115130726/http://moreno.ss.uci.edu/data.html#taro'
citation = [('E. Schwimmer, "Exchange in the social structure of the Orokaiva." St. Martin\'s Press (1973)', 'https://doi.org/10.14288/1.0102239'),
('P. Hage, F. Harary, "Structural Models in Anthropology." Cambridge University Press (1983)', 'https://scholar.google.com/scholar?q=Hage+Harary+%22Structural+models+in+anthropology%22')]
-icon_hash = '57e18af38cf714f319c38bdb'
+date_added = '2020-08-11'
upstream_license = None
upstream_prefix = 'https://web.archive.org/web/20210115130726id_/http://moreno.ss.uci.edu'
files = [('taro.dat', None, None)]
[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/moreno_taro/__init__.py b/entries/moreno_taro/__init__.py
index 8ab818e..890df9e 100644
--- a/entries/moreno_taro/__init__.py
+++ b/entries/moreno_taro/__init__.py
@@ -41,7 +41,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/moreno_taro/__init__.py b/entries/moreno_taro/__init__.py
index a695b1c..8ab818e 100644
--- a/entries/moreno_taro/__init__.py
+++ b/entries/moreno_taro/__init__.py
@@ -19,18 +19,23 @@
from .. import *
title = "Papuan gift-giving (1970)"
-description = """A network of gift-giving relationships (taro exchange) among households in a Papuan village. Data collected by survey c.1970.[^icon]
-[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
+description = """Gift-giving relationships (taro exchange) among 22 households in a Papuan village of the Orokaiva, studied by E. Schwimmer, who points out how these ties define the appropriate persons to mediate the act of asking for or receiving assistance among group members. P. Hage and F. Harary (1983) used the data to illustrate a Hamiltonian cycle. 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 a gift-giving relationship between households i and j (the source matrix is symmetric)."""
tags = ['Social', 'Offline', 'Unweighted']
-url = 'http://konect.cc/networks/moreno_taro'
-citation = [('G. Schwimmer, "Exchange in the social structure of the Orokaiva." St. Martin\'s Press (1973)', 'https://doi.org/10.14288/1.0102239')]
+url = 'https://web.archive.org/web/20210115130726/http://moreno.ss.uci.edu/data.html#taro'
+citation = [('E. Schwimmer, "Exchange in the social structure of the Orokaiva." St. Martin\'s Press (1973)', 'https://doi.org/10.14288/1.0102239'),
+ ('P. Hage, F. Harary, "Structural Models in Anthropology." Cambridge University Press (1983)', 'https://scholar.google.com/scholar?q=Hage+Harary+%22Structural+models+in+anthropology%22')]
icon_hash = '57e18af38cf714f319c38bdb'
-upstream_prefix = 'http://konect.cc/files'
-files = [('download.tsv.moreno_taro.tar.bz2', None, 'konect')]
+upstream_license = None
+upstream_prefix = 'https://web.archive.org/web/20210115130726id_/http://moreno.ss.uci.edu'
+files = [('taro.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 +49,11 @@ 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]
+ A = d["data"][0]
+ assert (A == A.T).all()
+ g = matrix_graph(d["data"], False, wtype=None)
yield alt, g
Update copyright information 73a4f0d
diff --git a/entries/moreno_taro/__init__.py b/entries/moreno_taro/__init__.py
index a8cf2c4..a695b1c 100644
--- a/entries/moreno_taro/__init__.py
+++ b/entries/moreno_taro/__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_taro/__init__.py b/entries/moreno_taro/__init__.py
index dcbda4c..a8cf2c4 100644
--- a/entries/moreno_taro/__init__.py
+++ b/entries/moreno_taro/__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_taro/__init__.py b/entries/moreno_taro/__init__.py
index 319cfb4..dcbda4c 100644
--- a/entries/moreno_taro/__init__.py
+++ b/entries/moreno_taro/__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_taro/__init__.py b/entries/moreno_taro/__init__.py
index 30d334b..319cfb4 100644
--- a/entries/moreno_taro/__init__.py
+++ b/entries/moreno_taro/__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_taro/__init__.py b/entries/moreno_taro/__init__.py
index 5bb4cc1..30d334b 100644
--- a/entries/moreno_taro/__init__.py
+++ b/entries/moreno_taro/__init__.py
@@ -26,7 +26,6 @@ url = 'http://konect.cc/networks/moreno_taro'
citation = [('G. Schwimmer, "Exchange in the social structure of the Orokaiva." St. Martin\'s Press (1973)', 'https://doi.org/10.14288/1.0102239')]
icon_hash = '57e18af38cf714f319c38bdb'
upstream_prefix = 'http://konect.cc/files'
-orphan = True
files = [('download.tsv.moreno_taro.tar.bz2', None, 'konect')]
def fetch_upstream(force=False):
Update citations to use DOIs e878874
diff --git a/entries/moreno_taro/__init__.py b/entries/moreno_taro/__init__.py
index 1806df8..5bb4cc1 100644
--- a/entries/moreno_taro/__init__.py
+++ b/entries/moreno_taro/__init__.py
@@ -23,7 +23,7 @@ description = """A network of gift-giving relationships (taro exchange) among ho
[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Social', 'Offline', 'Unweighted']
url = 'http://konect.cc/networks/moreno_taro'
-citation = [('G. Schwimmer, "Exchange in the social structure of the Orokaiva." St. Martin\'s Press (1973)', 'https://open.library.ubc.ca/cIRcle/collections/ubctheses/831/items/1.0102239')]
+citation = [('G. Schwimmer, "Exchange in the social structure of the Orokaiva." St. Martin\'s Press (1973)', 'https://doi.org/10.14288/1.0102239')]
icon_hash = '57e18af38cf714f319c38bdb'
upstream_prefix = 'http://konect.cc/files'
orphan = True
Add support for 'orphan' datasets and tag konect entries e330b80
diff --git a/entries/moreno_taro/__init__.py b/entries/moreno_taro/__init__.py
index 24bfbe9..1806df8 100644
--- a/entries/moreno_taro/__init__.py
+++ b/entries/moreno_taro/__init__.py
@@ -26,6 +26,7 @@ url = 'http://konect.cc/networks/moreno_taro'
citation = [('G. Schwimmer, "Exchange in the social structure of the Orokaiva." St. Martin\'s Press (1973)', 'https://open.library.ubc.ca/cIRcle/collections/ubctheses/831/items/1.0102239')]
icon_hash = '57e18af38cf714f319c38bdb'
upstream_prefix = 'http://konect.cc/files'
+orphan = True
files = [('download.tsv.moreno_taro.tar.bz2', None, 'konect')]
def fetch_upstream(force=False):
Change license from GPLv3 to AGPLv3 d754be5
diff --git a/entries/moreno_taro/__init__.py b/entries/moreno_taro/__init__.py
index 16aeafa..24bfbe9 100644
--- a/entries/moreno_taro/__init__.py
+++ b/entries/moreno_taro/__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_taro/__init__.py b/entries/moreno_taro/__init__.py
index ca1e27b..16aeafa 100644
--- a/entries/moreno_taro/__init__.py
+++ b/entries/moreno_taro/__init__.py
@@ -19,7 +19,8 @@
from .. import *
title = "Papuan gift-giving (1970)"
-description = "A network of gift-giving relationships (taro exchange) among households in a Papuan village. Data collected by survey c.1970."
+description = """A network of gift-giving relationships (taro exchange) among households in a Papuan village. Data collected by survey c.1970.[^icon]
+[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Social', 'Offline', 'Unweighted']
url = 'http://konect.cc/networks/moreno_taro'
citation = [('G. Schwimmer, "Exchange in the social structure of the Orokaiva." St. Martin\'s Press (1973)', 'https://open.library.ubc.ca/cIRcle/collections/ubctheses/831/items/1.0102239')]
Initial commit cc85872
diff --git a/entries/moreno_taro/__init__.py b/entries/moreno_taro/__init__.py
new file mode 100644
index 0000000..ca1e27b
--- /dev/null
+++ b/entries/moreno_taro/__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 = "Papuan gift-giving (1970)"
+description = "A network of gift-giving relationships (taro exchange) among households in a Papuan village. Data collected by survey c.1970."
+tags = ['Social', 'Offline', 'Unweighted']
+url = 'http://konect.cc/networks/moreno_taro'
+citation = [('G. Schwimmer, "Exchange in the social structure of the Orokaiva." St. Martin\'s Press (1973)', 'https://open.library.ubc.ca/cIRcle/collections/ubctheses/831/items/1.0102239')]
+icon_hash = '57e18af38cf714f319c38bdb'
+upstream_prefix = 'http://konect.cc/files'
+files = [('download.tsv.moreno_taro.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