History of terrorists_911
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/terrorists_911/__init__.py b/entries/terrorists_911/__init__.py
index dc2b8d9..0055ff1 100644
--- a/entries/terrorists_911/__init__.py
+++ b/entries/terrorists_911/__init__.py
@@ -29,7 +29,7 @@ The network has the following properties:
tags = ['Social', 'Offline', 'Unweighted', 'Metadata']
url = 'https://aaronclauset.github.io/datacode.htm'
citation = [('V. Krebs, "Mapping networks of terrorist cells." Connections 24, 43-52 (2002).', 'http://insna.org/PDF/Connections/v24/2001_I-3-7.pdf')]
-icon_hash = '56a85c8e26855e083a2f7924'
+date_added = '2020-08-11'
upstream_license = None
upstream_prefix = 'https://aaronclauset.github.io/hierarchy'
files = [(('terrorists.zip:terrorists/terrorist.pairs',
[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/terrorists_911/__init__.py b/entries/terrorists_911/__init__.py
index 5082174..dc2b8d9 100644
--- a/entries/terrorists_911/__init__.py
+++ b/entries/terrorists_911/__init__.py
@@ -23,9 +23,9 @@ description = """Network of the 19 hijackers of the September 11, 2001 terrorist
The network has the following properties:
-- `id`: the numerical identifier of the individual in the upstream data.
-- `name`: the name of the individual.
-- `group`: the flight the individual was aboard on September 11, 2001, for the hijackers (one value from 0 to 3 for each of the four hijacked flights), or 4 for individuals who were not aboard any of the flights. The correspondence between the values 0 to 3 and the flights is not documented in the upstream data."""
+- (Node) `id`: the numerical identifier of the individual in the upstream data.
+- (Node) `name`: the name of the individual.
+- (Node) `group`: the flight the individual was aboard on September 11, 2001, for the hijackers (one value from 0 to 3 for each of the four hijacked flights), or 4 for individuals who were not aboard any of the flights. The correspondence between the values 0 to 3 and the flights is not documented in the upstream data."""
tags = ['Social', 'Offline', 'Unweighted', 'Metadata']
url = 'https://aaronclauset.github.io/datacode.htm'
citation = [('V. Krebs, "Mapping networks of terrorist cells." Connections 24, 43-52 (2002).', 'http://insna.org/PDF/Connections/v24/2001_I-3-7.pdf')]
[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/terrorists_911/__init__.py b/entries/terrorists_911/__init__.py
index e4a7a03..5082174 100644
--- a/entries/terrorists_911/__init__.py
+++ b/entries/terrorists_911/__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] Fix parse bugs and improve descriptions and metadata 6bb6851
- parse fixes from the review of the descriptions, e.g. us_patents (directed), celegans_2019 (synapse direction), ecoli_transcription and yeast_transcription (regulator to target), bitcoin (direction, phantom node), ego_social (Google+ features and circles), scotus_majority, arxiv_authors and social_location (as in SNAP), caida_as, dnc, dom, mist, reuters and bibsonomy (names on the right nodes), uci_zoo - every description now states explicitly what the nodes and edges represent; corrected titles, years, tags, citations and licences - the "Hypergraph" tag is removed; very large entries are marked `huge = True` (see --skip-huge) - ICON ids of partial duplicates added (hiv_transmission, congress_bills, openflights, dutch_school)
diff --git a/entries/terrorists_911/__init__.py b/entries/terrorists_911/__init__.py
index e18b47c..e4a7a03 100644
--- a/entries/terrorists_911/__init__.py
+++ b/entries/terrorists_911/__init__.py
@@ -19,13 +19,18 @@
from .. import *
title = "9-11 terrorist network"
-description = """Network of individuals and their known social associations, centered around the hijackers that carried out the September 11th, 2001 terrorist attacks. Associations extracted after-the-fact from public data. Metadata labels say which plane a person was on, if any, on 9/11.[^icon]
-[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
+description = """Network of the 19 hijackers of the September 11, 2001 terrorist attacks in the United States and of other individuals associated with them, compiled by V. Krebs from public information released in newspapers after the attacks. Nodes are individuals and an undirected edge indicates a known association between two individuals (e.g. having lived or trained together, or having met or communicated). The network has 62 nodes. This version of the data was distributed by A. Clauset.
+
+The network has the following properties:
+
+- `id`: the numerical identifier of the individual in the upstream data.
+- `name`: the name of the individual.
+- `group`: the flight the individual was aboard on September 11, 2001, for the hijackers (one value from 0 to 3 for each of the four hijacked flights), or 4 for individuals who were not aboard any of the flights. The correspondence between the values 0 to 3 and the flights is not documented in the upstream data."""
tags = ['Social', 'Offline', 'Unweighted', 'Metadata']
url = 'https://aaronclauset.github.io/datacode.htm'
-citation = [('V. Krebs, "Mapping networks of terrorist cells." Connections 24, 43-52 (2002).', 'https://doi.org/10.5210/fm.v7i4.941')]
+citation = [('V. Krebs, "Mapping networks of terrorist cells." Connections 24, 43-52 (2002).', 'http://insna.org/PDF/Connections/v24/2001_I-3-7.pdf')]
icon_hash = '56a85c8e26855e083a2f7924'
-ustream_license = None
+upstream_license = None
upstream_prefix = 'https://aaronclauset.github.io/hierarchy'
files = [(('terrorists.zip:terrorists/terrorist.pairs',
'terrorists.zip:terrorists/terrorist.names',
Update copyright information 73a4f0d
diff --git a/entries/terrorists_911/__init__.py b/entries/terrorists_911/__init__.py
index d8a30e0..e18b47c 100644
--- a/entries/terrorists_911/__init__.py
+++ b/entries/terrorists_911/__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/terrorists_911/__init__.py b/entries/terrorists_911/__init__.py
index 7131e9e..d8a30e0 100644
--- a/entries/terrorists_911/__init__.py
+++ b/entries/terrorists_911/__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/terrorists_911/__init__.py b/entries/terrorists_911/__init__.py
index 499b342..7131e9e 100644
--- a/entries/terrorists_911/__init__.py
+++ b/entries/terrorists_911/__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/terrorists_911/__init__.py b/entries/terrorists_911/__init__.py
index d564b3f..499b342 100644
--- a/entries/terrorists_911/__init__.py
+++ b/entries/terrorists_911/__init__.py
@@ -22,11 +22,11 @@ title = "9-11 terrorist network"
description = """Network of individuals and their known social associations, centered around the hijackers that carried out the September 11th, 2001 terrorist attacks. Associations extracted after-the-fact from public data. Metadata labels say which plane a person was on, if any, on 9/11.[^icon]
[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Social', 'Offline', 'Unweighted', 'Metadata']
-url = 'http://tuvalu.santafe.edu/~aaronc/datacode.htm'
+url = 'https://aaronclauset.github.io/datacode.htm'
citation = [('V. Krebs, "Mapping networks of terrorist cells." Connections 24, 43-52 (2002).', 'https://doi.org/10.5210/fm.v7i4.941')]
icon_hash = '56a85c8e26855e083a2f7924'
ustream_license = None
-upstream_prefix = 'http://tuvalu.santafe.edu/~aaronc/hierarchy'
+upstream_prefix = 'https://aaronclauset.github.io/hierarchy'
files = [(('terrorists.zip:terrorists/terrorist.pairs',
'terrorists.zip:terrorists/terrorist.names',
'terrorists.zip:terrorists/terrorist.groups'), None, 'loadtxt')]
Update copyright info db2efcc
diff --git a/entries/terrorists_911/__init__.py b/entries/terrorists_911/__init__.py
index f6d1718..d564b3f 100644
--- a/entries/terrorists_911/__init__.py
+++ b/entries/terrorists_911/__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/terrorists_911/__init__.py b/entries/terrorists_911/__init__.py
index f3a653c..f6d1718 100644
--- a/entries/terrorists_911/__init__.py
+++ b/entries/terrorists_911/__init__.py
@@ -23,7 +23,7 @@ description = """Network of individuals and their known social associations, cen
[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Social', 'Offline', 'Unweighted', 'Metadata']
url = 'http://tuvalu.santafe.edu/~aaronc/datacode.htm'
-citation = [('V. Krebs, "Mapping networks of terrorist cells." Connections 24, 43-52 (2002).', 'http://insna.org/PDF/Connections/v24/2001_I-3-7.pdf')]
+citation = [('V. Krebs, "Mapping networks of terrorist cells." Connections 24, 43-52 (2002).', 'https://doi.org/10.5210/fm.v7i4.941')]
icon_hash = '56a85c8e26855e083a2f7924'
ustream_license = None
upstream_prefix = 'http://tuvalu.santafe.edu/~aaronc/hierarchy'
Change license from GPLv3 to AGPLv3 d754be5
diff --git a/entries/terrorists_911/__init__.py b/entries/terrorists_911/__init__.py
index 8c3cd28..f3a653c 100644
--- a/entries/terrorists_911/__init__.py
+++ b/entries/terrorists_911/__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/terrorists_911/__init__.py b/entries/terrorists_911/__init__.py
index 1e03a24..8c3cd28 100644
--- a/entries/terrorists_911/__init__.py
+++ b/entries/terrorists_911/__init__.py
@@ -19,7 +19,8 @@
from .. import *
title = "9-11 terrorist network"
-description = "Network of individuals and their known social associations, centered around the hijackers that carried out the September 11th, 2001 terrorist attacks. Associations extracted after-the-fact from public data. Metadata labels say which plane a person was on, if any, on 9/11."
+description = """Network of individuals and their known social associations, centered around the hijackers that carried out the September 11th, 2001 terrorist attacks. Associations extracted after-the-fact from public data. Metadata labels say which plane a person was on, if any, on 9/11.[^icon]
+[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Social', 'Offline', 'Unweighted', 'Metadata']
url = 'http://tuvalu.santafe.edu/~aaronc/datacode.htm'
citation = [('V. Krebs, "Mapping networks of terrorist cells." Connections 24, 43-52 (2002).', 'http://insna.org/PDF/Connections/v24/2001_I-3-7.pdf')]
Initial commit cc85872
diff --git a/entries/terrorists_911/__init__.py b/entries/terrorists_911/__init__.py
new file mode 100644
index 0000000..1e03a24
--- /dev/null
+++ b/entries/terrorists_911/__init__.py
@@ -0,0 +1,77 @@
+#! /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 = "9-11 terrorist network"
+description = "Network of individuals and their known social associations, centered around the hijackers that carried out the September 11th, 2001 terrorist attacks. Associations extracted after-the-fact from public data. Metadata labels say which plane a person was on, if any, on 9/11."
+tags = ['Social', 'Offline', 'Unweighted', 'Metadata']
+url = 'http://tuvalu.santafe.edu/~aaronc/datacode.htm'
+citation = [('V. Krebs, "Mapping networks of terrorist cells." Connections 24, 43-52 (2002).', 'http://insna.org/PDF/Connections/v24/2001_I-3-7.pdf')]
+icon_hash = '56a85c8e26855e083a2f7924'
+ustream_license = None
+upstream_prefix = 'http://tuvalu.santafe.edu/~aaronc/hierarchy'
+files = [(('terrorists.zip:terrorists/terrorist.pairs',
+ 'terrorists.zip:terrorists/terrorist.names',
+ 'terrorists.zip:terrorists/terrorist.groups'), None, '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 = parse_graph([fs[0]], fmt, directed=False)
+
+ g.vp.id = g.vp.name
+ del g.vp["name"]
+
+ vs = {g.vp.id[v] : v for v in g.vertices()}
+
+ g.vp.name = g.new_vp("string")
+ f = io.TextIOWrapper(fs[1])
+ for line in f:
+ vals = line.split()
+ v = vs[vals[0]]
+ g.vp.name[v] = " ".join(vals[1:])
+
+ g.vp.group = g.new_vp("int")
+ f = io.TextIOWrapper(fs[2])
+ for line in f:
+ vals = line.split()
+ v = vs[vals[0]]
+ try:
+ g.vp.group[v] = int(vals[1])
+ except ValueError:
+ # crap in data!
+ g.vp.group[v] = 4
+
+ remove_parallel_edges(g)
+
+ yield alt, g