X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=mjo%2Fcone%2Fdoubly_nonnegative.py;h=a30a827d158f3b99d7d9df5d295096e7cc349e0f;hb=93cab80b7a220a16a906be8442ba795d8146df14;hp=583c3c60e8b46d43f9226e413eea70e83000d969;hpb=411f3b1863b7ee61b9e4fa651e14ef13a68e8349;p=sage.d.git

diff --git a/mjo/cone/doubly_nonnegative.py b/mjo/cone/doubly_nonnegative.py
index 583c3c6..a30a827 100644
--- a/mjo/cone/doubly_nonnegative.py
+++ b/mjo/cone/doubly_nonnegative.py
@@ -13,7 +13,9 @@ It is represented typically by either `\mathcal{D}^{n}` or
 
 from sage.all import *
 
-from mjo.cone.symmetric_psd import factor_psd, is_symmetric_psd, random_psd
+from mjo.cone.symmetric_psd import (factor_psd,
+                                    is_symmetric_psd,
+                                    random_symmetric_psd)
 from mjo.matrix_vector import isomorphism
 
 
@@ -56,7 +58,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 +371,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
@@ -458,10 +460,10 @@ def random_doubly_nonnegative(V, accept_zero=True, rank=None):
 
     # Generate random symmetric positive-semidefinite matrices until
     # one of them is nonnegative, then return that.
-    A = random_psd(V, accept_zero, rank)
+    A = random_symmetric_psd(V, accept_zero, rank)
 
-    while not all([ x >= 0 for x in A.list() ]):
-        A = random_psd(V, accept_zero, rank)
+    while not all( x >= 0 for x in A.list() ):
+        A = random_symmetric_psd(V, accept_zero, rank)
 
     return A