mjo/cone: drop is_symmetric_p{s,}d() methods.

[sage.d.git] / mjo / cone / completely_positive.py

diff --git a/mjo/cone/completely_positive.py b/mjo/cone/completely_positive.py
index 533c509012f6e0fd2e70ac0b989d22d09f34ffb0..3dc66b454dfb8a85a4aa2ba4a4be03978a5b3690 100644 (file)
--- a/mjo/cone/completely_positive.py
+++ b/mjo/cone/completely_positive.py
@@ -1,4 +1,4 @@
-"""
+r"""
 The completely positive cone `$\mathcal{K}$` over `\mathbb{R}^{n}$` is
 the set of all matrices `$A$`of the form `$\sum uu^{T}$` for `$u \in
 \mathbb{R}^{n}_{+}$`. Equivalently, `$A = XX{T}$` where all entries of
@@ -6,15 +6,9 @@ the set of all matrices `$A$`of the form `$\sum uu^{T}$` for `$u \in
 """
 
 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.cone"
-# resolves.
-from os.path import abspath
-from site import addsitedir
-addsitedir(abspath('../../'))
-from mjo.cone.symmetric_psd import factor_psd, is_symmetric_psd
-from mjo.cone.doubly_nonnegative import is_doubly_nonnegative, is_extreme_doubly_nonnegative
+from mjo.cone.symmetric_psd import factor_psd
+from mjo.cone.doubly_nonnegative import (is_doubly_nonnegative,
+                                         is_extreme_doubly_nonnegative)
 
 def is_completely_positive(A):
     """
@@ -95,7 +89,7 @@ def is_completely_positive(A):
         msg = 'The matrix ``A`` cannot be symbolic.'
         raise ValueError.new(msg)
 
-    if not is_symmetric_psd(A):
+    if not A.is_positive_semidefinite():
         return False
 
     n = A.nrows() # Makes sense since ``A`` is symmetric.
@@ -182,7 +176,7 @@ def is_extreme_completely_positive(A):
         msg = 'The matrix ``A`` cannot be symbolic.'
         raise ValueError(msg)
 
-    if not is_symmetric_psd(A):
+    if not A.is_positive_semidefinite():
         return False
 
     n = A.nrows() # Makes sense since ``A`` is symmetric.