1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149
|
Subject: Fix some test case failures on i386.
Origin: upstream
Bug-Debian: https://bugs.debian.org/806383
Applied-Upstream: https://github.com/igraph/python-igraph/commit/17df5c301a952e4894db4e4a8963d85527fdc860
--- a/igraph/test/decomposition.py 2016-08-24 11:32:21.187287419 +0200
+++ b/igraph/test/decomposition.py 2016-08-24 11:50:58.345023251 +0200
@@ -141,15 +141,25 @@
class CommunityTests(unittest.TestCase):
def reindexMembership(self, cl):
+ if hasattr(cl, "membership"):
+ cl = cl.membership
idgen = UniqueIdGenerator()
- return [idgen[i] for i in cl.membership]
+ return [idgen[i] for i in cl]
+
+ def assertMembershipsEqual(self, observed, expected):
+ if hasattr(observed, "membership"):
+ observed = observed.membership
+ if hasattr(expected, "membership"):
+ expected = expected.membership
+ self.assertEqual(self.reindexMembership(expected), \
+ self.reindexMembership(observed))
def testClauset(self):
# Two cliques of size 5 with one connecting edge
g = Graph.Full(5) + Graph.Full(5)
g.add_edges([(0, 5)])
cl = g.community_fastgreedy().as_clustering()
- self.assertEqual(cl.membership, [0,0,0,0,0,1,1,1,1,1])
+ self.assertMembershipsEqual(cl, [0,0,0,0,0,1,1,1,1,1])
self.assertAlmostEqual(cl.q, 0.4523, places=3)
# Lollipop, weighted
@@ -157,46 +167,46 @@
g.add_edges([(3,4)])
weights = [1, 1, 1, 1, 1, 1, 10, 10]
cl = g.community_fastgreedy(weights).as_clustering()
- self.assertEqual(cl.membership, [0, 0, 0, 1, 1, 1])
+ self.assertMembershipsEqual(cl, [0,0,0,1,1,1])
self.assertAlmostEqual(cl.q, 0.1708, places=3)
# Same graph, different weights
g.es["weight"] = [3] * g.ecount()
cl = g.community_fastgreedy("weight").as_clustering()
- self.assertEqual(cl.membership, [0, 0, 0, 0, 1, 1])
+ self.assertMembershipsEqual(cl, [0,0,0,0,1,1])
self.assertAlmostEqual(cl.q, 0.1796, places=3)
# Disconnected graph
g = Graph.Full(4) + Graph.Full(4) + Graph.Full(3) + Graph.Full(2)
cl = g.community_fastgreedy().as_clustering()
- self.assertEqual(cl.membership, [0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 3, 3])
+ self.assertMembershipsEqual(cl, [0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 3, 3])
# Empty graph
g = Graph(20)
cl = g.community_fastgreedy().as_clustering()
- self.assertEqual(cl.membership, range(g.vcount()))
+ self.assertMembershipsEqual(cl, range(g.vcount()))
def testEdgeBetweenness(self):
# Full graph, no weights
g = Graph.Full(5)
cl = g.community_edge_betweenness().as_clustering()
- self.assertEqual(cl.membership, [0]*5)
+ self.assertMembershipsEqual(cl, [0]*5)
# Full graph with weights
g.es["weight"] = 1
g[0,1] = g[1,2] = g[2,0] = g[3,4] = 10
cl = g.community_edge_betweenness(weights="weight").as_clustering()
- self.assertEqual(cl.membership, [0,0,0,1,1])
+ self.assertMembershipsEqual(cl, [0,0,0,1,1])
self.assertAlmostEqual(cl.q, 0.2750, places=3)
def testEigenvector(self):
g = Graph.Full(5) + Graph.Full(5)
g.add_edges([(0, 5)])
cl = g.community_leading_eigenvector()
- self.assertTrue(cl.membership == [0,0,0,0,0,1,1,1,1,1])
+ self.assertMembershipsEqual(cl, [0,0,0,0,0,1,1,1,1,1])
self.assertAlmostEqual(cl.q, 0.4523, places=3)
cl = g.community_leading_eigenvector(2)
- self.assertTrue(cl.membership == [0,0,0,0,0,1,1,1,1,1])
+ self.assertMembershipsEqual(cl, [0,0,0,0,0,1,1,1,1,1])
self.assertAlmostEqual(cl.q, 0.4523, places=3)
def testInfomap(self):
@@ -204,7 +214,7 @@
cl = g.community_infomap()
self.assertAlmostEqual(cl.codelength, 4.60605, places=3)
self.assertAlmostEqual(cl.q, 0.40203, places=3)
- self.assertTrue(cl.membership == [1,1,1,1,2,2,2,1,0,1,2,1,1,1,0,0,2,1,0,1,0,1] + [0]*12)
+ self.assertMembershipsEqual(cl, [1,1,1,1,2,2,2,1,0,1,2,1,1,1,0,0,2,1,0,1,0,1] + [0]*12)
# Smoke testing with vertex and edge weights
v_weights = [random.randint(1, 5) for _ in xrange(g.vcount())]
@@ -223,7 +233,7 @@
g.es["weight"] = [2, 1, 2]
g.vs["initial"] = [0, -1, -1, 1]
cl = g.community_label_propagation("weight", "initial", [1,0,0,1])
- self.assertTrue(cl.membership == [0, 0, 1, 1])
+ self.assertMembershipsEqual(cl, [0,0,1,1])
cl = g.community_label_propagation(initial="initial", fixed=[1,0,0,1])
self.assertTrue(cl.membership == [0, 0, 1, 1] or \
cl.membership == [0, 1, 1, 1] or \
@@ -240,8 +250,8 @@
(10,14), (11,13)]
cls = g.community_multilevel(return_levels=True)
self.assertTrue(len(cls) == 2)
- self.assertTrue(cls[0].membership == [0,0,0,1,0,0,1,1,2,2,2,3,2,3,2,2])
- self.assertTrue(cls[1].membership == [0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1])
+ self.assertMembershipsEqual(cls[0], [1,1,1,0,1,1,0,0,2,2,2,3,2,3,2,2])
+ self.assertMembershipsEqual(cls[1], [0,0,0,0,0,0,0,0,1,1,1,1,1,1,1,1])
self.assertAlmostEqual(cls[0].q, 0.346301, places=5)
self.assertAlmostEqual(cls[1].q, 0.392219, places=5)
@@ -251,7 +261,7 @@
cl = g.community_optimal_modularity()
self.assertTrue(len(cl) == 2)
- self.assertTrue(cl.membership == [0, 0, 1, 0, 1])
+ self.assertMembershipsEqual(cl, [0, 0, 1, 0, 1])
self.assertAlmostEqual(cl.q, 0.08, places=7)
ws = [i % 5 for i in xrange(g.ecount())]
@@ -262,7 +272,7 @@
g = Graph.Famous("zachary")
cl = g.community_optimal_modularity()
self.assertTrue(len(cl) == 4)
- self.assertTrue(cl.membership == [0, 0, 0, 0, 1, 1, 1, 0, 2, 2, 1, \
+ self.assertMembershipsEqual(cl, [0, 0, 0, 0, 1, 1, 1, 0, 2, 2, 1, \
0, 0, 0, 2, 2, 1, 0, 2, 0, 2, 0, 2, 3, 3, 3, 2, 3, 3, \
2, 2, 3, 2, 2])
self.assertAlmostEqual(cl.q, 0.4197896, places=7)
@@ -293,9 +303,9 @@
g = Graph.Full(5) + Graph.Full(5) + Graph.Full(5)
g += [(0,5), (5,10), (10, 0)]
cl = g.community_walktrap().as_clustering()
- self.assertTrue(cl.membership == [0,0,0,0,0,1,1,1,1,1,2,2,2,2,2])
+ self.assertMembershipsEqual(cl, [0,0,0,0,0,1,1,1,1,1,2,2,2,2,2])
cl = g.community_walktrap(steps=3).as_clustering()
- self.assertTrue(cl.membership == [0,0,0,0,0,1,1,1,1,1,2,2,2,2,2])
+ self.assertMembershipsEqual(cl, [0,0,0,0,0,1,1,1,1,1,2,2,2,2,2])
class CohesiveBlocksTests(unittest.TestCase):
|