History of ambassador
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/ambassador/__init__.py b/entries/ambassador/__init__.py
index 4eef857..b7602ae 100644
--- a/entries/ambassador/__init__.py
+++ b/entries/ambassador/__init__.py
@@ -31,7 +31,7 @@ In all networks, the node property `name` is the numeric JJATT identifier of the
tags = ['Social', 'Offline', 'Weighted', 'Temporal']
url = 'https://web.archive.org/web/20201011193305/https://sites.google.com/site/ucinetsoftware/datasets/covert-networks/philippinesbombing'
citation = [('S. Atran et al., "Philippines Ambassador Residence Bombing 2000, Jakarta." John Jay & ARTIS Transnational Terrorism Database (2009)', 'http://doitapps.jjay.cuny.edu/jjatt/data.php')]
-icon_hash = '59fe8cadee01e9ab21ac7fb5'
+date_added = '2020-08-11'
# The files are no longer available from the UCINET site (its file
# attachments were lost when the site was migrated); the same archives are
# obtained from the public Google Drive folder of the UCINET datasets.
[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/ambassador/__init__.py b/entries/ambassador/__init__.py
index 711e920..4eef857 100644
--- a/entries/ambassador/__init__.py
+++ b/entries/ambassador/__init__.py
@@ -49,7 +49,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] Merge duplicate entries and add cross-references between related ones 9bc6033
- Removed duplicates, merged into the entries holding the same data: dblp_coauthor_snap (soc_net_comms), cattle and bison (dom; bison's breeding data move there, as do the wolves' age and sex), football_tsevans (football, with both conference assignments), eu_procurements_alt (eu_procurements), foursquare_friendships (foursquare_global). - software_dependencies: colt and scolt are one network; ambassador: the duplicate 2001 network is dropped and the three same-edge networks combined; dom: the dataset count corrected (436). - macaque_neural: Young's 71-area network added (young71; the 47-area one is now cocomac47), both from archived copies. - collins_yeast, celegans_interactomes: from archived copies of the dead CCSB site (byte-identical files). - Cross-references between entries holding versions of the same data (food webs, Wikipedia, Slashdot, physicians, SNAP/Mislove, CCSB). - ICON ids of duplicate records added; macaque_neural's corrected. - prosper, dbpedia_all: string properties given in edge-index order (needs graph-tool with the fixed vals ordering).
diff --git a/entries/ambassador/__init__.py b/entries/ambassador/__init__.py
index 0a4838c..711e920 100644
--- a/entries/ambassador/__init__.py
+++ b/entries/ambassador/__init__.py
@@ -23,10 +23,9 @@ description = """Networks of relations among 16 individuals directly or indirect
Nodes are individuals, and an undirected edge connects two individuals who had a relation (in a given time period, or of a given kind); there are several such networks on the same set of nodes:
-- `1985_1989`, `1990_1994`, `1995_1999` and `2000` to `2007`: the relations existing during each time period. The edge `weight` takes values 1 to 3 and encodes the strength of the tie; the exact coding is not documented in the source files (in other JJATT networks, 1 denotes acquaintances or distant family, 2 friends or moderately close family, and 3 close friends, family or tight-knit operational cliques).
+- `1985_1989`, `1990_1994`, `1995_1999` and `2000` to `2007`: the relations existing during each time period. The edge `weight` takes values 1 to 3 and encodes the strength of the tie; the exact coding is not documented in the source files (in other JJATT networks, 1 denotes acquaintances or distant family, 2 friends or moderately close family, and 3 close friends, family or tight-knit operational cliques). The source also contains a file for 2001, which is identical to the one for 2000 (including the weights), and is therefore omitted; the network `2000` thus also describes the relations in 2001.
- `KINSHIP`: kinship relations, with the `weight` encoding the kind of kinship tie (values 1 to 3; coding undocumented).
-- `OPERATION_ID`: ties labeled with the identifier of the operation (attack) in which both individuals were involved, stored in `weight`.
-- `TIE_YEAR` and `TIE_EXTINGUISH`: ties labeled with a code for the year in which the relation was formed and in which it ended, respectively, stored in `weight`. The meaning of these codes is not documented in the source files.
+- `ties`: all the relations among the individuals (the same 69 ties as in the network `2000`), with three coded attributes, given in the source as three separate matrices with the same nonzero entries: the edge properties `tie_year` and `tie_extinguish` are codes for the year in which the relation was formed and in which it ended, respectively (the meaning of these codes is not documented in the source files), and `operation_id` is the identifier of the operation (attack) in which both individuals were involved (36 for all ties).
In all networks, the node property `name` is the numeric JJATT identifier of the person."""
tags = ['Social', 'Offline', 'Weighted', 'Temporal']
@@ -37,7 +36,10 @@ icon_hash = '59fe8cadee01e9ab21ac7fb5'
# attachments were lost when the site was migrated); the same archives are
# obtained from the public Google Drive folder of the UCINET datasets.
upstream_prefix = 'gdrive://'
-files = [('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_1985_1989.csv', '1985_1989', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_1990_1994.csv', '1990_1994', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_1995_1999.csv', '1995_1999', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_2000.csv', '2000', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_2001.csv', '2001', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_2002.csv', '2002', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_2003.csv', '2003', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_2004.csv', '2004', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_2005.csv', '2005', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_2006.csv', '2006', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_2007.csv', '2007', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_KINSHIP.csv', 'KINSHIP', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_OPERATION_ID.csv', 'OPERATION_ID', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_TIE_EXTINGUISH.csv', 'TIE_EXTINGUISH', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_TIE_YEAR.csv', 'TIE_YEAR', 'csv_matrix')]
+files = [('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_1985_1989.csv', '1985_1989', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_1990_1994.csv', '1990_1994', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_1995_1999.csv', '1995_1999', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_2000.csv', '2000', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_2002.csv', '2002', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_2003.csv', '2003', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_2004.csv', '2004', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_2005.csv', '2005', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_2006.csv', '2006', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_2007.csv', '2007', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_KINSHIP.csv', 'KINSHIP', 'csv_matrix'), (('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_TIE_YEAR.csv', '1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_TIE_EXTINGUISH.csv', '1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_OPERATION_ID.csv'), 'ties', 'csv_matrix')]
+
+# edge properties of the `ties` network, from the files above (same edges)
+tie_props = ['tie_year', 'tie_extinguish', 'operation_id']
def fetch_upstream(force=False):
return fetch_upstream_files(__name__.split(".")[-1], upstream_prefix, files,
@@ -56,5 +58,24 @@ def parse(alts=None):
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=False)
+ gs = [parse_graph([f], fmt, directed=False) for f in fs]
+ g = gs[0]
+ if alt == "ties":
+ # the coded attributes are given as matrices with the same nonzero
+ # entries: they become edge properties of a single network
+ def pairs(h):
+ return {tuple(sorted((h.vp.name[e.source()],
+ h.vp.name[e.target()]))): h.ep.weight[e]
+ for e in h.edges()}
+ ws = [pairs(h) for h in gs]
+ assert all(list(h.vp.name) == list(g.vp.name) for h in gs)
+ assert all(h.num_edges() == len(w) == g.num_edges()
+ for h, w in zip(gs, ws))
+ assert all(w.keys() == ws[0].keys() for w in ws)
+ del g.ep["weight"]
+ for pname, w in zip(tie_props, ws):
+ g.ep[pname] = p = g.new_ep("int")
+ for e in g.edges():
+ p[e] = w[tuple(sorted((g.vp.name[e.source()],
+ g.vp.name[e.target()])))]
yield alt, g
[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/ambassador/__init__.py b/entries/ambassador/__init__.py
index c11330b..0a4838c 100644
--- a/entries/ambassador/__init__.py
+++ b/entries/ambassador/__init__.py
@@ -21,7 +21,7 @@ from .. import *
title = "Philippines Ambassador bombing (2000)"
description = """Networks of relations among 16 individuals directly or indirectly involved in the bombing of the residence of the Philippine ambassador in Jakarta, Indonesia, on 1 August 2000. The data are part of the John Jay & ARTIS Transnational Terrorism Database (JJATT), assembled by S. Atran and collaborators from open sources such as court documents and news reports, and were distributed in the UCINET covert networks collection.
-There are several undirected networks on the same set of nodes:
+Nodes are individuals, and an undirected edge connects two individuals who had a relation (in a given time period, or of a given kind); there are several such networks on the same set of nodes:
- `1985_1989`, `1990_1994`, `1995_1999` and `2000` to `2007`: the relations existing during each time period. The edge `weight` takes values 1 to 3 and encodes the strength of the tie; the exact coding is not documented in the source files (in other JJATT networks, 1 denotes acquaintances or distant family, 2 friends or moderately close family, and 3 close friends, family or tight-knit operational cliques).
- `KINSHIP`: kinship relations, with the `weight` encoding the kind of kinship tie (values 1 to 3; coding undocumented).
[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/ambassador/__init__.py b/entries/ambassador/__init__.py
index 84360c6..c11330b 100644
--- a/entries/ambassador/__init__.py
+++ b/entries/ambassador/__init__.py
@@ -19,14 +19,25 @@
from .. import *
title = "Philippines Ambassador bombing (2000)"
-description = """A temporal network representing snapshots of relationships among individuals directly or indirectly associated with Philippines Ambassador Residence Bombing 2000, Jakarta. Nodes are people, and an edge exists if they are associated with each other. Definition of the edge weight is unknown.[^icon]
-[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
+description = """Networks of relations among 16 individuals directly or indirectly involved in the bombing of the residence of the Philippine ambassador in Jakarta, Indonesia, on 1 August 2000. The data are part of the John Jay & ARTIS Transnational Terrorism Database (JJATT), assembled by S. Atran and collaborators from open sources such as court documents and news reports, and were distributed in the UCINET covert networks collection.
+
+There are several undirected networks on the same set of nodes:
+
+- `1985_1989`, `1990_1994`, `1995_1999` and `2000` to `2007`: the relations existing during each time period. The edge `weight` takes values 1 to 3 and encodes the strength of the tie; the exact coding is not documented in the source files (in other JJATT networks, 1 denotes acquaintances or distant family, 2 friends or moderately close family, and 3 close friends, family or tight-knit operational cliques).
+- `KINSHIP`: kinship relations, with the `weight` encoding the kind of kinship tie (values 1 to 3; coding undocumented).
+- `OPERATION_ID`: ties labeled with the identifier of the operation (attack) in which both individuals were involved, stored in `weight`.
+- `TIE_YEAR` and `TIE_EXTINGUISH`: ties labeled with a code for the year in which the relation was formed and in which it ended, respectively, stored in `weight`. The meaning of these codes is not documented in the source files.
+
+In all networks, the node property `name` is the numeric JJATT identifier of the person."""
tags = ['Social', 'Offline', 'Weighted', 'Temporal']
-url = 'https://sites.google.com/site/ucinetsoftware/datasets/covert-networks/philippinesbombing'
+url = 'https://web.archive.org/web/20201011193305/https://sites.google.com/site/ucinetsoftware/datasets/covert-networks/philippinesbombing'
citation = [('S. Atran et al., "Philippines Ambassador Residence Bombing 2000, Jakarta." John Jay & ARTIS Transnational Terrorism Database (2009)', 'http://doitapps.jjay.cuny.edu/jjatt/data.php')]
icon_hash = '59fe8cadee01e9ab21ac7fb5'
-upstream_prefix = 'https://sites.google.com/site/ucinetsoftware/datasets/covert-networks/philippinesbombing'
-files = [('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_1985_1989.csv', '1985_1989', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_1990_1994.csv', '1990_1994', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_1995_1999.csv', '1995_1999', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_2000.csv', '2000', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_2001.csv', '2001', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_2002.csv', '2002', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_2003.csv', '2003', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_2004.csv', '2004', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_2005.csv', '2005', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_2006.csv', '2006', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_2007.csv', '2007', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_KINSHIP.csv', 'KINSHIP', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_OPERATION_ID.csv', 'OPERATION_ID', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_TIE_EXTINGUISH.csv', 'TIE_EXTINGUISH', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_TIE_YEAR.csv', 'TIE_YEAR', 'csv_matrix')]
+# The files are no longer available from the UCINET site (its file
+# attachments were lost when the site was migrated); the same archives are
+# obtained from the public Google Drive folder of the UCINET datasets.
+upstream_prefix = 'gdrive://'
+files = [('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_1985_1989.csv', '1985_1989', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_1990_1994.csv', '1990_1994', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_1995_1999.csv', '1995_1999', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_2000.csv', '2000', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_2001.csv', '2001', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_2002.csv', '2002', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_2003.csv', '2003', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_2004.csv', '2004', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_2005.csv', '2005', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_2006.csv', '2006', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_2007.csv', '2007', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_KINSHIP.csv', 'KINSHIP', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_OPERATION_ID.csv', 'OPERATION_ID', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_TIE_EXTINGUISH.csv', 'TIE_EXTINGUISH', 'csv_matrix'), ('1lSgE3T3HR8OEShFTiw3FzchvlLNtnpf2:zip:CSV/PHILBOMB_2000_TIE_YEAR.csv', 'TIE_YEAR', 'csv_matrix')]
def fetch_upstream(force=False):
return fetch_upstream_files(__name__.split(".")[-1], upstream_prefix, files,
Update copyright information 73a4f0d
diff --git a/entries/ambassador/__init__.py b/entries/ambassador/__init__.py
index 28c386b..84360c6 100644
--- a/entries/ambassador/__init__.py
+++ b/entries/ambassador/__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/ambassador/__init__.py b/entries/ambassador/__init__.py
index 02c83c0..28c386b 100644
--- a/entries/ambassador/__init__.py
+++ b/entries/ambassador/__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/ambassador/__init__.py b/entries/ambassador/__init__.py
index ef20690..02c83c0 100644
--- a/entries/ambassador/__init__.py
+++ b/entries/ambassador/__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/ambassador/__init__.py b/entries/ambassador/__init__.py
index 8b245c2..ef20690 100644
--- a/entries/ambassador/__init__.py
+++ b/entries/ambassador/__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
Change license from GPLv3 to AGPLv3 d754be5
diff --git a/entries/ambassador/__init__.py b/entries/ambassador/__init__.py
index ec48d00..8b245c2 100644
--- a/entries/ambassador/__init__.py
+++ b/entries/ambassador/__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/ambassador/__init__.py b/entries/ambassador/__init__.py
index f6d18d3..ec48d00 100644
--- a/entries/ambassador/__init__.py
+++ b/entries/ambassador/__init__.py
@@ -19,7 +19,8 @@
from .. import *
title = "Philippines Ambassador bombing (2000)"
-description = "A temporal network representing snapshots of relationships among individuals directly or indirectly associated with Philippines Ambassador Residence Bombing 2000, Jakarta. Nodes are people, and an edge exists if they are associated with each other. Definition of the edge weight is unknown."
+description = """A temporal network representing snapshots of relationships among individuals directly or indirectly associated with Philippines Ambassador Residence Bombing 2000, Jakarta. Nodes are people, and an edge exists if they are associated with each other. Definition of the edge weight is unknown.[^icon]
+[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Social', 'Offline', 'Weighted', 'Temporal']
url = 'https://sites.google.com/site/ucinetsoftware/datasets/covert-networks/philippinesbombing'
citation = [('S. Atran et al., "Philippines Ambassador Residence Bombing 2000, Jakarta." John Jay & ARTIS Transnational Terrorism Database (2009)', 'http://doitapps.jjay.cuny.edu/jjatt/data.php')]
Initial commit cc85872
diff --git a/entries/ambassador/__init__.py b/entries/ambassador/__init__.py
new file mode 100644
index 0000000..f6d18d3
--- /dev/null
+++ b/entries/ambassador/__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 = "Philippines Ambassador bombing (2000)"
+description = "A temporal network representing snapshots of relationships among individuals directly or indirectly associated with Philippines Ambassador Residence Bombing 2000, Jakarta. Nodes are people, and an edge exists if they are associated with each other. Definition of the edge weight is unknown."
+tags = ['Social', 'Offline', 'Weighted', 'Temporal']
+url = 'https://sites.google.com/site/ucinetsoftware/datasets/covert-networks/philippinesbombing'
+citation = [('S. Atran et al., "Philippines Ambassador Residence Bombing 2000, Jakarta." John Jay & ARTIS Transnational Terrorism Database (2009)', 'http://doitapps.jjay.cuny.edu/jjatt/data.php')]
+icon_hash = '59fe8cadee01e9ab21ac7fb5'
+upstream_prefix = 'https://sites.google.com/site/ucinetsoftware/datasets/covert-networks/philippinesbombing'
+files = [('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_1985_1989.csv', '1985_1989', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_1990_1994.csv', '1990_1994', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_1995_1999.csv', '1995_1999', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_2000.csv', '2000', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_2001.csv', '2001', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_2002.csv', '2002', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_2003.csv', '2003', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_2004.csv', '2004', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_2005.csv', '2005', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_2006.csv', '2006', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_2007.csv', '2007', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_KINSHIP.csv', 'KINSHIP', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_OPERATION_ID.csv', 'OPERATION_ID', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_TIE_EXTINGUISH.csv', 'TIE_EXTINGUISH', 'csv_matrix'), ('Philippines%20Bombing%202000%20CSV.zip:CSV/PHILBOMB_2000_TIE_YEAR.csv', 'TIE_YEAR', 'csv_matrix')]
+
+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=False)
+ yield alt, g