History of football
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/football/__init__.py b/entries/football/__init__.py
index e2f7553..39d786f 100644
--- a/entries/football/__init__.py
+++ b/entries/football/__init__.py
@@ -33,7 +33,7 @@ url = ['http://www-personal.umich.edu/~mejn/netdata',
'https://figshare.com/articles/American_College_Football_Network_Files/93179']
citation = [('M. Girvan and M. E. J. Newman, "Community structure in social and biological networks." Proc. Natl. Acad. Sci. USA 99(12), 7821-7826 (2002).', 'https://doi.org/10.1073/pnas.122653799'),
('T.S. Evans, "Clique Graphs and Overlapping Communities", J. Stat. Mech. (2010) P12037', 'https://doi.org/10.1088/1742-5468/2010/12/P12037')]
-icon_hash = '56a85c8e26855e083a2f78a2'
+date_added = '2020-08-11'
upstream_license = None
upstream_prefix = 'http://www-personal.umich.edu/~mejn/netdata'
files = [('football.zip:football.gml', None, 'gml')]
[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/football/__init__.py b/entries/football/__init__.py
index ce7fd60..e2f7553 100644
--- a/entries/football/__init__.py
+++ b/entries/football/__init__.py
@@ -25,9 +25,9 @@ As pointed out by T. S. Evans (J. Stat. Mech. P12037, 2010), the conference assi
The network has the following properties:
-- `label`: the name of the team.
-- `conference`: the original conference assignment of Girvan and Newman: 0 = Atlantic Coast, 1 = Big East, 2 = Big Ten, 3 = Big Twelve, 4 = Conference USA, 5 = Independents, 6 = Mid-American, 7 = Mountain West, 8 = Pacific Ten, 9 = Southeastern, 10 = Sun Belt, 11 = Western Athletic.
-- `conference_evans`: the conference assignment corrected by T. S. Evans for the 2000 season: 0 = Atlantic Coast, 1 = Big East, 2 = Big Ten, 3 = Big Twelve, 4 = Conference USA, 5 = Big West, 6 = Mid-American, 7 = Mountain West, 8 = Pacific Ten, 9 = Southeastern, 10 = Western Athletic, and 11-18 for the independent teams Notre Dame, Navy, Connecticut, Central Florida, Middle Tennessee State, Louisiana Tech, Louisiana Monroe and Louisiana Lafayette, respectively (instead of grouping the independent teams, which belong to no conference, under a single label, each independent team has its own label)."""
+- (Node) `label`: the name of the team.
+- (Node) `conference`: the original conference assignment of Girvan and Newman: 0 = Atlantic Coast, 1 = Big East, 2 = Big Ten, 3 = Big Twelve, 4 = Conference USA, 5 = Independents, 6 = Mid-American, 7 = Mountain West, 8 = Pacific Ten, 9 = Southeastern, 10 = Sun Belt, 11 = Western Athletic.
+- (Node) `conference_evans`: the conference assignment corrected by T. S. Evans for the 2000 season: 0 = Atlantic Coast, 1 = Big East, 2 = Big Ten, 3 = Big Twelve, 4 = Conference USA, 5 = Big West, 6 = Mid-American, 7 = Mountain West, 8 = Pacific Ten, 9 = Southeastern, 10 = Western Athletic, and 11-18 for the independent teams Notre Dame, Navy, Connecticut, Central Florida, Middle Tennessee State, Louisiana Tech, Louisiana Monroe and Louisiana Lafayette, respectively (instead of grouping the independent teams, which belong to no conference, under a single label, each independent team has its own label)."""
tags = ['Social', 'Sports', 'Unweighted']
url = ['http://www-personal.umich.edu/~mejn/netdata',
'https://figshare.com/articles/American_College_Football_Network_Files/93179']
[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/football/__init__.py b/entries/football/__init__.py
index 3610d93..ce7fd60 100644
--- a/entries/football/__init__.py
+++ b/entries/football/__init__.py
@@ -52,7 +52,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/football/__init__.py b/entries/football/__init__.py
index 3b91830..3610d93 100644
--- a/entries/football/__init__.py
+++ b/entries/football/__init__.py
@@ -19,23 +19,34 @@
from .. import *
title = "NCAA college football 2000"
-description = r"""A network of American football games between Division I-A colleges during the regular season of Fall 2000, compiled by M. Girvan and M. E. J. Newman. Nodes are college teams, and an undirected edge connects two teams that played each other in at least one game. Because teams play more often against teams in their own conference, the conferences form a well-known community structure, and the data are widely used as a benchmark for community detection. Two edges that were erroneously duplicated in the original data were removed by the authors in 2014.
+description = r"""A network of American football games between Division I-A colleges during the regular season of Fall 2000, compiled by M. Girvan and M. E. J. Newman. Nodes are college teams, and an undirected edge connects two teams that played each other in at least one game. Because teams play more often against teams in their own conference, the conferences form a well-known community structure, and the data are widely used as a benchmark for community detection. The original data contained duplicated edges (some pairs of teams met twice in the season, in the regular season and again in their conference final), which were removed both by T. S. Evans in his corrected version (three multiple edges) and later by the original authors (two edges, in 2014), so that both versions now have the same simple network.
+
+As pointed out by T. S. Evans (J. Stat. Mech. P12037, 2010), the conference assignments of the original file correspond to the 2001 season rather than the 2000 season of the games, so that a few teams that changed conference between the two seasons are mislabeled (in 2000 there were 10 conferences and 8 independent teams, rather than the 11 conferences and 5 independents of 2001; e.g. the Big West conference existed for football until 2000, while the Sun Belt conference only started in 2001). Evans corrected the assignments for the 2000 season after checking the games against the College Football Data Warehouse; they differ from the original ones for 22 of the 115 teams. Both assignments are given as vertex properties.
The network has the following properties:
- `label`: the name of the team.
-- `value`: the conference to which the team belongs: 0 = Atlantic Coast, 1 = Big East, 2 = Big Ten, 3 = Big Twelve, 4 = Conference USA, 5 = Independents, 6 = Mid-American, 7 = Mountain West, 8 = Pacific Ten, 9 = Southeastern, 10 = Sun Belt, 11 = Western Athletic. As pointed out by T. S. Evans (J. Stat. Mech. P12037, 2010), these conference assignments correspond to the 2001 season rather than the 2000 season of the games, so that a few teams that changed conference between the two seasons are mislabeled (in 2000 there were 10 conferences and 8 independent teams, rather than the 11 conferences and 5 independents of 2001)."""
+- `conference`: the original conference assignment of Girvan and Newman: 0 = Atlantic Coast, 1 = Big East, 2 = Big Ten, 3 = Big Twelve, 4 = Conference USA, 5 = Independents, 6 = Mid-American, 7 = Mountain West, 8 = Pacific Ten, 9 = Southeastern, 10 = Sun Belt, 11 = Western Athletic.
+- `conference_evans`: the conference assignment corrected by T. S. Evans for the 2000 season: 0 = Atlantic Coast, 1 = Big East, 2 = Big Ten, 3 = Big Twelve, 4 = Conference USA, 5 = Big West, 6 = Mid-American, 7 = Mountain West, 8 = Pacific Ten, 9 = Southeastern, 10 = Western Athletic, and 11-18 for the independent teams Notre Dame, Navy, Connecticut, Central Florida, Middle Tennessee State, Louisiana Tech, Louisiana Monroe and Louisiana Lafayette, respectively (instead of grouping the independent teams, which belong to no conference, under a single label, each independent team has its own label)."""
tags = ['Social', 'Sports', 'Unweighted']
-url = 'http://www-personal.umich.edu/~mejn/netdata'
-citation = [('M. Girvan and M. E. J. Newman, "Community structure in social and biological networks." Proc. Natl. Acad. Sci. USA 99(12), 7821-7826 (2002).', 'https://doi.org/10.1073/pnas.122653799')]
+url = ['http://www-personal.umich.edu/~mejn/netdata',
+ 'https://figshare.com/articles/American_College_Football_Network_Files/93179']
+citation = [('M. Girvan and M. E. J. Newman, "Community structure in social and biological networks." Proc. Natl. Acad. Sci. USA 99(12), 7821-7826 (2002).', 'https://doi.org/10.1073/pnas.122653799'),
+ ('T.S. Evans, "Clique Graphs and Overlapping Communities", J. Stat. Mech. (2010) P12037', 'https://doi.org/10.1088/1742-5468/2010/12/P12037')]
icon_hash = '56a85c8e26855e083a2f78a2'
upstream_license = None
upstream_prefix = 'http://www-personal.umich.edu/~mejn/netdata'
files = [('football.zip:football.gml', None, 'gml')]
+# T. S. Evans' corrected version (figshare), from which only the corrected
+# conference assignments are used
+evans_prefix = 'https://ndownloader.figshare.com/files'
+evans_files = [('94935:zip:footballTSEinput.gml', None, 'gml')]
+
def fetch_upstream(force=False):
- return fetch_upstream_files(__name__.split(".")[-1], upstream_prefix, files,
- force)
+ name = __name__.split(".")[-1]
+ fetch_upstream_files(name, upstream_prefix, files, force)
+ fetch_upstream_files(name, evans_prefix, evans_files, force)
@cache_network()
@coerce_props()
@@ -46,9 +57,18 @@ def parse(alts=None):
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)
+ with open_upstream_file(name, fnames, "rb") as f:
+ g = parse_graph([f], fmt, directed=False)
+ with open_upstream_file(name, evans_files[0][0], "rb") as f:
+ ge = parse_graph([f], fmt, directed=False)
+
+ # both files have the same vertex ordering and edge set
+ assert g.num_vertices() == ge.num_vertices()
+ assert all(g.vp.label[v] == ge.vp.label[v] for v in g.vertices())
+ es = set(tuple(sorted(e)) for e in g.get_edges().tolist())
+ assert es == set(tuple(sorted(e)) for e in ge.get_edges().tolist())
+
+ g.vp.conference = g.vp.value
+ del g.vp["value"]
+ g.vp.conference_evans = g.new_vp("int", vals=ge.vp.value.fa)
yield alt, g
[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/football/__init__.py b/entries/football/__init__.py
index e974303..3b91830 100644
--- a/entries/football/__init__.py
+++ b/entries/football/__init__.py
@@ -19,13 +19,17 @@
from .. import *
title = "NCAA college football 2000"
-description = """A network of American football games between Division IA colleges during regular season Fall 2000[^icon]
-[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
+description = r"""A network of American football games between Division I-A colleges during the regular season of Fall 2000, compiled by M. Girvan and M. E. J. Newman. Nodes are college teams, and an undirected edge connects two teams that played each other in at least one game. Because teams play more often against teams in their own conference, the conferences form a well-known community structure, and the data are widely used as a benchmark for community detection. Two edges that were erroneously duplicated in the original data were removed by the authors in 2014.
+
+The network has the following properties:
+
+- `label`: the name of the team.
+- `value`: the conference to which the team belongs: 0 = Atlantic Coast, 1 = Big East, 2 = Big Ten, 3 = Big Twelve, 4 = Conference USA, 5 = Independents, 6 = Mid-American, 7 = Mountain West, 8 = Pacific Ten, 9 = Southeastern, 10 = Sun Belt, 11 = Western Athletic. As pointed out by T. S. Evans (J. Stat. Mech. P12037, 2010), these conference assignments correspond to the 2001 season rather than the 2000 season of the games, so that a few teams that changed conference between the two seasons are mislabeled (in 2000 there were 10 conferences and 8 independent teams, rather than the 11 conferences and 5 independents of 2001)."""
tags = ['Social', 'Sports', 'Unweighted']
url = 'http://www-personal.umich.edu/~mejn/netdata'
citation = [('M. Girvan and M. E. J. Newman, "Community structure in social and biological networks." Proc. Natl. Acad. Sci. USA 99(12), 7821-7826 (2002).', 'https://doi.org/10.1073/pnas.122653799')]
icon_hash = '56a85c8e26855e083a2f78a2'
-ustream_license = None
+upstream_license = None
upstream_prefix = 'http://www-personal.umich.edu/~mejn/netdata'
files = [('football.zip:football.gml', None, 'gml')]
Update copyright information 73a4f0d
diff --git a/entries/football/__init__.py b/entries/football/__init__.py
index 9329430..e974303 100644
--- a/entries/football/__init__.py
+++ b/entries/football/__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/football/__init__.py b/entries/football/__init__.py
index df1d98f..9329430 100644
--- a/entries/football/__init__.py
+++ b/entries/football/__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/football/__init__.py b/entries/football/__init__.py
index 4c6e2ce..df1d98f 100644
--- a/entries/football/__init__.py
+++ b/entries/football/__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/football/__init__.py b/entries/football/__init__.py
index 702fff7..4c6e2ce 100644
--- a/entries/football/__init__.py
+++ b/entries/football/__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/football/__init__.py b/entries/football/__init__.py
index 8028e44..702fff7 100644
--- a/entries/football/__init__.py
+++ b/entries/football/__init__.py
@@ -23,7 +23,7 @@ description = """A network of American football games between Division IA colleg
[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Social', 'Sports', 'Unweighted']
url = 'http://www-personal.umich.edu/~mejn/netdata'
-citation = [('M. Girvan and M. E. J. Newman, "Community structure in social and biological networks." Proc. Natl. Acad. Sci. USA 99(12), 7821-7826 (2002). arxiv:cond-mat/0112110', 'http://www-personal.umich.edu/~mejn/netdata/')]
+citation = [('M. Girvan and M. E. J. Newman, "Community structure in social and biological networks." Proc. Natl. Acad. Sci. USA 99(12), 7821-7826 (2002).', 'https://doi.org/10.1073/pnas.122653799')]
icon_hash = '56a85c8e26855e083a2f78a2'
ustream_license = None
upstream_prefix = 'http://www-personal.umich.edu/~mejn/netdata'
Change license from GPLv3 to AGPLv3 d754be5
diff --git a/entries/football/__init__.py b/entries/football/__init__.py
index fb21ca0..8028e44 100644
--- a/entries/football/__init__.py
+++ b/entries/football/__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/football/__init__.py b/entries/football/__init__.py
index 888a5c6..fb21ca0 100644
--- a/entries/football/__init__.py
+++ b/entries/football/__init__.py
@@ -19,7 +19,8 @@
from .. import *
title = "NCAA college football 2000"
-description = "A network of American football games between Division IA colleges during regular season Fall 2000"
+description = """A network of American football games between Division IA colleges during regular season Fall 2000[^icon]
+[^icon]: Description obtained from the [ICON](https://icon.colorado.edu) project."""
tags = ['Social', 'Sports', 'Unweighted']
url = 'http://www-personal.umich.edu/~mejn/netdata'
citation = [('M. Girvan and M. E. J. Newman, "Community structure in social and biological networks." Proc. Natl. Acad. Sci. USA 99(12), 7821-7826 (2002). arxiv:cond-mat/0112110', 'http://www-personal.umich.edu/~mejn/netdata/')]
Initial commit cc85872
diff --git a/entries/football/__init__.py b/entries/football/__init__.py
new file mode 100644
index 0000000..888a5c6
--- /dev/null
+++ b/entries/football/__init__.py
@@ -0,0 +1,49 @@
+#! /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 = "NCAA college football 2000"
+description = "A network of American football games between Division IA colleges during regular season Fall 2000"
+tags = ['Social', 'Sports', 'Unweighted']
+url = 'http://www-personal.umich.edu/~mejn/netdata'
+citation = [('M. Girvan and M. E. J. Newman, "Community structure in social and biological networks." Proc. Natl. Acad. Sci. USA 99(12), 7821-7826 (2002). arxiv:cond-mat/0112110', 'http://www-personal.umich.edu/~mejn/netdata/')]
+icon_hash = '56a85c8e26855e083a2f78a2'
+ustream_license = None
+upstream_prefix = 'http://www-personal.umich.edu/~mejn/netdata'
+files = [('football.zip:football.gml', None, 'gml')]
+
+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