X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=mjo%2Fcone%2Fsymmetric_psd.py;h=e4be629447987bca42a6d3e795f1b9926bc378c8;hb=3da1b3bbfcc95758bcce3596a86b0697765bd177;hp=514d0392c1fbe4fbae72057a87fd5524744c0668;hpb=a4f22c00f915d4c20f5105039d647540c18b3d83;p=sage.d.git

diff --git a/mjo/cone/symmetric_psd.py b/mjo/cone/symmetric_psd.py
index 514d039..e4be629 100644
--- a/mjo/cone/symmetric_psd.py
+++ b/mjo/cone/symmetric_psd.py
@@ -6,14 +6,6 @@ all symmetric positive-semidefinite matrices (as a subset of
 
 from sage.all import *
 
-# Sage doesn't load ~/.sage/init.sage during testing (sage -t), so we
-# have to explicitly mangle our sitedir here so that "mjo.symbolic"
-# resolves.
-from os.path import abspath
-from site import addsitedir
-addsitedir(abspath('../../'))
-
-
 def is_symmetric_psd(A):
     """
     Determine whether or not the matrix ``A`` is symmetric
@@ -300,9 +292,8 @@ def random_psd(V, accept_zero=True, rank=None):
         # Use the one the user gave us.
         rank_A = rank
 
-    # Begin with the zero matrix, and add projectors to it if we have
-    # any.
-    A = V.zero_element().column()*V.zero_element().row()
+    # Begin with the zero matrix, and add projectors to it if we have any.
+    A = V.zero().column()*V.zero().row()
 
     # Careful, begin at idx=1 so that we only generate a projector
     # when rank_A is greater than zero.