History of marvel_universe
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/marvel_universe/__init__.py b/entries/marvel_universe/__init__.py
index d7844dc..301b0a9 100644
--- a/entries/marvel_universe/__init__.py
+++ b/entries/marvel_universe/__init__.py
@@ -28,7 +28,7 @@ The network has the following properties:
tags = ['Social', 'Fictional', 'Affiliation', 'Unweighted', 'Metadata']
url = 'http://bioinfo.uib.es/~joemiro/marvel/porgat.txt'
citation = [('R. Alberich, J. Miro-Julia, and F. Rossello, "Marvel Universe looks almost like a real social network." arxiv:cond-mat/0202174 (2002).', 'http://arxiv.org/abs/cond-mat/0202174')]
-icon_hash = '56a85c8e26855e083a2f78d2'
+date_added = '2020-08-13'
upstream_license = None
upstream_prefix = 'http://bioinfo.uib.es/~joemiro/marvel'
files = [('porgat.txt', None, 'pajek')]
[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/marvel_universe/__init__.py b/entries/marvel_universe/__init__.py
index 3bc421a..d7844dc 100644
--- a/entries/marvel_universe/__init__.py
+++ b/entries/marvel_universe/__init__.py
@@ -23,8 +23,8 @@ description = """A bipartite network of Marvel comic book characters and the com
The network has the following properties:
-- `name`: the name of the character, often with its alter ego and truncated to 20 characters in the source (as in "SPIDER-MAN/PETER PAR"), or the comic book (title abbreviation and issue number, as in "ASM 300"). Some character names occur more than once.
-- `is_comic`: whether the node is a comic book (otherwise it is a character)."""
+- (Node) `name`: the name of the character, often with its alter ego and truncated to 20 characters in the source (as in "SPIDER-MAN/PETER PAR"), or the comic book (title abbreviation and issue number, as in "ASM 300"). Some character names occur more than once.
+- (Node) `is_comic`: whether the node is a comic book (otherwise it is a character)."""
tags = ['Social', 'Fictional', 'Affiliation', 'Unweighted', 'Metadata']
url = 'http://bioinfo.uib.es/~joemiro/marvel/porgat.txt'
citation = [('R. Alberich, J. Miro-Julia, and F. Rossello, "Marvel Universe looks almost like a real social network." arxiv:cond-mat/0202174 (2002).', 'http://arxiv.org/abs/cond-mat/0202174')]
[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/marvel_universe/__init__.py b/entries/marvel_universe/__init__.py
index c0667ee..3bc421a 100644
--- a/entries/marvel_universe/__init__.py
+++ b/entries/marvel_universe/__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] 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/marvel_universe/__init__.py b/entries/marvel_universe/__init__.py
index 1100fc1..c0667ee 100644
--- a/entries/marvel_universe/__init__.py
+++ b/entries/marvel_universe/__init__.py
@@ -18,14 +18,18 @@
from .. import *
-title = "Marvel Universe social network"
-description = """The Marvel Universe collaboration network, where two Marvel characters are considered linked if they jointly appear in the same Marvel comic book[^icon]
-[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
-tags = ['Social', 'Fictional', 'Unweighted']
+title = "Marvel Universe characters and comic books"
+description = """A bipartite network of Marvel comic book characters and the comic books in which they appear, compiled by R. Alberich, J. Miro-Julia and F. Rosselló from the Marvel Chronology Project (MCP), a database created by R. Chappell that catalogs every canonical appearance of every significant Marvel character. Each edge connects a character to a comic book in which the character appears. The network contains 96,662 appearances of 6,486 characters in 12,942 comic books; the MCP database does not include comic books published between early 1993 and mid 1994. The one-mode projection onto the characters, where two characters are connected if they appear together in some comic book, is the "Marvel Universe collaboration network" studied by the authors.
+
+The network has the following properties:
+
+- `name`: the name of the character, often with its alter ego and truncated to 20 characters in the source (as in "SPIDER-MAN/PETER PAR"), or the comic book (title abbreviation and issue number, as in "ASM 300"). Some character names occur more than once.
+- `is_comic`: whether the node is a comic book (otherwise it is a character)."""
+tags = ['Social', 'Fictional', 'Affiliation', 'Unweighted', 'Metadata']
url = 'http://bioinfo.uib.es/~joemiro/marvel/porgat.txt'
citation = [('R. Alberich, J. Miro-Julia, and F. Rossello, "Marvel Universe looks almost like a real social network." arxiv:cond-mat/0202174 (2002).', 'http://arxiv.org/abs/cond-mat/0202174')]
icon_hash = '56a85c8e26855e083a2f78d2'
-ustream_license = None
+upstream_license = None
upstream_prefix = 'http://bioinfo.uib.es/~joemiro/marvel'
files = [('porgat.txt', None, 'pajek')]
@@ -53,8 +57,12 @@ def parse(alts=None):
shutil.copyfileobj(fs[0], wp)
tmp.seek(0)
g = parse_graph([tmp], fmt, directed=False)
+ # Characters come first, followed by the comic books
+ g.vp.is_comic = g.vp["type"]
del g.vp["type"]
- del g.vp["id"]
- del g.vp["_graphml_vertex_id"]
- del g.ep["_graphml_edge_id"]
+ for k in ["id", "_graphml_vertex_id"]:
+ if k in g.vp:
+ del g.vp[k]
+ if "_graphml_edge_id" in g.ep:
+ del g.ep["_graphml_edge_id"]
yield alt, g
Update copyright information 73a4f0d
diff --git a/entries/marvel_universe/__init__.py b/entries/marvel_universe/__init__.py
index 0197447..1100fc1 100644
--- a/entries/marvel_universe/__init__.py
+++ b/entries/marvel_universe/__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/marvel_universe/__init__.py b/entries/marvel_universe/__init__.py
index e5ceb18..0197447 100644
--- a/entries/marvel_universe/__init__.py
+++ b/entries/marvel_universe/__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/marvel_universe/__init__.py b/entries/marvel_universe/__init__.py
index 8b0dbb5..e5ceb18 100644
--- a/entries/marvel_universe/__init__.py
+++ b/entries/marvel_universe/__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/marvel_universe/__init__.py b/entries/marvel_universe/__init__.py
index e136dfb..8b0dbb5 100644
--- a/entries/marvel_universe/__init__.py
+++ b/entries/marvel_universe/__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/marvel_universe/__init__.py b/entries/marvel_universe/__init__.py
index 3b075d0..e136dfb 100644
--- a/entries/marvel_universe/__init__.py
+++ b/entries/marvel_universe/__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/marvel_universe/__init__.py b/entries/marvel_universe/__init__.py
index 3ced5d7..3b075d0 100644
--- a/entries/marvel_universe/__init__.py
+++ b/entries/marvel_universe/__init__.py
@@ -19,7 +19,8 @@
from .. import *
title = "Marvel Universe social network"
-description = "The Marvel Universe collaboration network, where two Marvel characters are considered linked if they jointly appear in the same Marvel comic book"
+description = """The Marvel Universe collaboration network, where two Marvel characters are considered linked if they jointly appear in the same Marvel comic book[^icon]
+[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Social', 'Fictional', 'Unweighted']
url = 'http://bioinfo.uib.es/~joemiro/marvel/porgat.txt'
citation = [('R. Alberich, J. Miro-Julia, and F. Rossello, "Marvel Universe looks almost like a real social network." arxiv:cond-mat/0202174 (2002).', 'http://arxiv.org/abs/cond-mat/0202174')]
add entry: marvel_universe 327c7bf
diff --git a/entries/marvel_universe/__init__.py b/entries/marvel_universe/__init__.py
new file mode 100644
index 0000000..3ced5d7
--- /dev/null
+++ b/entries/marvel_universe/__init__.py
@@ -0,0 +1,59 @@
+#! /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 = "Marvel Universe social network"
+description = "The Marvel Universe collaboration network, where two Marvel characters are considered linked if they jointly appear in the same Marvel comic book"
+tags = ['Social', 'Fictional', 'Unweighted']
+url = 'http://bioinfo.uib.es/~joemiro/marvel/porgat.txt'
+citation = [('R. Alberich, J. Miro-Julia, and F. Rossello, "Marvel Universe looks almost like a real social network." arxiv:cond-mat/0202174 (2002).', 'http://arxiv.org/abs/cond-mat/0202174')]
+icon_hash = '56a85c8e26855e083a2f78d2'
+ustream_license = None
+upstream_prefix = 'http://bioinfo.uib.es/~joemiro/marvel'
+files = [('porgat.txt', None, 'pajek')]
+
+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, "r",
+ encoding="ISO-8859-1")) for fn in fnames]
+ # convert to utf8
+ with TemporaryFile(mode="w+b") as tmp:
+ wp = io.TextIOWrapper(tmp)
+ shutil.copyfileobj(fs[0], wp)
+ tmp.seek(0)
+ g = parse_graph([tmp], fmt, directed=False)
+ del g.vp["type"]
+ del g.vp["id"]
+ del g.vp["_graphml_vertex_id"]
+ del g.ep["_graphml_edge_id"]
+ yield alt, g