History of karate
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/karate/__init__.py b/entries/karate/__init__.py
index 17c600a..2a99094 100644
--- a/entries/karate/__init__.py
+++ b/entries/karate/__init__.py
@@ -30,7 +30,7 @@ The networks have the following properties:
tags = ['Social', 'Offline', 'Unweighted']
url = 'https://aaronclauset.github.io/datacode.htm'
citation = [('W. W. Zachary, "An information flow model for conflict and fission in small groups." Journal of Anthropological Research 33, 452-473 (1977).', 'https://doi.org/10.1086/jar.33.4.3629752')]
-icon_hash = '56a85c8e26855e083a2f789e'
+date_added = '2020-08-11'
upstream_license = None
upstream_prefix = "https://aaronclauset.github.io/data"
files = [(('zkcc-77.zip:zkcc-77/karate_edges_77.txt',
[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/karate/__init__.py b/entries/karate/__init__.py
index b7c247b..17c600a 100644
--- a/entries/karate/__init__.py
+++ b/entries/karate/__init__.py
@@ -25,8 +25,8 @@ There are two versions of the network, due to an inconsistency in the adjacency
The networks have the following properties:
-- `name`: the member's number, as in the original study (1 to 34).
-- `groups`: the faction to which the member belonged after the split, as given in the data distributed by A. Clauset: 1 for the instructor's faction (node 1), 2 for the administrator's (node 34)."""
+- (Node) `name`: the member's number, as in the original study (1 to 34).
+- (Node) `groups`: the faction to which the member belonged after the split, as given in the data distributed by A. Clauset: 1 for the instructor's faction (node 1), 2 for the administrator's (node 34)."""
tags = ['Social', 'Offline', 'Unweighted']
url = 'https://aaronclauset.github.io/datacode.htm'
citation = [('W. W. Zachary, "An information flow model for conflict and fission in small groups." Journal of Anthropological Research 33, 452-473 (1977).', 'https://doi.org/10.1086/jar.33.4.3629752')]
[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/karate/__init__.py b/entries/karate/__init__.py
index f926f2d..b7c247b 100644
--- a/entries/karate/__init__.py
+++ b/entries/karate/__init__.py
@@ -46,7 +46,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] Fix parse bugs and improve the metadata of existing entries c996a0e
From a review of the dataset descriptions against the upstream sources and papers, and from user reports: - parse fixes (wrong edge direction or directedness, shifted or misnamed properties, merged node identities, duplicated or missing edges and nodes, wrong types), e.g. arxiv_citation (the HepTh dates were a copy of the HepPh ones; now from the KDD Cup 2003 data), eu_procurements, foursquare_global, hiv_transmission, genetic_multiplex, gnutella (adds the 05 snapshot), roadnet, macaque_neural, python_dependency - descriptions rewritten from the upstream sources, documenting every property - corrected titles, citations and DOIs, licences (ustream_license typo, the data's own terms), tags and ICON ids - url lists for entries with several sources or dataset pages - SocioPatterns entries moved to the site's new data location, with the daily networks of sp_infectious and sp_primary_school - the Michael Fire entries marked as orphans (served from the mirror) - redundant type forcings removed after the graph-tool coercion fixes
diff --git a/entries/karate/__init__.py b/entries/karate/__init__.py
index efc5318..f926f2d 100644
--- a/entries/karate/__init__.py
+++ b/entries/karate/__init__.py
@@ -19,13 +19,19 @@
from .. import *
title = "Zachary Karate Club"
-description = """Network of friendships among members of a university karate club. Includes metadata for faction membership after a social partition. Note: there are two versions of this network, one with 77 edges and one with 78, due to an ambiguous typo in the original study. (The most commonly used is the one with 78 edges.)[^icon]
-[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
+description = r"""Network of social ties among the 34 members of a university karate club in the United States, observed by the anthropologist W. W. Zachary from 1970 to 1972. An undirected edge connects two members who consistently interacted outside the activities of the club. During the observation period, a conflict between the club's instructor ("Mr. Hi", node 1) and its administrator (node 34) led the club to split into two.
+
+There are two versions of the network, due to an inconsistency in the adjacency matrix published by Zachary, which is not symmetric for the pair of members 23 and 34: `77` has 77 edges and omits the edge between them, while `78` has 78 edges and includes it. The 78-edge version is the one most commonly used.
+
+The networks have the following properties:
+
+- `name`: the member's number, as in the original study (1 to 34).
+- `groups`: the faction to which the member belonged after the split, as given in the data distributed by A. Clauset: 1 for the instructor's faction (node 1), 2 for the administrator's (node 34)."""
tags = ['Social', 'Offline', 'Unweighted']
url = 'https://aaronclauset.github.io/datacode.htm'
citation = [('W. W. Zachary, "An information flow model for conflict and fission in small groups." Journal of Anthropological Research 33, 452-473 (1977).', 'https://doi.org/10.1086/jar.33.4.3629752')]
icon_hash = '56a85c8e26855e083a2f789e'
-ustream_license = None
+upstream_license = None
upstream_prefix = "https://aaronclauset.github.io/data"
files = [(('zkcc-77.zip:zkcc-77/karate_edges_77.txt',
'zkcc-77.zip:zkcc-77/karate_groups.txt'), '77', 'loadtxt'),
Update copyright information 73a4f0d
diff --git a/entries/karate/__init__.py b/entries/karate/__init__.py
index cbd7f2c..efc5318 100644
--- a/entries/karate/__init__.py
+++ b/entries/karate/__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/karate/__init__.py b/entries/karate/__init__.py
index e785f15..cbd7f2c 100644
--- a/entries/karate/__init__.py
+++ b/entries/karate/__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/karate/__init__.py b/entries/karate/__init__.py
index 93decae..e785f15 100644
--- a/entries/karate/__init__.py
+++ b/entries/karate/__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 upstream for karate and terrorists_911 cc3a6c5
diff --git a/entries/karate/__init__.py b/entries/karate/__init__.py
index e50ecae..93decae 100644
--- a/entries/karate/__init__.py
+++ b/entries/karate/__init__.py
@@ -22,11 +22,11 @@ title = "Zachary Karate Club"
description = """Network of friendships among members of a university karate club. Includes metadata for faction membership after a social partition. Note: there are two versions of this network, one with 77 edges and one with 78, due to an ambiguous typo in the original study. (The most commonly used is the one with 78 edges.)[^icon]
[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Social', 'Offline', 'Unweighted']
-url = 'http://tuvalu.santafe.edu/~aaronc/data/'
+url = 'https://aaronclauset.github.io/datacode.htm'
citation = [('W. W. Zachary, "An information flow model for conflict and fission in small groups." Journal of Anthropological Research 33, 452-473 (1977).', 'https://doi.org/10.1086/jar.33.4.3629752')]
icon_hash = '56a85c8e26855e083a2f789e'
ustream_license = None
-upstream_prefix = "http://tuvalu.santafe.edu/~aaronc/data"
+upstream_prefix = "https://aaronclauset.github.io/data"
files = [(('zkcc-77.zip:zkcc-77/karate_edges_77.txt',
'zkcc-77.zip:zkcc-77/karate_groups.txt'), '77', 'loadtxt'),
(('zkcc-77.zip:zkcc-77/karate_edges_77.txt',
Update copyright info db2efcc
diff --git a/entries/karate/__init__.py b/entries/karate/__init__.py
index 499c840..e50ecae 100644
--- a/entries/karate/__init__.py
+++ b/entries/karate/__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
Update citations to use DOIs e878874
diff --git a/entries/karate/__init__.py b/entries/karate/__init__.py
index 1dd00b5..499c840 100644
--- a/entries/karate/__init__.py
+++ b/entries/karate/__init__.py
@@ -23,7 +23,7 @@ description = """Network of friendships among members of a university karate clu
[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Social', 'Offline', 'Unweighted']
url = 'http://tuvalu.santafe.edu/~aaronc/data/'
-citation = [('W. W. Zachary, "An information flow model for conflict and fission in small groups." Journal of Anthropological Research 33, 452-473 (1977).', 'http://www1.ind.ku.dk/complexLearning/zachary1977.pdf')]
+citation = [('W. W. Zachary, "An information flow model for conflict and fission in small groups." Journal of Anthropological Research 33, 452-473 (1977).', 'https://doi.org/10.1086/jar.33.4.3629752')]
icon_hash = '56a85c8e26855e083a2f789e'
ustream_license = None
upstream_prefix = "http://tuvalu.santafe.edu/~aaronc/data"
Change license from GPLv3 to AGPLv3 d754be5
diff --git a/entries/karate/__init__.py b/entries/karate/__init__.py
index d1bad08..1dd00b5 100644
--- a/entries/karate/__init__.py
+++ b/entries/karate/__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/karate/__init__.py b/entries/karate/__init__.py
index 9d65950..d1bad08 100644
--- a/entries/karate/__init__.py
+++ b/entries/karate/__init__.py
@@ -19,7 +19,8 @@
from .. import *
title = "Zachary Karate Club"
-description = "Network of friendships among members of a university karate club. Includes metadata for faction membership after a social partition. Note: there are two versions of this network, one with 77 edges and one with 78, due to an ambiguous typo in the original study. (The most commonly used is the one with 78 edges.)"
+description = """Network of friendships among members of a university karate club. Includes metadata for faction membership after a social partition. Note: there are two versions of this network, one with 77 edges and one with 78, due to an ambiguous typo in the original study. (The most commonly used is the one with 78 edges.)[^icon]
+[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Social', 'Offline', 'Unweighted']
url = 'http://tuvalu.santafe.edu/~aaronc/data/'
citation = [('W. W. Zachary, "An information flow model for conflict and fission in small groups." Journal of Anthropological Research 33, 452-473 (1977).', 'http://www1.ind.ku.dk/complexLearning/zachary1977.pdf')]
Initial commit cc85872
diff --git a/entries/karate/__init__.py b/entries/karate/__init__.py
new file mode 100644
index 0000000..9d65950
--- /dev/null
+++ b/entries/karate/__init__.py
@@ -0,0 +1,67 @@
+#! /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 = "Zachary Karate Club"
+description = "Network of friendships among members of a university karate club. Includes metadata for faction membership after a social partition. Note: there are two versions of this network, one with 77 edges and one with 78, due to an ambiguous typo in the original study. (The most commonly used is the one with 78 edges.)"
+tags = ['Social', 'Offline', 'Unweighted']
+url = 'http://tuvalu.santafe.edu/~aaronc/data/'
+citation = [('W. W. Zachary, "An information flow model for conflict and fission in small groups." Journal of Anthropological Research 33, 452-473 (1977).', 'http://www1.ind.ku.dk/complexLearning/zachary1977.pdf')]
+icon_hash = '56a85c8e26855e083a2f789e'
+ustream_license = None
+upstream_prefix = "http://tuvalu.santafe.edu/~aaronc/data"
+files = [(('zkcc-77.zip:zkcc-77/karate_edges_77.txt',
+ 'zkcc-77.zip:zkcc-77/karate_groups.txt'), '77', 'loadtxt'),
+ (('zkcc-77.zip:zkcc-77/karate_edges_77.txt',
+ 'zkcc-77.zip:zkcc-77/karate_groups.txt'), '78', 'loadtxt')]
+
+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 = Graph(directed=False)
+ edges = numpy.loadtxt(fs[0], dtype="int")
+ g.vp.name = g.add_edge_list(edges, hashed=True, hash_type="int")
+ remove_parallel_edges(g)
+ groups = numpy.loadtxt(fs[1], dtype="int")
+ g.vp.groups = g.new_vp("int")
+ vs = {g.vp.name[v]:v for v in g.vertices()}
+ for v, r in groups:
+ g.vp.groups[vs[v]] = r
+ idx = g.vp.name.copy("int")
+
+ if alt == "78":
+ g.add_edge(vs[23], vs[34])
+
+ g = Graph(g, vorder=idx)
+ yield alt, g