History of residence_hall
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/residence_hall/__init__.py b/entries/residence_hall/__init__.py
index 4c5f453..ccf8f1f 100644
--- a/entries/residence_hall/__init__.py
+++ b/entries/residence_hall/__init__.py
@@ -29,7 +29,7 @@ The network has the following properties:
tags = ['Social', 'Offline', 'Weighted']
url = 'https://web.archive.org/web/20210115130726/http://moreno.ss.uci.edu/data.html#oz'
citation = [('L. Freeman, C. Webster, & D. Kirke, "Exploring social structure using dynamic three-dimensional color images." Social Networks 20(2), 109-118 (1998)', 'https://doi.org/10.1016/s0378-8733(97)00016-6')]
-icon_hash = '57e189f98cf714f319c38bda'
+date_added = '2020-08-11'
upstream_license = None
upstream_prefix = 'https://web.archive.org/web/20210115130726id_/http://moreno.ss.uci.edu'
files = [('oz.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/residence_hall/__init__.py b/entries/residence_hall/__init__.py
index f2a94e9..4c5f453 100644
--- a/entries/residence_hall/__init__.py
+++ b/entries/residence_hall/__init__.py
@@ -25,7 +25,7 @@ A directed edge (i, j) indicates that resident i named resident j as a friend.
The network has the following properties:
-- Edges: `weight`, the strength of the friendship tie, from 1 to 5 (the source mentions the three levels above, but does not document the coding of the values; 95% of the ties have values 3 to 5)."""
+- (Edge) `weight`: the strength of the friendship tie, from 1 to 5 (the source mentions the three levels above, but does not document the coding of the values; 95% of the ties have values 3 to 5)."""
tags = ['Social', 'Offline', 'Weighted']
url = 'https://web.archive.org/web/20210115130726/http://moreno.ss.uci.edu/data.html#oz'
citation = [('L. Freeman, C. Webster, & D. Kirke, "Exploring social structure using dynamic three-dimensional color images." Social Networks 20(2), 109-118 (1998)', 'https://doi.org/10.1016/s0378-8733(97)00016-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/residence_hall/__init__.py b/entries/residence_hall/__init__.py
index cf7e465..f2a94e9 100644
--- a/entries/residence_hall/__init__.py
+++ b/entries/residence_hall/__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/residence_hall/__init__.py b/entries/residence_hall/__init__.py
index 5d7ff34..cf7e465 100644
--- a/entries/residence_hall/__init__.py
+++ b/entries/residence_hall/__init__.py
@@ -19,18 +19,26 @@
from .. import *
title = "ANU Residence Hall network"
-description = """A network of friendships among students living in a residence hall at Australian National University (date unknown). Edge direction indicates that resident i named resident j as a friend, and edge weight indicates the level of friendship: 5 (best friend), 4 (close friend), 3 (friend), 2, 1.[^icon]
-[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
+description = """Friendships among the 217 residents of a residence hall on the campus of the Australian National University, collected by C. M. Webster. The residents were interviewed individually at the start of the second semester: first, they were asked to recall all their friends currently living in the residence hall; then they were given a list of all the residents, and asked to add anyone else they considered a friend. Finally, they indicated the strength of each friendship tie; most specified three levels of friendship: "best friend", "close friend" and "friend". The data were combined into a valued matrix of reported friendship relations. 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 resident i named resident j as a friend.
+
+The network has the following properties:
+
+- Edges: `weight`, the strength of the friendship tie, from 1 to 5 (the source mentions the three levels above, but does not document the coding of the values; 95% of the ties have values 3 to 5)."""
tags = ['Social', 'Offline', 'Weighted']
-url = 'http://konect.cc/networks/moreno_oz'
+url = 'https://web.archive.org/web/20210115130726/http://moreno.ss.uci.edu/data.html#oz'
citation = [('L. Freeman, C. Webster, & D. Kirke, "Exploring social structure using dynamic three-dimensional color images." Social Networks 20(2), 109-118 (1998)', 'https://doi.org/10.1016/s0378-8733(97)00016-6')]
icon_hash = '57e189f98cf714f319c38bda'
-upstream_prefix = 'http://konect.cc/files'
-files = [('download.tsv.moreno_oz.tar.bz2', None, 'konect')]
+upstream_license = None
+upstream_prefix = 'https://web.archive.org/web/20210115130726id_/http://moreno.ss.uci.edu'
+files = [('oz.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,9 @@ 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]
+ g = matrix_graph(d["data"], True)
yield alt, g
Update copyright information 73a4f0d
diff --git a/entries/residence_hall/__init__.py b/entries/residence_hall/__init__.py
index 74aba15..5d7ff34 100644
--- a/entries/residence_hall/__init__.py
+++ b/entries/residence_hall/__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/residence_hall/__init__.py b/entries/residence_hall/__init__.py
index 3f3e40a..74aba15 100644
--- a/entries/residence_hall/__init__.py
+++ b/entries/residence_hall/__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/residence_hall/__init__.py b/entries/residence_hall/__init__.py
index 5d10847..3f3e40a 100644
--- a/entries/residence_hall/__init__.py
+++ b/entries/residence_hall/__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/residence_hall/__init__.py b/entries/residence_hall/__init__.py
index e658f37..5d10847 100644
--- a/entries/residence_hall/__init__.py
+++ b/entries/residence_hall/__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/residence_hall/__init__.py b/entries/residence_hall/__init__.py
index d1b5457..e658f37 100644
--- a/entries/residence_hall/__init__.py
+++ b/entries/residence_hall/__init__.py
@@ -26,7 +26,6 @@ url = 'http://konect.cc/networks/moreno_oz'
citation = [('L. Freeman, C. Webster, & D. Kirke, "Exploring social structure using dynamic three-dimensional color images." Social Networks 20(2), 109-118 (1998)', 'https://doi.org/10.1016/s0378-8733(97)00016-6')]
icon_hash = '57e189f98cf714f319c38bda'
upstream_prefix = 'http://konect.cc/files'
-orphan = True
files = [('download.tsv.moreno_oz.tar.bz2', None, 'konect')]
def fetch_upstream(force=False):
Update citations to use DOIs e878874
diff --git a/entries/residence_hall/__init__.py b/entries/residence_hall/__init__.py
index 3cde8c9..d1b5457 100644
--- a/entries/residence_hall/__init__.py
+++ b/entries/residence_hall/__init__.py
@@ -23,7 +23,7 @@ description = """A network of friendships among students living in a residence h
[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Social', 'Offline', 'Weighted']
url = 'http://konect.cc/networks/moreno_oz'
-citation = [('L. Freeman, C. Webster, & D. Kirke, "Exploring social structure using dynamic three-dimensional color images." Social Networks 20(2), 109-118 (1998)', 'http://www.sciencedirect.com/science/article/pii/S0378873397000166')]
+citation = [('L. Freeman, C. Webster, & D. Kirke, "Exploring social structure using dynamic three-dimensional color images." Social Networks 20(2), 109-118 (1998)', 'https://doi.org/10.1016/s0378-8733(97)00016-6')]
icon_hash = '57e189f98cf714f319c38bda'
upstream_prefix = 'http://konect.cc/files'
orphan = True
Add support for 'orphan' datasets and tag konect entries e330b80
diff --git a/entries/residence_hall/__init__.py b/entries/residence_hall/__init__.py
index f927c1e..3cde8c9 100644
--- a/entries/residence_hall/__init__.py
+++ b/entries/residence_hall/__init__.py
@@ -26,6 +26,7 @@ url = 'http://konect.cc/networks/moreno_oz'
citation = [('L. Freeman, C. Webster, & D. Kirke, "Exploring social structure using dynamic three-dimensional color images." Social Networks 20(2), 109-118 (1998)', 'http://www.sciencedirect.com/science/article/pii/S0378873397000166')]
icon_hash = '57e189f98cf714f319c38bda'
upstream_prefix = 'http://konect.cc/files'
+orphan = True
files = [('download.tsv.moreno_oz.tar.bz2', None, 'konect')]
def fetch_upstream(force=False):
Change license from GPLv3 to AGPLv3 d754be5
diff --git a/entries/residence_hall/__init__.py b/entries/residence_hall/__init__.py
index a4b2f6d..f927c1e 100644
--- a/entries/residence_hall/__init__.py
+++ b/entries/residence_hall/__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/residence_hall/__init__.py b/entries/residence_hall/__init__.py
index 92f776b..a4b2f6d 100644
--- a/entries/residence_hall/__init__.py
+++ b/entries/residence_hall/__init__.py
@@ -19,7 +19,8 @@
from .. import *
title = "ANU Residence Hall network"
-description = "A network of friendships among students living in a residence hall at Australian National University (date unknown). Edge direction indicates that resident i named resident j as a friend, and edge weight indicates the level of friendship: 5 (best friend), 4 (close friend), 3 (friend), 2, 1."
+description = """A network of friendships among students living in a residence hall at Australian National University (date unknown). Edge direction indicates that resident i named resident j as a friend, and edge weight indicates the level of friendship: 5 (best friend), 4 (close friend), 3 (friend), 2, 1.[^icon]
+[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Social', 'Offline', 'Weighted']
url = 'http://konect.cc/networks/moreno_oz'
citation = [('L. Freeman, C. Webster, & D. Kirke, "Exploring social structure using dynamic three-dimensional color images." Social Networks 20(2), 109-118 (1998)', 'http://www.sciencedirect.com/science/article/pii/S0378873397000166')]
Initial commit cc85872
diff --git a/entries/residence_hall/__init__.py b/entries/residence_hall/__init__.py
new file mode 100644
index 0000000..92f776b
--- /dev/null
+++ b/entries/residence_hall/__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 = "ANU Residence Hall network"
+description = "A network of friendships among students living in a residence hall at Australian National University (date unknown). Edge direction indicates that resident i named resident j as a friend, and edge weight indicates the level of friendship: 5 (best friend), 4 (close friend), 3 (friend), 2, 1."
+tags = ['Social', 'Offline', 'Weighted']
+url = 'http://konect.cc/networks/moreno_oz'
+citation = [('L. Freeman, C. Webster, & D. Kirke, "Exploring social structure using dynamic three-dimensional color images." Social Networks 20(2), 109-118 (1998)', 'http://www.sciencedirect.com/science/article/pii/S0378873397000166')]
+icon_hash = '57e189f98cf714f319c38bda'
+upstream_prefix = 'http://konect.cc/files'
+files = [('download.tsv.moreno_oz.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