Commit f2fc71ef authored by Maximilian Stahlberg's avatar Maximilian Stahlberg
Browse files

Update doctests that display SciPy matrix types.

parent 6f406f4b

doc/numscipy.rst

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ variable and some data: 
<class 'numpy.ndarray'>

>>> S = scipy.sparse.spdiags(range(4), 0, 4, 4)

>>> type(S)

<class 'scipy.sparse.dia.dia_matrix'>

<class 'scipy.sparse._dia.dia_matrix'>



.. rubric:: Taking input from NumPy or SciPy
@@ -85,7 +85,7 @@ array otherwise: 
[    0      1.00e+00     0    ]

[    0         0      1.00e+00]

>>> type(I.sp)

<class 'scipy.sparse.csc.csc_matrix'>

<class 'scipy.sparse._csc.csc_matrix'>

>>> J = picos.J(3, 3)

>>> print(J)

[ 1.00e+00  1.00e+00  1.00e+00]

picos/valuable.py

+1 −1
Original line number Diff line number Diff line
@@ -361,7 +361,7 @@ class Valuable(ABC): 
        >>> type(X.value)

        <class 'cvxopt.base.spmatrix'>

        >>> type(X.sp)

        <class 'scipy.sparse.csc.csc_matrix'>

        <class 'scipy.sparse._csc.csc_matrix'>

        >>> X.value = range(9)  # Stored as a dense matrix.

        >>> type(X.value)

        <class 'cvxopt.base.matrix'>