umfpack continued

Author: counterclocker

benchmarks/todo.txt

@@ -3,4 +3,4 @@ Benchmarks:
 compare to:
   - PySparse
   - Scipy sparse matrices
-  - utilisation BLAS 
+  - with the use of BLAS via Tokyo

examples/umfpack.py

@@ -1,15 +1,13 @@
 from sparse_lib.sparse.ll_mat import MakeLLSparseMatrix
 import sparse_lib.solvers.suitesparse.umfpack as umfpack
 
-matrix = MakeLLSparseMatrix(nrow=2, ncol=3, size_hint=10)
-print matrix
-matrix[0, 0] = 1
-matrix[0, 2] = 3.6
-matrix[1, 1] = 1
-matrix[1, 2] = -2
+import numpy
 
+A = MakeLLSparseMatrix(size=4)
 
-solver = umfpack.UmfpackSolver(matrix)
+A.put_triplet([1.0, 2.0, 6.0, 3.0, 5.0, 4.0], [0, 1, 1, 2, 3, 3], [0, 1, 2, 2, 0, 3])
+
+solver = umfpack.UmfpackSolver(A)
 
 print solver.UMFPACK_VERSION
 
@@ -23,3 +21,21 @@
 solver.report_symbolic()
 
 solver.report_numeric()
+
+print "*" * 80
+
+
+b = numpy.array([1.0, 1.0, 1.0, 1.0])
+
+sol = solver.solve(b)
+
+print "Solution: ",
+print sol
+print "b: ",
+print b
+print "A*sol: ",
+print A * sol
+
+print "&" * 80
+
+print solver.get_lunz()