# HG changeset patch
# User Nathann Cohen <nathann.cohen@gmail.com>
# Date 1327864079 -3600
# Node ID a8817ed5082bf4e9bdbb7512ee11f4059a8661fa
# Parent 221417268f2c6cb2b36372244da12fbcf55d3c21
trac 9714 -- Fixing the "loop" management in the Graph() constructor -- reviewer's patch
diff --git a/sage/graphs/graph.py b/sage/graphs/graph.py
a
|
b
|
|
1071 | 1071 | positions.append(tuple(NZ)) |
1072 | 1072 | L = uniq(c.list()) |
1073 | 1073 | L.sort() |
1074 | | desirable = [-1, 0, 1] if len(NZ) == 2 else [0, 1] |
1075 | | if data.nrows() == len(desirable) - 1: |
1076 | | desirable = filter(lambda i: i != 0, desirable) |
| 1074 | |
| 1075 | if data.nrows() != len(desirable) - 1: |
| 1076 | desirable = [-1, 0, 1] if len(NZ) == 2 else [0, 1] |
| 1077 | else: |
| 1078 | desirable = [-1, 1] if len(NZ) == 2 else [1] |
| 1079 | |
1077 | 1080 | if L != desirable: |
1078 | 1081 | msg += "Each column represents an edge: -1 goes to 1." |
1079 | 1082 | assert False |