X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;ds=sidebyside;f=mjo%2Fcone%2Fdoubly_nonnegative.py;h=92184d15c4133e33f04e877352787378ae3739df;hb=cc84aa97cee45609d60893755d5b06be2c79f32e;hp=583c3c60e8b46d43f9226e413eea70e83000d969;hpb=411f3b1863b7ee61b9e4fa651e14ef13a68e8349;p=sage.d.git diff --git a/mjo/cone/doubly_nonnegative.py b/mjo/cone/doubly_nonnegative.py index 583c3c6..92184d1 100644 --- a/mjo/cone/doubly_nonnegative.py +++ b/mjo/cone/doubly_nonnegative.py @@ -56,7 +56,7 @@ def is_doubly_nonnegative(A): raise ValueError.new(msg) # Check that all of the entries of ``A`` are nonnegative. - if not all([ a >= 0 for a in A.list() ]): + if not all( a >= 0 for a in A.list() ): return False # It's nonnegative, so all we need to do is check that it's @@ -369,8 +369,8 @@ def is_extreme_doubly_nonnegative(A): # whenever we come across an index pair `$(i,j)$` with # `$A_{ij} = 0$`. spanning_set = [] - for j in range(0, A.ncols()): - for i in range(0,j): + for j in xrange(A.ncols()): + for i in xrange(j): if A[i,j] == 0: M = A.matrix_space() S = X.transpose() * (stdE(M,i,j) + stdE(M,j,i)) * X @@ -460,7 +460,7 @@ def random_doubly_nonnegative(V, accept_zero=True, rank=None): # one of them is nonnegative, then return that. A = random_psd(V, accept_zero, rank) - while not all([ x >= 0 for x in A.list() ]): + while not all( x >= 0 for x in A.list() ): A = random_psd(V, accept_zero, rank) return A