bug #23 fixed

Author: counterclocker

doc/source/contents.rst

@@ -12,6 +12,7 @@ CySparse documentation
    :maxdepth: 2
 
    introduction
+   installation
    sparse_matrix_formats
    sparse_mat_hierarchy
    ll_mat

doc/source/cysparse_cython_users.rst

@@ -4,5 +4,8 @@
 :program:`CySparse` for :program:`Cython` users
 =========================================================
 
+I efficiency is a major concern to you, we strongly encourage you to use :program:`Cython` to 
+compile your own Python extension. 
+
 Accessing matrix elements
 ==========================

doc/source/installation.rst

@@ -0,0 +1,8 @@
+..  cysparse_intallation:
+
+===================================
+:program:`CySparse` installation
+===================================
+
+Depencies
+============

doc/source/introduction.rst

@@ -1,12 +1,21 @@
 .. introduction_to_cy_sparse:
 
-==========================
-Introduction to CySparse
-==========================
+====================================
+Introduction to :program:`CySparse`
+====================================
+
+What is :program:`CySparse`?
+=============================
+
+Content
+========
+
 
 :program:`PySparse` legacy
 ============================
 
+
+
 License
 ========
 

doc/source/ll_mat.rst

@@ -37,6 +37,22 @@ The :class:`LLSparseMatrixView` class
 Views of views
 --------------
 
+It is possible to have views of... views as the following code illustrates:
+
+..  code-block:: python 
+
+    A = MakeLLSparseMatrix(...)
+    A_view1 = A[..., ...]
+    A_view2 = A_view1[..., ...]
+
+The second :class:`LLSparseMatrixView` is **not** a view on a view but a direct view on the original matrix ``A``. The only difference between the two objects ``A_view1`` and ``A_view2`` is that 
+the indices given in the ``[..., ...]`` in ``A_view1[..., ...]`` refer to indices of ``A_view1`` **not** the original matrix ``A``.
+
+An example will clarify this:
+
+..  code-block:: python
+
+    pass
 
 References to the base :class:`LLSparseMatrix`
 ----------------------------------------------

examples/ll_mat_view.py

@@ -0,0 +1,22 @@
+from sparse_lib.sparse.ll_mat import LLSparseMatrix, MakeLLSparseMatrix
+import sys
+
+A = MakeLLSparseMatrix(nrow=2, ncol=4, size_hint=10)
+A.put_triplet([0,1, 2, 3, 4, 5, 6, 7], [0, 0, 0, 0, 1, 1, 1 ,1], [0, 1, 2, 3, 0 , 1, 2 , 3])
+
+A.print_to(sys.stdout)
+
+A_view = A[0:2, 0:4:2]
+A_view_copy = A_view.copy()
+A_view_copy.print_to(sys.stdout)
+
+A_view2 = A_view[1, 0:2]
+print "$" * 50
+print A_view2.nnz
+print "/" * 50
+A_view2_copy = A_view2.copy()
+A_view2_copy.print_to(sys.stdout)
+print "!" * 50
+A_view3 = A_view[::-1, ::-1]
+A_view3_copy = A_view3.copy()
+A_view3_copy.print_to(sys.stdout)

setup.py

@@ -58,7 +58,7 @@ def get_path_option(config, section, option):
   Extension("sparse_lib.sparse.sparse_mat", ["sparse_lib/sparse/sparse_mat.pxd", "sparse_lib/sparse/sparse_mat.pyx"], **sparse_ext_params),
   Extension("sparse_lib.sparse.csr_mat", ["sparse_lib/sparse/csr_mat.pxd", "sparse_lib/sparse/csr_mat.pyx"], **sparse_ext_params),
   Extension("sparse_lib.sparse.csc_mat", ["sparse_lib/sparse/csc_mat.pxd", "sparse_lib/sparse/csc_mat.pyx"], **sparse_ext_params),
-  Extension("sparse_lib.sparse.ll_mat_view", ["sparse_lib/sparse/ll_mat_view.pxd", "sparse_lib/sparse/ll_mat_view.pyx"], **sparse_ext_params),
+  Extension("sparse_lib.sparse.ll_mat_view", ["sparse_lib.sparse.object_index.pxi","sparse_lib/sparse/ll_mat_view.pxd", "sparse_lib/sparse/ll_mat_view.pyx"], **sparse_ext_params),
   Extension("sparse_lib.sparse.IO.mm", ["sparse_lib/sparse/IO/mm_read_file.pxi", "sparse_lib/sparse/IO/mm.pxd", "sparse_lib/sparse/IO/mm.pyx"], **sparse_ext_params),
   #Extension("sparse.ll_vec", ["sparse_lib/sparse/ll_vec.pyx"], **sparse_ext_params)
 ]